diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-07-22 13:22:35 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-10-04 00:19:38 +0200 |
| commit | 17665c929c3a9fb7fe75dd680648129bc1c1f874 (patch) | |
| tree | a489cb742b7c5f3d7850d26157b3ac480aa00633 /src/server/game/Server | |
| parent | ad2df01b2c25ca6264096b8b8324dc8136ebd48b (diff) | |
Core/Instances: Instance lock rewrite (WIP)
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/CalendarPackets.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/CalendarPackets.h | 2 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/server/game/Server/Packets/CalendarPackets.cpp b/src/server/game/Server/Packets/CalendarPackets.cpp index 870761ae3c6..1e42362a480 100644 --- a/src/server/game/Server/Packets/CalendarPackets.cpp +++ b/src/server/game/Server/Packets/CalendarPackets.cpp @@ -39,7 +39,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Calendar::CalendarSendCal data << uint64(lockoutInfo.InstanceID); data << int32(lockoutInfo.MapID); data << uint32(lockoutInfo.DifficultyID); - data << uint32(lockoutInfo.ExpireTime); + data << int32(lockoutInfo.ExpireTime); return data; } diff --git a/src/server/game/Server/Packets/CalendarPackets.h b/src/server/game/Server/Packets/CalendarPackets.h index 1f292ca1468..4ee6ddbfc3a 100644 --- a/src/server/game/Server/Packets/CalendarPackets.h +++ b/src/server/game/Server/Packets/CalendarPackets.h @@ -174,7 +174,7 @@ namespace WorldPackets uint64 InstanceID = 0; int32 MapID = 0; uint32 DifficultyID = 0; - time_t ExpireTime = time_t(0); + int32 ExpireTime = 0; }; struct CalendarSendCalendarEventInfo diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 05e376b8e70..4433c91fa31 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -43,6 +43,7 @@ class BlackMarketEntry; class CollectionMgr; class Creature; +class InstanceLock; class InstanceSave; class Item; class LoginQueryHolder; @@ -1682,8 +1683,10 @@ class TC_GAME_API WorldSession void HandleCalendarGetNumPending(WorldPackets::Calendar::CalendarGetNumPending& calendarGetNumPending); void HandleCalendarEventSignup(WorldPackets::Calendar::CalendarEventSignUp& calendarEventSignUp); - void SendCalendarRaidLockout(InstanceSave const* save, bool add); + void SendCalendarRaidLockoutAdded(InstanceLock const* lock); void SendCalendarRaidLockoutUpdated(InstanceSave const* save); + void SendCalendarRaidLockoutRemoved(InstanceSave const* save); + void SendCalendarRaidLockoutRemoved(InstanceLock const* lock); void HandleSetSavedInstanceExtend(WorldPackets::Calendar::SetSavedInstanceExtend& setSavedInstanceExtend); // Void Storage |