From 0d96866cea706a32dd30f6ecabfef8c1872f3c5b Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Tue, 15 Jun 2021 12:37:58 +0200
Subject: [PATCH] fix(Core/Packets): sending item's random property in a few
 packets (#6193)

- Closes #4843
---
 src/server/game/Entities/Player/Player.cpp | 2 +-
 src/server/game/Guilds/Guild.cpp           | 6 +++---
 src/server/game/Handlers/TradeHandler.cpp  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index d86a5166d..8b583263f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -26832,7 +26832,7 @@ void Player::BuildEnchantmentsInfoData(WorldPacket* data)
 
         data->put<uint16>(enchantmentMaskPos, enchantmentMask);
 
-        *data << uint16(item->GetItemRandomPropertyId());                   // item random property id
+        *data << int16(item->GetItemRandomPropertyId());                    // item random property id
         *data << item->GetGuidValue(ITEM_FIELD_CREATOR).WriteAsPacked();    // item creator
         *data << uint32(item->GetItemSuffixFactor());                       // item suffix factor
     }
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 83b4d4b8d..2201f3f57 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -472,13 +472,13 @@ bool Guild::BankTab::WriteSlotPacket(WorldPacket& data, uint8 slotId, bool ignor
     {
         data << uint32(0);                                  // 3.3.0 (0x00018020, 0x00018000)
 
-        if (uint32 random = pItem->GetItemRandomPropertyId())
+        if (int32 random = pItem->GetItemRandomPropertyId())
         {
-            data << uint32(random);                         // Random item property id
+            data << int32(random);                          // Random item property id
             data << uint32(pItem->GetItemSuffixFactor());   // SuffixFactor
         }
         else
-            data << uint32(0);
+            data << int32(0);
 
         data << uint32(pItem->GetCount());                  // ITEM_FIELD_STACK_COUNT
         data << uint32(0);
diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp
index 33e072a10..3206d7288 100644
--- a/src/server/game/Handlers/TradeHandler.cpp
+++ b/src/server/game/Handlers/TradeHandler.cpp
@@ -105,7 +105,7 @@ void WorldSession::SendUpdateTrade(bool trader_data /*= true*/)
             data << item->GetGuidValue(ITEM_FIELD_CREATOR);
             data << uint32(item->GetSpellCharges());        // charges
             data << uint32(item->GetItemSuffixFactor());    // SuffixFactor
-            data << uint32(item->GetItemRandomPropertyId());// random properties id
+            data << int32(item->GetItemRandomPropertyId()); // random properties id
             data << uint32(item->GetTemplate()->LockID);       // lock id
             // max durability
             data << uint32(item->GetUInt32Value(ITEM_FIELD_MAXDURABILITY));