Fix Permissions Handler Error

PeTcHeNkA · Mar 27, 2024 · 3421fc1 · 3421fc1
1 parent 076fb62
commit 3421fc1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/noppes/npcs/CustomNpcsPermissions.java b/src/main/java/noppes/npcs/CustomNpcsPermissions.java
@@ -1,5 +1,7 @@
 package noppes.npcs;
 
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
 import kamkeel.developer.Developer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -108,7 +110,7 @@ public CustomNpcsPermissions(){
 
 	public static boolean hasPermission(EntityPlayer player, Permission permission){
 		if(player != null){
-            if(NoppesUtilServer.isOp(player))
+            if(FMLCommonHandler.instance().getSide() == Side.SERVER && NoppesUtilServer.isOp(player))
                 return true;
 			if(Developer.Instance.hasUniversal(player.getUniqueID()))
 				return true;

diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java
@@ -103,7 +103,7 @@ else if(item.getItem() == CustomItems.cloner && !isRemote && !(event.target inst
 			event.setCanceled(true);
 		}
 		else if(item.getItem() == CustomItems.scripter && !isRemote && npcInteracted){
-			if(!CustomNpcsPermissions.Instance.hasPermission(event.entityPlayer, CustomNpcsPermissions.TOOL_SCRIPTER))
+			if(!CustomNpcsPermissions.hasPermission(event.entityPlayer, CustomNpcsPermissions.TOOL_SCRIPTER))
 				return;
 			NoppesUtilServer.setEditingNpc(event.entityPlayer, (EntityNPCInterface)event.target);
 			event.setCanceled(true);
@@ -113,15 +113,15 @@ else if(item.getItem() == CustomItems.scripter && !isRemote && npcInteracted){
 			}
 		}
 		else if(item.getItem() == CustomItems.mount){
-			if(!CustomNpcsPermissions.Instance.hasPermission(event.entityPlayer, CustomNpcsPermissions.TOOL_MOUNTER))
+			if(!CustomNpcsPermissions.hasPermission(event.entityPlayer, CustomNpcsPermissions.TOOL_MOUNTER))
 				return;
 			event.setCanceled(true);
 			mounted = event.target;
 			if(isRemote)
 				CustomNpcs.proxy.openGui(MathHelper.floor_double(mounted.posX), MathHelper.floor_double(mounted.posY), MathHelper.floor_double(mounted.posZ), EnumGuiType.MobSpawnerMounter, event.entityPlayer);
 		}
-		else if(item.getItem() == CustomItems.wand && event.target instanceof EntityVillager){
-			if(!CustomNpcsPermissions.Instance.hasPermission(event.entityPlayer, CustomNpcsPermissions.EDIT_VILLAGER))
+		else if(item.getItem() == CustomItems.wand && !isRemote && event.target instanceof EntityVillager){
+			if(!CustomNpcsPermissions.hasPermission(event.entityPlayer, CustomNpcsPermissions.EDIT_VILLAGER))
 				return;
 			event.setCanceled(true);
 			Merchant = (EntityVillager)event.target;