Deleted data blob in item_instance
Fixed issues with displaying sockets/enchants/durability on heroic items --HG-- branch : trunk
This commit is contained in:
1 parent
c227065fc0
commit
77fc91bde8
13 files changed
+243
-111
No files matched your search
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user