From 1342bc5af8854a1e84f43ba20cf3f6f2423164f2 Mon Sep 17 00:00:00 2001 From: Emagi Date: Wed, 22 Jan 2025 11:37:50 -0500 Subject: [PATCH] Update Combat.cpp --- source/WorldServer/Combat.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/WorldServer/Combat.cpp b/source/WorldServer/Combat.cpp index 37f0c04..9290707 100644 --- a/source/WorldServer/Combat.cpp +++ b/source/WorldServer/Combat.cpp @@ -128,7 +128,10 @@ bool Entity::AttackAllowed(Entity* target, float distance, bool range_attack) { } if(rule_manager.GetZoneRule(GetZoneID(), R_Combat, LockedEncounterNoAttack)->GetBool()) { - if(target->IsNPC() && (target->GetLockedNoLoot() == ENCOUNTER_STATE_LOCKED || target->GetLockedNoLoot() == ENCOUNTER_STATE_OVERMATCHED) && + if(IsNPC() && GetAttackable() == 0 && target->IsNPC()) { + return true; + } + else if(target->IsNPC() && (target->GetLockedNoLoot() == ENCOUNTER_STATE_LOCKED || target->GetLockedNoLoot() == ENCOUNTER_STATE_OVERMATCHED) && !attacker->IsEngagedBySpawnID(target->GetID())) { return false; }