Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: Handle timezones for hour-specific events specifieds in worldserver.conf

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/493fe066f6b107a9f356d693c5d37d878d3a63eb)
This commit is contained in:
hondacrx
2022-01-01 16:35:15 -05:00
parent a4c4897b4d
commit 9b3fe829d6
4 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/Instances/InstanceSaveManager.cs
+7 -7
View File
@@ -219,7 +219,7 @@ namespace Game.Maps
}
// load the global respawn times for raid/heroic instances
uint diff = (uint)(WorldConfig.GetIntValue(WorldCfg.InstanceResetTimeHour) * Time.Hour);
uint resetHour = WorldConfig.GetUIntValue(WorldCfg.InstanceResetTimeHour);
result = DB.Characters.Query("SELECT mapid, difficulty, resettime FROM instance_reset");
if (!result.IsEmpty())
{
@@ -241,7 +241,7 @@ namespace Game.Maps
}
// update the reset time if the hour in the configs changes
long newresettime = (oldresettime / Time.Day) * Time.Day + diff;
long newresettime = Time.GetLocalHourTimestamp(oldresettime, resetHour, false);
if (oldresettime != newresettime)
{
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_GLOBAL_INSTANCE_RESETTIME);
@@ -277,7 +277,7 @@ namespace Game.Maps
if (t == 0)
{
// initialize the reset time
t = today + period + diff;
t = Time.GetLocalHourTimestamp(today + period, resetHour);
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.INS_GLOBAL_INSTANCE_RESETTIME);
stmt.AddValue(0, mapid);
@@ -290,8 +290,8 @@ namespace Game.Maps
{
// assume that expired instances have already been cleaned
// calculate the next reset time
t = (t / Time.Day) * Time.Day;
t += ((today - t) / period + 1) * period + diff;
long day = (t / Time.Day) * Time.Day;
t = Time.GetLocalHourTimestamp(day + ((today - day) / period + 1) * period, resetHour);
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_GLOBAL_INSTANCE_RESETTIME);
stmt.AddValue(0, t);
@@ -327,12 +327,12 @@ namespace Game.Maps
return 0;
}
long diff = WorldConfig.GetIntValue(WorldCfg.InstanceResetTimeHour) * Time.Hour;
long resetHour = WorldConfig.GetIntValue(WorldCfg.InstanceResetTimeHour);
long period = (uint)(((mapDiff.GetRaidDuration() * WorldConfig.GetFloatValue(WorldCfg.RateInstanceResetTime)) / Time.Day) * Time.Day);
if (period < Time.Day)
period = Time.Day;
return ((resetTime + Time.Minute) / Time.Day * Time.Day) + period + diff;
return Time.GetLocalHourTimestamp(((resetTime + Time.Minute) / Time.Day * Time.Day) + period, (uint)resetHour);
}
public void ScheduleReset(bool add, long time, InstResetEvent Event)