Fixes required to make jrb's servers work.

MustaphaTR · Jan 27, 2019 · 3c7f763 · 3c7f763
1 parent 3e9bf36
commit 3c7f763
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/OpenRA.Game/Network/Connection.cs b/OpenRA.Game/Network/Connection.cs
@@ -68,11 +68,13 @@ public virtual void Send(int frame, List<byte[]> orders)
 
 		public virtual void SendImmediate(List<byte[]> orders)
 		{
-			var ms = new MemoryStream();
-			ms.WriteArray(BitConverter.GetBytes(0));
 			foreach (var o in orders)
+			{
+				var ms = new MemoryStream();
+				ms.WriteArray(BitConverter.GetBytes(0));
 				ms.WriteArray(o);
-			Send(ms.ToArray());
+				Send(ms.ToArray());
+			}
 		}
 
 		public virtual void SendSync(int frame, byte[] syncData)

diff --git a/OpenRA.Game/Network/OrderManager.cs b/OpenRA.Game/Network/OrderManager.cs
@@ -179,8 +179,8 @@ public void Tick()
 			if (!IsReadyForNextFrame)
 				throw new InvalidOperationException();
 
-			Connection.Send(NetFrameNumber + FramesAhead, localOrders.Select(o => o.Serialize()).ToList());
-			localOrders.Clear();
+			Connection.Send(NetFrameNumber + FramesAhead, localOrders.Where(o => !o.IsImmediate).Select(o => o.Serialize()).ToList());
+			localOrders.RemoveAll(o => !o.IsImmediate);
 
 			foreach (var order in frameData.OrdersForFrame(World, NetFrameNumber))
 				UnitOrders.ProcessOrder(this, World, order.Client, order.Order);