summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/Explosion.java
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-03-23 06:08:54 -0500
committerEvilSeph <evilseph@gmail.com>2012-03-23 07:18:20 -0400
commit40e096273576ec5f0f49490f3167095d8678cbd8 (patch)
tree8b322b89c49f47ac5156ee3968444683328c3634 /src/main/java/net/minecraft/server/Explosion.java
parentff22e4e3419b0bef85b6cf0e8cefe27711fc27ff (diff)
downloadcraftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.tar
craftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.tar.gz
craftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.tar.lz
craftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.tar.xz
craftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.zip
Seriously fix natural drops. Fixes BUKKIT-1297 and fixes BUKKIT-1295
Diffstat (limited to 'src/main/java/net/minecraft/server/Explosion.java')
-rw-r--r--src/main/java/net/minecraft/server/Explosion.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index e4ba3207..d00d4232 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -243,10 +243,11 @@ public class Explosion {
this.world.a("smoke", d0, d1, d2, d3, d4, d5);
}
- // CraftBukkit - stop explosions from putting out fire
+ // CraftBukkit start - stop explosions from putting out fire
if (i1 > 0 && i1 != Block.FIRE.id) {
- // CraftBukkit
Block.byId[i1].dropNaturally(this.world, j, k, l, this.world.getData(j, k, l), event.getYield(), 0);
+ Block.byId[i1].doActualDrop(this.world, j, k, l);
+ // CraftBukkit end
this.world.setTypeId(j, k, l, 0);
Block.byId[i1].wasExploded(this.world, j, k, l);
}