From 0dc5307b922027347c7b49d7460c4a94678aa49e Mon Sep 17 00:00:00 2001
From: edmand46 <theedison4@gmail.com>
Date: Thu, 23 Mar 2023 19:17:54 +0400
Subject: [PATCH] fixed: tickrate

---
 Ragon.Client/Sources/Entity/RagonProperty.cs | 7 ++-----
 Ragon.Server/Sources/RagonServer.cs          | 5 ++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Ragon.Client/Sources/Entity/RagonProperty.cs b/Ragon.Client/Sources/Entity/RagonProperty.cs
index f8909fe..e7b5b40 100644
--- a/Ragon.Client/Sources/Entity/RagonProperty.cs
+++ b/Ragon.Client/Sources/Entity/RagonProperty.cs
@@ -70,11 +70,11 @@ namespace Ragon.Client
     {
       InvokeChanged();
 
-      if (_dirty)
+      if (_dirty || _entity == null)
         return;
 
       _dirty = true;
-      _entity?.TrackChangedProperty(this);
+      _entity.TrackChangedProperty(this);
     }
 
     internal void Flush()
@@ -91,9 +91,6 @@ namespace Ragon.Client
     internal void AssignEntity(RagonEntity ent)
     {
       _entity = ent;
-
-      if (_dirty)
-        _entity.TrackChangedProperty(this);
       
       Changed?.Invoke();
     }
diff --git a/Ragon.Server/Sources/RagonServer.cs b/Ragon.Server/Sources/RagonServer.cs
index 8286068..8d310da 100644
--- a/Ragon.Server/Sources/RagonServer.cs
+++ b/Ragon.Server/Sources/RagonServer.cs
@@ -51,7 +51,7 @@ public class RagonServer : INetworkListener
     
     _reader = new RagonBuffer();
     _writer = new RagonBuffer();
-    _tickrate = _configuration.ServerTickRate;
+    _tickrate = 1000 / _configuration.ServerTickRate;
     _timer = new Stopwatch();
     
     _handlers = new IRagonOperation[byte.MaxValue];
@@ -78,12 +78,11 @@ public class RagonServer : INetworkListener
       if (_timer.ElapsedMilliseconds > _tickrate)
       {
         _executor.Update();
+        _scheduler.Update();
         _timer.Restart();
       }
       
-      _scheduler.Update();
       _server.Update();
-      
       Thread.Sleep(1);
     }
   }