Removed EndermanPickup/Place events, replaced with EntityChangeBlock event.

1 files changed, 2 insertions, 12 deletions

diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index 6416d889..7317466e 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -5,8 +5,6 @@ import java.util.List;
 
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.event.CraftEventFactory;
-import org.bukkit.event.entity.EndermanPickupEvent;
-import org.bukkit.event.entity.EndermanPlaceEvent;
 import org.bukkit.event.entity.EntityTeleportEvent;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 // CraftBukkit end
@@ -109,14 +107,10 @@ public class EntityEnderman extends EntityMonster {
                     l = this.world.getTypeId(i, j, k);
                     if (b[l]) {
                         // CraftBukkit start - pickup event
-                        // TODO: We still call the old event
-                        EndermanPickupEvent pickup = new EndermanPickupEvent(this.getBukkitEntity(), this.world.getWorld().getBlockAt(i, j, k));
-                        this.world.getServer().getPluginManager().callEvent(pickup);
-
                         EntityChangeBlockEvent event = new EntityChangeBlockEvent(this.getBukkitEntity(), this.world.getWorld().getBlockAt(i, j, k), org.bukkit.Material.AIR);
                         this.world.getServer().getPluginManager().callEvent(event);
 
-                        if (!pickup.isCancelled() && !event.isCancelled()) {
+                        if (!event.isCancelled()) {
                             this.setCarriedId(this.world.getTypeId(i, j, k));
                             this.setCarriedData(this.world.getData(i, j, k));
                             this.world.setTypeId(i, j, k, 0);
@@ -133,16 +127,12 @@ public class EntityEnderman extends EntityMonster {
 
                 if (l == 0 && i1 > 0 && Block.byId[i1].b()) {
                     // CraftBukkit start - place event
-                    // TODO: We still call the old event
-                    EndermanPlaceEvent place = new EndermanPlaceEvent(this.getBukkitEntity(), new Location(this.world.getWorld(), i, j, k));
-                    this.world.getServer().getPluginManager().callEvent(place);
-
                     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 (!place.isCancelled() && !event.isCancelled()) {
+                    if (!event.isCancelled()) {
                         this.world.setTypeIdAndData(i, j, k, this.getCarriedId(), this.getCarriedData());
                         this.setCarriedId(0);
                     }