From a956d73f1024a83a219e9235906db57a9da6963a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Feb 2015 16:13:17 +1100 Subject: SPIGOT-506: Falling blocks are special too --- nms-patches/Explosion.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nms-patches/Explosion.patch') diff --git a/nms-patches/Explosion.patch b/nms-patches/Explosion.patch index 6a240318..b9423fd1 100644 --- a/nms-patches/Explosion.patch +++ b/nms-patches/Explosion.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/Explosion.java 2015-01-28 08:50:50.364126925 +1100 -+++ src/main/java/net/minecraft/server/Explosion.java 2015-01-28 08:50:50.368126914 +1100 +--- ../work/decompile-8eb82bde/net/minecraft/server/Explosion.java 2015-02-01 16:12:57.784236937 +1100 ++++ src/main/java/net/minecraft/server/Explosion.java 2015-02-01 16:12:57.788236936 +1100 @@ -8,6 +8,12 @@ import java.util.List; import java.util.Map; @@ -60,7 +60,7 @@ + CraftEventFactory.entityDamage = source; + boolean wasDamaged = entity.damageEntity(DamageSource.explosion(this), (float) ((int) ((d13 * d13 + d13) / 2.0D * 8.0D * (double) f3 + 1.0D))); + CraftEventFactory.entityDamage = null; -+ if (!wasDamaged && !(entity instanceof EntityTNTPrimed)) { ++ if (!wasDamaged && !(entity instanceof EntityTNTPrimed || entity instanceof EntityFallingBlock)) { + continue; + } + // CraftBukkit end -- cgit v1.2.3