[1.21.3] Remove hardcoded ShieldItem check in LivingEntity (#1676)

neoforged · Nov 10, 2024 · 20ce6df · 20ce6df
1 parent 424b600
commit 20ce6df
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/patches/net/minecraft/world/entity/LivingEntity.java.patch b/patches/net/minecraft/world/entity/LivingEntity.java.patch
@@ -290,6 +290,15 @@
                      itemstack = itemstack1.copy();
                      itemstack1.shrink(1);
                      break;
+@@ -1309,7 +_,7 @@
+         }
+
+         ItemStack itemstack = this.getItemBlockingWith();
+-        if (!p_21276_.is(DamageTypeTags.BYPASSES_SHIELD) && itemstack != null && itemstack.getItem() instanceof ShieldItem && !flag) {
++        if (!p_21276_.is(DamageTypeTags.BYPASSES_SHIELD) && itemstack != null && !flag) {
+             Vec3 vec3 = p_21276_.getSourcePosition();
+             if (vec3 != null) {
+                 Vec3 vec31 = this.calculateViewVector(0.0F, this.getYHeadRot());
 @@ -1343,6 +_,7 @@
      }