From 9349a914cef190f09a57af2469593ad367fc14ca Mon Sep 17 00:00:00 2001 From: Driftay Date: Sat, 16 Nov 2019 04:25:34 -0500 Subject: [PATCH] Misc Changes --- src/main/java/com/massivecraft/factions/cmd/CmdLock.java | 1 - .../factions/zcore/fperms/gui/PermissableRelationFrame.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdLock.java b/src/main/java/com/massivecraft/factions/cmd/CmdLock.java index d0fe8b5e..e5486928 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdLock.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdLock.java @@ -19,7 +19,6 @@ public class CmdLock extends FCommand { this.optionalArgs.put("on/off", "flip"); this.requirements = new CommandRequirements.Builder(Permission.LOCK) - .playerOnly() .build(); } diff --git a/src/main/java/com/massivecraft/factions/zcore/fperms/gui/PermissableRelationFrame.java b/src/main/java/com/massivecraft/factions/zcore/fperms/gui/PermissableRelationFrame.java index ba5e3d92..0e5cd655 100644 --- a/src/main/java/com/massivecraft/factions/zcore/fperms/gui/PermissableRelationFrame.java +++ b/src/main/java/com/massivecraft/factions/zcore/fperms/gui/PermissableRelationFrame.java @@ -37,6 +37,7 @@ public class PermissableRelationFrame { GUIItems.add(new GuiItem(dumby, e -> e.setCancelled(true))); ConfigurationSection sec = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.relation"); for (String key : sec.getConfigurationSection("slots").getKeys(false)) { + if (key == null || sec.getInt("slots." + key) < 0) continue; GUIItems.set(sec.getInt("slots." + key), new GuiItem(buildAsset("fperm-gui.relation.materials." + key, key), e -> { e.setCancelled(true); // Closing and opening resets the cursor.