keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix unblockable damage being blocked by armor. (#3933) (#4106)

Browse source
This commit is contained in:
talandar 2017-07-03 15:56:23 -04:00 committed by mezz
parent c1ae2cdbf2
commit 03b7885aa6
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/minecraftforge/common/ISpecialArmor.java
View file

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