diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-20 21:07:49 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-20 21:07:49 +0200 |
| commit | 313ef9da33f2c8068d0f7704893205c36e74f45a (patch) | |
| tree | 8744fbc29b9b1468424a0d63f8bf886095b99a03 /src | |
| parent | 99d34bde1bfa385723f8a65ac068509325d8679c (diff) | |
| parent | bf100ffc3cd5ea1d08f57c31aa9612fd19977462 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/zone_icecrown.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index a5d3ed7d0d5..5802a2e4220 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -1035,11 +1035,12 @@ class npc_margrave_dhakar : public CreatureScript if (Creature* morbidus = me->FindNearestCreature(NPC_MORBIDUS, 50.0f, true)) { - Creature* lichKing = me->SummonCreature(NPC_LICH_KING, morbidus->GetPositionX()+10, morbidus->GetPositionY(), morbidus->GetPositionZ()); - _lichKingGuid = lichKing->GetGUID(); - lichKing = me->SummonCreature(NPC_LICH_KING, morbidus->GetPositionX()+10, morbidus->GetPositionY(), morbidus->GetPositionZ()); - lichKing->SetFacingTo(morbidus->GetOrientation()); - lichKing->CastSpell(lichKing, SPELL_SIMPLE_TELEPORT, true); + if (Creature* lichKing = me->SummonCreature(NPC_LICH_KING, morbidus->GetPositionX() + 10.0f, morbidus->GetPositionY(), morbidus->GetPositionZ())) + { + _lichKingGuid = lichKing->GetGUID(); + lichKing->SetFacingTo(morbidus->GetOrientation()); + lichKing->CastSpell(lichKing, SPELL_SIMPLE_TELEPORT, true); + } } _events.ScheduleEvent(EVENT_LK_SAY_1, 5000); |