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/Protocol | |
| 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/Protocol')
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index ecc5fa52fc8..4c1496de6c4 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -608,7 +608,7 @@ void OpcodeTable::Initialize() /*0x1DD*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_PONG, STATUS_NEVER); /*0x1DE*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_COOLDOWN, STATUS_NEVER); /*0x1DF*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_PAGETEXT, STATUS_NEVER); - /*0x1E0*/ DEFINE_HANDLER(CMSG_SETSHEATHED, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleSetSheathedOpcode ); + /*0x1E0*/ DEFINE_HANDLER(CMSG_SET_SHEATHED, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleSetSheathedOpcode ); /*0x1E1*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_COOLDOWN_CHEAT, STATUS_NEVER); /*0x1E2*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_DELAYED, STATUS_NEVER); /*0x1E3*/ DEFINE_HANDLER(CMSG_QUEST_POI_QUERY, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleQuestPOIQuery ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 6f09e5d1561..9fb20367c00 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -506,7 +506,7 @@ enum Opcodes : uint16 SMSG_PONG = 0x1DD, SMSG_CLEAR_COOLDOWN = 0x1DE, SMSG_GAMEOBJECT_PAGETEXT = 0x1DF, - CMSG_SETSHEATHED = 0x1E0, + CMSG_SET_SHEATHED = 0x1E0, SMSG_COOLDOWN_CHEAT = 0x1E1, SMSG_SPELL_DELAYED = 0x1E2, CMSG_QUEST_POI_QUERY = 0x1E3, |