diff options
author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-24 00:10:53 +1100 |
---|---|---|
committer | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-24 00:10:53 +1100 |
commit | ab3412e8781e1f3e3f94aa2690cc95120b70a8a2 (patch) | |
tree | 8eaae09a66a97b3e6253ad522030b595536e08dc /src/main/java/net/minecraft/server/ItemRedstone.java | |
parent | a809e4e6e32e194c288723ceb2e1534bbddea174 (diff) | |
download | craftbukkit-ab3412e8781e1f3e3f94aa2690cc95120b70a8a2.tar craftbukkit-ab3412e8781e1f3e3f94aa2690cc95120b70a8a2.tar.gz craftbukkit-ab3412e8781e1f3e3f94aa2690cc95120b70a8a2.tar.lz craftbukkit-ab3412e8781e1f3e3f94aa2690cc95120b70a8a2.tar.xz craftbukkit-ab3412e8781e1f3e3f94aa2690cc95120b70a8a2.zip |
removed some potential bugs from some items
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemRedstone.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemRedstone.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/ItemRedstone.java b/src/main/java/net/minecraft/server/ItemRedstone.java index 2119012d..e28a1525 100644 --- a/src/main/java/net/minecraft/server/ItemRedstone.java +++ b/src/main/java/net/minecraft/server/ItemRedstone.java @@ -19,6 +19,11 @@ public class ItemRedstone extends Item { } public boolean a(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) { + // CraftBukkit - store the clicked block + CraftWorld craftWorld = ((WorldServer) world).getWorld(); + CraftServer craftServer = ((WorldServer) world).getServer(); + org.bukkit.block.Block blockClicked = craftWorld.getBlockAt(i, j, k); + if (l == 0) { j--; } @@ -42,13 +47,9 @@ public class ItemRedstone extends Item { } if (Block.av.a(world, i, j, k)) { // CraftBukkit start - Redstone - 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); |