From d2ba73d97f12da64b76895b7335500d1fc993a37 Mon Sep 17 00:00:00 2001 From: Spp Date: Mon, 29 Oct 2012 12:28:12 +0100 Subject: Core/Misc: Proper fix for previous commit (c5c8e38 - check race change before perfoming faction-change actions) Core/Misc: tab to spaces and remove trailing whitespaces --- src/server/scripts/World/areatrigger_scripts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/scripts/World') diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index db35e84b930..67aeda314bf 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -246,7 +246,7 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) { - if (!player->isDead() && (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) != QUEST_STATUS_NONE || + if (!player->isDead() && (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) != QUEST_STATUS_NONE || (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED))) { switch (trigger->id) -- cgit v1.2.3