From 03b7885aa6a514ce01eef54e93ed6e775575c660 Mon Sep 17 00:00:00 2001
From: talandar <jmtalandar@gmail.com>
Date: Mon, 3 Jul 2017 15:56:23 -0400
Subject: [PATCH] Fix unblockable damage being blocked by armor. (#3933)
 (#4106)

---
 src/main/java/net/minecraftforge/common/ISpecialArmor.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/common/ISpecialArmor.java b/src/main/java/net/minecraftforge/common/ISpecialArmor.java
index 2aaa116246..4789fa35df 100644
--- a/src/main/java/net/minecraftforge/common/ISpecialArmor.java
+++ b/src/main/java/net/minecraftforge/common/ISpecialArmor.java
@@ -118,6 +118,11 @@ public interface ISpecialArmor
          */
         public static float applyArmor(EntityLivingBase entity, NonNullList<ItemStack> inventory, DamageSource source, double damage)
         {
+            if (source.isUnblockable())
+            {
+                return (float)damage;
+            }
+
             if (DEBUG)
             {
                 System.out.println("Start: " + damage);
@@ -144,7 +149,7 @@ public interface ISpecialArmor
                     totalArmor += prop.Armor;
                     totalToughness += prop.Toughness;
                 }
-                else if (stack.getItem() instanceof ItemArmor && !source.isUnblockable())
+                else if (stack.getItem() instanceof ItemArmor)
                 {
                     ItemArmor armor = (ItemArmor)stack.getItem();
                     prop = new ArmorProperties(0, 0, Integer.MAX_VALUE);