From 7feff52f69a73d83d238df94151d19406232317f Mon Sep 17 00:00:00 2001
From: teascade <teascade@gmail.com>
Date: Tue, 16 May 2017 23:12:44 +0300
Subject: [PATCH] Add timestamp to sync packets and clean up client
 synchandling

---
 Assets/Scripts/Networking/Clientside/SyncHandler.cs   | 8 +++++++-
 Assets/Scripts/Networking/Messages/MoveCreaturePkt.cs | 7 -------
 Assets/Scripts/Networking/Messages/SyncPkt.cs         | 8 +++++++-
 Assets/Scripts/Networking/Serverside/Server.cs        | 1 -
 Assets/Scripts/Networking/Serverside/ServerSyncer.cs  | 3 ++-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Assets/Scripts/Networking/Clientside/SyncHandler.cs b/Assets/Scripts/Networking/Clientside/SyncHandler.cs
index c5775e9..8c87d54 100644
--- a/Assets/Scripts/Networking/Clientside/SyncHandler.cs
+++ b/Assets/Scripts/Networking/Clientside/SyncHandler.cs
@@ -14,6 +14,8 @@ namespace Cyber.Networking.Clientside {
     /// </summary>
     public class SyncHandler {
 
+        public static double LastTimestamp = NetworkHelper.GetCurrentSystemTime();
+
         private SyncDB SyncDB;
         private int LatestSyncID = -1;
 
@@ -47,7 +49,11 @@ namespace Cyber.Networking.Clientside {
                         }
                     }
 
-                    Client.Send(PktType.FailedChecksums, new IntListPkt(FailedSyncBases.ToArray()));
+                    if (FailedSyncBases.Count > 0) {
+                        Client.Send(PktType.FailedChecksums, new IntListPkt(FailedSyncBases.ToArray()));
+                    }
+
+                    LastTimestamp = SyncPacket.Timestamp;
                 }
             }
             // Otherwise disregard the sync.
diff --git a/Assets/Scripts/Networking/Messages/MoveCreaturePkt.cs b/Assets/Scripts/Networking/Messages/MoveCreaturePkt.cs
index 92298bd..cc17820 100644
--- a/Assets/Scripts/Networking/Messages/MoveCreaturePkt.cs
+++ b/Assets/Scripts/Networking/Messages/MoveCreaturePkt.cs
@@ -19,11 +19,6 @@ namespace Cyber.Networking.Messages {
         /// </summary>
         public int SyncBaseID;
 
-        /// <summary>
-        /// Time when server received this request. Used for compensating ping.
-        /// </summary>
-        public double Timestamp;
-
         /// <summary>
         /// Creates a MoveCreaturePkt which contains the direction of desired movement (or (0, 0, 0) for stopping)
         /// </summary>
@@ -48,7 +43,6 @@ namespace Cyber.Networking.Messages {
         public override void Deserialize(NetworkReader reader) {
             Direction = reader.ReadVector3();
             SyncBaseID = reader.ReadInt32();
-            Timestamp = reader.ReadDouble();
         }
 
         /// <summary>
@@ -58,7 +52,6 @@ namespace Cyber.Networking.Messages {
         public override void Serialize(NetworkWriter writer) {
             writer.Write(Direction);
             writer.Write(SyncBaseID);
-            writer.Write(Timestamp);
         }
 
     }
diff --git a/Assets/Scripts/Networking/Messages/SyncPkt.cs b/Assets/Scripts/Networking/Messages/SyncPkt.cs
index 55c05a3..46c3b33 100644
--- a/Assets/Scripts/Networking/Messages/SyncPkt.cs
+++ b/Assets/Scripts/Networking/Messages/SyncPkt.cs
@@ -10,6 +10,11 @@ namespace Cyber.Networking.Messages {
     /// </summary>
     public class SyncPkt : MessageBase {
 
+        /// <summary>
+        /// Timestamp of the sync packet when sent from the server.
+        /// </summary>
+        public double Timestamp;
+
         /// <summary>
         /// The Sync Packet ID of this packet.
         /// </summary>
@@ -40,12 +45,13 @@ namespace Cyber.Networking.Messages {
         /// <param name="checksummedSyncBases"></param>
         /// <param name="checksums"></param>
         /// <param name="syncPacketID">ID of the sync packet itself.</param>
-        public SyncPkt(SyncDB syncDB, int[] syncBases, int[] checksummedSyncBases, int[] checksums, int syncPacketID) {
+        public SyncPkt(SyncDB syncDB, int[] syncBases, int[] checksummedSyncBases, int[] checksums, int syncPacketID, double timestamp) {
             SyncPacketID = syncPacketID;
             SyncDB = syncDB;
             SyncedSyncBases = syncBases;
             ChecksummedSyncBases = checksummedSyncBases;
             Checksums = checksums;
+            timestamp = Timestamp;
         }
 
         /// <summary>
diff --git a/Assets/Scripts/Networking/Serverside/Server.cs b/Assets/Scripts/Networking/Serverside/Server.cs
index 844ddea..81d0b55 100644
--- a/Assets/Scripts/Networking/Serverside/Server.cs
+++ b/Assets/Scripts/Networking/Serverside/Server.cs
@@ -200,7 +200,6 @@ namespace Cyber.Networking.Serverside {
                     if (Player.Value.Connection.connectionId == msg.conn.connectionId) {
                         continue;
                     }
-                    MoveCreature.Timestamp = NetworkHelper.GetCurrentSystemTime();
                     NetworkServer.SendToClient(Player.Value.Connection.connectionId, PktType.MoveCreature, MoveCreature);
                 }
                 break;
diff --git a/Assets/Scripts/Networking/Serverside/ServerSyncer.cs b/Assets/Scripts/Networking/Serverside/ServerSyncer.cs
index 77f3e96..4a35393 100644
--- a/Assets/Scripts/Networking/Serverside/ServerSyncer.cs
+++ b/Assets/Scripts/Networking/Serverside/ServerSyncer.cs
@@ -62,7 +62,8 @@ namespace Cyber.Networking.Serverside {
 
             if (QueuedSyncs.Count > 0) {
                 int[] SyncIDs = QueuedSyncs.ToArray();
-                SyncPkt SyncPacket = new SyncPkt(Database, SyncIDs, checksummedIds.ToArray(), checksums.ToArray(), NextSyncID());
+                SyncPkt SyncPacket = new SyncPkt(Database, SyncIDs, checksummedIds.ToArray(), 
+                    checksums.ToArray(), NextSyncID(), NetworkHelper.GetCurrentSystemTime());
                 Server.SendToAllByChannel(PktType.Sync, SyncPacket, NetworkChannelID.Unreliable);
 
                 QueuedSyncs.Clear();