From 2a96affea0d65ffe8b2757a1e5d021851cb35b91 Mon Sep 17 00:00:00 2001
From: teascade <teascade@gmail.com>
Date: Wed, 10 May 2017 17:34:16 +0300
Subject: [PATCH] Make Syncer a bit neater and change "Client Launched" to
 "Connecting"

---
 .../Scripts/Networking/Clientside/Client.cs   |  4 ++--
 .../Scripts/Networking/Serverside/Syncer.cs   | 21 ++++++++-----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Assets/Scripts/Networking/Clientside/Client.cs b/Assets/Scripts/Networking/Clientside/Client.cs
index 9d9bead..1c48e32 100644
--- a/Assets/Scripts/Networking/Clientside/Client.cs
+++ b/Assets/Scripts/Networking/Clientside/Client.cs
@@ -134,8 +134,8 @@ namespace Cyber.Networking.Clientside {
 
             NetClient.Connect(ip, port);
 
-            Debug.Log("Client launched!");
-            Term.Println("Client launched!");
+            Debug.Log("Connecting..");
+            Term.Println("Connecting..");
 
             return true;
         }
diff --git a/Assets/Scripts/Networking/Serverside/Syncer.cs b/Assets/Scripts/Networking/Serverside/Syncer.cs
index 99cddb0..c221681 100644
--- a/Assets/Scripts/Networking/Serverside/Syncer.cs
+++ b/Assets/Scripts/Networking/Serverside/Syncer.cs
@@ -53,26 +53,15 @@ namespace Cyber.Networking.Serverside {
 
                 foreach (Type type in Categorized.Keys) {
                     SyncHandletype Handletype = Database.GetSyncHandletypes()[type];
-                    if (Handletype.RequireHash) {
+                    if (TickCounter % Handletype.TickInterval == 0) {
                         foreach (int SyncBaseID in Categorized[type]) {
                             if (DirtySyncBases.Contains(SyncBaseID)) {
                                 QueueSyncBase(SyncBaseID);
                             }
                         }
-                    } else {
-                        if (TickCounter % Handletype.TickInterval == 0) {
-                            foreach (int SyncBaseID in Categorized[type]) {
-                                if (DirtySyncBases.Contains(SyncBaseID)) {
-                                    QueueSyncBase(SyncBaseID);
-                                }
-                            }
-                        }
                     }
                 }
 
-                TickCounter++;
-                TimeSinceLastTick -= TickInterval;
-
                 if (QueuedSyncs.Count > 0) {
                     int[] SyncIDs = QueuedSyncs.ToArray();
                     SyncPkt SyncPacket = new SyncPkt(Database, SyncIDs, SyncPacketID++);
@@ -87,6 +76,14 @@ namespace Cyber.Networking.Serverside {
                         DirtSyncBase(i);
                     }
                 }
+
+
+                if (TickCounter < int.MaxValue) {
+                    TickCounter++;
+                } else {
+                    TickCounter = 0;
+                }
+                TimeSinceLastTick -= TickInterval;
             }