SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Seriously fix natural drops. Fixes BUKKIT-1297 and fixes BUKKIT-1295

Browse Source 
By: feildmaster <admin@feildmaster.com>
This commit is contained in:
CraftBukkit/Spigot
2012-03-23 06:08:54 -05:00
parent 25b27ad27b
commit 7d54b49e13
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -1056,6 +1056,7 @@ public class CraftWorld implements World {
int blockZ = block.getZ(); int blockZ = block.getZ();
// following code is lifted from Explosion.a(boolean), and modified // following code is lifted from Explosion.a(boolean), and modified
net.minecraft.server.Block.byId[blockId].dropNaturally(this.world, blockX, blockY, blockZ, block.getData(), yield, 0); net.minecraft.server.Block.byId[blockId].dropNaturally(this.world, blockX, blockY, blockZ, block.getData(), yield, 0);
net.minecraft.server.Block.byId[blockId].doActualDrop(this.world, blockX, blockY, blockZ);
block.setType(org.bukkit.Material.AIR); block.setType(org.bukkit.Material.AIR);
// not sure what this does, seems to have something to do with the 'base' material of a block. // not sure what this does, seems to have something to do with the 'base' material of a block.
// For example, WOODEN_STAIRS does something with WOOD in this method // For example, WOODEN_STAIRS does something with WOOD in this method

5
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View File

@@ -348,10 +348,7 @@ public class CraftBlock implements Block {
setTypeId(Material.AIR.getId()); setTypeId(Material.AIR.getId());
if (block != null) { if (block != null) {
block.dropNaturally(chunk.getHandle().world, x, y, z, data, 1.0F, 0); block.b(chunk.getHandle().world, x, y, z, data, 0);
for (ItemStack item : getDrops()) {
block.finishDrop(chunk.getHandle().world, x, y, z, CraftItemStack.createNMSItemStack(item));
}
return true; return true;
} }
return false; return false;