From 974f3163bcd43905a508b8b6b2512269962cb39e Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 16 Apr 2021 18:09:08 +0200 Subject: [PATCH] Core/Packets: converted SMSG_CORPSE_RECLAIM_DELAY to packet class --- src/server/game/Entities/Player/Player.cpp | 6 +++--- src/server/game/Server/Packets/MiscPackets.cpp | 7 +++++++ src/server/game/Server/Packets/MiscPackets.h | 10 ++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 5b2cc7c881..12aee7af24 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -24955,9 +24955,9 @@ int32 Player::CalculateCorpseReclaimDelay(bool load) const void Player::SendCorpseReclaimDelay(uint32 delay) const { - WorldPacket data(SMSG_CORPSE_RECLAIM_DELAY, 4); - data << uint32(delay); - SendDirectMessage(&data); + WorldPackets::Misc::CorpseReclaimDelay packet; + packet.Remaining = delay; + SendDirectMessage(packet.Write()); } Player* Player::GetNextRandomRaidMember(float radius) diff --git a/src/server/game/Server/Packets/MiscPackets.cpp b/src/server/game/Server/Packets/MiscPackets.cpp index 1d6868d9bc..b34354cb7d 100644 --- a/src/server/game/Server/Packets/MiscPackets.cpp +++ b/src/server/game/Server/Packets/MiscPackets.cpp @@ -477,3 +477,10 @@ WorldPacket const* WorldPackets::Misc::RequestCemeteryListResponse::Write() return &_worldPacket; } + +WorldPacket const* WorldPackets::Misc::CorpseReclaimDelay::Write() +{ + _worldPacket << uint32(Remaining); + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h index 7d609ac1f1..0f39cd68b5 100644 --- a/src/server/game/Server/Packets/MiscPackets.h +++ b/src/server/game/Server/Packets/MiscPackets.h @@ -509,6 +509,16 @@ namespace WorldPackets bool IsGossipTriggered = false; std::vector CemeteryID; }; + + class CorpseReclaimDelay final : public ServerPacket + { + public: + CorpseReclaimDelay() : ServerPacket(SMSG_CORPSE_RECLAIM_DELAY, 4) { } + + WorldPacket const* Write() override; + + uint32 Remaining = 0; + }; } }