From d090c2834b239c0fe4c1c14d6d76460d4e119e2c Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 27 Apr 2016 18:37:54 -0700 Subject: [PATCH] Fix NPE on shield break. Closes #2786 --- .../net/minecraft/entity/EntityLivingBase.java.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch index 5c2909d5b2..1715d44ced 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch @@ -232,9 +232,12 @@ public abstract EnumHandSide func_184591_cq(); public boolean func_184587_cr() -@@ -2371,6 +2437,14 @@ +@@ -2369,8 +2435,16 @@ + { + ItemStack itemstack = this.func_184586_b(this.func_184600_cs()); - if (itemstack == this.field_184627_bm) +- if (itemstack == this.field_184627_bm) ++ if (itemstack == this.field_184627_bm && itemstack != null) { + field_184628_bn = net.minecraftforge.event.ForgeEventFactory.onItemUseTick(this, field_184627_bm, field_184628_bn); + if (field_184628_bn <= 0)