diff options
| author | md_5 <git@md-5.net> | 2015-02-01 16:13:17 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-02-01 16:13:24 +1100 |
| commit | a956d73f1024a83a219e9235906db57a9da6963a (patch) | |
| tree | d77f6219c3f80b981a2ee613cebc723b8f381204 | |
| parent | e87122e1101377b8d2eb2166870bd2ec7095b602 (diff) | |
| download | craftbukkit-a956d73f1024a83a219e9235906db57a9da6963a.tar craftbukkit-a956d73f1024a83a219e9235906db57a9da6963a.tar.gz craftbukkit-a956d73f1024a83a219e9235906db57a9da6963a.tar.lz craftbukkit-a956d73f1024a83a219e9235906db57a9da6963a.tar.xz craftbukkit-a956d73f1024a83a219e9235906db57a9da6963a.zip | |
SPIGOT-506: Falling blocks are special too
| -rw-r--r-- | nms-patches/Explosion.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 |