From a518bfaf8239d834aefd487b9af23880d331a2ec Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Fri, 23 Nov 2018 21:34:22 -0500 Subject: [PATCH] Anther fix. --- .../com/songoda/ultimaterepairing/UltimateRepairing.java | 3 --- .../songoda/ultimaterepairing/anvil/editor/Editor.java | 8 ++++++-- .../ultimaterepairing/events/InventoryListeners.java | 6 ++++++ .../songoda/ultimaterepairing/utils/SettingsManager.java | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java b/src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java index a68cdeb..838ec2b 100644 --- a/src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java +++ b/src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java @@ -22,9 +22,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -import java.util.ArrayList; -import java.util.List; - public final class UltimateRepairing extends JavaPlugin implements Listener { private static CommandSender console = Bukkit.getConsoleSender(); diff --git a/src/main/java/com/songoda/ultimaterepairing/anvil/editor/Editor.java b/src/main/java/com/songoda/ultimaterepairing/anvil/editor/Editor.java index b0f97c2..27c6b5d 100644 --- a/src/main/java/com/songoda/ultimaterepairing/anvil/editor/Editor.java +++ b/src/main/java/com/songoda/ultimaterepairing/anvil/editor/Editor.java @@ -26,7 +26,7 @@ public class Editor { } public void open(Player player, Block block) { - UAnvil anvil = editing.put(player.getUniqueId(), instance.getAnvilManager().getAnvil(block)); + UAnvil anvil = instance.getAnvilManager().getAnvil(block); open(player, anvil); } @@ -62,7 +62,7 @@ public class Editor { inventory.setItem(15, Methods.createButton(Material.FIREWORK_ROCKET, "&9&lToggle Particles", anvil.isParticles() ? "&7Currently: &aEnabled&7." : "&7Currently &cDisabled&7.")); player.openInventory(inventory); - + editing.put(player.getUniqueId(), anvil); } public void toggleHologram(Player player) { @@ -87,4 +87,8 @@ public class Editor { return editing.containsKey(player.getUniqueId()); } + public void removeEditing(Player player) { + editing.remove(player.getUniqueId()); + } + } diff --git a/src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java b/src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java index 7cf41be..4ddccd0 100644 --- a/src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java +++ b/src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java @@ -8,6 +8,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryPickupItemEvent; /** @@ -72,4 +73,9 @@ public class InventoryListeners implements Listener { Debugger.runReport(ex); } } + + @EventHandler + public void onClose(InventoryCloseEvent event) { + instance.getEditor().removeEditing((Player)event.getPlayer()); + } } \ No newline at end of file diff --git a/src/main/java/com/songoda/ultimaterepairing/utils/SettingsManager.java b/src/main/java/com/songoda/ultimaterepairing/utils/SettingsManager.java index 224e168..e840ca5 100644 --- a/src/main/java/com/songoda/ultimaterepairing/utils/SettingsManager.java +++ b/src/main/java/com/songoda/ultimaterepairing/utils/SettingsManager.java @@ -21,7 +21,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * Created by songo on 6/4/2017. + * Created by songoda on 6/4/2017. */ public class SettingsManager implements Listener {