diff options
| author | Warren Loo <evilseph@gmail.com> | 2012-03-27 11:37:00 -0400 |
|---|---|---|
| committer | Warren Loo <evilseph@gmail.com> | 2012-03-27 20:04:26 -0400 |
| commit | c100e20d605a0dde2c2e149954324e1659a6108b (patch) | |
| tree | ca98a2be106bb69031bd94a5486bb702b599c77b /src/main/java/net/minecraft/server/Explosion.java | |
| parent | c16bf07e85feb5e7bcb3e4a98048de36fe7859f2 (diff) | |
| download | craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar.gz craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar.lz craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar.xz craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.zip | |
Reverting the Drop API for now, we need to re-evalute this as it is causing too many issues and blocking releases.
This reverts commits:
- d2d03afc8854394aeefb40ea5ebf224c8032b19f
- 6245746e91123dd8ef70e5f15b7cdfc7e36d8e8c
- 41fae5c613e9e69a8f6bdf33b23bb09d7f407433
- c34bdecab42cf4098054a5ea43e1c2958d44ae92
- d7445084ac9a90fa0b66d8b050b8d0d2a062eaf3
- 6a6ed2e6ae2328a8a791bcc6857c44dc6c6a7030
- a783bc4dc95da8e26c673abe48fad96b550aba28
- cb50fd68766df8e07631ba5be85759f8257e8068
- 34dfff2ad5c407c712b2783f02960aac5e8649f2
- f33b513820de987b49a4338e85df80968217a601
- 5fd9fdfde055e6eb6a83db246d009b69377b7c94
- 2795b116f40d06551fbb7b96d1963c0ddbeac384
Diffstat (limited to 'src/main/java/net/minecraft/server/Explosion.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/Explosion.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java index d00d4232..e4ba3207 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -243,11 +243,10 @@ public class Explosion { this.world.a("smoke", d0, d1, d2, d3, d4, d5); } - // CraftBukkit start - stop explosions from putting out fire + // CraftBukkit - 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); } |