diff options
Diffstat (limited to 'nms-patches/EnchantmentThorns.patch')
| -rw-r--r-- | nms-patches/EnchantmentThorns.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/EnchantmentThorns.patch b/nms-patches/EnchantmentThorns.patch index 13386c76..02c026a1 100644 --- a/nms-patches/EnchantmentThorns.patch +++ b/nms-patches/EnchantmentThorns.patch @@ -1,11 +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 +--- /home/matt/mc-dev-private//net/minecraft/server/EnchantmentThorns.java 2015-02-26 22:40:22.463608141 +0000 ++++ src/main/java/net/minecraft/server/EnchantmentThorns.java 2015-02-26 22:40:22.463608141 +0000 @@ -29,7 +29,7 @@ - Random random = entityliving.bb(); + Random random = entityliving.bc(); 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) { + if (entity != null) { + entity.damageEntity(DamageSource.a(entityliving), (float) b(i, random)); + entity.makeSound("damage.thorns", 0.5F, 1.0F); |