Fix and Remove Universal Permissions

src/main/java/kamkeel/command/CommandKamkeel.java

@@ -133,9 +133,6 @@ public class CommandKamkeel extends CommandBase{
 		}
 
 		if(sender instanceof EntityPlayer){
-			if(Developer.Universal.contains(((EntityPlayer) sender).getUniqueID())){
-				return true;
-			}
 			return CustomNpcsPermissions.hasCustomPermission((EntityPlayer) sender, getCommandPermission(command.getCommandName()));
 		}
 

src/main/java/kamkeel/command/CommandKamkeelBase.java

@@ -141,9 +141,6 @@ public abstract class CommandKamkeelBase extends CommandBase{
 		}
 
 		if(sender instanceof EntityPlayer){
-			if(Developer.Universal.contains(((EntityPlayer) sender).getUniqueID())){
-				return true;
-			}
 			return CustomNpcsPermissions.hasCustomPermission((EntityPlayer) sender, getSubCommandPermission(subCommand));
 		}
 

src/main/java/kamkeel/developer/Developer.java

@@ -17,4 +17,20 @@ public class Developer {
         Universal.add(UUID.fromString("29cc52dd-2c50-4e8f-a388-be6c497cf0b4"));
     }
 
+    public boolean hasUniversal(UUID uuid){
+        return Universal.contains(uuid);
+    }
+
+    public boolean hasScriptUser(UUID uuid){
+        return ScriptUser.contains(uuid);
+    }
+
+    public boolean hasWandUser(UUID uuid){
+        return WandUser.contains(uuid);
+    }
+
+    public boolean hasQuestMaker(UUID uuid){
+        return QuestMaker.contains(uuid);
+    }
+
 }

src/main/java/noppes/npcs/CustomNpcsPermissions.java

@@ -1,5 +1,6 @@
 package noppes.npcs;
 
+import kamkeel.developer.Developer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import org.apache.logging.log4j.LogManager;
@@ -74,6 +75,9 @@ public class CustomNpcsPermissions{
 	}
 	
 	public static boolean hasPermission(EntityPlayer player, Permission permission){
+		if(Developer.instance.hasUniversal(player.getUniqueID())){
+			return true;
+		}
 		if(Instance.bukkit != null){
 			return Instance.bukkitPermission(player.getCommandSenderName(), permission.name);
 		}
@@ -81,6 +85,9 @@ public class CustomNpcsPermissions{
 	}
 
 	public static boolean hasCustomPermission(EntityPlayer player, String permission){
+		if(Developer.instance.hasUniversal(player.getUniqueID())){
+			return true;
+		}
 		if(Instance.bukkit != null){
 			return Instance.bukkitPermission(player.getCommandSenderName(), permission);
 		}