The piercing damage of arrows/bolts doesn't determine whether an enti…

…ty has been hit anymore (since it always hits since it's unblockable)
SlimeKnights · Dec 3, 2014 · d2b06da · d2b06da
1 parent 011298e
commit d2b06da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java
@@ -33,7 +33,6 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit
     public final static String stoneSound = Reference.resource("stoneHit");
 
     public ItemStack returnStack;
-    public int returnStackSlot;
 
     public boolean bounceOnNoDamage = true;
     public boolean defused = false; // if this is true it wont hit any entities anymore
@@ -67,7 +66,6 @@ public ProjectileBase(World world, EntityPlayer player, float speed, float accur
         this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, speed, accuracy);
 
         // our stuff
-        returnStackSlot = player.inventory.currentItem;
         returnStack = stack;
 
 /*

diff --git a/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java b/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java
@@ -101,7 +101,8 @@ public boolean dealDamage(float damage, ToolCore ammo, NBTTagCompound tags, Enti
 
             //Minecraft.getMinecraft().thePlayer.sendChatMessage("Piercing Damage: " + shift);
 
-            dealtDamage |= entityHit.attackEntityFrom(damagesource, shift);
+            // piercing damage does not affect wether the entity was hit (return value), since it should go through always
+            entityHit.attackEntityFrom(damagesource, shift);
         }
 
         return dealtDamage;