diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-07-24 03:35:19 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-24 03:35:19 +0100 |
| commit | 5193eaac872d4bfa1fe511c15ea4e062824d19f2 (patch) | |
| tree | b11750c08d750ee3c99736a59944060e584413fc /src/server/scripts/EasternKingdoms | |
| parent | 8bc519a308ab78b1d6b243f49b332ddd9dd4ae17 (diff) | |
| parent | 7524e2dfda499177ffe633bd8284aad2cf1f547f (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 43a66c813a3..0839a476941 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -143,7 +143,8 @@ public: player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_SUBTERFUGE) == QUEST_STATUS_COMPLETE && - !player->GetQuestRewardStatus(QUEST_IN_DREAMS) && !player->HasAura(SPELL_SCARLET_ILLUSION)) + player->GetQuestStatus(QUEST_IN_DREAMS) != QUEST_STATUS_COMPLETE && + !player->HasAura(SPELL_SCARLET_ILLUSION)) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ILLUSION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(4773, creature->GetGUID()); |