From 92d26dbebf70e42a7958e5ba508c712b46d4f0b8 Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Sun, 9 May 2010 09:55:31 +0200 Subject: [PATCH] [9852] Disable forced alteration of specialFlags in quest_template at startup. This will allow quest 10162 to work properly with the expected data in quest_template (no specialFlags is needed), but will still give a startup error for spell 33824. Signed-off-by: NoFantasy --- src/game/ObjectMgr.cpp | 7 +++++-- src/shared/revision_nr.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index e83a193ca..7b3896124 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -3987,10 +3987,13 @@ void ObjectMgr::LoadQuests() if (!quest->HasFlag(QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT)) { - sLog.outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u , but quest not have flag QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT. Quest flags must be fixed, quest modified to enable objective.",spellInfo->Id,quest_id); + sLog.outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u , but quest does not have SpecialFlags QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT (2) set. Quest SpecialFlags should be corrected to enable this objective.", spellInfo->Id, quest_id); + + // The below forced alteration has been disabled because of spell 33824 / quest 10162. + // A startup error will still occur with proper data in quest_template, but it will be possible to sucessfully complete the quest with the expected data. // this will prevent quest completing without objective - const_cast(quest)->SetFlag(QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT); + // const_cast(quest)->SetFlag(QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT); } } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 74c35151c..a7b7c509a 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9851" + #define REVISION_NR "9852" #endif // __REVISION_NR_H__