diff options
| author | md_5 <git@md-5.net> | 2014-12-10 15:57:27 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2014-12-10 15:57:27 +1100 |
| commit | 262c7779fe1193489e27b48cbc3800bfa4f3f1ab (patch) | |
| tree | a2997d3ef2f758825751794291707bacac03025e | |
| parent | b73cfb0f6ad4e0868475f70a2376c79f14805558 (diff) | |
| download | craftbukkit-262c7779fe1193489e27b48cbc3800bfa4f3f1ab.tar craftbukkit-262c7779fe1193489e27b48cbc3800bfa4f3f1ab.tar.gz craftbukkit-262c7779fe1193489e27b48cbc3800bfa4f3f1ab.tar.lz craftbukkit-262c7779fe1193489e27b48cbc3800bfa4f3f1ab.tar.xz craftbukkit-262c7779fe1193489e27b48cbc3800bfa4f3f1ab.zip | |
Fix crash with null thorns damager
| -rw-r--r-- | nms-patches/EnchantmentThorns.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/nms-patches/EnchantmentThorns.patch b/nms-patches/EnchantmentThorns.patch new file mode 100644 index 00000000..13386c76 --- /dev/null +++ b/nms-patches/EnchantmentThorns.patch @@ -0,0 +1,11 @@ +--- ../work/decompile-8eb82bde/net/minecraft/server/EnchantmentThorns.java 2014-12-10 15:53:01.980344940 +1100 ++++ src/main/java/net/minecraft/server/EnchantmentThorns.java 2014-12-10 15:52:50.688364236 +1100 +@@ -29,7 +29,7 @@ + Random random = entityliving.bb(); + ItemStack itemstack = EnchantmentManager.a(Enchantment.THORNS, entityliving); + +- if (a(i, random)) { ++ if (entity != null && a(i, random)) { // CraftBukkit + entity.damageEntity(DamageSource.a(entityliving), (float) b(i, random)); + entity.makeSound("damage.thorns", 0.5F, 1.0F); + if (itemstack != null) { |