diff --git a/CommandGUI V2/pom.xml b/CommandGUI V2/pom.xml index 9960bf5..44c1f5f 100644 --- a/CommandGUI V2/pom.xml +++ b/CommandGUI V2/pom.xml @@ -6,7 +6,7 @@ net.t2code CommandGUI_V2 - 2.7.0 + 2.7.1 jar CommandGUI diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java index 1b9e68f..59c7a4f 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java @@ -43,19 +43,20 @@ public class ItemChange { } } } - send.debug(Main.plugin,"GiveOnlyOnFirstJoin: " +player.getName()); + send.debug(Main.plugin, "GiveOnlyOnFirstJoin: " + player.getName()); return; } if (!SelectConfig.UseItem_GiveOnEveryJoin) { - send.debug(Main.plugin,"!GiveOnEveryJoin: " +player.getName()); + send.debug(Main.plugin, "!GiveOnEveryJoin: " + player.getName()); return; } new BukkitRunnable() { @Override public void run() { + if (player == null) return; if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player)) { if (SelectConfig.UseItem_InventorySlotEnforce || player.getInventory().getItem(slot - 1) == null) { - send.debug(Main.plugin,"Give: " +player.getName()); + send.debug(Main.plugin, "Give: " + player.getName()); UseItem.giveUseItem(player); if (setCursor) { setCursor(player, slot); @@ -79,37 +80,37 @@ public class ItemChange { } private static void setCursor(Player player, int slot) { - send.debug(Main.plugin,"setCursor 1 Player: "+player.getName()); + send.debug(Main.plugin, "setCursor 1 Player: " + player.getName()); if (!SelectConfig.Cursor_ToGUIItem_OnLogin) { return; } - send.debug(Main.plugin,"setCursor 2 Player: "+player.getName()); + send.debug(Main.plugin, "setCursor 2 Player: " + player.getName()); if (SelectConfig.Cursor_ToGUIItem_OnlyOnFirstLogin) { if (!player.hasPlayedBefore()) { player.getInventory().setHeldItemSlot(slot - 1); - send.debug(Main.plugin,"setCursor 3 Player: "+player.getName()); + send.debug(Main.plugin, "setCursor 3 Player: " + player.getName()); } return; } - send.debug(Main.plugin,"setCursor 4 Player: "+player.getName()); + send.debug(Main.plugin, "setCursor 4 Player: " + player.getName()); if (!SelectConfig.Bungee) { player.getInventory().setHeldItemSlot(slot - 1); - send.debug(Main.plugin,"setCursor 5 Player: "+player.getName()); + send.debug(Main.plugin, "setCursor 5 Player: " + player.getName()); return; } - send.debug(Main.plugin,"setCursor 6 Player: "+player.getName()); + send.debug(Main.plugin, "setCursor 6 Player: " + player.getName()); if (SelectConfig.UseItem_ServerChange) { player.getInventory().setHeldItemSlot(slot - 1); - send.debug(Main.plugin,"setCursor 7 Player: "+player.getName()); + send.debug(Main.plugin, "setCursor 7 Player: " + player.getName()); return; } - send.debug(Main.plugin,"setCursor 8 Player: "+player.getName()); - send.debug(Main.plugin,"setCursor bungeejoinplayers: " +Main.bungeejoinplayers); - send.debug(Main.plugin,"setCursor Player: " +player.getName()); + send.debug(Main.plugin, "setCursor 8 Player: " + player.getName()); + send.debug(Main.plugin, "setCursor bungeejoinplayers: " + Main.bungeejoinplayers); + send.debug(Main.plugin, "setCursor Player: " + player.getName()); if (Main.bungeejoinplayers.contains(player.getName())) { player.getInventory().setHeldItemSlot(slot - 1); - send.debug(Main.plugin,"setCursor 9 Player: "+player.getName()); + send.debug(Main.plugin, "setCursor 9 Player: " + player.getName()); Main.bungeejoinplayers.remove(player.getName()); } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java index 49492b1..fa0610f 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java @@ -160,9 +160,11 @@ public class Events implements Listener { private static void openGUI(PlayerInteractEvent e, Player player) { e.setCancelled(true); - if (SelectConfig.disableInfoBySneak && player.isSneaking()) { - Commands.info(player); - return; + if (!SelectConfig.disableInfoBySneak){ + if ( player.isSneaking()) { + Commands.info(player); + return; + } } if (!legacy()) { diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java index 2f9525c..635f183 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java @@ -65,7 +65,6 @@ public class Commands { CmdExecuter_GUITab.arg1.clear(); CmdExecuter_GUITab.arg1.put("admin", "commandgui.admin;commandgui.giveitem.other;commandgui.command.info"); - ConfigCreate.configCreate(); SelectConfig.onSelect(); Main.plugin.reloadConfig(); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java index f9c2d25..0e6f2a7 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java @@ -61,7 +61,7 @@ public class SelectConfig { public static String UseItemWorldMode; public static List UseItemWorldList; - public static Boolean disableInfoBySneak; + public static Boolean disableInfoBySneak = false; public static Boolean UseItem_InventorySlot_FreeSlot; public static Integer UseItem_InventorySlot;