From 323240c6cf29e2e3cfcb9b8e9af6b1af19005099 Mon Sep 17 00:00:00 2001
From: Jan Heberer <jangc@t-online.de>
Date: Wed, 2 Dec 2015 14:38:58 +0100
Subject: [PATCH] Workaround for runtime join desync

Reconstruct a part of C4GameControlNetwork::PackCompleteCtrl from Clonk Rage [312] disassembly. This will fix a bug where a control packet is executed twice if it was received twice.
---
 src/network/C4GameControlNetwork.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/network/C4GameControlNetwork.cpp b/src/network/C4GameControlNetwork.cpp
index a432464..9903ec5 100644
--- a/src/network/C4GameControlNetwork.cpp
+++ b/src/network/C4GameControlNetwork.cpp
@@ -775,17 +775,10 @@ C4GameControlPacket *C4GameControlNetwork::PackCompleteCtrl(int32_t iTick)
 	// pack everything in ID order (client list is ordered this way)
 	C4GameControlPacket *pCtrl;
 	for (pClient = pClients; pClient; pClient = pClient->pNext)
-		while (pClient->getNextControl() <= iTick)
-		{
-			// get control
-			int32_t iNextControl = pClient->getNextControl();
-			pCtrl = getCtrl(pClient->getClientID(), iNextControl);
-			if (!pCtrl) break;
-			pClient->SetNextControl(iNextControl + 1);
-			assert(pCtrl);
-			// add
-			pComplete->Add(*pCtrl);
-		}
+	{
+		pCtrl = getCtrl(pClient->getClientID(), iTick);
+		if (pCtrl) pComplete->Add(*pCtrl);
+	}
 
 	// add to list
 	AddCtrl(pComplete);
-- 
2.6.3.windows.1

From d976a6ba1b2ffd23f0ece7deeb08b4c49ec1d0ee Mon Sep 17 00:00:00 2001
From: Jan Heberer <jangc@t-online.de>
Date: Sat, 2 Jan 2016 22:59:08 +0100
Subject: [PATCH] Fix sync loss on runtime join in decentral network mode

---
 src/network/C4GameControlNetwork.cpp | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/network/C4GameControlNetwork.cpp b/src/network/C4GameControlNetwork.cpp
index a432464..6a59a96 100644
--- a/src/network/C4GameControlNetwork.cpp
+++ b/src/network/C4GameControlNetwork.cpp
@@ -773,19 +773,33 @@ C4GameControlPacket *C4GameControlNetwork::PackCompleteCtrl(int32_t iTick)
 	pComplete->Set(C4ClientIDAll, iTick);
 
 	// pack everything in ID order (client list is ordered this way)
-	C4GameControlPacket *pCtrl;
-	for (pClient = pClients; pClient; pClient = pClient->pNext)
-		while (pClient->getNextControl() <= iTick)
+	if (eMode == CNM_Async)
+	{
+		for (pClient = pClients; pClient; pClient = pClient->pNext)
+		{
+			while (pClient->getNextControl() <= iTick)
+			{
+				// get control
+				int32_t iNextControl = pClient->getNextControl();
+				C4GameControlPacket *pCtrl = getCtrl(pClient->getClientID(), iNextControl);
+				if (!pCtrl) break;
+				pClient->SetNextControl(iNextControl + 1);
+				// add
+				pComplete->Add(*pCtrl);
+			}
+		}
+	}
+	else
+	{
+		for (pClient = pClients; pClient; pClient = pClient->pNext)
 		{
 			// get control
-			int32_t iNextControl = pClient->getNextControl();
-			pCtrl = getCtrl(pClient->getClientID(), iNextControl);
-			if (!pCtrl) break;
-			pClient->SetNextControl(iNextControl + 1);
+			C4GameControlPacket *pCtrl = getCtrl(pClient->getClientID(), iTick);
 			assert(pCtrl);
 			// add
 			pComplete->Add(*pCtrl);
 		}
+	}
 
 	// add to list
 	AddCtrl(pComplete);
-- 
2.6.4.windows.1