diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
commit | 5b2c774edc069f70d1fa9940d96bb0b8705bef7a (patch) | |
tree | 79d1800e7154bba7b5fca4f8c8373ee4376cca89 /src/main/java/net/minecraft/server/ItemPainting.java | |
parent | 54bcd1c1f36691a714234e5ca2f30a20b3ad2816 (diff) | |
download | craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.gz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.lz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.xz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.zip |
Update for Minecraft 1.8
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemPainting.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemPainting.java | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/src/main/java/net/minecraft/server/ItemPainting.java b/src/main/java/net/minecraft/server/ItemPainting.java index 9ec87d0e..5985a6b4 100644 --- a/src/main/java/net/minecraft/server/ItemPainting.java +++ b/src/main/java/net/minecraft/server/ItemPainting.java @@ -32,30 +32,34 @@ public class ItemPainting extends Item { b0 = 3; } - EntityPainting entitypainting = new EntityPainting(world, i, j, k, b0); + if (!entityhuman.c(i, j, k)) { + return false; + } else { + EntityPainting entitypainting = new EntityPainting(world, i, j, k, b0); - if (entitypainting.h()) { - if (!world.isStatic) { - // CraftBukkit start - Player who = (entityhuman == null) ? null : (Player) entityhuman.getBukkitEntity(); + if (entitypainting.i()) { + if (!world.isStatic) { + // CraftBukkit start + Player who = (entityhuman == null) ? null : (Player) entityhuman.getBukkitEntity(); - org.bukkit.block.Block blockClicked = world.getWorld().getBlockAt(i, j, k); - org.bukkit.block.BlockFace blockFace = CraftBlock.notchToBlockFace(l); + org.bukkit.block.Block blockClicked = world.getWorld().getBlockAt(i, j, k); + org.bukkit.block.BlockFace blockFace = CraftBlock.notchToBlockFace(l); - PaintingPlaceEvent event = new PaintingPlaceEvent((org.bukkit.entity.Painting) entitypainting.getBukkitEntity(), who, blockClicked, blockFace); - world.getServer().getPluginManager().callEvent(event); + PaintingPlaceEvent event = new PaintingPlaceEvent((org.bukkit.entity.Painting) entitypainting.getBukkitEntity(), who, blockClicked, blockFace); + world.getServer().getPluginManager().callEvent(event); - if (event.isCancelled()) { - return false; + if (event.isCancelled()) { + return false; + } + // CraftBukkit end + world.addEntity(entitypainting); } - // CraftBukkit end - world.addEntity(entitypainting); + + --itemstack.count; } - --itemstack.count; + return true; } - - return true; } } } |