removed all instances of new CraftEntity* where appropriate.

Entity.getBukkitEntity() is now used instead.

1 files changed, 13 insertions, 7 deletions

diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java
index c9c92fee..33c577e1 100644
--- a/src/main/java/net/minecraft/server/BlockDoor.java
+++ b/src/main/java/net/minecraft/server/BlockDoor.java
@@ -3,8 +3,11 @@ package net.minecraft.server;
 import java.util.Random;
 
 // CraftBukkit start
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.block.CraftBlock;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockInteractEvent;
 // CraftBukkit end
@@ -72,13 +75,16 @@ public class BlockDoor extends Block {
         }
 
         // CraftBukkit start - Interact Door
-        CraftBlock block = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k);
-        CraftPlayer player = new CraftPlayer(((WorldServer) world).getServer(), (EntityPlayerMP) entityplayer);
-        BlockInteractEvent bie = new BlockInteractEvent(Type.BLOCK_INTERACT, block, player);
-
-        ((WorldServer) world).getServer().getPluginManager().callEvent(bie);
-
-        // Craftbukkit the client updates the doors before the server does it's thing.
+        CraftWorld craftWorld = ((WorldServer) world).getWorld();
+        CraftServer server = ((WorldServer) world).getServer();
+        Type eventType = Type.BLOCK_INTERACT;
+        CraftBlock block = (CraftBlock) craftWorld.getBlockAt(i, j, k);
+        LivingEntity who = (entityplayer == null)?null:(LivingEntity)entityplayer.getBukkitEntity();
+        
+        BlockInteractEvent bie = new BlockInteractEvent(eventType, block, who);
+        server.getPluginManager().callEvent(bie);
+
+        // CraftBukkit the client updates the doors before the server does it's thing.
         // Forcibly send correct data.
         if (bie.isCancelled()) {
             ((EntityPlayerMP) entityplayer).a.b(new Packet53BlockChange(i, j, k, (WorldServer) world));