diff options
Diffstat (limited to 'src/game/GuildHandler.cpp')
| -rw-r--r-- | src/game/GuildHandler.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index 2d51d7ccda7..f7880ed9b1b 100644 --- a/src/game/GuildHandler.cpp +++ b/src/game/GuildHandler.cpp @@ -891,7 +891,7 @@ void WorldSession::HandleGuildBankQueryTab( WorldPacket & recv_data ) if (!pGuild) return; - if (!pGuild->IsGuildBankLoaded() || TabId >= pGuild->GetPurchasedTabs()) + if (TabId >= pGuild->GetPurchasedTabs()) return; // Let's update the amount of gold the player can withdraw before displaying the content @@ -925,7 +925,7 @@ void WorldSession::HandleGuildBankDepositMoney( WorldPacket & recv_data ) if (!pGuild) return; - if (!pGuild->IsGuildBankLoaded() || !pGuild->GetPurchasedTabs()) + if (!pGuild->GetPurchasedTabs()) return; CharacterDatabase.BeginTransaction(); @@ -948,7 +948,7 @@ void WorldSession::HandleGuildBankDepositMoney( WorldPacket & recv_data ) pGuild->DisplayGuildBankTabsInfo(this); pGuild->DisplayGuildBankContent(this, 0); - pGuild->DisplayGuildBankMoneyUpdate(); + pGuild->DisplayGuildBankMoneyUpdate(this); } void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data ) @@ -973,7 +973,7 @@ void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data ) if(!pGuild) return; - if (!pGuild->IsGuildBankLoaded() || !pGuild->GetPurchasedTabs()) + if (!pGuild->GetPurchasedTabs()) return; if (pGuild->GetGuildBankMoney()<money) // not enough money in bank @@ -1001,7 +1001,7 @@ void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data ) pGuild->SendMoneyInfo(this, GetPlayer()->GetGUIDLow()); pGuild->DisplayGuildBankTabsInfo(this); pGuild->DisplayGuildBankContent(this,0); - pGuild->DisplayGuildBankMoneyUpdate(); + pGuild->DisplayGuildBankMoneyUpdate(this); } void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data ) @@ -1030,7 +1030,7 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data ) } Guild *pGuild = objmgr.GetGuildById(GuildId); - if (!pGuild || !pGuild->IsGuildBankLoaded()) + if (!pGuild) { recv_data.rpos(recv_data.wpos()); // prevent additional spam at rejected packet return; @@ -1135,7 +1135,7 @@ void WorldSession::HandleGuildBankBuyTab( WorldPacket & recv_data ) return; // m_PurchasedTabs = 0 when buying Tab 0, that is why this check can be made - if (!pGuild->IsGuildBankLoaded() || TabId != pGuild->GetPurchasedTabs()) + if (TabId != pGuild->GetPurchasedTabs()) return; uint32 TabCost = GetGuildBankTabPrice(TabId) * GOLD; @@ -1185,7 +1185,7 @@ void WorldSession::HandleGuildBankUpdateTab( WorldPacket & recv_data ) if (!pGuild) return; - if (!pGuild->IsGuildBankLoaded() || TabId >= pGuild->GetPurchasedTabs()) + if (TabId >= pGuild->GetPurchasedTabs()) return; pGuild->SetGuildBankTabInfo(TabId, Name, IconIndex); @@ -1208,9 +1208,6 @@ void WorldSession::HandleGuildBankLogQuery( WorldPacket & recv_data ) if (!pGuild) return; - if (!pGuild->IsGuildBankLoaded()) - return; - // GUILD_BANK_MAX_TABS send by client for money log if (TabId >= pGuild->GetPurchasedTabs() && TabId != GUILD_BANK_MAX_TABS) return; @@ -1233,7 +1230,7 @@ void WorldSession::HandleQueryGuildBankTabText(WorldPacket &recv_data) if (!pGuild) return; - if (!pGuild->IsGuildBankLoaded() || TabId >= pGuild->GetPurchasedTabs()) + if (TabId >= pGuild->GetPurchasedTabs()) return; pGuild->SendGuildBankTabText(this, TabId); @@ -1256,7 +1253,7 @@ void WorldSession::HandleSetGuildBankTabText(WorldPacket &recv_data) if (!pGuild) return; - if (!pGuild->IsGuildBankLoaded() || TabId >= pGuild->GetPurchasedTabs()) + if (TabId >= pGuild->GetPurchasedTabs()) return; pGuild->SetGuildBankTabText(TabId, Text); |