From 9fd815013197110606144e651fe5cc4803404f8b Mon Sep 17 00:00:00 2001 From: Andrew Fryer Date: Tue, 18 Feb 2020 11:10:57 -0500 Subject: [PATCH] fixes uint to ushort truncation issue for Amount (#89) --- Projects/Server/Network/Packets.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Projects/Server/Network/Packets.cs b/Projects/Server/Network/Packets.cs index f2c45d137..920e07326 100644 --- a/Projects/Server/Network/Packets.cs +++ b/Projects/Server/Network/Packets.cs @@ -1839,7 +1839,7 @@ namespace Server.Network m_Stream.Write(item.Serial); m_Stream.Write((ushort)item.ItemID); m_Stream.Write((byte)0); // signed, itemID offset - m_Stream.Write((ushort)item.Amount); + m_Stream.Write((ushort)Math.Min(item.Amount, ushort.MaxValue)); m_Stream.Write((short)item.X); m_Stream.Write((short)item.Y); m_Stream.Write(parentSerial); @@ -1866,7 +1866,7 @@ namespace Server.Network m_Stream.Write(item.Serial); m_Stream.Write((ushort)item.ItemID); m_Stream.Write((byte)0); // signed, itemID offset - m_Stream.Write((ushort)item.Amount); + m_Stream.Write((ushort)Math.Min(item.Amount, ushort.MaxValue)); m_Stream.Write((short)item.X); m_Stream.Write((short)item.Y); m_Stream.Write((byte)0); // Grid Location? @@ -1901,7 +1901,7 @@ namespace Server.Network m_Stream.Write(child.Serial); m_Stream.Write((ushort)child.ItemID); m_Stream.Write((byte)0); // signed, itemID offset - m_Stream.Write((ushort)child.Amount); + m_Stream.Write((ushort)Math.Min(child.Amount, ushort.MaxValue)); m_Stream.Write((short)loc.m_X); m_Stream.Write((short)loc.m_Y); m_Stream.Write(beheld.Serial); @@ -1942,7 +1942,7 @@ namespace Server.Network m_Stream.Write(child.Serial); m_Stream.Write((ushort)child.ItemID); m_Stream.Write((byte)0); // signed, itemID offset - m_Stream.Write((ushort)child.Amount); + m_Stream.Write((ushort)Math.Min(child.Amount, ushort.MaxValue)); m_Stream.Write((short)loc.m_X); m_Stream.Write((short)loc.m_Y); m_Stream.Write((byte)0); // Grid Location?