diff options
author | Shauren <shauren.trinity@gmail.com> | 2021-01-17 14:32:06 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-10-04 00:19:38 +0200 |
commit | cedf09f93c44be2abf1c2b40e0e4c51f95f2975c (patch) | |
tree | 1ced904f172acd663982fa13ba1c8b86add7e914 /src/server/game/Instances | |
parent | 0be72f68c33617d78a4139f3e667b03d0a22a435 (diff) |
Core/Instances: Add new config options to control the time when both daily and weekly resets occur (will not be restricted to instances only)
Diffstat (limited to 'src/server/game/Instances')
-rw-r--r-- | src/server/game/Instances/InstanceLockMgr.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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<InstanceResetTimePoint, InstanceResetTimePoint> 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 |