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

Core/Misc: Replace Time.UnixTime with GameTime.GetGameTime()

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/e17e4e6f0700c7d950e1b2654c217ec8b28ae79e)
This commit is contained in:
hondacrx
2021-04-17 19:28:50 -04:00
parent 95889fa53c
commit 63f0f919e2
68 changed files with 217 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/BattleFieldHandler.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace Game
BFMgrEntryInvite bfMgrEntryInvite = new();
bfMgrEntryInvite.QueueID = queueId;
bfMgrEntryInvite.AreaID = (int)zoneId;
bfMgrEntryInvite.ExpireTime = Time.UnixTime + acceptTime;
bfMgrEntryInvite.ExpireTime = GameTime.GetGameTime() + acceptTime;
SendPacket(bfMgrEntryInvite);
}
Source/Game/Handlers/CalendarHandler.cs
+8 -8
View File
@@ -35,7 +35,7 @@ namespace Game
{
ObjectGuid guid = GetPlayer().GetGUID();
long currTime = Time.UnixTime;
long currTime = GameTime.GetGameTime();
CalendarSendCalendar packet = new();
packet.ServerTime = currTime;
@@ -123,7 +123,7 @@ namespace Game
// prevent events in the past
// To Do: properly handle timezones and remove the "- time_t(86400L)" hack
if (calendarAddEvent.EventInfo.Time < (Time.UnixTime - 86400L))
if (calendarAddEvent.EventInfo.Time < (GameTime.GetGameTime() - 86400L))
return;
CalendarEvent calendarEvent = new(Global.CalendarMgr.GetFreeEventId(), guid, 0, (CalendarEventType)calendarAddEvent.EventInfo.EventType, calendarAddEvent.EventInfo.TextureID,
@@ -172,7 +172,7 @@ namespace Game
// prevent events in the past
// To Do: properly handle timezones and remove the "- time_t(86400L)" hack
if (calendarUpdateEvent.EventInfo.Time < (Time.UnixTime - 86400L))
if (calendarUpdateEvent.EventInfo.Time < (GameTime.GetGameTime() - 86400L))
return;
CalendarEvent calendarEvent = Global.CalendarMgr.GetEvent(calendarUpdateEvent.EventInfo.EventID);
@@ -208,7 +208,7 @@ namespace Game
// prevent events in the past
// To Do: properly handle timezones and remove the "- time_t(86400L)" hack
if (calendarCopyEvent.Date < (Time.UnixTime - 86400L))
if (calendarCopyEvent.Date < (GameTime.GetGameTime() - 86400L))
return;
CalendarEvent oldEvent = Global.CalendarMgr.GetEvent(calendarCopyEvent.EventID);
@@ -339,7 +339,7 @@ namespace Game
}
CalendarInviteStatus status = calendarEventSignUp.Tentative ? CalendarInviteStatus.Tentative : CalendarInviteStatus.SignedUp;
CalendarInvite invite = new(Global.CalendarMgr.GetFreeInviteId(), calendarEventSignUp.EventID, guid, guid, Time.UnixTime, status, CalendarModerationRank.Player, "");
CalendarInvite invite = new(Global.CalendarMgr.GetFreeInviteId(), calendarEventSignUp.EventID, guid, guid, GameTime.GetGameTime(), status, CalendarModerationRank.Player, "");
Global.CalendarMgr.AddInvite(calendarEvent, invite);
Global.CalendarMgr.SendCalendarClearPendingAction(guid);
}
@@ -366,7 +366,7 @@ namespace Game
if (invite != null)
{
invite.Status = calendarRSVP.Status;
invite.ResponseTime = Time.UnixTime;
invite.ResponseTime = GameTime.GetGameTime();
Global.CalendarMgr.UpdateInvite(invite);
Global.CalendarMgr.SendCalendarEventStatus(calendarEvent, invite);
@@ -491,7 +491,7 @@ namespace Game
public void SendCalendarRaidLockout(InstanceSave save, bool add)
{
long currTime = Time.UnixTime;
long currTime = GameTime.GetGameTime();
if (add)
{
@@ -518,7 +518,7 @@ namespace Game
if (save == null)
return;
long currTime = Time.UnixTime;
long currTime = GameTime.GetGameTime();
CalendarRaidLockoutUpdated packet = new();
packet.DifficultyID = (uint)save.GetDifficultyID();
Source/Game/Handlers/CharacterHandler.cs
+4 -4
View File
@@ -2204,7 +2204,7 @@ namespace Game
if (!result.IsEmpty())
{
uint lastUndelete = result.Read<uint>(0);
uint now = (uint)Time.UnixTime;
uint now = (uint)GameTime.GetGameTime();
if (lastUndelete + maxCooldown > now)
cooldown = Math.Max(0, lastUndelete + maxCooldown - now);
}
@@ -2231,7 +2231,7 @@ namespace Game
{
uint lastUndelete = result.Read<uint>(0);
uint maxCooldown = WorldConfig.GetUIntValue(WorldCfg.FeatureSystemCharacterUndeleteCooldown);
if (lastUndelete != 0 && (lastUndelete + maxCooldown > Time.UnixTime))
if (lastUndelete != 0 && (lastUndelete + maxCooldown > GameTime.GetGameTime()))
{
SendUndeleteCharacterResponse(CharacterUndeleteResult.Cooldown, undeleteInfo);
return;
@@ -2390,7 +2390,7 @@ namespace Game
return;
// prevent resurrect before 30-sec delay after body release not finished
if ((corpse.GetGhostTime() + GetPlayer().GetCorpseReclaimDelay(corpse.GetCorpseType() == CorpseType.ResurrectablePVP)) > Time.UnixTime)
if ((corpse.GetGhostTime() + GetPlayer().GetCorpseReclaimDelay(corpse.GetCorpseType() == CorpseType.ResurrectablePVP)) > GameTime.GetGameTime())
return;
if (!corpse.IsWithinDistInMap(GetPlayer(), 39, true))
@@ -2648,7 +2648,7 @@ namespace Game
stmt = DB.Characters.GetPreparedStatement(CharStatements.SEL_CHARACTER_MAILCOUNT);
stmt.AddValue(0, lowGuid);
stmt.AddValue(1, Time.UnixTime);
stmt.AddValue(1, GameTime.GetGameTime());
SetQuery(PlayerLoginQueryLoad.MailCount, stmt);
stmt = DB.Characters.GetPreparedStatement(CharStatements.SEL_CHARACTER_MAILDATE);
Source/Game/Handlers/ChatHandler.cs
+2 -2
View File
@@ -168,7 +168,7 @@ namespace Game
if (!CanSpeak())
{
string timeStr = Time.secsToTimeString((ulong)(m_muteTime - Time.UnixTime));
string timeStr = Time.secsToTimeString((ulong)(m_muteTime - GameTime.GetGameTime()));
SendNotification(CypherStrings.WaitBeforeSpeaking, timeStr);
return;
}
@@ -560,7 +560,7 @@ namespace Game
if (!CanSpeak())
{
string timeStr = Time.secsToTimeString((ulong)(m_muteTime - Time.UnixTime));
string timeStr = Time.secsToTimeString((ulong)(m_muteTime - GameTime.GetGameTime()));
SendNotification(CypherStrings.WaitBeforeSpeaking, timeStr);
return;
}
Source/Game/Handlers/DuelHandler.cs
+1 -1
View File
@@ -69,7 +69,7 @@ namespace Game
Log.outDebug(LogFilter.Network, "Player 1 is: {0} ({1})", player.GetGUID().ToString(), player.GetName());
Log.outDebug(LogFilter.Network, "Player 2 is: {0} ({1})", plTarget.GetGUID().ToString(), plTarget.GetName());
long now = Time.UnixTime;
long now = GameTime.GetGameTime();
player.duel.startTimer = now;
plTarget.duel.startTimer = now;
Source/Game/Handlers/GuildFinderHandler.cs
+4 -4
View File
@@ -44,7 +44,7 @@ namespace Game
return;
MembershipRequest request = new(GetPlayer().GetGUID(), lfGuildAddRecruit.GuildGUID, lfGuildAddRecruit.Availability,
lfGuildAddRecruit.ClassRoles, lfGuildAddRecruit.PlayStyle, lfGuildAddRecruit.Comment, Time.UnixTime);
lfGuildAddRecruit.ClassRoles, lfGuildAddRecruit.PlayStyle, lfGuildAddRecruit.Comment, GameTime.GetGameTime());
Global.GuildFinderMgr.AddMembershipRequest(lfGuildAddRecruit.GuildGUID, request);
}
@@ -129,8 +129,8 @@ namespace Game
applicationData.ClassRoles = guildSettings.GetClassRoles();
applicationData.PlayStyle = guildSettings.GetInterests();
applicationData.Availability = guildSettings.GetAvailability();
applicationData.SecondsSinceCreated = (uint)(Time.UnixTime - application.GetSubmitTime());
applicationData.SecondsUntilExpiration = (uint)(application.GetExpiryTime() - Time.UnixTime);
applicationData.SecondsSinceCreated = (uint)(GameTime.GetGameTime() - application.GetSubmitTime());
applicationData.SecondsUntilExpiration = (uint)(application.GetExpiryTime() - GameTime.GetGameTime());
applicationData.Comment = application.GetComment();
lfGuildApplications.Application.Add(applicationData);
@@ -176,7 +176,7 @@ namespace Game
if (!guild)
return;
long now = Time.UnixTime;
long now = GameTime.GetGameTime();
LFGuildRecruits lfGuildRecruits = new();
lfGuildRecruits.UpdateTime = now;
var recruitsList = Global.GuildFinderMgr.GetAllMembershipRequestsForGuild(guild.GetGUID());
Source/Game/Handlers/GuildHandler.cs
+1 -1
View File
@@ -551,7 +551,7 @@ namespace Game
var rewards = Global.GuildMgr.GetGuildRewards();
GuildRewardList rewardList = new();
rewardList.Version = Time.UnixTime;
rewardList.Version = GameTime.GetGameTime();
for (int i = 0; i < rewards.Count; i++)
{
Source/Game/Handlers/HotfixHandler.cs
+1 -1
View File
@@ -52,7 +52,7 @@ namespace Game
else
{
Log.outTrace(LogFilter.Network, "CMSG_DB_QUERY_BULK: {0} requested non-existing entry {1} in datastore: {2}", GetPlayerInfo(), record.RecordID, dbQuery.TableHash);
dbReply.Timestamp = (uint)Time.UnixTime;
dbReply.Timestamp = (uint)GameTime.GetGameTime();
}
SendPacket(dbReply);
Source/Game/Handlers/LFGHandler.cs
+1 -1
View File
@@ -433,7 +433,7 @@ namespace Game
LfgAnswer playerVote = boot.votes.LookupByKey(GetPlayer().GetGUID());
byte votesNum = 0;
byte agreeNum = 0;
uint secsleft = (uint)((boot.cancelTime - Time.UnixTime) / 1000);
uint secsleft = (uint)((boot.cancelTime - GameTime.GetGameTime()) / 1000);
foreach (var it in boot.votes)
{
if (it.Value != LfgAnswer.Pending)
Source/Game/Handlers/LogoutHandler.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace Game
pl.AddUnitFlag(UnitFlags.Stunned);
}
SetLogoutStartTime(Time.UnixTime);
SetLogoutStartTime(GameTime.GetGameTime());
}
[WorldPacketHandler(ClientOpcodes.LogoutCancel)]
Source/Game/Handlers/MailHandler.cs
+6 -6
View File
@@ -378,7 +378,7 @@ namespace Game
Player player = GetPlayer();
Mail m = player.GetMail(packet.MailID);
if (m == null || m.state == MailState.Deleted || m.deliver_time > Time.UnixTime || m.sender != packet.SenderGUID.GetCounter())
if (m == null || m.state == MailState.Deleted || m.deliver_time > GameTime.GetGameTime() || m.sender != packet.SenderGUID.GetCounter())
{
player.SendMailResult(packet.MailID, MailResponseType.ReturnedToSender, MailResponseResult.InternalError);
return;
@@ -433,7 +433,7 @@ namespace Game
Player player = GetPlayer();
Mail m = player.GetMail(packet.MailID);
if (m == null || m.state == MailState.Deleted || m.deliver_time > Time.UnixTime)
if (m == null || m.state == MailState.Deleted || m.deliver_time > GameTime.GetGameTime())
{
player.SendMailResult(packet.MailID, MailResponseType.ItemTaken, MailResponseResult.InternalError);
return;
@@ -530,7 +530,7 @@ namespace Game
Player player = GetPlayer();
Mail m = player.GetMail(packet.MailID);
if ((m == null || m.state == MailState.Deleted || m.deliver_time > Time.UnixTime) ||
if ((m == null || m.state == MailState.Deleted || m.deliver_time > GameTime.GetGameTime()) ||
(packet.Money > 0 && m.money != (ulong)packet.Money))
{
player.SendMailResult(packet.MailID, MailResponseType.MoneyTaken, MailResponseResult.InternalError);
@@ -572,7 +572,7 @@ namespace Game
var mails = player.GetMails();
MailListResult response = new();
long curTime = Time.UnixTime;
long curTime = GameTime.GetGameTime();
foreach (Mail m in mails)
{
@@ -603,7 +603,7 @@ namespace Game
Player player = GetPlayer();
Mail m = player.GetMail(packet.MailID);
if (m == null || (string.IsNullOrEmpty(m.body) && m.mailTemplateId == 0) || m.state == MailState.Deleted || m.deliver_time > Time.UnixTime)
if (m == null || (string.IsNullOrEmpty(m.body) && m.mailTemplateId == 0) || m.state == MailState.Deleted || m.deliver_time > GameTime.GetGameTime())
{
player.SendMailResult(packet.MailID, MailResponseType.MadePermanent, MailResponseResult.InternalError);
return;
@@ -662,7 +662,7 @@ namespace Game
{
result.NextMailTime = 0.0f;
long now = Time.UnixTime;
long now = GameTime.GetGameTime();
List<ulong> sentSenders = new();
foreach (Mail mail in GetPlayer().GetMails())
Source/Game/Handlers/MiscHandler.cs
+2 -2
View File
@@ -464,7 +464,7 @@ namespace Game
GetPlayer().RemovePlayerFlag(PlayerFlags.InPVP);
GetPlayer().AddPlayerFlag(PlayerFlags.PVPTimer);
if (!GetPlayer().pvpInfo.IsHostile && GetPlayer().IsPvP())
GetPlayer().pvpInfo.EndTimer = Time.UnixTime; // start toggle-off
GetPlayer().pvpInfo.EndTimer = GameTime.GetGameTime(); // start toggle-off
}
else
{
@@ -483,7 +483,7 @@ namespace Game
GetPlayer().RemovePlayerFlag(PlayerFlags.InPVP);
GetPlayer().AddPlayerFlag(PlayerFlags.PVPTimer);
if (!GetPlayer().pvpInfo.IsHostile && GetPlayer().IsPvP())
GetPlayer().pvpInfo.EndTimer = Time.UnixTime; // start toggle-off
GetPlayer().pvpInfo.EndTimer = GameTime.GetGameTime(); // start toggle-off
}
else
{
Source/Game/Handlers/MovementHandler.cs
+1 -1
View File
@@ -368,7 +368,7 @@ namespace Game
long timeReset = Global.InstanceSaveMgr.GetResetTimeFor(mapEntry.Id, diff);
if (timeReset != 0)
{
uint timeleft = (uint)(timeReset - Time.UnixTime);
uint timeleft = (uint)(timeReset - GameTime.GetGameTime());
GetPlayer().SendInstanceResetWarning(mapEntry.Id, diff, timeleft, true);
}
}
Source/Game/Handlers/PetHandler.cs
+1 -1
View File
@@ -585,7 +585,7 @@ namespace Game
DB.Characters.CommitTransaction(trans);
pet.SetPetNameTimestamp((uint)Time.UnixTime); // cast can't be helped
pet.SetPetNameTimestamp((uint)GameTime.GetGameTime()); // cast can't be helped
}
[WorldPacketHandler(ClientOpcodes.PetAbandon)]
Source/Game/Handlers/QueryHandler.cs
+1 -1
View File
@@ -60,7 +60,7 @@ namespace Game
void SendQueryTimeResponse()
{
QueryTimeResponse queryTimeResponse = new();
queryTimeResponse.CurrentTime = Time.UnixTime;
queryTimeResponse.CurrentTime = GameTime.GetGameTime();
SendPacket(queryTimeResponse);
}
Source/Game/Handlers/TimeHandler.cs
+1 -1
View File
@@ -28,7 +28,7 @@ namespace Game
void HandleServerTimeOffsetRequest(ServerTimeOffsetRequest packet)
{
ServerTimeOffset response = new();
response.Time = Time.UnixTime;
response.Time = GameTime.GetGameTime();
SendPacket(response);
}