Core/Quests: Update Quest::IsAutoComplete

(Fixes an issue with "Candy Bucket" quests)
Closes #3554
Closes #3569

2 files changed, 6 insertions, 1 deletions

diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index a1a1f5d5cac..9650afb60e2 100755
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -205,6 +205,11 @@ int32  Quest::GetRewOrReqMoney() const
     return int32(RewOrReqMoney * sWorld->getRate(RATE_DROP_MONEY));
 }
 
+bool Quest::IsAutoComplete() const
+{
+    return QuestMethod == 0 || HasFlag(QUEST_FLAGS_AUTOCOMPLETE);
+}
+
 bool Quest::IsAllowedInRaid() const
 {
     if (IsRaidQuest())
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 61d492ce88c..90e52660160 100755
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -246,7 +246,7 @@ class Quest
         uint32 GetQuestStartScript() const { return QuestStartScript; }
         uint32 GetQuestCompleteScript() const { return QuestCompleteScript; }
         bool   IsRepeatable() const { return QuestFlags & QUEST_TRINITY_FLAGS_REPEATABLE; }
-        bool   IsAutoComplete() const { return QuestMethod ? false : true; }
+        bool   IsAutoComplete() const;
         uint32 GetFlags() const { return QuestFlags; }
         bool   IsDaily() const { return QuestFlags & QUEST_FLAGS_DAILY; }
         bool   IsWeekly() const { return QuestFlags & QUEST_FLAGS_WEEKLY; }