diff options
author | feildmaster <admin@feildmaster.com> | 2012-08-08 06:23:43 -0500 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2012-08-08 19:49:10 -0500 |
commit | 27c1c85adb97073b7f048374c8a4356f8ba39c3c (patch) | |
tree | 6fa43cf5c1a06fc2c4ed5f69996ba8287fb5b42b /src/main/java/net/minecraft/server/ItemInWorldManager.java | |
parent | 8d946b88b3b96be1f6ae6b21bca915b73909e0bb (diff) | |
download | craftbukkit-27c1c85adb97073b7f048374c8a4356f8ba39c3c.tar craftbukkit-27c1c85adb97073b7f048374c8a4356f8ba39c3c.tar.gz craftbukkit-27c1c85adb97073b7f048374c8a4356f8ba39c3c.tar.lz craftbukkit-27c1c85adb97073b7f048374c8a4356f8ba39c3c.tar.xz craftbukkit-27c1c85adb97073b7f048374c8a4356f8ba39c3c.zip |
Implement BlockBreakEvent block experience. Adds BUKKIT-2033
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemInWorldManager.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemInWorldManager.java | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/ItemInWorldManager.java b/src/main/java/net/minecraft/server/ItemInWorldManager.java index aa63a1c4..64515d16 100644 --- a/src/main/java/net/minecraft/server/ItemInWorldManager.java +++ b/src/main/java/net/minecraft/server/ItemInWorldManager.java @@ -243,6 +243,8 @@ public class ItemInWorldManager { public boolean breakBlock(int i, int j, int k) { // CraftBukkit start + BlockBreakEvent event = null; + if (this.player instanceof EntityPlayer) { org.bukkit.block.Block block = this.world.getWorld().getBlockAt(i, j, k); @@ -255,8 +257,24 @@ public class ItemInWorldManager { ((EntityPlayer) this.player).netServerHandler.sendPacket(packet); } - BlockBreakEvent event = new BlockBreakEvent(block, (org.bukkit.entity.Player) this.player.getBukkitEntity()); - event.setCancelled(this.gamemode.isAdventure()); // Adventure mode pre-cancel + event = new BlockBreakEvent(block, this.player.getBukkitEntity()); + + // Adventure mode pre-cancel + event.setCancelled(this.gamemode.isAdventure()); + + // Calculate default block experience + Block nmsBlock = Block.byId[block.getTypeId()]; + + if (nmsBlock != null && !event.isCancelled() && !this.isCreative() && this.player.b(nmsBlock)) { + // Copied from Block.a(world, entityhuman, int, int, int, int) + if (!(nmsBlock.q_() && EnchantmentManager.hasSilkTouchEnchantment(this.player.inventory))) { + int data = block.getData(); + int bonusLevel = EnchantmentManager.getBonusBlockLootEnchantmentLevel(this.player.inventory); + + event.setExpToDrop(nmsBlock.getExpDrop(this.world, data, bonusLevel)); + } + } + this.world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -295,6 +313,12 @@ public class ItemInWorldManager { } } + // CraftBukkit start - drop event experience + if (flag && event != null) { + Block.byId[l].g(this.world, i, j, k, event.getExpToDrop()); + } + // CraftBukkit end + return flag; } } |