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/EntityMonster.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/EntityMonster.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityMonster.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java index c425f67c..f1c1a1fa 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java @@ -1,6 +1,7 @@ package net.minecraft.server; // CraftBukkit start +import org.bukkit.Bukkit; import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; @@ -49,7 +50,7 @@ public abstract class EntityMonster extends EntityCreature implements IMonster { org.bukkit.entity.Entity bukkitTarget = entity == null ? null : entity.getBukkitEntity(); EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), bukkitTarget, EntityTargetEvent.TargetReason.TARGET_ATTACKED_ENTITY); - this.world.getServer().getPluginManager().callEvent(event); + Bukkit.getPluginManager().callEvent(event); if (!event.isCancelled()) { if (event.getTarget() == null) { @@ -88,7 +89,7 @@ public abstract class EntityMonster extends EntityCreature implements IMonster { org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(this.getBukkitEntity(), damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK, this.damage); - this.world.getServer().getPluginManager().callEvent(event); + Bukkit.getPluginManager().callEvent(event); i = event.getDamage(); if (!event.isCancelled()) { |