From cedf09f93c44be2abf1c2b40e0e4c51f95f2975c Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 17 Jan 2021 14:32:06 +0100 Subject: Core/Instances: Add new config options to control the time when both daily and weekly resets occur (will not be restricted to instances only) --- src/server/game/Instances/InstanceLockMgr.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/game/Instances/InstanceLockMgr.cpp') diff --git a/src/server/game/Instances/InstanceLockMgr.cpp b/src/server/game/Instances/InstanceLockMgr.cpp index 1e2eb22cbe6..3b66f39eadc 100644 --- a/src/server/game/Instances/InstanceLockMgr.cpp +++ b/src/server/game/Instances/InstanceLockMgr.cpp @@ -455,14 +455,12 @@ std::pair InstanceLockMgr::Updat return { InstanceResetTimePoint::min(), InstanceResetTimePoint::min() }; } -#include "Config.h" - InstanceResetTimePoint InstanceLockMgr::GetNextResetTime(MapDb2Entries const& entries) { tm dateTime = *GameTime::GetDateAndTime(); dateTime.tm_sec = 0; dateTime.tm_min = 0; - int32 resetHour = sConfigMgr->GetIntDefault("ResetSchedule.DailyHour", 9); + int32 resetHour = sWorld->getIntConfig(CONFIG_RESET_SCHEDULE_HOUR); switch (entries.MapDifficulty->ResetInterval) { case MAP_DIFFICULTY_RESET_DAILY: @@ -475,7 +473,7 @@ InstanceResetTimePoint InstanceLockMgr::GetNextResetTime(MapDb2Entries const& en } case MAP_DIFFICULTY_RESET_WEEKLY: { - int32 resetDay = sConfigMgr->GetIntDefault("ResetSchedule.WeeklyDay", 2); + int32 resetDay = sWorld->getIntConfig(CONFIG_RESET_SCHEDULE_WEEK_DAY); int32 daysAdjust = resetDay - dateTime.tm_wday; if (dateTime.tm_wday > resetDay || (dateTime.tm_wday == resetDay && dateTime.tm_hour >= resetHour)) daysAdjust += 7; // passed it for current week, grab time from next week -- cgit v1.2.3