diff --git a/source/WorldServer/Combat.cpp b/source/WorldServer/Combat.cpp index 58f74a0..b345009 100644 --- a/source/WorldServer/Combat.cpp +++ b/source/WorldServer/Combat.cpp @@ -1555,7 +1555,7 @@ void NPC::ProcessCombat() { void Player::ProcessCombat() { // if not in combat OR casting a spell OR dazed OR feared return out - if (!EngagedInCombat() || IsCasting() || IsDazed() || IsFeared()) + if (!GetZone() || !EngagedInCombat() || IsCasting() || IsDazed() || IsFeared()) return; //If no target delete combat_target and return out