Merge pull request #12 from GTNewHorizons/fix/thorn-is-not-an-attack

prevent onAttack from firing if damage is caused by reflection
GTNewHorizons · Oct 16, 2022 · e453eec · e453eec
2 parents acce825 + 86e3c90
commit e453eec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/atomicstryker/infernalmobs/common/EntityEventHandler.java b/src/main/java/atomicstryker/infernalmobs/common/EntityEventHandler.java
@@ -134,7 +134,7 @@ public void onEntityLivingHurt(LivingHurtEvent event)
              * and attacker
              */
             Entity attacker = event.source.getEntity();
-            if (attacker != null && attacker instanceof EntityLivingBase)
+            if (attacker instanceof EntityLivingBase && !event.source.damageType.equals("thorns"))
             {
                 mod = InfernalMobsCore.getMobModifiers((EntityLivingBase) attacker);
                 if (mod != null)

diff --git a/src/main/java/atomicstryker/infernalmobs/common/mods/MM_Vengeance.java b/src/main/java/atomicstryker/infernalmobs/common/mods/MM_Vengeance.java
@@ -29,7 +29,7 @@ public float onHurt(EntityLivingBase mob, DamageSource source, float damage)
             {
                 reflectedDamage = Math.min(maxReflectDamage, reflectedDamage);
             }
-            source.getEntity().attackEntityFrom(DamageSource.causeMobDamage(mob), reflectedDamage);
+            source.getEntity().attackEntityFrom(DamageSource.causeThornsDamage(mob), reflectedDamage);
         }
 
         return super.onHurt(mob, source, damage);