From 77fc91bde85b44298ab6694236d1f6c9ece3cd34 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 30 Jul 2010 13:15:31 +0200 Subject: Deleted data blob in item_instance Fixed issues with displaying sockets/enchants/durability on heroic items --HG-- branch : trunk --- src/server/game/Guilds/Guild.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server/game/Guilds/Guild.cpp') diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 514398dc62f..03eec31535e 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1140,18 +1140,18 @@ void Guild::LoadGuildBankFromDB() } while (result->NextRow()); // data needs to be at first place for Item::LoadFromDB - // 0 1 2 3 4 - result = CharacterDatabase.PQuery("SELECT data, text, TabId, SlotId, item_guid, item_entry FROM guild_bank_item JOIN item_instance ON item_guid = guid WHERE guildid='%u' ORDER BY TabId", m_Id); + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 + result = CharacterDatabase.PQuery("SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyId, durability, playedTime, text, TabId, SlotId, item_guid, item_entry FROM guild_bank_item JOIN item_instance ON item_guid = guid WHERE guildid='%u' ORDER BY TabId", m_Id); if (!result) return; do { Field *fields = result->Fetch(); - uint8 TabId = fields[2].GetUInt8(); - uint8 SlotId = fields[3].GetUInt8(); - uint32 ItemGuid = fields[4].GetUInt32(); - uint32 ItemEntry = fields[5].GetUInt32(); + uint8 TabId = fields[11].GetUInt8(); + uint8 SlotId = fields[12].GetUInt8(); + uint32 ItemGuid = fields[13].GetUInt32(); + uint32 ItemEntry = fields[14].GetUInt32(); if (TabId >= m_PurchasedTabs || TabId >= GUILD_BANK_MAX_TABS) { @@ -1174,7 +1174,7 @@ void Guild::LoadGuildBankFromDB() } Item *pItem = NewItemOrBag(proto); - if (!pItem->LoadFromDB(ItemGuid, 0, result)) + if (!pItem->LoadFromDB(ItemGuid, 0, result, ItemEntry)) { CharacterDatabase.PExecute("DELETE FROM guild_bank_item WHERE guildid='%u' AND TabId='%u' AND SlotId='%u'", m_Id, uint32(TabId), uint32(SlotId)); sLog.outError("Item GUID %u not found in item_instance, deleting from Guild Bank!", ItemGuid); -- cgit v1.2.3