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/Server/Packets | |
| 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/Server/Packets')
| -rw-r--r-- | src/server/game/Server/Packets/CombatPackets.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/CombatPackets.h | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/server/game/Server/Packets/CombatPackets.cpp b/src/server/game/Server/Packets/CombatPackets.cpp index fa9d0370dd2..2b006a862bb 100644 --- a/src/server/game/Server/Packets/CombatPackets.cpp +++ b/src/server/game/Server/Packets/CombatPackets.cpp @@ -57,3 +57,7 @@ WorldPacket const* WorldPackets::Combat::CancelAutoRepeat::Write() return &_worldPacket; } +void WorldPackets::Combat::SetSheathed::Read() +{ + _worldPacket >> CurrentSheathState; +} diff --git a/src/server/game/Server/Packets/CombatPackets.h b/src/server/game/Server/Packets/CombatPackets.h index 28124773283..a17c2900770 100644 --- a/src/server/game/Server/Packets/CombatPackets.h +++ b/src/server/game/Server/Packets/CombatPackets.h @@ -118,6 +118,16 @@ namespace WorldPackets PackedGuid Guid; }; + + class SetSheathed final : public ClientPacket + { + public: + SetSheathed(WorldPacket&& packet) : ClientPacket(CMSG_SET_SHEATHED, std::move(packet)) { } + + void Read() override; + + uint32 CurrentSheathState = 0; + }; } } |