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

Core/PacketIO: Fixed server time sent in CalendarRaidLockoutAdded

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b4778a4d726d9c9ab9d55c49607bb91caa689433)
This commit is contained in:
hondacrx
2024-02-23 18:41:07 -05:00
parent 72d1f3737f
commit 30f53f03fd
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Calendar/CalendarManager.cs
+3 -3
View File
@@ -473,7 +473,7 @@ namespace Game
var packetBuilder = (Player receiver) =>
{
CalendarEventUpdatedAlert packet = new();
packet.ClearPending = true; // FIXME
packet.ClearPending = calendarEvent.OwnerGuid == receiver.GetGUID();
packet.Date.SetUtcTimeFromUnixTime(calendarEvent.Date);
packet.Date += receiver.GetSession().GetTimezoneOffset();
packet.Description = calendarEvent.Description;
@@ -500,7 +500,7 @@ namespace Game
var packetBuilder = (Player receiver) =>
{
CalendarInviteStatusPacket packet = new();
packet.ClearPending = true; // FIXME
packet.ClearPending = invite.InviteeGuid == receiver.GetGUID();
packet.Date.SetUtcTimeFromUnixTime(calendarEvent.Date);
packet.Date += receiver.GetSession().GetTimezoneOffset();
packet.EventID = calendarEvent.EventId;
@@ -522,7 +522,7 @@ namespace Game
var packetBuilder = (Player receiver) =>
{
CalendarEventRemovedAlert packet = new();
packet.ClearPending = true; // FIXME
packet.ClearPending = calendarEvent.OwnerGuid == receiver.GetGUID();
packet.Date.SetUtcTimeFromUnixTime(calendarEvent.Date);
packet.Date += receiver.GetSession().GetTimezoneOffset();
packet.EventID = calendarEvent.EventId;
Source/Game/Handlers/CalendarHandler.cs
+2 -5
View File
@@ -175,9 +175,6 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.CalendarUpdateEvent)]
void HandleCalendarUpdateEvent(CalendarUpdateEvent calendarUpdateEvent)
{
ObjectGuid guid = GetPlayer().GetGUID();
long oldEventTime;
calendarUpdateEvent.EventInfo.Time -= GetTimezoneOffset();
// prevent events in the past
@@ -187,7 +184,7 @@ namespace Game
CalendarEvent calendarEvent = Global.CalendarMgr.GetEvent(calendarUpdateEvent.EventInfo.EventID);
if (calendarEvent != null)
{
oldEventTime = calendarEvent.Date;
long oldEventTime = calendarEvent.Date;
calendarEvent.EventType = (CalendarEventType)calendarUpdateEvent.EventInfo.EventType;
calendarEvent.Flags = (CalendarFlags)calendarUpdateEvent.EventInfo.Flags;
@@ -200,7 +197,7 @@ namespace Game
Global.CalendarMgr.SendCalendarEventUpdateAlert(calendarEvent, oldEventTime);
}
else
Global.CalendarMgr.SendCalendarCommandResult(guid, CalendarError.EventInvalid);
Global.CalendarMgr.SendCalendarCommandResult(_player.GetGUID(), CalendarError.EventInvalid);
}
[WorldPacketHandler(ClientOpcodes.CalendarRemoveEvent)]