diff options
author | TomyLobo <tomylobo@nurfuerspam.de> | 2012-02-21 13:51:56 +0100 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-02-29 00:12:26 -0500 |
commit | 92dfb2500b68de14bc9b873f7d5821090af9bac0 (patch) | |
tree | 299f241b2365cc9cdc954461323a233f98551321 /src/main/java/net/minecraft/server/EntityEnderman.java | |
parent | dcf016822dc84146ee62cc2646d51673b0466706 (diff) | |
download | craftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.tar craftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.tar.gz craftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.tar.lz craftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.tar.xz craftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.zip |
Adjusted CraftBukkit to work with the entity event convenience patch in Bukkit. Addresses BUKKIT-809
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityEnderman.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityEnderman.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java index 7317466e..7e430803 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -6,7 +6,6 @@ import java.util.List; import org.bukkit.Location; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityTeleportEvent; -import org.bukkit.event.entity.EntityChangeBlockEvent; // CraftBukkit end public class EntityEnderman extends EntityMonster { @@ -107,10 +106,7 @@ public class EntityEnderman extends EntityMonster { l = this.world.getTypeId(i, j, k); if (b[l]) { // CraftBukkit start - pickup event - EntityChangeBlockEvent event = new EntityChangeBlockEvent(this.getBukkitEntity(), this.world.getWorld().getBlockAt(i, j, k), org.bukkit.Material.AIR); - this.world.getServer().getPluginManager().callEvent(event); - - if (!event.isCancelled()) { + if (!CraftEventFactory.callEntityChangeBlockEvent(this, this.world.getWorld().getBlockAt(i, j, k), org.bukkit.Material.AIR).isCancelled()) { this.setCarriedId(this.world.getTypeId(i, j, k)); this.setCarriedData(this.world.getData(i, j, k)); this.world.setTypeId(i, j, k, 0); @@ -129,10 +125,7 @@ public class EntityEnderman extends EntityMonster { // CraftBukkit start - place event org.bukkit.block.Block bblock = this.world.getWorld().getBlockAt(i, j, k); - EntityChangeBlockEvent event = new EntityChangeBlockEvent(this.getBukkitEntity(), bblock, bblock.getType()); - this.world.getServer().getPluginManager().callEvent(event); - - if (!event.isCancelled()) { + if (!CraftEventFactory.callEntityChangeBlockEvent(this, bblock, bblock.getType()).isCancelled()) { this.world.setTypeIdAndData(i, j, k, this.getCarriedId(), this.getCarriedData()); this.setCarriedId(0); } |