From 276d199a6f48cd61bed6f63ebb9a58a969a797dd Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 4 Oct 2022 17:02:16 -0400
Subject: [PATCH] Core/Instances: Add new config options to control the time
 when both daily and weekly resets occur (will not be restricted to instances
 only)

Port From (https://github.com/TrinityCore/TrinityCore/commit/cedf09f93c44be2abf1c2b40e0e4c51f95f2975c)
---
 Source/Framework/Constants/SharedConst.cs     |  2 ++
 .../Maps/Instances/InstanceLockManager.cs     |  4 ++--
 Source/Game/Server/WorldConfig.cs             |  3 ++-
 Source/WorldServer/WorldServer.conf.dist      | 24 ++++++++++++-------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/Source/Framework/Constants/SharedConst.cs b/Source/Framework/Constants/SharedConst.cs
index 159d6322a..461a0a4f5 100644
--- a/Source/Framework/Constants/SharedConst.cs
+++ b/Source/Framework/Constants/SharedConst.cs
@@ -1730,6 +1730,8 @@ namespace Framework.Constants
         RegenHpCannotReachTargetInRaid,
         ResetDuelCooldowns,
         ResetDuelHealthMana,
+        ResetScheduleWeekDay,
+        ResetScheduleHour,
         RespawnDynamicEscortNpc,
         RespawnDynamicMinimumCreature,
         RespawnDynamicMinimumGameObject,
diff --git a/Source/Game/Maps/Instances/InstanceLockManager.cs b/Source/Game/Maps/Instances/InstanceLockManager.cs
index e170fc217..c23641ccd 100644
--- a/Source/Game/Maps/Instances/InstanceLockManager.cs
+++ b/Source/Game/Maps/Instances/InstanceLockManager.cs
@@ -347,7 +347,7 @@ namespace Game.Maps
         public DateTime GetNextResetTime(MapDb2Entries entries)
         {
             DateTime dateTime = GameTime.GetDateAndTime();
-            int resetHour = ConfigMgr.GetDefaultValue("ResetSchedule.DailyHour", 9);
+            int resetHour = WorldConfig.GetIntValue(WorldCfg.ResetScheduleHour);
 
             int hour = 0;
             int day = 0;
@@ -363,7 +363,7 @@ namespace Game.Maps
                 }
                 case MapDifficultyResetInterval.Weekly:
                 {
-                    int resetDay = ConfigMgr.GetDefaultValue("ResetSchedule.WeeklyDay", 2);
+                    int resetDay = WorldConfig.GetIntValue(WorldCfg.ResetScheduleWeekDay);
                     int daysAdjust = resetDay - dateTime.Day;
                     if (dateTime.Day > resetDay || (dateTime.Day == resetDay && dateTime.Hour >= resetHour))
                         daysAdjust += 7; // passed it for current week, grab time from next week
diff --git a/Source/Game/Server/WorldConfig.cs b/Source/Game/Server/WorldConfig.cs
index d127638b8..d6a1d4724 100644
--- a/Source/Game/Server/WorldConfig.cs
+++ b/Source/Game/Server/WorldConfig.cs
@@ -541,7 +541,8 @@ namespace Game
             Values[WorldCfg.InstanceIgnoreRaid] = GetDefaultValue("Instance.IgnoreRaid", false);
 
             Values[WorldCfg.CastUnstuck] = GetDefaultValue("CastUnstuck", true);
-            Values[WorldCfg.InstanceResetTimeHour] = GetDefaultValue("Instance.ResetTimeHour", 4);
+            Values[WorldCfg.ResetScheduleWeekDay] = GetDefaultValue("ResetSchedule.WeekDay", 2);
+            Values[WorldCfg.ResetScheduleHour] = GetDefaultValue("ResetSchedule.Hour", 8);
             Values[WorldCfg.InstanceUnloadDelay] = GetDefaultValue("Instance.UnloadDelay", 30 * Time.Minute * Time.InMilliseconds);
             Values[WorldCfg.DailyQuestResetTimeHour] = GetDefaultValue("Quests.DailyResetTime", 3);
             if ((int)Values[WorldCfg.DailyQuestResetTimeHour] > 23)
diff --git a/Source/WorldServer/WorldServer.conf.dist b/Source/WorldServer/WorldServer.conf.dist
index e5d2fee10..c6dd4134b 100644
--- a/Source/WorldServer/WorldServer.conf.dist
+++ b/Source/WorldServer/WorldServer.conf.dist
@@ -970,14 +970,6 @@ Instance.IgnoreLevel = 0
 
 Instance.IgnoreRaid = 0
 
-#
-#    Instance.ResetTimeHour
-#        Description: Hour of the day when the global instance reset occurs.
-#        Range:       0-23
-#        Default:     4 - (04:00 AM)
-
-Instance.ResetTimeHour = 4
-
 #
 #    Instance.UnloadDelay
 #        Description: Time (in milliseconds) before instance maps are unloaded from memory if no
@@ -996,6 +988,22 @@ Instance.UnloadDelay = 1800000
 
 InstancesResetAnnounce = false
 
+#
+#    ResetSchedule.WeekDay
+#        Description: Day of the week when the global weekly reset occurs.
+#        Range:       0-6
+#        Default:     2 - (Tuesday)
+
+ResetSchedule.WeekDay = 2
+
+#
+#    ResetSchedule.Hour
+#        Description: Hour of the day when the global daily reset occurs.
+#        Range:       0-23
+#        Default:     8 - (08:00 AM)
+
+ResetSchedule.Hour = 8
+
 #
 #    Quests.EnableQuestTracker
 #        Description: Store data in the database about quest completion and abandonment to help finding bugged quests.