From 9b161cb1c242c87c969294ec14aa316f22e7a04a Mon Sep 17 00:00:00 2001 From: garbagemule Date: Wed, 22 Jan 2014 13:49:39 +0100 Subject: [PATCH] Simplify Setup Mode listener unregistration. --- .../MobArena/commands/setup/SetupCommand.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java b/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java index 3177209..ab111bc 100644 --- a/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java +++ b/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java @@ -17,10 +17,7 @@ import org.bukkit.block.Block; import org.bukkit.command.CommandSender; import org.bukkit.conversations.*; import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; +import org.bukkit.event.*; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.player.PlayerDropItemEvent; @@ -367,11 +364,7 @@ public class SetupCommand implements Command, Listener { @Override public void conversationAbandoned(ConversationAbandonedEvent event) { // Unregister listener - PlayerInteractEvent.getHandlerList().unregister(this); - PlayerDropItemEvent.getHandlerList().unregister(this); - BlockBreakEvent.getHandlerList().unregister(this); - PlayerQuitEvent.getHandlerList().unregister(this); - PluginDisableEvent.getHandlerList().unregister(this); + HandlerList.unregisterAll(this); // Restore player and arena state arena.setEnabled(enabled);