diff options
| -rw-r--r-- | sql/updates/10828_characters_character_queststatus.sql | 2 | ||||
| -rw-r--r-- | src/server/game/Tools/CharacterDatabaseCleaner.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sql/updates/10828_characters_character_queststatus.sql b/sql/updates/10828_characters_character_queststatus.sql index 88681714a86..946a8fc119f 100644 --- a/sql/updates/10828_characters_character_queststatus.sql +++ b/sql/updates/10828_characters_character_queststatus.sql @@ -1,5 +1,3 @@ -DELETE FROM character_queststatus WHERE `status` = 0; - DROP TABLE IF EXISTS `character_queststatus_rewarded`; CREATE TABLE `character_queststatus_rewarded` ( `guid` int(10) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier', diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index 7e6dcc64508..1724aa6d93b 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -38,8 +38,7 @@ void CharacterDatabaseCleaner::CleanDatabase() return; uint32 flags = (*result)[0].GetUInt32(); - sWorld->SetCleaningFlags(flags); - + // clean up if (flags & CLEANING_FLAG_ACHIEVEMENT_PROGRESS) CleanCharacterAchievementProgress(); @@ -56,7 +55,12 @@ void CharacterDatabaseCleaner::CleanDatabase() if (flags & CLEANING_FLAG_QUESTSTATUS) CleanCharacterQuestStatus(); - CharacterDatabase.DirectPExecute("UPDATE worldstates SET value = value & %u WHERE entry = 20004", sWorld->getIntConfig(CONFIG_PERSISTENT_CHARACTER_CLEAN_FLAGS)); + // NOTE: In order to have persistentFlags be set in worldstates for the next cleanup, + // you need to define them at least once in worldstates. + flags &= sWorld->getIntConfig(CONFIG_PERSISTENT_CHARACTER_CLEAN_FLAGS); + CharacterDatabase.DirectPExecute("UPDATE worldstates SET value = %u WHERE entry = 20004", flags); + + sWorld->SetCleaningFlags(flags); sLog->outString(">> Cleaned character database in %u ms", GetMSTimeDiffToNow(oldMSTime)); sLog->outString(); |