diff options
-rw-r--r-- | src/server/game/World/World.cpp | 19 | ||||
-rw-r--r-- | src/server/game/World/World.h | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 1a5e6de5dfe..ca78d179498 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2263,7 +2263,7 @@ void World::Update(uint32 diff) if (m_gameTime > m_NextDailyQuestReset) { DailyReset(); - m_NextDailyQuestReset += DAY; + InitDailyQuestResetTime(false); } /// Handle weekly quests reset time @@ -3088,18 +3088,19 @@ void World::InitWeeklyQuestResetTime() m_NextWeeklyQuestReset = wstime < curtime ? curtime : wstime; } -void World::InitDailyQuestResetTime() +void World::InitDailyQuestResetTime(bool loading) { - time_t mostRecentQuestTime; + time_t mostRecentQuestTime = 0; - QueryResult result = CharacterDatabase.Query("SELECT MAX(time) FROM character_queststatus_daily"); - if (result) + if (loading) { - Field* fields = result->Fetch(); - mostRecentQuestTime = time_t(fields[0].GetUInt32()); + QueryResult result = CharacterDatabase.Query("SELECT MAX(time) FROM character_queststatus_daily"); + if (result) + { + Field* fields = result->Fetch(); + mostRecentQuestTime = time_t(fields[0].GetUInt32()); + } } - else - mostRecentQuestTime = 0; // client built-in time for reset is 6:00 AM // FIX ME: client not show day start time diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 2a460ef23df..e96092bd170 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -816,7 +816,7 @@ class TC_GAME_API World // callback for UpdateRealmCharacters void _UpdateRealmCharCount(PreparedQueryResult resultCharCount); - void InitDailyQuestResetTime(); + void InitDailyQuestResetTime(bool loading = true); void InitWeeklyQuestResetTime(); void InitMonthlyQuestResetTime(); void InitRandomBGResetTime(); |