From 94b60ff0ef7ee908e9ab4660f6dce0dcfe3f13e8 Mon Sep 17 00:00:00 2001 From: Keader Date: Wed, 12 Jun 2019 15:22:32 -0300 Subject: Core/Misc: Implemented Icecrown Citadel buff disable (#23394) Closes #8576 Closes #7940 --- src/server/game/Entities/Pet/Pet.cpp | 4 ++++ src/server/game/Spells/Auras/SpellAuras.cpp | 2 ++ 2 files changed, 6 insertions(+) (limited to 'src/server/game') diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 7ffcd0d04f3..5888120acf6 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -21,6 +21,7 @@ #include "DatabaseEnv.h" #include "Formulas.h" #include "Group.h" +#include "InstanceScript.h" #include "Log.h" #include "ObjectMgr.h" #include "Player.h" @@ -33,6 +34,7 @@ #include "Util.h" #include "WorldPacket.h" #include "WorldSession.h" +#include "ZoneScript.h" #define PET_XP_FACTOR 0.05f @@ -71,6 +73,8 @@ void Pet::AddToWorld() GetMap()->GetObjectsStore().Insert(GetGUID(), this); Unit::AddToWorld(); AIM_Initialize(); + if (ZoneScript* zoneScript = GetZoneScript() ? GetZoneScript() : GetInstanceScript()) + zoneScript->OnCreatureCreate(this); } // Prevent stuck pets when zoning. Pets default to "follow" when added to world diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index e50e90ebfbc..91d4b4d80a4 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1153,6 +1153,8 @@ bool Aura::CanBeSaved() const case 44413: // Incanter's Absorption case 40075: // Fel Flak Fire case 55849: // Power Spark + case 73822: // Hellscream's Warsong + case 73828: // Strength of Wrynn return false; } -- cgit v1.2.3