aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MiscHandler.cpp
diff options
context:
space:
mode:
authorNoName <322016+Faq@users.noreply.github.com>2020-07-15 00:15:33 +0300
committerGitHub <noreply@github.com>2020-07-14 23:15:33 +0200
commit9fe6756cf26e916d69673879c31e09ee57ef6470 (patch)
tree9b7e519990e2c6e5f72e1e60162570b9083977b8 /src/server/game/Handlers/MiscHandler.cpp
parent0072fa922db1642d720c545ccc2ac095c140f0ca (diff)
Core/PacketIO: Updated corpse related packet structures (#24922)
# Conflicts: # src/server/game/Entities/Player/Player.cpp # src/server/game/Handlers/MiscHandler.cpp # src/server/game/Handlers/QueryHandler.cpp # src/server/game/Maps/MapManager.cpp # src/server/game/Server/Packets/MiscPackets.cpp # src/server/game/Server/Packets/QueryPackets.h # src/server/game/Server/Protocol/Opcodes.cpp # src/server/game/Server/Protocol/Opcodes.h # src/server/game/Server/WorldSession.h * + For SMSG_DEATH_RELEASE_LOC G3D::Vector3 -> TaggedPosition<Position::XYZ> + removed non 3.3.5 packets Co-authored-by: Peter Keresztes Schmidt <carbenium@outlook.com> Co-authored-by: Mogadischu <cgnad@live.de> Co-authored-by: Shauren <shauren.trinity@gmail.com>
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 324d5701939..d3c14538c58 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -55,12 +55,10 @@
#include <cstdarg>
#include <zlib.h>
-void WorldSession::HandleRepopRequestOpcode(WorldPacket& recvData)
+void WorldSession::HandleRepopRequest(WorldPackets::Misc::RepopRequest& /*packet*/)
{
TC_LOG_DEBUG("network", "WORLD: Recvd CMSG_REPOP_REQUEST Message");
- recvData.read_skip<uint8>();
-
if (GetPlayer()->IsAlive() || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
return;
@@ -521,13 +519,10 @@ void WorldSession::HandleBugOpcode(WorldPacket& recvData)
CharacterDatabase.Execute(stmt);
}
-void WorldSession::HandleReclaimCorpseOpcode(WorldPacket& recvData)
+void WorldSession::HandleReclaimCorpse(WorldPackets::Misc::ReclaimCorpse& /*packet*/)
{
TC_LOG_DEBUG("network", "WORLD: Received CMSG_RECLAIM_CORPSE");
- ObjectGuid guid;
- recvData >> guid;
-
if (_player->IsAlive())
return;
@@ -557,25 +552,20 @@ void WorldSession::HandleReclaimCorpseOpcode(WorldPacket& recvData)
_player->SpawnCorpseBones();
}
-void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recvData)
+void WorldSession::HandleResurrectResponse(WorldPackets::Misc::ResurrectResponse& packet)
{
TC_LOG_DEBUG("network", "WORLD: Received CMSG_RESURRECT_RESPONSE");
- ObjectGuid guid;
- uint8 status;
- recvData >> guid;
- recvData >> status;
-
if (GetPlayer()->IsAlive())
return;
- if (status == 0)
+ if (packet.Response == 0)
{
GetPlayer()->ClearResurrectRequestData(); // reject
return;
}
- if (!GetPlayer()->IsResurrectRequestedBy(guid))
+ if (!GetPlayer()->IsResurrectRequestedBy(packet.Resurrecter))
return;
GetPlayer()->ResurrectUsingRequestData();