From 1add57e5ade92e727675cd8a3613699bbfaf14c8 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sun, 27 Nov 2022 15:51:44 +0000
Subject: [PATCH] Fix frame number not being included in pre-serialized order
 packets.

---
 OpenRA.Game/Network/OrderIO.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Game/Network/OrderIO.cs b/OpenRA.Game/Network/OrderIO.cs
index 3fc347160b..0c104d044f 100644
--- a/OpenRA.Game/Network/OrderIO.cs
+++ b/OpenRA.Game/Network/OrderIO.cs
@@ -54,13 +54,14 @@ namespace OpenRA.Network
 
 		public byte[] Serialize(int frame)
 		{
-			if (data != null)
-				return data.ToArray();
-
 			var ms = new MemoryStream();
 			ms.WriteArray(BitConverter.GetBytes(frame));
-			foreach (var o in orders)
-				ms.WriteArray(o.Serialize());
+			if (data != null)
+				data.CopyTo(ms);
+			else
+				foreach (var o in orders)
+					ms.WriteArray(o.Serialize());
+
 			return ms.ToArray();
 		}