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

Core/Events: Replace remaining packed time calculations with WowTime class

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3b8f64831a766b469dfb8f8506e09dffdcfe723c)
This commit is contained in:
Hondacrx
2025-12-07 17:54:16 -05:00
parent 6b6338efc9
commit 2572f775df
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Events/GameEventManager.cs
+12 -19
View File
@@ -1551,9 +1551,9 @@ namespace Game
byte stageIndex = (byte)(gameEvent.holidayStage - 1); byte stageIndex = (byte)(gameEvent.holidayStage - 1);
gameEvent.length = (uint)(holiday.Duration[stageIndex] * Time.Hour / Time.Minute); gameEvent.length = (uint)(holiday.Duration[stageIndex] * Time.Hour / Time.Minute);
long stageOffset = 0; TimeSpan stageOffset = TimeSpan.Zero;
for (int i = 0; i < stageIndex; ++i) for (int i = 0; i < stageIndex; ++i)
stageOffset += holiday.Duration[i] * Time.Hour; stageOffset += TimeSpan.FromHours(holiday.Duration[i]);
switch (holiday.CalendarFilterType) switch (holiday.CalendarFilterType)
{ {
@@ -1576,31 +1576,24 @@ namespace Game
gameEvent.occurence += (uint)(holiday.Duration[i] * Time.Hour / Time.Minute); gameEvent.occurence += (uint)(holiday.Duration[i] * Time.Hour / Time.Minute);
} }
bool singleDate = ((holiday.Date[0] >> 24) & 0x1F) == 31; // Events with fixed date within year have - 1 WowTime curTime = GameTime.GetWowTime();
long curTime = GameTime.GetGameTime();
for (int i = 0; i < SharedConst.MaxHolidayDates && holiday.Date[i] != 0; ++i) for (int i = 0; i < SharedConst.MaxHolidayDates && holiday.Date[i] != 0; ++i)
{ {
uint date = holiday.Date[i]; WowTime date = new();
date.SetPackedTime(holiday.Date[i]);
int year; bool singleDate = date.GetYear() == -1;
if (singleDate) if (singleDate)
year = Time.UnixTimeToDateTime(curTime).ToLocalTime().Year - 1; // First try last year (event active through New Year) date.SetYear(GameTime.GetWowTime().GetYear() - 1); // First try last year (event active through New Year)
else
year = (int)((date >> 24) & 0x1F) + 100 + 1900;
var timeInfo = new DateTime(year, (int)((date >> 20) & 0xF) + 1, (int)((date >> 14) & 0x3F) + 1, (int)((date >> 6) & 0x1F), (int)(date & 0x3F), 0); if (curTime < date + TimeSpan.FromMinutes(gameEvent.length))
long startTime = Time.DateTimeToUnixTime(timeInfo);
if (curTime < startTime + gameEvent.length * Time.Minute)
{ {
gameEvent.start = startTime + stageOffset; gameEvent.start = (date + stageOffset).GetUnixTimeFromUtcTime();
break; break;
} }
else if (singleDate) else if (singleDate)
{ {
var tmCopy = timeInfo.AddYears(Time.UnixTimeToDateTime(curTime).ToLocalTime().Year); // This year date.SetYear(date.GetYear() + 1); // This year
gameEvent.start = Time.DateTimeToUnixTime(tmCopy) + stageOffset; gameEvent.start = (date + stageOffset).GetUnixTimeFromUtcTime();
break; break;
} }
else else
@@ -1625,7 +1618,7 @@ namespace Game
TimeSpan durationSinceLastStart = TimeSpan.FromTicks((now - eventInitialStart).Ticks % occurence.Ticks); TimeSpan durationSinceLastStart = TimeSpan.FromTicks((now - eventInitialStart).Ticks % occurence.Ticks);
return Time.DateTimeToUnixTime(now - durationSinceLastStart); return Time.DateTimeToUnixTime(now - durationSinceLastStart);
} }
public bool IsHolidayActive(HolidayIds id) public bool IsHolidayActive(HolidayIds id)
{ {
if (id == HolidayIds.None) if (id == HolidayIds.None)