summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-21 14:55:07 +1000
committermd_5 <git@md-5.net>2018-07-21 14:55:07 +1000
commit961295e4327324766a0404857c1ca85051971995 (patch)
treef09da2ecace2cdbb091ecb2d6d87784ac4f1de92 /nms-patches
parente5d6f6b596c3d52dd66133d13a1b52faaa82ef4f (diff)
downloadcraftbukkit-961295e4327324766a0404857c1ca85051971995.tar
craftbukkit-961295e4327324766a0404857c1ca85051971995.tar.gz
craftbukkit-961295e4327324766a0404857c1ca85051971995.tar.lz
craftbukkit-961295e4327324766a0404857c1ca85051971995.tar.xz
craftbukkit-961295e4327324766a0404857c1ca85051971995.zip
SPIGOT-4101: Turtle lightning strike causing crash
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityTurtle.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/nms-patches/EntityTurtle.patch b/nms-patches/EntityTurtle.patch
new file mode 100644
index 00000000..cf12bb06
--- /dev/null
+++ b/nms-patches/EntityTurtle.patch
@@ -0,0 +1,12 @@
+--- a/net/minecraft/server/EntityTurtle.java
++++ b/net/minecraft/server/EntityTurtle.java
+@@ -260,7 +260,9 @@
+ }
+
+ public void onLightningStrike(EntityLightning entitylightning) {
++ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = entitylightning; // CraftBukkit
+ this.damageEntity(DamageSource.LIGHTNING, Float.MAX_VALUE);
++ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit
+ }
+
+ public void die(DamageSource damagesource) {