diff options
| author | Shocker <shocker@freakz.ro> | 2011-10-07 09:28:10 -0700 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-10-07 09:28:10 -0700 |
| commit | 7f89678bcda1b58ff0701c0915074e81a9caf720 (patch) | |
| tree | 7af429895fce42337479a4b135257917875edfac /src/server/scripts/Outland | |
| parent | b789cc63a7e2530ca1f511863db2d2a53af7c137 (diff) | |
| parent | 8acf07dbabca3ba5ea3c0de8b2b742f72c35c812 (diff) | |
Merge pull request #3278 from lost-illusion/master
CleanUp
Diffstat (limited to 'src/server/scripts/Outland')
| -rw-r--r-- | src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp | 1 | ||||
| -rw-r--r-- | src/server/scripts/Outland/blades_edge_mountains.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
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(); } } |