summaryrefslogtreecommitdiffstats
path: root/nms-patches/Explosion.patch
diff options
context:
space:
mode:
authorNathan Wolf <nathan@elmakers.com>2015-05-26 18:48:53 +1000
committermd_5 <git@md-5.net>2015-05-26 18:50:33 +1000
commit01930e268e70fc634b16f726d773427a48922299 (patch)
tree0fc75858a85584452393ff458471710f7e8a5bd6 /nms-patches/Explosion.patch
parent75f835c07ade8b19e48c20e098b32453e2648c6e (diff)
downloadcraftbukkit-01930e268e70fc634b16f726d773427a48922299.tar
craftbukkit-01930e268e70fc634b16f726d773427a48922299.tar.gz
craftbukkit-01930e268e70fc634b16f726d773427a48922299.tar.lz
craftbukkit-01930e268e70fc634b16f726d773427a48922299.tar.xz
craftbukkit-01930e268e70fc634b16f726d773427a48922299.zip
SPIGOT-738: Return explosion source for Fireball-induced explosions
Diffstat (limited to 'nms-patches/Explosion.patch')
-rw-r--r--nms-patches/Explosion.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/nms-patches/Explosion.patch b/nms-patches/Explosion.patch
index c49fa8ff..1da3e5fa 100644
--- a/nms-patches/Explosion.patch
+++ b/nms-patches/Explosion.patch
@@ -144,3 +144,15 @@
}
}
}
+@@ -197,7 +266,10 @@
+ }
+
+ public EntityLiving c() {
+- return this.source == null ? null : (this.source instanceof EntityTNTPrimed ? ((EntityTNTPrimed) this.source).getSource() : (this.source instanceof EntityLiving ? (EntityLiving) this.source : null));
++ // CraftBukkit start - obtain Fireball shooter for explosion tracking
++ // PAIL: Rename
++ return this.source == null ? null : (this.source instanceof EntityTNTPrimed ? ((EntityTNTPrimed) this.source).getSource() : (this.source instanceof EntityLiving ? (EntityLiving) this.source : (this.source instanceof EntityFireball ? ((EntityFireball) this.source).shooter : null)));
++ // CraftBukkit end
+ }
+
+ public void clearBlocks() {