From 9162692a9f4a99356a7f63276032d75e1b1edea2 Mon Sep 17 00:00:00 2001 From: Emagi Date: Mon, 18 Aug 2025 14:57:50 -0400 Subject: [PATCH] don't process combat if player doesn't have a zone set --- source/WorldServer/Combat.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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