diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-13 06:41:25 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-13 06:41:25 +0200 |
| commit | 4136f3c974d2b08e1e9098fe9ab410db9a6aebd4 (patch) | |
| tree | f3755bef2fdc1613072e5112c7591263e75d5352 /src/server/scripts | |
| parent | cfe644b457a8262d7cd4ee613c7e05ea5b9a328b (diff) | |
| parent | db2593f41d75fb9b832f240313522d50d95f4618 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/ArenaTeamHandler.cpp
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 7366ba32bdf..0c5514a1c0a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -347,6 +347,8 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript npc_jaina_or_sylvanas_intro_horAI(Creature* creature) : ScriptedAI(creature) { _instance = me->GetInstanceScript(); + _utherGUID = 0; + _lichkingGUID = 0; } void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override |