pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 00:46:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IsPetOwner fixes

Browse Source
This commit is contained in:
nytmyr
2025-01-31 00:16:18 -06:00
parent 3ce9579a6c
commit d810d32069
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/npc.cpp
+1 -1
View File
@@ -555,7 +555,7 @@ void NPC::SetTarget(Mob* mob) {
// either normal pet and owner is client or charmed pet and owner is client // either normal pet and owner is client or charmed pet and owner is client
Mob *owner = nullptr; Mob *owner = nullptr;
if (IsPet() && IsPetOwnerOfClientBot()) { if (IsPet() && IsPetOwnerClient()) {
owner = GetOwner(); owner = GetOwner();
} else if (IsCharmed()) { } else if (IsCharmed()) {
owner = GetOwner(); owner = GetOwner();
zone/spells.cpp
+2 -2
View File
@@ -2722,8 +2722,8 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, in
SpellOnTarget(spell_id, this); SpellOnTarget(spell_id, this);
} }
} }
} else if (spell_target->IsRaidGrouped() && spell_target->IsClient()) { } else if (spell_target->IsRaidGrouped() && spell_target->IsOfClientBot()) {
Raid *target_raid = entity_list.GetRaidByClient(spell_target->CastToClient()); Raid *target_raid = (IsClient() ? entity_list.GetRaidByClient(spell_target->CastToClient()) : entity_list.GetRaidByBot(spell_target->CastToBot()));
uint32 gid = 0xFFFFFFFF; uint32 gid = 0xFFFFFFFF;
if (target_raid) { if (target_raid) {
gid = target_raid->GetGroup(spell_target->GetName()); gid = target_raid->GetGroup(spell_target->GetName());