diff options
author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-12-05 19:13:10 +1100 |
---|---|---|
committer | Andrew Ardill <andrew.ardill@gmail.com> | 2011-12-05 19:23:40 +1100 |
commit | b1a3aa602a8021228e3cdf429cb613c590ceb122 (patch) | |
tree | 8021307349caffcf78fa6e7aefbf0cfe0d33125a /src/main/java/net/minecraft/server/EntityHuman.java | |
parent | 8363eadcabe1ac9277842e75d56a7409ef6e3ced (diff) | |
download | craftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.tar craftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.tar.gz craftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.tar.lz craftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.tar.xz craftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.zip |
Clean-up some events to maintain general style
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityHuman.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 3a8b7f8f..29297677 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; // CraftBukkit start +import org.bukkit.Bukkit; import org.bukkit.craftbukkit.entity.CraftItem; import org.bukkit.craftbukkit.TrigMath; import org.bukkit.entity.Player; @@ -591,7 +592,7 @@ public abstract class EntityHuman extends EntityLiving { org.bukkit.entity.Entity damagee = this.getBukkitEntity(); EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK, i); - this.world.getServer().getPluginManager().callEvent(event); + Bukkit.getPluginManager().callEvent(event); if (event.isCancelled() || event.getDamage() == 0) { return false; @@ -779,7 +780,7 @@ public abstract class EntityHuman extends EntityLiving { org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK, i); - this.world.getServer().getPluginManager().callEvent(event); + Bukkit.getPluginManager().callEvent(event); if (event.isCancelled() || event.getDamage() == 0) { return; |