diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index d95a14f3..bb15fe91 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -112,7 +112,11 @@ public class AbilityHelper { } boolean causedDamage = false; boolean isAlive = entity.isEntityAlive(); - if (tool.pierceArmor() && !broken) { + + if (tool.pierceArmor() && !broken && entity instanceof EntityLivingBase) { + int armorValue = Math.min(20, ((EntityLivingBase) entity).getTotalArmorValue()); + damage = (int) (damage / (1 - (0.04 * armorValue))); + if (player instanceof EntityPlayer) causedDamage = entity.attackEntityFrom(causePlayerPiercingDamage((EntityPlayer) player), damage); diff --git a/src/main/java/tconstruct/library/util/PiercingArrowDamage.java b/src/main/java/tconstruct/library/util/PiercingArrowDamage.java index 0ed99108..d9952546 100644 --- a/src/main/java/tconstruct/library/util/PiercingArrowDamage.java +++ b/src/main/java/tconstruct/library/util/PiercingArrowDamage.java @@ -6,7 +6,6 @@ import net.minecraft.util.EntityDamageSourceIndirect; public class PiercingArrowDamage extends EntityDamageSourceIndirect { public PiercingArrowDamage(String p_i1568_1_, Entity p_i1568_2_, Entity p_i1568_3_) { super(p_i1568_1_, p_i1568_2_, p_i1568_3_); - this.setDamageBypassesArmor(); this.setProjectile(); } } diff --git a/src/main/java/tconstruct/library/util/PiercingEntityDamage.java b/src/main/java/tconstruct/library/util/PiercingEntityDamage.java index f5e413f2..ac814218 100644 --- a/src/main/java/tconstruct/library/util/PiercingEntityDamage.java +++ b/src/main/java/tconstruct/library/util/PiercingEntityDamage.java @@ -6,6 +6,5 @@ import net.minecraft.util.EntityDamageSource; public class PiercingEntityDamage extends EntityDamageSource { public PiercingEntityDamage(String str, Entity entity) { super(str, entity); - this.setDamageBypassesArmor(); } } diff --git a/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java b/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java index e7dd8ccc..0eb8e9c8 100644 --- a/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java @@ -1,6 +1,7 @@ package tconstruct.weaponry.entity; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -95,6 +96,11 @@ public class ArrowEntity extends ProjectileBase { // deal armor piercing damage if (shift > 0) { + + if (entityHit instanceof EntityLivingBase) { + int armorValue = Math.min(20, ((EntityLivingBase) entityHit).getTotalArmorValue()); + shift = (int) (shift / (1 - (0.04 * armorValue))); + } DamageSource damagesource; if (this.shootingEntity == null) damagesource = new PiercingArrowDamage("arrow", this, this); else damagesource = new PiercingArrowDamage("arrow", this, this.shootingEntity);