twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-18 05:43:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Bleeding] Fixed blocks dropping when BlockBreakEvent is canceled. Fixes BUKKIT-1299

Browse Source
This commit is contained in:
feildmaster
2012-03-23 09:49:34 -05:00
committed by EvilSeph
parent 942c1c6a3e
commit 9c7ffb6d3c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/Block.java
View File

@@ -564,7 +564,7 @@ public class Block {
} else { } else {
int i1 = EnchantmentManager.getBonusBlockLootEnchantmentLevel(entityhuman.inventory); int i1 = EnchantmentManager.getBonusBlockLootEnchantmentLevel(entityhuman.inventory);
this.b(world, i, j, k, l, i1); this.dropNaturally(world, i, j, k, l, 1.0F, i1); // CraftBukkit
} }
return this.dropList; // CraftBukkit return this.dropList; // CraftBukkit
} }

1
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@@ -539,6 +539,7 @@ public class CraftEventFactory {
world.getServer().getPluginManager().callEvent(event); world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
blockType.setDrops(new ArrayList<ItemStack>());
// Let the client know the block still exists // Let the client know the block still exists
((EntityPlayer) player).netServerHandler.sendPacket(new Packet53BlockChange(x, y, z, world)); ((EntityPlayer) player).netServerHandler.sendPacket(new Packet53BlockChange(x, y, z, world));
return true; return true;