From ad7f3b3b5c94b8460068acd6b6fae93ec894892b Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Fri, 16 Apr 2021 11:26:21 -0700
Subject: [PATCH] fix(networking): Standardizes SecureTrade packets (#577)

- Updates secure trade packets. Ref: https://docs.polserver.com/packets/index.php?Packet=0x6F
---
 .../Network/Packets/Outgoing/SecureTradePackets.cs   |  8 ++++++--
 .../Network/Packets/OutgoingSecureTradePackets.cs    | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/SecureTradePackets.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/SecureTradePackets.cs
index 7936b2496..906bed30f 100644
--- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/SecureTradePackets.cs
+++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/SecureTradePackets.cs
@@ -9,7 +9,7 @@ namespace Server.Network
         {
             name ??= "";
 
-            EnsureCapacity(18 + name.Length);
+            EnsureCapacity(17 + name.Length);
 
             Stream.Write((byte)0); // Display
             Stream.Write(them.Serial);
@@ -26,10 +26,13 @@ namespace Server.Network
         public CloseSecureTrade(Container cont)
             : base(0x6F)
         {
-            EnsureCapacity(8);
+            EnsureCapacity(17);
 
             Stream.Write((byte)1); // Close
             Stream.Write(cont.Serial);
+            Stream.Write(0);
+            Stream.Write(0);
+            Stream.Write(false);
         }
     }
 
@@ -49,6 +52,7 @@ namespace Server.Network
             Stream.Write(cont.Serial);
             Stream.Write(first);
             Stream.Write(second);
+            Stream.Write(false);
         }
     }
 
diff --git a/Projects/Server/Network/Packets/OutgoingSecureTradePackets.cs b/Projects/Server/Network/Packets/OutgoingSecureTradePackets.cs
index 424df5d14..eef3336ee 100644
--- a/Projects/Server/Network/Packets/OutgoingSecureTradePackets.cs
+++ b/Projects/Server/Network/Packets/OutgoingSecureTradePackets.cs
@@ -59,11 +59,14 @@ namespace Server.Network
                 return;
             }
 
-            var writer = new SpanWriter(stackalloc byte[8]);
+            var writer = new SpanWriter(stackalloc byte[17]);
             writer.Write((byte)0x6F); // Packet ID
-            writer.Write((ushort)8); // Length
+            writer.Write((ushort)17); // Length
             writer.Write((byte)TradeFlag.Close);
             writer.Write(cont.Serial);
+            writer.Write(0);
+            writer.Write(0);
+            writer.Write(false);
 
             ns.Send(writer.Span);
         }
@@ -78,13 +81,14 @@ namespace Server.Network
                 return;
             }
 
-            var writer = new SpanWriter(stackalloc byte[16]);
+            var writer = new SpanWriter(stackalloc byte[17]);
             writer.Write((byte)0x6F); // Packet ID
-            writer.Write((ushort)16); // Length
+            writer.Write((ushort)17); // Length
             writer.Write((byte)flag);
             writer.Write(cont.Serial);
             writer.Write(first);
             writer.Write(second);
+            writer.Write(false);
 
             ns.Send(writer.Span);
         }