diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Handlers/GuildHandler.cpp | 24 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/GuildPackets.cpp | 20 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/GuildPackets.h | 24 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 2 |
4 files changed, 0 insertions, 70 deletions
diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp index 25002c2f0b6..fa81e9d2e28 100644 --- a/src/server/game/Handlers/GuildHandler.cpp +++ b/src/server/game/Handlers/GuildHandler.cpp @@ -277,30 +277,6 @@ void WorldSession::HandleGuildBankWithdrawMoney(WorldPackets::Guild::GuildBankWi guild->HandleMemberWithdrawMoney(this, packet.Money); } -void WorldSession::HandleGuildBankSwapItems(WorldPackets::Guild::GuildBankSwapItems& packet) -{ - if (!GetPlayer()->GetGameObjectIfCanInteractWith(packet.Banker, GAMEOBJECT_TYPE_GUILD_BANK)) - return; - - Guild* guild = GetPlayer()->GetGuild(); - if (!guild) - return; - - if (packet.BankOnly) - { - guild->SwapItems(GetPlayer(), packet.BankTab1, packet.BankSlot1, packet.BankTab, packet.BankSlot, packet.StackCount); - } - else - { - // Player <-> Bank - // Allow to work with inventory only - if (!Player::IsInventoryPos(packet.ContainerSlot, packet.ContainerItemSlot) && !packet.AutoStore) - GetPlayer()->SendEquipError(EQUIP_ERR_INTERNAL_BAG_ERROR, nullptr); - else - guild->SwapItemsWithInventory(GetPlayer(), packet.ToSlot != 0, packet.BankTab, packet.BankSlot, packet.ContainerSlot, packet.ContainerItemSlot, packet.StackCount); - } -} - void WorldSession::HandleGuildBankBuyTab(WorldPackets::Guild::GuildBankBuyTab& packet) { TC_LOG_DEBUG("guild", "CMSG_GUILD_BANK_BUY_TAB [%s]: [%s[, TabId: %u", GetPlayerInfo().c_str(), packet.Banker.ToString().c_str(), packet.BankTab); diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp index c14f58ae8b3..5ae849a0102 100644 --- a/src/server/game/Server/Packets/GuildPackets.cpp +++ b/src/server/game/Server/Packets/GuildPackets.cpp @@ -641,26 +641,6 @@ WorldPacket const* WorldPackets::Guild::GuildBankQueryResults::Write() return &_worldPacket; } -void WorldPackets::Guild::GuildBankSwapItems::Read() -{ - _worldPacket >> Banker; - _worldPacket >> BankTab; - _worldPacket >> BankSlot; - _worldPacket >> ItemID; - _worldPacket >> BankTab1; - _worldPacket >> BankSlot1; - _worldPacket >> ItemID1; - _worldPacket >> BankItemCount; - _worldPacket >> ContainerSlot; - _worldPacket >> ContainerItemSlot; - _worldPacket >> ToSlot; - _worldPacket >> StackCount; - - _worldPacket.ResetBitPos(); - BankOnly = _worldPacket.ReadBit(); - AutoStore = _worldPacket.ReadBit(); -} - void WorldPackets::Guild::DepositGuildBankItem::Read() { _worldPacket >> Banker; diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h index be277c2e38c..536e68fed75 100644 --- a/src/server/game/Server/Packets/GuildPackets.h +++ b/src/server/game/Server/Packets/GuildPackets.h @@ -827,30 +827,6 @@ namespace WorldPackets bool FullUpdate = false; }; - // TODO: research new guild bank opcodes - class GuildBankSwapItems final : public ClientPacket - { - public: - GuildBankSwapItems(WorldPacket&& packet) : ClientPacket(std::move(packet)) { } - - void Read() override; - - ObjectGuid Banker; - int32 StackCount = 0; - int32 BankItemCount = 0; - uint32 ItemID = 0; - uint32 ItemID1 = 0; - uint8 ToSlot = 0; - uint8 BankSlot = 0; - uint8 BankSlot1 = 0; - uint8 BankTab = 0; - uint8 BankTab1 = 0; - uint8 ContainerSlot = 0; - uint8 ContainerItemSlot = 0; - bool AutoStore = false; - bool BankOnly = false; - }; - class DepositGuildBankItem final : public ClientPacket { public: diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index f030d9fa046..eb0e22b3e05 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -362,7 +362,6 @@ namespace WorldPackets class GuildBankQueryTab; class GuildBankDepositMoney; class GuildBankWithdrawMoney; - class GuildBankSwapItems; class DepositGuildBankItem; class StoreGuildBankItem; class SwapItemWithGuildBankItem; @@ -1646,7 +1645,6 @@ class TC_GAME_API WorldSession void HandleGuildBankLogQuery(WorldPackets::Guild::GuildBankLogQuery& packet); void HandleGuildBankDepositMoney(WorldPackets::Guild::GuildBankDepositMoney& packet); void HandleGuildBankWithdrawMoney(WorldPackets::Guild::GuildBankWithdrawMoney& packet); - void HandleGuildBankSwapItems(WorldPackets::Guild::GuildBankSwapItems& packet); void HandleDepositGuildBankItem(WorldPackets::Guild::DepositGuildBankItem& depositGuildBankItem); void HandleStoreGuildBankItem(WorldPackets::Guild::StoreGuildBankItem& storeGuildBankItem); void HandleSwapItemWithGuildBankItem(WorldPackets::Guild::SwapItemWithGuildBankItem& swapItemWithGuildBankItem); |