diff options
author | Feildmaster <admin@feildmaster.com> | 2012-02-18 09:14:44 -0600 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-02-23 18:27:22 -0500 |
commit | d7f6d2d929b1ec1d0da53e5262756e0e1ee85977 (patch) | |
tree | 568007abdf540939b18d76d987e80b11a08d73f5 /src/main/java/org | |
parent | 70c5f06425f81470406329473ffb55e9c8cc60c5 (diff) | |
download | craftbukkit-d7f6d2d929b1ec1d0da53e5262756e0e1ee85977.tar craftbukkit-d7f6d2d929b1ec1d0da53e5262756e0e1ee85977.tar.gz craftbukkit-d7f6d2d929b1ec1d0da53e5262756e0e1ee85977.tar.lz craftbukkit-d7f6d2d929b1ec1d0da53e5262756e0e1ee85977.tar.xz craftbukkit-d7f6d2d929b1ec1d0da53e5262756e0e1ee85977.zip |
[Bleeding] Use player.getItemInHand(), instead of a new ItemStack. Addresses BUKKIT-767
Diffstat (limited to 'src/main/java/org')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index b06db0f0..767499c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -64,27 +64,18 @@ public class CraftEventFactory { /** * Block place methods */ - public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ, int type) { - return callBlockPlaceEvent(world, who, replacedBlockState, clickedX, clickedY, clickedZ, net.minecraft.server.Block.byId[type]); - } - - public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ, net.minecraft.server.Block block) { - return callBlockPlaceEvent(world, who, replacedBlockState, clickedX, clickedY, clickedZ, new ItemStack(block)); - } - - public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ, ItemStack itemstack) { + public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ) { CraftWorld craftWorld = ((WorldServer) world).getWorld(); CraftServer craftServer = ((WorldServer) world).getServer(); Player player = (who == null) ? null : (Player) who.getBukkitEntity(); - CraftItemStack itemInHand = new CraftItemStack(itemstack); Block blockClicked = craftWorld.getBlockAt(clickedX, clickedY, clickedZ); Block placedBlock = replacedBlockState.getBlock(); boolean canBuild = canBuild(craftWorld, player, placedBlock.getX(), placedBlock.getZ()); - BlockPlaceEvent event = new BlockPlaceEvent(placedBlock, replacedBlockState, blockClicked, itemInHand, player, canBuild); + BlockPlaceEvent event = new BlockPlaceEvent(placedBlock, replacedBlockState, blockClicked, player.getItemInHand(), player, canBuild); craftServer.getPluginManager().callEvent(event); return event; |