From f0d7c9ed1e41b1dd66190706d45c76e5527651f0 Mon Sep 17 00:00:00 2001 From: mfnalex <1122571+mfnalex@users.noreply.github.com> Date: Thu, 16 Jul 2020 21:57:57 +0200 Subject: [PATCH] 8.16.1-SNAPSHOT (should be fine) --- CHANGELOG.md | 3 +++ .../ChestSort/ChestSortChestSortCommand.java | 13 +++++++++++++ .../de/jeff_media/ChestSort/ChestSortListener.java | 2 +- .../de/jeff_media/ChestSort/ChestSortPlugin.java | 5 ++++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 641a34d..e4b1478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 8.16.1 +- Allow middle-click hotkey in creative mode when clicked slot is empty + ## 8.16.0 - Added generic hook for 3rd party plugin GUIs - Added config option to disable additional hotkeys (left-click and right-click outside of inventory) diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortChestSortCommand.java b/src/main/java/de/jeff_media/ChestSort/ChestSortChestSortCommand.java index 9b7012c..29bad01 100644 --- a/src/main/java/de/jeff_media/ChestSort/ChestSortChestSortCommand.java +++ b/src/main/java/de/jeff_media/ChestSort/ChestSortChestSortCommand.java @@ -36,6 +36,19 @@ public class ChestSortChestSortCommand implements CommandExecutor { return true; } + // Debug command + if(args.length>0 && args[0].equalsIgnoreCase("debug")) { + if(!sender.hasPermission("chestsort.debug")) { + sender.sendMessage(plugin.getCommand("chestsort").getPermissionMessage()); + } + sender.sendMessage(ChatColor.RED+"ChestSort Debug mode enabled - I hope you know what you are doing!"); + plugin.debug=true; + ChestSortDebugger debugger = new ChestSortDebugger(plugin); + plugin.getServer().getPluginManager().registerEvents(debugger, plugin); + plugin.debug("Debug mode activated through command by "+sender.getName()); + return true; + } + if(args.length>0 && args[0].equalsIgnoreCase("help")) { return false; } diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortListener.java b/src/main/java/de/jeff_media/ChestSort/ChestSortListener.java index 8e2a851..9729fb9 100644 --- a/src/main/java/de/jeff_media/ChestSort/ChestSortListener.java +++ b/src/main/java/de/jeff_media/ChestSort/ChestSortListener.java @@ -376,7 +376,7 @@ public class ChestSortListener implements Listener { if (event.getWhoClicked().getGameMode() != GameMode.CREATIVE) { sort = true; } else { - if (event.getCurrentItem() == null || event.getCurrentItem().getType() == Material.AIR) { + if (event.getCurrentItem() != null || event.getCurrentItem().getType() != Material.AIR) { sort = false; } } diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortPlugin.java b/src/main/java/de/jeff_media/ChestSort/ChestSortPlugin.java index bd97332..5efcc55 100644 --- a/src/main/java/de/jeff_media/ChestSort/ChestSortPlugin.java +++ b/src/main/java/de/jeff_media/ChestSort/ChestSortPlugin.java @@ -161,7 +161,10 @@ public class ChestSortPlugin extends JavaPlugin implements de.jeff_media.ChestSo // Using old config version, but it's no problem. We just print a warning and // use the default values later on - } else*/ if (getConfig().getInt("config-version", 0) != currentConfigVersion) { + + } else*/ + + if (getConfig().getInt("config-version", 0) != currentConfigVersion) { showOldConfigWarning(); ChestSortConfigUpdater configUpdater = new ChestSortConfigUpdater(this); configUpdater.updateConfig();