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

Core/OjectMgr: Properly load guildbank items (and some minor cleanups)

Browse Source 
- fixes issues where guildbanks looked empty but weren't
- kudos to Linencloth for the discussion and thorough breakdown of this issue
Closes issue 4199.

--HG--
branch : trunk
This commit is contained in:
click
2010-09-27 04:16:41 +02:00
parent ede2a1c5ed
commit ee705bba32
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectMgr.cpp
+7 -8
View File
@@ -3517,8 +3517,6 @@ void ObjectMgr::LoadGuilds()
continue; continue;
} }
newGuild->m_TabListMap.resize(newGuild->GetPurchasedTabs());
AddGuild(newGuild); AddGuild(newGuild);
if (maxid < newGuild->GetId()) if (maxid < newGuild->GetId())
@@ -3539,7 +3537,7 @@ void ObjectMgr::LoadGuilds()
QueryResult guildBankEventResult = CharacterDatabase.Query("SELECT LogGuid, EventType, PlayerGuid, ItemOrMoney, ItemStackCount, DestTabId, TimeStamp, guildid, TabId FROM guild_bank_eventlog ORDER BY TimeStamp DESC,LogGuid DESC"); QueryResult guildBankEventResult = CharacterDatabase.Query("SELECT LogGuid, EventType, PlayerGuid, ItemOrMoney, ItemStackCount, DestTabId, TimeStamp, guildid, TabId FROM guild_bank_eventlog ORDER BY TimeStamp DESC,LogGuid DESC");
// 0 1 2 3 4 // 0 1 2 3 4
QueryResult guildBankTabResult = CharacterDatabase.Query("SELECT TabId, TabName, TabIcon, TabText, guildid FROM guild_bank_tab ORDER BY TabId"); QueryResult guildBankTabResult = CharacterDatabase.Query("SELECT TabId, TabName, TabIcon, TabText, guildid FROM guild_bank_tab");
PreparedStatement* guildBankItemStmt = CharacterDatabase.GetPreparedStatement(CHAR_LOAD_GUILD_BANK_ITEMS); PreparedStatement* guildBankItemStmt = CharacterDatabase.GetPreparedStatement(CHAR_LOAD_GUILD_BANK_ITEMS);
PreparedQueryResult guildBankItemResult = CharacterDatabase.Query(guildBankItemStmt); PreparedQueryResult guildBankItemResult = CharacterDatabase.Query(guildBankItemStmt);
@@ -3571,7 +3569,7 @@ void ObjectMgr::LoadGuildEvents(std::vector<Guild*>& GuildVector, QueryResult& r
Field *fields = result->Fetch(); Field *fields = result->Fetch();
uint32 guildid = fields[6].GetUInt32(); uint32 guildid = fields[6].GetUInt32();
if (guildid >= GuildVector.size() || GuildVector[guildid] == NULL) if (guildid >= GuildVector.size() || GuildVector[guildid] == NULL)
return; continue;
if (!GuildVector[guildid]->m_GuildEventLogNextGuid) if (!GuildVector[guildid]->m_GuildEventLogNextGuid)
GuildVector[guildid]->m_GuildEventLogNextGuid = fields[0].GetUInt32(); GuildVector[guildid]->m_GuildEventLogNextGuid = fields[0].GetUInt32();
@@ -3602,7 +3600,7 @@ void ObjectMgr::LoadGuildBankEvents(std::vector<Guild*>& GuildVector, QueryResul
uint32 logGuid = fields[0].GetUInt32(); uint32 logGuid = fields[0].GetUInt32();
uint32 guildid = fields[7].GetUInt32(); uint32 guildid = fields[7].GetUInt32();
if (guildid >= GuildVector.size() || GuildVector[guildid] == NULL) if (guildid >= GuildVector.size() || GuildVector[guildid] == NULL)
return; continue;
uint8 TabId = fields[8].GetUInt8(); uint8 TabId = fields[8].GetUInt8();
@@ -3668,10 +3666,11 @@ void ObjectMgr::LoadGuildBanks(std::vector<Guild*>& GuildVector, QueryResult& re
do do
{ {
Field *fields = result->Fetch(); Field *fields = result->Fetch();
uint32 TabId = fields[0].GetUInt32(); uint8 TabId = fields[0].GetUInt8();
uint32 guildid = fields[4].GetUInt32(); uint32 guildid = fields[4].GetUInt32();
if (guildid >= GuildVector.size() || GuildVector[guildid] == NULL) if (guildid >= GuildVector.size() || GuildVector[guildid] == NULL)
return; continue;
if (TabId < GuildVector[guildid]->GetPurchasedTabs()) if (TabId < GuildVector[guildid]->GetPurchasedTabs())
{ {
@@ -3698,7 +3697,7 @@ void ObjectMgr::LoadGuildBanks(std::vector<Guild*>& GuildVector, QueryResult& re
uint32 ItemId = fields[14].GetUInt32(); uint32 ItemId = fields[14].GetUInt32();
uint32 guildid = fields[15].GetUInt32(); uint32 guildid = fields[15].GetUInt32();
if (guildid >= GuildVector.size() || GuildVector[guildid] == NULL) if (guildid >= GuildVector.size() || GuildVector[guildid] == NULL)
return; continue;
if (TabId >= GuildVector[guildid]->GetPurchasedTabs()) if (TabId >= GuildVector[guildid]->GetPurchasedTabs())
{ {