Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

Update Combat.cpp

Browse Source
This commit is contained in:
Emagi 2025-01-22 11:37:50 -05:00
parent 883f172312
commit 1342bc5af8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/WorldServer/Combat.cpp
View File

@ -128,7 +128,10 @@ bool Entity::AttackAllowed(Entity* target, float distance, bool range_attack) {
} }
if(rule_manager.GetZoneRule(GetZoneID(), R_Combat, LockedEncounterNoAttack)->GetBool()) { 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())) { !attacker->IsEngagedBySpawnID(target->GetID())) {
return false; return false;
} }