diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2020-04-11 21:48:16 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-11 19:48:16 +0200 |
| commit | 3e54e798e67ba0f3a141cd75ff2f7bd9d8980d3c (patch) | |
| tree | 4987c8df9b07abf3a5db00e9a5a7157583533a70 /src/server/game/Handlers/CombatHandler.cpp | |
| parent | 194691f7c3992fbea13227a190007f05451d742a (diff) | |
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 <chemicstry@gmail.com>
* 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 <chemicstry@gmail.com>
Diffstat (limited to 'src/server/game/Handlers/CombatHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/CombatHandler.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
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) |