aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2013-07-21 23:49:38 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2013-07-21 23:49:38 +0200
commitb684cd60797924478ebaa66a7edfdeb1f6b97c4a (patch)
tree23cd12dc5ffaeeac200781b0cd1733b73db6779f /src/server/scripts/Northrend
parentb6a5d667e2844a41d8c23fadbe5268ddde254db0 (diff)
parent3d6b88f5aad984ff1f35bc6bc2f67bf72c74b14e (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/zone_icecrown.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index 5802a2e4220..24452a5fb5f 100644
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -1110,8 +1110,8 @@ class npc_margrave_dhakar : public CreatureScript
private:
EventMap _events;
- uint64 _lichKingGuid;
SummonList _summons;
+ uint64 _lichKingGuid;
};
CreatureAI* GetAI(Creature* creature) const OVERRIDE