diff --git a/resource/plugin.yml b/resource/plugin.yml index fb2e3d0..d34143f 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.16.3.0 +version: 3.16.3.1 main: me.rockyhawk.commandpanels.CommandPanels name: CommandPanels author: RockyHawk diff --git a/src/me/rockyhawk/commandpanels/Utils.java b/src/me/rockyhawk/commandpanels/Utils.java index c4ad32a..f4ebd0b 100644 --- a/src/me/rockyhawk/commandpanels/Utils.java +++ b/src/me/rockyhawk/commandpanels/Utils.java @@ -41,11 +41,6 @@ public class Utils implements Listener { //set the panel to the top panel Panel panel = plugin.openPanels.getOpenPanel(p.getName(),PanelPosition.Top); - if(e.getAction() == InventoryAction.MOVE_TO_OTHER_INVENTORY){ - e.setCancelled(true); - return; - } - if(e.getSlotType() == InventoryType.SlotType.OUTSIDE){ //if the panel is clicked on the outside area of the GUI if (panel.getConfig().contains("outside-commands")) { @@ -60,6 +55,13 @@ public class Utils implements Listener { PanelPosition position = PanelPosition.Top; if(e.getClickedInventory().getType() == InventoryType.PLAYER) { + //cancel the event and return, stops items going from players inventory to the panels + if(e.getAction() == InventoryAction.MOVE_TO_OTHER_INVENTORY){ + e.setCancelled(true); + return; + } + + //do player or panel inventory checks if (e.getSlotType() == InventoryType.SlotType.CONTAINER) { if(plugin.openPanels.hasPanelOpen(p.getName(),PanelPosition.Middle)) { position = PanelPosition.Middle; @@ -108,6 +110,7 @@ public class Utils implements Listener { } } + //updates the inventory to stop item glitches e.setCancelled(true); p.updateInventory(); diff --git a/src/me/rockyhawk/commandpanels/openpanelsmanager/OpenGUI.java b/src/me/rockyhawk/commandpanels/openpanelsmanager/OpenGUI.java index fe6467a..c148e76 100644 --- a/src/me/rockyhawk/commandpanels/openpanelsmanager/OpenGUI.java +++ b/src/me/rockyhawk/commandpanels/openpanelsmanager/OpenGUI.java @@ -218,7 +218,7 @@ public class OpenGUI { return false; } try { - int d = Integer.parseInt(strNum); + int unused = Integer.parseInt(strNum); } catch (NumberFormatException nfe) { return false; }