Fix Script Permission

This commit is contained in:
Kam committed 2024-03-07 19:34:25 -05:00
1 parent bc44d34ab3
commit 739bc932f9
5 files changed
+14 -4

No files matched your search

@@ -72,6 +72,7 @@ public class CustomNpcsPermissions{
public static final Permission SOULSTONE_ALL = new Permission("customnpcs.soulstone.all");
// Modify / Save Scripts
public static final Permission SCRIPT = new Permission("customnpcs.script");
public static final Permission SCRIPT_NPC = new Permission("customnpcs.script.npc");
public static final Permission SCRIPT_FORGE = new Permission("customnpcs.script.forge");
public static final Permission SCRIPT_PLAYER = new Permission("customnpcs.script.player");
@@ -285,7 +285,7 @@ public class PacketHandlerServer{
featherPackets(type, buffer, player);
else if (item.getItem() == Item.getItemFromBlock(CustomItems.waypoint) || item.getItem() == Item.getItemFromBlock(CustomItems.border) || item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock))
blockPackets(type, buffer, player);
else if (ConfigScript.isScriptDev(player)) {
else if (ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) {
if (type == EnumPacketServer.EventScriptDataGet || type == EnumPacketServer.EventScriptDataSave)
npcEventScriptPackets(type, buffer, player, npc);
else if (type == EnumPacketServer.ScriptPlayerGet || type == EnumPacketServer.ScriptPlayerSave)
@@ -7,6 +7,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import noppes.npcs.CustomNpcs;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.config.legacy.LegacyConfig;
import org.apache.logging.log4j.Level;
@@ -168,8 +169,16 @@ public class ConfigScript
}
public static boolean isScriptDev(EntityPlayer player) {
return ScriptOpsOnly && MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile()) ||
return MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile()) ||
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);
}
}
@@ -37,7 +37,7 @@ public class ItemNpcScripter extends Item{
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player){
if(!world.isRemote)
return itemStack;
if(!ConfigScript.isScriptDev(player) && !CustomNpcsPermissions.hasPermission(player, CustomNpcsPermissions.TOOL_SCRIPTER)){
if(!ConfigScript.canScript(player, CustomNpcsPermissions.TOOL_SCRIPTER)){
player.addChatMessage(new ChatComponentTranslation("availability.permission"));
} else {
CustomNpcs.proxy.openGui(0, 0, 0, EnumGuiType.ScriptEvent, player);
@@ -59,7 +59,7 @@ public class ItemScripted extends Item implements ItemRenderInterface {
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
{
if(player.isSneaking() && player.capabilities.isCreativeMode) {
if(!ConfigScript.isScriptDev(player) && !CustomNpcsPermissions.Instance.hasPermission(player, CustomNpcsPermissions.TOOL_SCRIPTED_ITEM)){
if(!ConfigScript.canScript(player, CustomNpcsPermissions.TOOL_SCRIPTED_ITEM)){
player.addChatMessage(new ChatComponentTranslation("availability.permission"));
} else {
CustomNpcs.proxy.openGui(0, 0, 0, EnumGuiType.ScriptItem, player);