From d0b52d92fe2047c4a8d92c0d92d0ff9394173e3a Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Tue, 2 May 2017 22:18:36 +0300
Subject: [PATCH] Event ID wraparound fixes

---
 .../NetEntityEvent/ClientEntityEventManager.cs       |  4 ++--
 .../NetEntityEvent/ServerEntityEventManager.cs       | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Subsurface/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs b/Subsurface/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs
index cef87377d..ded8fc1e3 100644
--- a/Subsurface/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs
+++ b/Subsurface/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs
@@ -145,9 +145,9 @@ namespace Barotrauma.Networking
                 IServerSerializable entity = Entity.FindEntityByID(entityID) as IServerSerializable;
 
                 //skip the event if we've already received it or if the entity isn't found
-                if (thisEventID != lastReceivedID + 1 || entity == null)
+                if (thisEventID != (UInt16)(lastReceivedID + 1) || entity == null)
                 {
-                    if (thisEventID != lastReceivedID + 1)
+                    if (thisEventID != (UInt16)(lastReceivedID + 1))
                     {
                         DebugConsole.NewMessage("received msg " + thisEventID + " (waiting for "+ (lastReceivedID+1) + ")", thisEventID<lastReceivedID+1 ? Microsoft.Xna.Framework.Color.Yellow : Microsoft.Xna.Framework.Color.Red);
                     }
diff --git a/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs b/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
index 9b6774810..b9c6c3312 100644
--- a/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
+++ b/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
@@ -137,21 +137,19 @@ namespace Barotrauma.Networking
 
                 bufferedEvent.IsProcessed = true;
             }
-
+            
             var inGameClients = clients.FindAll(c => c.inGame && !c.NeedsMidRoundSync);
             if (inGameClients.Count > 0)
             {
                 lastSentToAll = inGameClients[0].lastRecvEntityEventID;
                 inGameClients.ForEach(c => { if (NetIdUtils.IdMoreRecent(lastSentToAll, c.lastRecvEntityEventID)) lastSentToAll = c.lastRecvEntityEventID; });
 
-                ServerEntityEvent firstEventToResend = events.Find(e => e.ID == (lastSentToAll + 1));
+                ServerEntityEvent firstEventToResend = events.Find(e => e.ID == (ushort)(lastSentToAll + 1));
                 if (firstEventToResend != null && (Timing.TotalTime - firstEventToResend.CreateTime) > 10.0f)
                 {
                     //it's been 10 seconds since this event was created
                     //kick everyone that hasn't received it yet, this is way too old
-                    List<Client> toKick = inGameClients.FindAll(c => 
-                        NetIdUtils.IdMoreRecent((UInt16)(lastSentToAll + 1), c.lastRecvEntityEventID) && 
-                        (Timing.TotalTime - c.MidRoundSyncTimeOut) > 10.0f); //give mid-round joining players extra 10 seconds to receive the events
+                    List<Client> toKick = inGameClients.FindAll(c => NetIdUtils.IdMoreRecent((UInt16)(lastSentToAll + 1), c.lastRecvEntityEventID));
 
                     if (toKick != null) toKick.ForEach(c => server.DisconnectClient(c, "", "You have been disconnected because of excessive desync"));
                 }
@@ -322,9 +320,9 @@ namespace Barotrauma.Networking
                 IClientSerializable entity = Entity.FindEntityByID(entityID) as IClientSerializable;
 
                 //skip the event if we've already received it or if the entity isn't found
-                if (thisEventID != sender.lastSentEntityEventID + 1 || entity == null)
+                if (thisEventID != (UInt16)(sender.lastSentEntityEventID + 1) || entity == null)
                 {
-                    if (thisEventID != sender.lastSentEntityEventID + 1)
+                    if (thisEventID != (UInt16)(sender.lastSentEntityEventID + 1))
                     {
                         DebugConsole.NewMessage("received msg " + thisEventID, Microsoft.Xna.Framework.Color.Red);
                     }