aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-01-31 20:18:32 +0100
committerShauren <shauren.trinity@gmail.com>2011-01-31 20:18:32 +0100
commit22c9246d97c1eb939ea389294ae01460c277a72d (patch)
tree3179c5c71f1c6ebb325ac40d1db0f53dd84edd4c /src
parent8d7a6cd6119c3d514c4f06acee77ad1088e4754a (diff)
Scripts/Trial of the Crusader: Removed IsRaidWiped in SetData(boss, FAIL), calling SetData with FAIL parameter already implies wipe, fixes event getting stuck after using self resurrection spells like Reincarnation/Soulstone
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index a1fae7ed87e..408fd2cd7b7 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -125,17 +125,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript
}
}
- bool IsRaidWiped()
- {
- Map::PlayerList const &players = instance->GetPlayers();
- for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
- if (Player* player = i->getSource())
- if (player->isAlive())
- return false;
-
- return true;
- }
-
void OpenDoor(uint64 guid)
{
if (!guid)
@@ -417,12 +406,9 @@ class instance_trial_of_the_crusader : public InstanceMapScript
sLog->outDetail("[ToCr] EncounterStatus[type %u] %u = data %u;", type, EncounterStatus[type], data);
if (data == FAIL)
{
- if (IsRaidWiped())
- {
- --TrialCounter;
- NeedSave = true;
- EventStage = (type == TYPE_BEASTS ? 666 : 0);
- }
+ --TrialCounter;
+ NeedSave = true;
+ EventStage = (type == TYPE_BEASTS ? 666 : 0);
data = NOT_STARTED;
}