From 3a6624ffb4a4b8e09e2b552a577a6411e615a5a6 Mon Sep 17 00:00:00 2001
From: lumokai <155067345+lumokai@users.noreply.github.com>
Date: Tue, 3 Mar 2026 22:24:36 -0800
Subject: [PATCH] Add checks for master in isMobOwner

---
 src/map/ai/helpers/targetfind.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/map/ai/helpers/targetfind.cpp b/src/map/ai/helpers/targetfind.cpp
index de3d05e3aa4..8c8a13a209f 100644
--- a/src/map/ai/helpers/targetfind.cpp
+++ b/src/map/ai/helpers/targetfind.cpp
@@ -440,13 +440,13 @@ CBattleEntity* CTargetFind::findMaster(CBattleEntity* PTarget)
 
 bool CTargetFind::isMobOwner(CBattleEntity* PTarget)
 {
-    if (m_PBattleEntity->objtype != TYPE_PC || PTarget->objtype == TYPE_PC)
+    if (findMaster(m_PBattleEntity)->objtype != TYPE_PC || PTarget->objtype == TYPE_PC)
     {
         // always true for mobs, npcs, pets
         return true;
     }
 
-    if (PTarget->m_OwnerID.id == 0 || PTarget->m_OwnerID.id == m_PBattleEntity->id)
+    if (PTarget->m_OwnerID.id == 0 || PTarget->m_OwnerID.id == findMaster(m_PBattleEntity)->id)
     {
         return true;
     }
@@ -462,7 +462,7 @@ bool CTargetFind::isMobOwner(CBattleEntity* PTarget)
     bool found = false;
 
     // clang-format off
-    m_PBattleEntity->ForAlliance([&found, &PTarget](CBattleEntity* PMember)
+    findMaster(m_PBattleEntity)->ForAlliance([&found, &PTarget](CBattleEntity* PMember)
     {
         if (PMember->id == PTarget->m_OwnerID.id)
         {