From 2396c9c21c2a28e9bccf925b3a770ea478d7f8ad Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Thu, 20 Nov 2014 15:06:16 +0100 Subject: [PATCH] Prevent crash when hitting ghast-fireballs etc. with tinker projectiles --- src/main/java/tconstruct/library/entity/ProjectileBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java index 3a76971bd06..7fe2d814732 100644 --- a/src/main/java/tconstruct/library/entity/ProjectileBase.java +++ b/src/main/java/tconstruct/library/entity/ProjectileBase.java @@ -206,7 +206,7 @@ public void onHitEntity(MovingObjectPosition movingobjectposition) { // stonebound decreases, jagged increases damage too float bonusDamage = -AbilityHelper.calcStoneboundBonus(ammo, tags); // enchantments might add too - if(shootingEntity != null) + if(shootingEntity != null && movingobjectposition.entityHit instanceof EntityLivingBase) bonusDamage += EnchantmentHelper.getEnchantmentModifierLiving((EntityLivingBase)this.shootingEntity, (EntityLivingBase)movingobjectposition.entityHit); damage += bonusDamage;