summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-01-28 08:51:25 +1100
committermd_5 <git@md-5.net>2015-01-28 08:51:25 +1100
commitbc03b6f017ba2120a52813c37de4eace79166f3c (patch)
tree407a23f2d3fff8f7f583a029fed02483641eea6f
parent15e81cf551facaee9e808b598655a6cf1274ffb1 (diff)
downloadcraftbukkit-bc03b6f017ba2120a52813c37de4eace79166f3c.tar
craftbukkit-bc03b6f017ba2120a52813c37de4eace79166f3c.tar.gz
craftbukkit-bc03b6f017ba2120a52813c37de4eace79166f3c.tar.lz
craftbukkit-bc03b6f017ba2120a52813c37de4eace79166f3c.tar.xz
craftbukkit-bc03b6f017ba2120a52813c37de4eace79166f3c.zip
SPIGOT-485: Special case TnT in explosions.
I tested this in the original commit, maybe IDE didn't recompile properly.
-rw-r--r--nms-patches/Explosion.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/Explosion.patch b/nms-patches/Explosion.patch
index a5ef1741..6a240318 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-25 10:44:43.764182684 +1100
-+++ src/main/java/net/minecraft/server/Explosion.java 2015-01-25 10:44:43.768182687 +1100
+--- ../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
@@ -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) {
++ if (!wasDamaged && !(entity instanceof EntityTNTPrimed)) {
+ continue;
+ }
+ // CraftBukkit end