diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-02-25 17:22:39 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-02-25 17:22:39 +0000 |
commit | 9f02fb4dd4367fcaa8cca03b61e520e76c58030b (patch) | |
tree | b70cafcdcd4d21bc734daa4107832f31129ee16b /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java | |
parent | 8042cefd3daca229066578fe83a9b75eac09bb31 (diff) | |
parent | 07baa6e611f153dd75b512127a4aa9996fd04892 (diff) | |
download | Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.tar Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.tar.gz Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.tar.lz Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.tar.xz Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.zip |
Merge branch 'master' into release
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java')
-rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index af80647a6..9c257662d 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -9,8 +9,6 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; import org.bukkit.entity.Player; -import org.bukkit.event.Event.Priority; -import org.bukkit.event.Event.Type; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; @@ -65,21 +63,8 @@ public class EssentialsProtect extends JavaPlugin implements IProtect private void enableEmergencyMode(final PluginManager pm) { - //final EmergencyListener emListener = new EmergencyListener(); - //pm.registerEvents(emListener, this); - - //TODO: Remove deprecated listners in a few weeks. - - final EmergencyBlockListener emBlockListener = new EmergencyBlockListener(); - final EmergencyEntityListener emEntityListener = new EmergencyEntityListener(); - final EmergencyPlayerListener emPlayerListener = new EmergencyPlayerListener(); - pm.registerEvent(Type.PLAYER_JOIN, emPlayerListener, Priority.Low, this); - pm.registerEvent(Type.BLOCK_BURN, emBlockListener, Priority.Low, this); - pm.registerEvent(Type.BLOCK_IGNITE, emBlockListener, Priority.Low, this); - pm.registerEvent(Type.BLOCK_FROMTO, emBlockListener, Priority.Low, this); - pm.registerEvent(Type.BLOCK_BREAK, emBlockListener, Priority.Low, this); - pm.registerEvent(Type.ENTITY_DAMAGE, emEntityListener, Priority.Low, this); - pm.registerEvent(Type.ENTITY_EXPLODE, emEntityListener, Priority.Low, this); + final EmergencyListener emListener = new EmergencyListener(); + pm.registerEvents(emListener, this); for (Player player : getServer().getOnlinePlayers()) { |