From 8acf07dbabca3ba5ea3c0de8b2b742f72c35c812 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 29 Sep 2011 22:35:00 +0400 Subject: Random minor code cleanup --- src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp | 1 - src/server/scripts/Outland/blades_edge_mountains.cpp | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Outland') diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 7b7c8c5e478..51c336af375 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -129,7 +129,6 @@ class boss_high_astromancer_solarian : public CreatureScript AppearDelay = false; Wrath_Timer = 20000+rand()%5000;//twice in phase one Phase = 1; - Wrath_Timer = 20000+rand()%5000;//twice in phase one if (pInstance) pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, NOT_STARTED); diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index 60495d4e0ac..b73d2f81fb6 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -503,7 +503,8 @@ public: if (me->IsWithinDistInMap(who, 50.0f)) { if (who->GetTypeId() == TYPEID_PLAYER) - if (who->ToPlayer()->GetQuestStatus(QUEST_GETTING_THE_BLADESPIRE_TANKED || QUEST_BLADESPIRE_KEGGER) == QUEST_STATUS_INCOMPLETE) + if (who->ToPlayer()->GetQuestStatus(QUEST_GETTING_THE_BLADESPIRE_TANKED) == QUEST_STATUS_INCOMPLETE + || who->ToPlayer()->GetQuestStatus(QUEST_BLADESPIRE_KEGGER) == QUEST_STATUS_INCOMPLETE) PlayerGUID = who->GetGUID(); } } -- cgit v1.2.3