removed all instances of new CraftEntity* where appropriate.

Entity.getBukkitEntity() is now used instead.

1 files changed, 19 insertions, 9 deletions

diff --git a/src/main/java/net/minecraft/server/ItemSign.java b/src/main/java/net/minecraft/server/ItemSign.java
index 09a01186..5950f526 100644
--- a/src/main/java/net/minecraft/server/ItemSign.java
+++ b/src/main/java/net/minecraft/server/ItemSign.java
@@ -1,9 +1,12 @@
 package net.minecraft.server;
 
 // CraftBukkit start
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.block.CraftBlock;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;
 // CraftBukkit end
@@ -25,7 +28,6 @@ public class ItemSign extends Item {
         }
 
         // CraftBukkit - store the clicked block
-        CraftBlock blockClicked = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k);
 
         if (l == 1) {
             j++;
@@ -48,13 +50,21 @@ public class ItemSign extends Item {
 
         // CraftBukkit start
         // Signs
-        CraftItemStack itemInHand = new CraftItemStack(itemstack);
-        CraftPlayer thePlayer = new CraftPlayer(((WorldServer) world).getServer(), (EntityPlayerMP) entityplayer);
-        PlayerItemEvent pie = new PlayerItemEvent(Type.PLAYER_ITEM, thePlayer, itemInHand, blockClicked, CraftBlock.notchToBlockFace(l));
-
-        ((WorldServer) world).getServer().getPluginManager().callEvent(pie);
-
-        if (pie.isCancelled()) return false;
+        CraftWorld craftWorld = ((WorldServer) world).getWorld();
+        CraftServer craftServer = ((WorldServer) world).getServer();
+        
+        Type eventType = Type.PLAYER_ITEM;
+        Player who = (entityplayer == null)?null:(Player)entityplayer.getBukkitEntity();
+        org.bukkit.inventory.ItemStack itemInHand = new CraftItemStack(itemstack);
+        org.bukkit.block.Block blockClicked = craftWorld.getBlockAt(i, j, k);
+        BlockFace blockface = CraftBlock.notchToBlockFace(1);
+        
+        PlayerItemEvent pie = new PlayerItemEvent(eventType, who, itemInHand, blockClicked, blockface);
+        craftServer.getPluginManager().callEvent(pie);
+        
+        if (pie.isCancelled()) {
+            return false;
+        }
         // CraftBukkit end
 
         if (l == 1) {