josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Update to guild handlers. Fix bugs related to the wrong ranks being updated, the greyed out withdraw button when you were eligible to withdraw money, and the improper display of no withdrawals left for a tab when you have plenty.

Browse Source 
NOTE: Guild masters might need to reconfigure their permissions per rank in order to resolve any permission issues.

--HG--
branch : trunk
This commit is contained in:
Machiavelli
2009-08-28 01:50:29 +02:00
parent 56bdb0fc6b
commit 1c45055482
3 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Guild.cpp
+7 -22
View File
@@ -678,7 +678,7 @@ void Guild::SetRankName(uint32 rankId, std::string name_)
// name now can be used for encoding to DB
CharacterDatabase.escape_string(name_);
CharacterDatabase.PExecute("UPDATE guild_rank SET rname='%s' WHERE rid='%u' AND guildid='%u'", name_.c_str(), (rankId+1), m_Id);
CharacterDatabase.PExecute("UPDATE guild_rank SET rname='%s' WHERE rid='%u' AND guildid='%u'", name_.c_str(), rankId, m_Id);
}
void Guild::SetRankRights(uint32 rankId, uint32 rights)
@@ -688,7 +688,7 @@ void Guild::SetRankRights(uint32 rankId, uint32 rights)
m_Ranks[rankId].rights = rights;
CharacterDatabase.PExecute("UPDATE guild_rank SET rights='%u' WHERE rid='%u' AND guildid='%u'", rights, (rankId+1), m_Id);
CharacterDatabase.PExecute("UPDATE guild_rank SET rights='%u' WHERE rid='%u' AND guildid='%u'", rights, rankId, m_Id);
}
int32 Guild::GetRank(uint32 LowGuid)
@@ -946,7 +946,7 @@ void Guild::LogGuildEvent(uint8 EventType, uint32 PlayerGuid1, uint32 PlayerGuid
// Bank content related
void Guild::DisplayGuildBankContent(WorldSession *session, uint8 TabId)
{
WorldPacket data(SMSG_GUILD_BANK_LIST,1200);
WorldPacket data(SMSG_GUILD_BANK_LIST, 1300);
GuildBankTab const* tab = GetBankTab(TabId);
if (!tab)
@@ -957,8 +957,7 @@ void Guild::DisplayGuildBankContent(WorldSession *session, uint8 TabId)
data << uint64(GetGuildBankMoney());
data << uint8(TabId);
// remaining slots for today
data << uint32(GetMemberSlotWithdrawRem(session->GetPlayer()->GetGUIDLow(), TabId));
data << uint32(GetMemberSlotWithdrawRem(session->GetPlayer()->GetGUIDLow(), TabId)); // remaining slots for today
data << uint8(0); // Tell client this is a tab content packet
data << uint8(GUILD_BANK_MAX_SLOTS);
@@ -971,20 +970,6 @@ void Guild::DisplayGuildBankContent(WorldSession *session, uint8 TabId)
sLog.outDebug("WORLD: Sent (SMSG_GUILD_BANK_LIST)");
}
void Guild::DisplayGuildBankMoneyUpdate()
{
WorldPacket data(SMSG_GUILD_BANK_LIST, 8+1+4+1+1);
data << uint64(GetGuildBankMoney());
data << uint8(0); // TabId, default 0
data << uint32(0); // slot withdrow, default 0
data << uint8(0); // Tell client this is a tab content packet
data << uint8(0); // not send items
BroadcastPacket(&data);
sLog.outDebug("WORLD: Sent (SMSG_GUILD_BANK_LIST)");
}
void Guild::DisplayGuildBankContentUpdate(uint8 TabId, int32 slot1, int32 slot2)
{
GuildBankTab const* tab = GetBankTab(TabId);
@@ -1093,9 +1078,9 @@ void Guild::DisplayGuildBankTabsInfo(WorldSession *session)
data << uint64(GetGuildBankMoney());
data << uint8(0); // TabInfo packet must be for TabId 0
data << uint32(0xFFFFFFFF); // bit 9 must be set for this packet to work
//data << uint32(0xFFFFFFFF); // bit 9 must be set for this packet to work
data << uint32(0);
data << uint8(1); // Tell Client this is a TabInfo packet
data << uint8(m_PurchasedTabs); // here is the number of tabs
for(int i = 0; i < m_PurchasedTabs; ++i)
@@ -1400,7 +1385,7 @@ void Guild::SetBankMoneyPerDay(uint32 rankId, uint32 money)
if (itr->second.RankId == rankId)
itr->second.BankResetTimeMoney = 0;
CharacterDatabase.PExecute("UPDATE guild_rank SET BankMoneyPerDay='%u' WHERE rid='%u' AND guildid='%u'", money, (rankId+1), m_Id);
CharacterDatabase.PExecute("UPDATE guild_rank SET BankMoneyPerDay='%u' WHERE rid='%u' AND guildid='%u'", money, rankId, m_Id);
CharacterDatabase.PExecute("UPDATE guild_member SET BankResetTimeMoney='0' WHERE guildid='%u' AND rank='%u'", m_Id, rankId);
}
src/game/Guild.h
-1
View File
@@ -389,7 +389,6 @@ class Guild
// ** Guild bank **
// Content & item deposit/withdraw
void DisplayGuildBankContent(WorldSession *session, uint8 TabId);
void DisplayGuildBankMoneyUpdate();
void SwapItems( Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankTabDst, uint8 BankTabSlotDst, uint32 SplitedAmount);
void MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 PlayerBag, uint8 PlayerSlot, uint32 SplitedAmount);
src/game/GuildHandler.cpp
-2
View File
@@ -995,7 +995,6 @@ void WorldSession::HandleGuildBankDepositMoney( WorldPacket & recv_data )
pGuild->DisplayGuildBankTabsInfo(this);
pGuild->DisplayGuildBankContent(this, 0);
pGuild->DisplayGuildBankMoneyUpdate();
}
void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data )
@@ -1044,7 +1043,6 @@ void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data )
pGuild->SendMoneyInfo(this, GetPlayer()->GetGUIDLow());
pGuild->DisplayGuildBankTabsInfo(this);
pGuild->DisplayGuildBankContent(this,0);
pGuild->DisplayGuildBankMoneyUpdate();
}
void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )