diff options
| author | Aokromes <Aokromes@users.noreply.github.com> | 2014-03-16 21:40:35 +0100 |
|---|---|---|
| committer | Aokromes <Aokromes@users.noreply.github.com> | 2014-03-16 21:40:35 +0100 |
| commit | f8938c209281e6401f5006f19b918186c227ffdc (patch) | |
| tree | 33b003b974ab15c307905ab65a1aa42f65551b55 /src | |
| parent | 69fb9642a3322fdfb219e3f65eb8db0872d4d9bf (diff) | |
| parent | 5f7e0f6929ea70fa97565c4bb38c0d63d40fc43a (diff) | |
Merge pull request #11718 from untaught/master
Instance Script/Stratholme: Correct logic in Baron Run event and add SAI...
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index d8518085b26..9ceaf8cb85b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -310,6 +310,15 @@ class instance_stratholme : public InstanceMapScript { HandleGameObject(ziggurat4GUID, false); HandleGameObject(ziggurat5GUID, false); + } + if (data == DONE || data == NOT_STARTED) + { + HandleGameObject(ziggurat4GUID, true); + HandleGameObject(ziggurat5GUID, true); + } + if (data == DONE) + { + HandleGameObject(portGauntletGUID, true); if (GetData(TYPE_BARON_RUN) == IN_PROGRESS) { DoRemoveAurasDueToSpellOnPlayers(SPELL_BARON_ULTIMATUM); @@ -318,18 +327,13 @@ class instance_stratholme : public InstanceMapScript for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) if (Player* player = itr->GetSource()) if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE) + { player->AreaExploredOrEventHappens(QUEST_DEAD_MAN_PLEA); - + player->KilledMonsterCredit(NPC_YSIDA); + } SetData(TYPE_BARON_RUN, DONE); } } - if (data == DONE || data == NOT_STARTED) - { - HandleGameObject(ziggurat4GUID, true); - HandleGameObject(ziggurat5GUID, true); - } - if (data == DONE) - HandleGameObject(portGauntletGUID, true); EncounterState[5] = data; break; case TYPE_SH_AELMAR: |