mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 04:37:00 +00:00
Guild bank hopefully fixed.
This commit is contained in:
parent
eba214eb8a
commit
57126880cf
6 changed files with 126 additions and 202 deletions
|
|
@ -887,7 +887,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
|
||||
|
|
@ -921,7 +921,7 @@ void WorldSession::HandleGuildBankDepositMoney( WorldPacket & recv_data )
|
|||
if (!pGuild)
|
||||
return;
|
||||
|
||||
if (!pGuild->IsGuildBankLoaded() || !pGuild->GetPurchasedTabs())
|
||||
if (!pGuild->GetPurchasedTabs())
|
||||
return;
|
||||
|
||||
CharacterDatabase.BeginTransaction();
|
||||
|
|
@ -944,7 +944,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 )
|
||||
|
|
@ -969,7 +969,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
|
||||
|
|
@ -997,7 +997,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 )
|
||||
|
|
@ -1026,7 +1026,7 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
|
|||
}
|
||||
|
||||
Guild *pGuild = sObjectMgr.GetGuildById(GuildId);
|
||||
if (!pGuild || !pGuild->IsGuildBankLoaded())
|
||||
if (!pGuild)
|
||||
{
|
||||
recv_data.rpos(recv_data.wpos()); // prevent additional spam at rejected packet
|
||||
return;
|
||||
|
|
@ -1128,7 +1128,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;
|
||||
|
|
@ -1177,7 +1177,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);
|
||||
|
|
@ -1200,9 +1200,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;
|
||||
|
|
@ -1225,7 +1222,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);
|
||||
|
|
@ -1248,7 +1245,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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue