From afbf47c761b18290574aad4f9a22ed6e44e13cc1 Mon Sep 17 00:00:00 2001 From: sogladev Date: Fri, 28 Nov 2025 10:58:59 +0100 Subject: [PATCH] fix(Scripts/Northrend): Dalaran guards now ignore non-combat pets (#23939) --- src/server/scripts/Northrend/zone_dalaran.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index ca887acbe..7c5b9fba4 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -428,7 +428,7 @@ public: struct npc_mageguard_dalaranAI : public ScriptedAI { - npc_mageguard_dalaranAI(Creature* creature) : ScriptedAI(creature) + explicit npc_mageguard_dalaranAI(Creature* creature) : ScriptedAI(creature) { creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_NORMAL, true); @@ -449,6 +449,9 @@ public: if (!me->IsWithinDist(who, 5.0f, false)) return; + if (who->IsCreature() && who->GetCreatureType() == CREATURE_TYPE_NON_COMBAT_PET) + return; + Player* player = who->GetCharmerOrOwnerPlayerOrPlayerItself(); if (!player || player->IsGameMaster() || player->IsBeingTeleported() || (player->GetPositionZ() > 670 && player->GetVehicle()) || @@ -484,7 +487,6 @@ public: break; } me->SetOrientation(me->GetHomePosition().GetOrientation()); - return; } void UpdateAI(uint32 /*diff*/) override {}