diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index f1c7972879..15111101eb 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -3615,8 +3615,8 @@ void Guild::_SendBankContentUpdate(uint8 tabId, SlotIds slots) const itemInfo.Item.ItemID = int32(tabItem ? tabItem->GetEntry() : 0); itemInfo.Count = int32(tabItem ? tabItem->GetCount() : 0); itemInfo.Charges = int32(tabItem ? abs(tabItem->GetSpellCharges()) : 0); - itemInfo.RandomPropertiesID = int32(tabItem ? tabItem->GetItemRandomPropertyId() : 0); - itemInfo.RandomPropertiesSeed = int32(tabItem ? tabItem->GetItemSuffixFactor() : 0); + itemInfo.Item.RandomPropertiesID = int32(tabItem ? tabItem->GetItemRandomPropertyId() : 0); + itemInfo.Item.RandomPropertiesSeed = int32(tabItem ? tabItem->GetItemSuffixFactor() : 0); itemInfo.EnchantmentID = int32(tabItem ? tabItem->GetEnchantmentId(EnchantmentSlot(PERM_ENCHANTMENT_SLOT)) : 0); itemInfo.OnUseEnchantmentID = int32(tabItem ? tabItem->GetEnchantmentId(EnchantmentSlot(BONUS_ENCHANTMENT_SLOT)) : 0); itemInfo.ReforgeEnchantmentID = int32(tabItem ? tabItem->GetEnchantmentId(EnchantmentSlot(REFORGE_ENCHANTMENT_SLOT)) : 0); @@ -3723,10 +3723,10 @@ void Guild::SendBankList(WorldSession* session, uint8 tabId, bool fullUpdate) co itemInfo.Slot = int32(slotId); itemInfo.Item.ItemID = tabItem->GetEntry(); + itemInfo.Item.RandomPropertiesID = int32(tabItem->GetItemRandomPropertyId()); + itemInfo.Item.RandomPropertiesSeed = int32(tabItem->GetItemSuffixFactor()); itemInfo.Count = int32(tabItem->GetCount()); itemInfo.Charges = int32(abs(tabItem->GetSpellCharges())); - itemInfo.RandomPropertiesID = int32(tabItem->GetItemRandomPropertyId()); - itemInfo.RandomPropertiesSeed = int32(tabItem->GetItemSuffixFactor()); itemInfo.EnchantmentID = tabItem->GetEnchantmentId(EnchantmentSlot(PERM_ENCHANTMENT_SLOT)); itemInfo.OnUseEnchantmentID = tabItem->GetEnchantmentId(EnchantmentSlot(BONUS_ENCHANTMENT_SLOT)); itemInfo.ReforgeEnchantmentID = tabItem->GetEnchantmentId(EnchantmentSlot(REFORGE_ENCHANTMENT_SLOT)); diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp index 1ec414d041..2e8083a05f 100644 --- a/src/server/game/Server/Packets/GuildPackets.cpp +++ b/src/server/game/Server/Packets/GuildPackets.cpp @@ -176,9 +176,9 @@ WorldPacket const* WorldPackets::Guild::GuildBankQueryResults::Write() _worldPacket << uint32(item.Slot); _worldPacket << uint32(item.Flags); _worldPacket << uint32(item.Item.ItemID); - _worldPacket << uint32(item.RandomPropertiesID); + _worldPacket << uint32(item.Item.RandomPropertiesID); _worldPacket << uint32(item.Charges); - _worldPacket << uint32(item.RandomPropertiesSeed); + _worldPacket << uint32(item.Item.RandomPropertiesSeed); } _worldPacket << uint32(Tab); diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h index f3daf32f03..a62e97c2a5 100644 --- a/src/server/game/Server/Packets/GuildPackets.h +++ b/src/server/game/Server/Packets/GuildPackets.h @@ -191,8 +191,6 @@ namespace WorldPackets int32 Charges = 0; int32 OnUseEnchantmentID = 0; int32 ReforgeEnchantmentID = 0; - int32 RandomPropertiesID = 0; - int32 RandomPropertiesSeed = 0; int32 Flags = 0; bool Locked = false; std::vector SocketEnchant;