diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-12-02 16:03:50 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-12-02 16:03:50 +0100 |
| commit | b4778a4d726d9c9ab9d55c49607bb91caa689433 (patch) | |
| tree | 4fb9f829c0c6f56fda47485b58b03c1c7f18c9f6 /src/server/game/Handlers/CalendarHandler.cpp | |
| parent | 333630b7de15c4090392fcbbc1bc58da4d5fb138 (diff) | |
Core/PacketIO: Fixed server time sent in CalendarRaidLockoutAdded
Diffstat (limited to 'src/server/game/Handlers/CalendarHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/CalendarHandler.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 5d90c79aeb2..01034c2f564 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -195,9 +195,6 @@ void WorldSession::HandleCalendarAddEvent(WorldPackets::Calendar::CalendarAddEve void WorldSession::HandleCalendarUpdateEvent(WorldPackets::Calendar::CalendarUpdateEvent& calendarUpdateEvent) { - ObjectGuid guid = _player->GetGUID(); - time_t oldEventTime = time_t(0); - calendarUpdateEvent.EventInfo.Time -= GetTimezoneOffset(); // prevent events in the past @@ -206,7 +203,7 @@ void WorldSession::HandleCalendarUpdateEvent(WorldPackets::Calendar::CalendarUpd if (CalendarEvent* calendarEvent = sCalendarMgr->GetEvent(calendarUpdateEvent.EventInfo.EventID)) { - oldEventTime = calendarEvent->GetDate(); + time_t oldEventTime = calendarEvent->GetDate(); calendarEvent->SetType(CalendarEventType(calendarUpdateEvent.EventInfo.EventType)); calendarEvent->SetFlags(calendarUpdateEvent.EventInfo.Flags); @@ -219,7 +216,7 @@ void WorldSession::HandleCalendarUpdateEvent(WorldPackets::Calendar::CalendarUpd sCalendarMgr->SendCalendarEventUpdateAlert(*calendarEvent, oldEventTime); } else - sCalendarMgr->SendCalendarCommandResult(guid, CALENDAR_ERROR_EVENT_INVALID); + sCalendarMgr->SendCalendarCommandResult(_player->GetGUID(), CALENDAR_ERROR_EVENT_INVALID); } void WorldSession::HandleCalendarRemoveEvent(WorldPackets::Calendar::CalendarRemoveEvent& calendarRemoveEvent) @@ -561,7 +558,7 @@ void WorldSession::SendCalendarRaidLockoutAdded(InstanceLock const* lock) { WorldPackets::Calendar::CalendarRaidLockoutAdded calendarRaidLockoutAdded; calendarRaidLockoutAdded.InstanceID = lock->GetInstanceId(); - calendarRaidLockoutAdded.ServerTime = uint32(GameTime::GetGameTime()); + calendarRaidLockoutAdded.ServerTime = *GameTime::GetWowTime(); calendarRaidLockoutAdded.MapID = int32(lock->GetMapId()); calendarRaidLockoutAdded.DifficultyID = lock->GetDifficultyId(); calendarRaidLockoutAdded.TimeRemaining = int32(std::chrono::duration_cast<Seconds>(lock->GetEffectiveExpiryTime() - GameTime::GetSystemTime()).count()); |