nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/Northrend): Dalaran guards now ignore non-combat pets (#23939)

Browse Source
This commit is contained in:
sogladev
2025-11-28 10:58:59 +01:00
committed by GitHub
parent a8b50ec9bf
commit afbf47c761
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/Northrend/zone_dalaran.cpp
View File

@@ -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 {}