From d810d320692d36055bf7e235c353796386f5a982 Mon Sep 17 00:00:00 2001 From: nytmyr <53322305+nytmyr@users.noreply.github.com> Date: Fri, 31 Jan 2025 00:16:18 -0600 Subject: [PATCH] IsPetOwner fixes --- zone/npc.cpp | 2 +- zone/spells.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zone/npc.cpp b/zone/npc.cpp index 468e4b35e..7210dee79 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -555,7 +555,7 @@ void NPC::SetTarget(Mob* mob) { // either normal pet and owner is client or charmed pet and owner is client Mob *owner = nullptr; - if (IsPet() && IsPetOwnerOfClientBot()) { + if (IsPet() && IsPetOwnerClient()) { owner = GetOwner(); } else if (IsCharmed()) { owner = GetOwner(); diff --git a/zone/spells.cpp b/zone/spells.cpp index f1da3f0e1..43ffbca1d 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -2722,8 +2722,8 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, in SpellOnTarget(spell_id, this); } } - } else if (spell_target->IsRaidGrouped() && spell_target->IsClient()) { - Raid *target_raid = entity_list.GetRaidByClient(spell_target->CastToClient()); + } else if (spell_target->IsRaidGrouped() && spell_target->IsOfClientBot()) { + Raid *target_raid = (IsClient() ? entity_list.GetRaidByClient(spell_target->CastToClient()) : entity_list.GetRaidByBot(spell_target->CastToBot())); uint32 gid = 0xFFFFFFFF; if (target_raid) { gid = target_raid->GetGroup(spell_target->GetName());