diff options
| author | Carbenium <carbenium@outlook.com> | 2015-11-10 19:58:13 +0100 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-11-14 04:22:42 +0100 |
| commit | 230e820898c4e7d17f17f5ad03bff6e981ade9b4 (patch) | |
| tree | dbd32c46e6c3418e09069a1f113f5ea687b9bfc3 /src/server/scripts | |
| parent | 4e76974ce5ba3f6ebd73d6dd96860b60d50a19f4 (diff) | |
Core/Creature: Remove duplicate call to LoadCreatureAddons in Creature::Create
* Add error log for duplicated aura entries in creature_(template_)addon
(cherry picked from commit c5f635b6896abaa3b9a2242c63c61a37fc60bf80)
Conflicts:
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 4a8f56d0d55..97ad45542d0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -309,7 +309,7 @@ class boss_valithria_dreamwalker : public CreatureScript { me->SetHealth(_spawnHealth); me->SetReactState(REACT_PASSIVE); - me->LoadCreaturesAddon(true); + me->LoadCreaturesAddon(); // immune to percent heals me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_OBS_MOD_HEALTH, true); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_HEAL_PCT, true); @@ -1072,7 +1072,7 @@ class npc_dream_cloud : public CreatureScript _events.Reset(); _events.ScheduleEvent(EVENT_CHECK_PLAYER, 1000); me->SetCorpseDelay(0); // remove corpse immediately - me->LoadCreaturesAddon(true); + me->LoadCreaturesAddon(); } void UpdateAI(uint32 diff) override |