summaryrefslogtreecommitdiffstats
path: root/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2012-01-20 05:20:37 +0100
committersnowleo <schneeleo@gmail.com>2012-01-20 05:20:37 +0100
commitebb3a1c19fd56c92987ffb16e29f691c2a386568 (patch)
tree39adec608276e792e84e24d8fec6c01acf8e9067 /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
parent1d0a9e4c89c657b1a251cb0f4d892b74cfd15b01 (diff)
downloadEssentials-ebb3a1c19fd56c92987ffb16e29f691c2a386568.tar
Essentials-ebb3a1c19fd56c92987ffb16e29f691c2a386568.tar.gz
Essentials-ebb3a1c19fd56c92987ffb16e29f691c2a386568.tar.lz
Essentials-ebb3a1c19fd56c92987ffb16e29f691c2a386568.tar.xz
Essentials-ebb3a1c19fd56c92987ffb16e29f691c2a386568.zip
Update for new CraftBukkit Event Code
EssentialsSpawn can't be updated yet, because the new event system lacks dynamic priorities.
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java')
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java17
1 files changed, 10 insertions, 7 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
index 89167b2b9..40167ec41 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@@ -8,12 +8,15 @@ import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.*;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
import org.bukkit.event.entity.*;
-public class EssentialsProtectEntityListener extends EntityListener
+public class EssentialsProtectEntityListener implements Listener
{
private final transient IProtect prot;
private final transient IEssentials ess;
@@ -24,7 +27,7 @@ public class EssentialsProtectEntityListener extends EntityListener
this.ess = prot.getEssentialsConnect().getEssentials();
}
- @Override
+ @EventHandler(priority = EventPriority.HIGHEST)
public void onEntityDamage(final EntityDamageEvent event)
{
if (event.isCancelled())
@@ -189,7 +192,7 @@ public class EssentialsProtectEntityListener extends EntityListener
}
}
- @Override
+ @EventHandler(priority = EventPriority.HIGHEST)
public void onEntityExplode(final EntityExplodeEvent event)
{
if (event.isCancelled())
@@ -261,7 +264,7 @@ public class EssentialsProtectEntityListener extends EntityListener
}
}
- @Override
+ @EventHandler(priority = EventPriority.HIGHEST)
public void onCreatureSpawn(final CreatureSpawnEvent event)
{
if (event.getEntity() instanceof Player)
@@ -288,7 +291,7 @@ public class EssentialsProtectEntityListener extends EntityListener
}
}
- @Override
+ @EventHandler(priority = EventPriority.HIGHEST)
public void onEntityTarget(final EntityTargetEvent event)
{
if (event.isCancelled())
@@ -314,7 +317,7 @@ public class EssentialsProtectEntityListener extends EntityListener
}
}
- @Override
+ @EventHandler(priority = EventPriority.HIGHEST)
public void onExplosionPrime(ExplosionPrimeEvent event)
{
if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
@@ -324,7 +327,7 @@ public class EssentialsProtectEntityListener extends EntityListener
}
}
- @Override
+ @EventHandler(priority = EventPriority.HIGHEST)
public void onEndermanPickup(EndermanPickupEvent event)
{
if (event.isCancelled())