From 3e54e798e67ba0f3a141cd75ff2f7bd9d8980d3c Mon Sep 17 00:00:00 2001 From: ForesterDev <11771800+ForesterDev@users.noreply.github.com> Date: Sat, 11 Apr 2020 21:48:16 +0400 Subject: Core/Opcodes: updated CMSG_SET_SHEATHED to new packet class (#24393) * Core/Packets: Added SMSG_LEARNED_SPELLS packet (cherry picked from commit 51026f28bd908664f6d47daadf790f84359b8288) Co-authored-by: chemicstry * Core/Opcodes: updated CMSG_SET_SHEATHED to new packet class (cherry picked from commit 7eb02e945f973ef3e5881cc1674123581f6750d4) # Conflicts: # src/server/game/Entities/Unit/Unit.cpp # src/server/game/Handlers/CombatHandler.cpp # src/server/game/Server/Packets/CombatPackets.cpp # src/server/game/Server/Packets/CombatPackets.h # src/server/game/Server/Protocol/Opcodes.cpp * rename opcode name CMSG_SETSHEATHED -> CMSG_SET_SHEATHED * Revert "Core/Packets: Added SMSG_LEARNED_SPELLS packet" This reverts commit 7beefdfb162f503067a519193f704ac15809779f. Co-authored-by: chemicstry --- src/server/game/Handlers/CombatHandler.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/server/game/Handlers/CombatHandler.cpp') diff --git a/src/server/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp index 61374dd59f1..4ed678e6e70 100644 --- a/src/server/game/Handlers/CombatHandler.cpp +++ b/src/server/game/Handlers/CombatHandler.cpp @@ -66,18 +66,15 @@ void WorldSession::HandleAttackStopOpcode(WorldPackets::Combat::AttackStop& /*pa GetPlayer()->AttackStop(); } -void WorldSession::HandleSetSheathedOpcode(WorldPacket& recvData) +void WorldSession::HandleSetSheathedOpcode(WorldPackets::Combat::SetSheathed& packet) { - uint32 sheathed; - recvData >> sheathed; - - if (sheathed >= MAX_SHEATH_STATE) + if (packet.CurrentSheathState >= MAX_SHEATH_STATE) { - TC_LOG_ERROR("network", "Unknown sheath state %u ??", sheathed); + TC_LOG_ERROR("network", "Unknown sheath state %u ??", packet.CurrentSheathState); return; } - GetPlayer()->SetSheath(SheathState(sheathed)); + _player->SetSheath(SheathState(packet.CurrentSheathState)); } void WorldSession::SendAttackStop(Unit const* enemy) -- cgit v1.2.3