diff options
| -rw-r--r-- | src/server/game/Handlers/CalendarHandler.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 3945b63aecb..22927a93ef9 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -499,21 +499,25 @@ void WorldSession::HandleSetSavedInstanceExtend(WorldPackets::Calendar::SetSaved void WorldSession::SendCalendarRaidLockout(InstanceSave const* save, bool add) { - TC_LOG_DEBUG("network", "%s", add ? "SMSG_CALENDAR_RAID_LOCKOUT_ADDED" : "SMSG_CALENDAR_RAID_LOCKOUT_REMOVED"); time_t currTime = time(NULL); - - WorldPacket data(SMSG_CALENDAR_RAID_LOCKOUT_REMOVED, (add ? 4 : 0) + 4 + 4 + 4 + 8); if (add) { - data.SetOpcode(SMSG_CALENDAR_RAID_LOCKOUT_ADDED); - data.AppendPackedTime(currTime); + WorldPackets::Calendar::CalendarRaidLockoutAdded calendarRaidLockoutAdded; + calendarRaidLockoutAdded.InstanceID = save->GetInstanceId(); + calendarRaidLockoutAdded.ServerTime = uint32(currTime); + calendarRaidLockoutAdded.MapID = int32(save->GetMapId()); + calendarRaidLockoutAdded.DifficultyID = save->GetDifficultyID(); + calendarRaidLockoutAdded.TimeRemaining = uint32(save->GetResetTime() - currTime); + SendPacket(calendarRaidLockoutAdded.Write()); + } + else + { + WorldPackets::Calendar::CalendarRaidLockoutRemoved calendarRaidLockoutRemoved; + calendarRaidLockoutRemoved.InstanceID = save->GetInstanceId(); + calendarRaidLockoutRemoved.MapID = int32(save->GetMapId()); + calendarRaidLockoutRemoved.DifficultyID = save->GetDifficultyID(); + SendPacket(calendarRaidLockoutRemoved.Write()); } - - data << uint32(save->GetMapId()); - data << uint32(save->GetDifficultyID()); - data << uint32(save->GetResetTime() - currTime); - data << uint64(save->GetInstanceId()); - SendPacket(&data); } void WorldSession::SendCalendarRaidLockoutUpdated(InstanceSave const* save) |