From 5f9a852b418743f2f170c183239c8e857232f147 Mon Sep 17 00:00:00 2001 From: rockyhawk64 Date: Tue, 15 Dec 2020 22:15:22 +1100 Subject: [PATCH] v3.14.2.5 --- resource/config.yml | 3 ++- resource/plugin.yml | 2 +- .../commandpanels/commands/Commandpanelsreload.java | 6 ++++-- .../commandpanels/panelblocks/PanelBlockOnClick.java | 4 +++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/resource/config.yml b/resource/config.yml index 4af70b8..3d20d9b 100644 --- a/resource/config.yml +++ b/resource/config.yml @@ -1,6 +1,6 @@ # |------------------------------------------------------------------------ # | CommandPanels Config File -# | By RockyHawk v4.3 +# | By RockyHawk v4.4 # | https://www.spigotmc.org/resources/command-panels-custom-guis.67788/ # | # | auto-update and minor-updates-only is HEAVILY RECOMMENDED @@ -11,6 +11,7 @@ config: ingame-editor: true hotbar-items: true custom-commands: true + auto-register-commands: true refresh-delay: 4 server-ping-timeout: 10 stop-sound: true diff --git a/resource/plugin.yml b/resource/plugin.yml index 5508c1b..7a7bce1 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.14.2.4 +version: 3.14.2.5 main: me.rockyhawk.commandpanels.CommandPanels name: CommandPanels author: RockyHawk diff --git a/src/me/rockyhawk/commandpanels/commands/Commandpanelsreload.java b/src/me/rockyhawk/commandpanels/commands/Commandpanelsreload.java index 3eb2232..868668f 100644 --- a/src/me/rockyhawk/commandpanels/commands/Commandpanelsreload.java +++ b/src/me/rockyhawk/commandpanels/commands/Commandpanelsreload.java @@ -36,8 +36,10 @@ public class Commandpanelsreload implements CommandExecutor { //reloadHotbarSlots plugin.hotbar.reloadHotbarSlots(); - //add custom commands - registerCommands(); + //add custom commands to commands.yml + if(plugin.config.getString("config.auto-register-commands").equalsIgnoreCase("true")) { + registerCommands(); + } plugin.tag = plugin.papi(plugin.config.getString("config.format.tag") + " "); sender.sendMessage(plugin.papi(plugin.tag + plugin.config.getString("config.format.reload"))); diff --git a/src/me/rockyhawk/commandpanels/panelblocks/PanelBlockOnClick.java b/src/me/rockyhawk/commandpanels/panelblocks/PanelBlockOnClick.java index ab5150d..7e9a2d4 100644 --- a/src/me/rockyhawk/commandpanels/panelblocks/PanelBlockOnClick.java +++ b/src/me/rockyhawk/commandpanels/panelblocks/PanelBlockOnClick.java @@ -31,7 +31,9 @@ public class PanelBlockOnClick implements Listener { if(!plugin.blockConfig.contains("blocks")){ return; } - if(Objects.requireNonNull(plugin.config.getString("config.panel-blocks")).equalsIgnoreCase("false")){ + if(plugin.openPanels.hasPanelOpen(p.getName())) { + //some blocks run this event twice, skip if panel already open + //as blocks cannot be clicked obviously if a panel is open return; } for (String configLocation : Objects.requireNonNull(plugin.blockConfig.getConfigurationSection("blocks")).getKeys(false)) {