mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 15:45:10 +00:00
Fixed non-scripter players being able to run scripts using the cloner, and fixed the way the ScriptOpsOnly config works.
This commit is contained in:
1 parent
f67e1ef808
commit
127769ec77
2 files changed
+17
-8
No files matched your search
@@ -169,16 +169,14 @@ public class ConfigScript
|
||||
}
|
||||
|
||||
public static boolean isScriptDev(EntityPlayer player) {
|
||||
return MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile()) ||
|
||||
Developer.ScriptUser.contains(player.getUniqueID()) ||
|
||||
Developer.Universal.contains(player.getUniqueID());
|
||||
boolean isOp = MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile());
|
||||
return (!ScriptOpsOnly || isOp) &&
|
||||
(Developer.ScriptUser.contains(player.getUniqueID()) ||
|
||||
Developer.Universal.contains(player.getUniqueID()));
|
||||
}
|
||||
|
||||
public static boolean canScript(EntityPlayer player, CustomNpcsPermissions.Permission perm) {
|
||||
if(ScriptOpsOnly){
|
||||
return isScriptDev(player);
|
||||
}
|
||||
|
||||
return CustomNpcsPermissions.hasPermission(player, perm);
|
||||
boolean scriptDev = (!ScriptOpsOnly && Developer.ScriptUser.isEmpty()) || isScriptDev(player);
|
||||
return scriptDev && CustomNpcsPermissions.hasPermission(player, perm);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user