diff --git a/src/server/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp index 8dfd2673be..1fc6fd236c 100644 --- a/src/server/game/Handlers/CombatHandler.cpp +++ b/src/server/game/Handlers/CombatHandler.cpp @@ -26,26 +26,21 @@ #include "Vehicle.h" #include "WorldPacket.h" -void WorldSession::HandleAttackSwingOpcode(WorldPacket& recvData) +void WorldSession::HandleAttackSwingOpcode(WorldPackets::Combat::AttackSwing& attackSwing) { - ObjectGuid guid; - recvData >> guid; + Unit* victim = ObjectAccessor::GetUnit(*_player, attackSwing.Victim); - TC_LOG_DEBUG("network", "WORLD: Recvd CMSG_ATTACKSWING Message %s", guid.ToString().c_str()); - - Unit* pEnemy = ObjectAccessor::GetUnit(*_player, guid); - - if (!pEnemy) + if (!victim) { // stop attack state at client SendAttackStop(nullptr); return; } - if (!_player->IsValidAttackTarget(pEnemy)) + if (!_player->IsValidAttackTarget(victim)) { // stop attack state at client - SendAttackStop(pEnemy); + SendAttackStop(victim); return; } @@ -58,33 +53,28 @@ void WorldSession::HandleAttackSwingOpcode(WorldPacket& recvData) ASSERT(seat); if (!(seat->Flags & VEHICLE_SEAT_FLAG_CAN_ATTACK)) { - SendAttackStop(pEnemy); + SendAttackStop(victim); return; } } - _player->Attack(pEnemy, true); + _player->Attack(victim, true); } -void WorldSession::HandleAttackStopOpcode(WorldPacket & /*recvData*/) +void WorldSession::HandleAttackStopOpcode(WorldPackets::Combat::CAttackStop& /*attackStop*/) { GetPlayer()->AttackStop(); } -void WorldSession::HandleSetSheathedOpcode(WorldPacket& recvData) +void WorldSession::HandleSetSheathedOpcode(WorldPackets::Combat::SetSheathed& setSheathed) { - uint32 sheathed; - recvData >> sheathed; - - //TC_LOG_DEBUG("network", "WORLD: Recvd CMSG_SETSHEATHED Message guidlow:%u value1:%u", GetPlayer()->GetGUID().GetCounter(), sheathed); - - if (sheathed >= MAX_SHEATH_STATE) + if (setSheathed.CurrentSheathState >= MAX_SHEATH_STATE) { - TC_LOG_ERROR("network", "Unknown sheath state %u ??", sheathed); + TC_LOG_ERROR("network", "Player %s tried to change his sheath state to an unknown value (%u)", _player->GetGUID().ToString().c_str(), setSheathed.CurrentSheathState); return; } - GetPlayer()->SetSheath(SheathState(sheathed)); + GetPlayer()->SetSheath(SheathState(setSheathed.CurrentSheathState)); } void WorldSession::SendAttackStop(Unit const* enemy) diff --git a/src/server/game/Server/Packets/CombatPackets.cpp b/src/server/game/Server/Packets/CombatPackets.cpp index b358bc150a..0f9b695645 100644 --- a/src/server/game/Server/Packets/CombatPackets.cpp +++ b/src/server/game/Server/Packets/CombatPackets.cpp @@ -122,3 +122,13 @@ WorldPacket const* WorldPackets::Combat::PvPCredit::Write() return &_worldPacket; } + +void WorldPackets::Combat::AttackSwing::Read() +{ + _worldPacket >> Victim; +} + +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 0a2e0edabc..68c25d00bb 100644 --- a/src/server/game/Server/Packets/CombatPackets.h +++ b/src/server/game/Server/Packets/CombatPackets.h @@ -152,6 +152,34 @@ namespace WorldPackets int32 Honor = 0; int32 Rank = 0; }; + + class AttackSwing final : public ClientPacket + { + public: + AttackSwing(WorldPacket&& packet) : ClientPacket(CMSG_ATTACK_SWING, std::move(packet)) { } + + void Read() override; + + ObjectGuid Victim; + }; + + class CAttackStop final : public ClientPacket + { + public: + CAttackStop(WorldPacket&& packet) : ClientPacket(CMSG_ATTACK_STOP, std::move(packet)) { } + + void Read() override { }; + }; + + class SetSheathed final : public ClientPacket + { + public: + SetSheathed(WorldPacket&& packet) : ClientPacket(CMSG_SET_SHEATHED, std::move(packet)) { } + + void Read() override; + + int32 CurrentSheathState = 0; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 0d137944e3..18ee8b240d 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -165,8 +165,8 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_ARENA_TEAM_QUERY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamQueryOpcode ); DEFINE_HANDLER(CMSG_ARENA_TEAM_REMOVE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamRemoveOpcode ); DEFINE_HANDLER(CMSG_ARENA_TEAM_ROSTER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamRosterOpcode ); - DEFINE_HANDLER(CMSG_ATTACKSTOP, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleAttackStopOpcode ); - DEFINE_HANDLER(CMSG_ATTACKSWING, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleAttackSwingOpcode ); + DEFINE_HANDLER(CMSG_ATTACK_STOP, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleAttackStopOpcode ); + DEFINE_HANDLER(CMSG_ATTACK_SWING, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleAttackSwingOpcode ); DEFINE_HANDLER(CMSG_AUCTION_LIST_BIDDER_ITEMS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListBidderItems ); DEFINE_HANDLER(CMSG_AUCTION_LIST_ITEMS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListItems ); DEFINE_HANDLER(CMSG_AUCTION_LIST_OWNER_ITEMS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListOwnerItems ); @@ -564,7 +564,7 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_SEND_MAIL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSendMail ); DEFINE_HANDLER(CMSG_SEND_SOR_REQUEST_VIA_ADDRESS, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_HANDLER(CMSG_SEND_SOR_REQUEST_VIA_BNET_ACCOUNT_ID, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); - DEFINE_HANDLER(CMSG_SETSHEATHED, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleSetSheathedOpcode ); + DEFINE_HANDLER(CMSG_SET_SHEATHED, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleSetSheathedOpcode ); DEFINE_HANDLER(CMSG_SET_ACTIONBAR_TOGGLES, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetActionBarToggles ); DEFINE_HANDLER(CMSG_SET_ACTION_BUTTON, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetActionButtonOpcode ); DEFINE_HANDLER(CMSG_SET_ACTIVE_MOVER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetActiveMoverOpcode ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index aeeafe3b2b..7939ff0b3d 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -49,8 +49,8 @@ enum OpcodeClient : uint16 CMSG_ARENA_TEAM_QUERY = 0x0514, CMSG_ARENA_TEAM_REMOVE = 0x2F05, CMSG_ARENA_TEAM_ROSTER = 0x6F37, - CMSG_ATTACKSTOP = 0x4106, - CMSG_ATTACKSWING = 0x0926, + CMSG_ATTACK_STOP = 0x4106, + CMSG_ATTACK_SWING = 0x0926, CMSG_AUCTION_LIST_BIDDER_ITEMS = 0x6937, CMSG_AUCTION_LIST_ITEMS = 0x0324, CMSG_AUCTION_LIST_OWNER_ITEMS = 0x0206, @@ -486,7 +486,7 @@ enum OpcodeClient : uint16 CMSG_SEND_SOR_REQUEST_VIA_BNET_ACCOUNT_ID = 0x0482, CMSG_SERVERTIME = 0x0000, CMSG_SETDEATHBINDPOINT = 0x0000, - CMSG_SETSHEATHED = 0x4326, + CMSG_SET_SHEATHED = 0x4326, CMSG_SET_ACTIONBAR_TOGGLES = 0x2506, CMSG_SET_ACTION_BUTTON = 0x6F06, CMSG_SET_ACTIVE_MOVER = 0x3314, diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index e2160282cd..c8362e7f29 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -99,6 +99,13 @@ namespace WorldPackets enum class LoginFailureReason : uint8; } + namespace Combat + { + class AttackSwing; + class CAttackStop; + class SetSheathed; + } + namespace LFG { class LFGJoin; @@ -942,9 +949,9 @@ class TC_GAME_API WorldSession void HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket); void HandleWrapItemOpcode(WorldPacket& recvPacket); - void HandleAttackSwingOpcode(WorldPacket& recvPacket); - void HandleAttackStopOpcode(WorldPacket& recvPacket); - void HandleSetSheathedOpcode(WorldPacket& recvPacket); + void HandleAttackSwingOpcode(WorldPackets::Combat::AttackSwing& packet); + void HandleAttackStopOpcode(WorldPackets::Combat::CAttackStop& packet); + void HandleSetSheathedOpcode(WorldPackets::Combat::SetSheathed& packet); void HandleUseItemOpcode(WorldPackets::Spells::UseItem& packet); void HandleOpenItemOpcode(WorldPacket& recvPacket);