From 710cb04f8db47fc388e430a13f7d8bc86d681453 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 9 Mar 2025 16:08:26 -0400 Subject: [PATCH] Apple Attributes for Items if DBC is not available, Resistances Always --- .../java/noppes/npcs/entity/EntityNPCInterface.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 4ac102e2f..8917596ab 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -565,13 +565,12 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti } else if (attackingEntity instanceof EntityPlayer && faction.isFriendlyToPlayer((EntityPlayer) attackingEntity)) return false; - // Attribute + Resistances - if(!DBCAddon.IsAvailable()){ - if(attackingEntity instanceof EntityPlayer) - i = AttributeAttackUtil.calculateDamagePlayerToNPC((EntityPlayer) attackingEntity, this, i); + // Attribute + if(!DBCAddon.IsAvailable() && attackingEntity instanceof EntityPlayer) + i = AttributeAttackUtil.calculateDamagePlayerToNPC((EntityPlayer) attackingEntity, this, i); - i = stats.resistances.applyResistance(damagesource, i); - } + // Resistances + i = stats.resistances.applyResistance(damagesource, i); NpcEvent.DamagedEvent event = new NpcEvent.DamagedEvent(this.wrappedNPC, attackingEntity, i, damagesource); if (EventHooks.onNPCDamaged(this, event) || isKilled())