diff options
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 f98fd302..ace0da6b 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -125,7 +125,7 @@ public class Explosion { // Craftbukkit TODO: get the x/y/z of the tnt block? EntityDamageByBlockEvent edbbe = new EntityDamageByBlockEvent(null, damagee, EntityDamageEvent.DamageCause.BLOCK_EXPLOSION, damage); servr.getPluginManager().callEvent(edbbe); - if(!edbbe.isCancelled()) entity.a(e, damage); + if(!edbbe.isCancelled()) entity.a(e, edbbe.getDamage()); } else { CraftEntity damager = null; if (e instanceof EntityPlayerMP) { @@ -138,7 +138,7 @@ public class Explosion { servr.getPluginManager().callEvent(edbbe); if (!edbbe.isCancelled()) { - entity.a(e, damage); + entity.a(e, edbbe.getDamage()); } } // Craftbukkit end @@ -211,6 +211,5 @@ public class Explosion { Block.m[j1].a_(i, k, l, i1); } } - } } |