fix: leave player logic

Ragon/Sources/Configuration/ConfigurationLoader.cs

@@ -9,7 +9,7 @@ namespace Ragon.Core
   public static class ConfigurationLoader
   {
     private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
-    private static readonly string _serverVersion = "1.0.9-rc";
+    private static readonly string _serverVersion = "1.0.13-rc";
 
     private static void CopyrightInfo()
     {

Ragon/Sources/Game/GameRoom.cs

@@ -117,7 +117,7 @@ namespace Ragon.Core
           Broadcast(_readyPlayers, sendData);
         }
 
-        if (_allPlayers.Length > 0)
+        if (_allPlayers.Length > 0 && player.PeerId == _owner)
         {
           var nextOwnerId = _allPlayers[0];
           _owner = nextOwnerId;

Ragon/Sources/Game/GameThread.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Security.Cryptography;
 using System.Threading;
 using Ragon.Common;
 using ENet;
@@ -13,42 +10,33 @@ namespace Ragon.Core
   {
     private readonly RoomManager _roomManager;
     private readonly Thread _thread;
-    private readonly Stopwatch _gameLoopTimer;
-    private readonly Stopwatch _statisticsTimer;
-    
-    private readonly Stopwatch _serverTimer;
-    private readonly Stopwatch _logicTimer;
-    
     private readonly Lobby _lobby;
+    private readonly ISocketServer _server;
+    private readonly IDispatcherInternal _dispatcherInternal;
+    private readonly IDispatcher _dispatcher;
     private readonly ILogger _logger = LogManager.GetCurrentClassLogger();
     private readonly float _deltaTime = 0.0f;
     private readonly Configuration _configuration;
-    private readonly IDispatcherInternal _dispatcherInternal;
 
-    public IDispatcher ThreadDispatcher { get; private set; }
+    public ISocketServer Server => _server;
-    public ISocketServer Server { get; private set; }
+    public IDispatcher ThreadDispatcher => _dispatcher;
 
     public GameThread(PluginFactory factory, Configuration configuration)
     {
+      var authorizationProvider = factory.CreateAuthorizationProvider(configuration);
+
       _configuration = configuration;
 
-      var authorizationProvider = factory.CreateAuthorizationProvider(configuration);
       var dispatcher = new Dispatcher();
       _dispatcherInternal = dispatcher;
+      _dispatcher = dispatcher;
 
-      ThreadDispatcher = dispatcher;
+      _server = new ENetServer(this);
-      Server = new ENetServer(this);
-
       _deltaTime = 1000.0f / configuration.SendRate;
 
       _roomManager = new RoomManager(factory, this);
       _lobby = new Lobby(authorizationProvider, _roomManager, this);
 
-      _gameLoopTimer = new Stopwatch();
-      _statisticsTimer = new Stopwatch();
-      _serverTimer = new Stopwatch();
-      _logicTimer = new Stopwatch();
-
       _thread = new Thread(Execute);
       _thread.Name = "Game Thread";
       _thread.IsBackground = true;
@@ -62,6 +50,7 @@ namespace Ragon.Core
         _logger.Error("Wrong protocol passed to connect method");
         return;
       }
+
       var parts = new uint[] {0, 0, 0};
       for (int i = 0; i < parts.Length; i++)
       {
@@ -70,25 +59,18 @@ namespace Ragon.Core
           _logger.Error("Wrong protocol");
           return;
         }
+
         parts[i] = v;
       }
 
       uint encoded = (parts[0] << 16) | (parts[1] << 8) | parts[2];
-      Server.Start(_configuration.Port, _configuration.MaxConnections, encoded);
+      _server.Start(_configuration.Port, _configuration.MaxConnections, encoded);
-
-      _gameLoopTimer.Start();
-      _statisticsTimer.Start();
-      _logicTimer.Start();
-      _serverTimer.Start();
       _thread.Start();
     }
 
     public void Stop()
     {
-      Server.Stop();
+      _server.Stop();
-
-      _gameLoopTimer.Stop();
-      _statisticsTimer.Stop();
       _thread.Interrupt();
     }
 
@@ -96,29 +78,11 @@ namespace Ragon.Core
     {
       while (true)
       {
-        _logicTimer.Restart();
+        _server.Process();
-        _serverTimer.Restart();
-        
-        Server.Process();
-
         _dispatcherInternal.Process();
+        _roomManager.Tick(_deltaTime);
 
-        var elapsedMilliseconds = _gameLoopTimer.ElapsedMilliseconds;
+        Thread.Sleep((int) _deltaTime);
-        if (elapsedMilliseconds > _deltaTime)
-        {
-          _roomManager.Tick(elapsedMilliseconds / 1000.0f);
-          _gameLoopTimer.Restart();
-          continue;
-        }
-
-        if (_statisticsTimer.Elapsed.Seconds > _configuration.StatisticsInterval && _roomManager.RoomsBySocket.Count > 0)
-        {
-          var rooms = _roomManager.Rooms.Count;
-          var clients = _roomManager.RoomsBySocket.Count;
-          var entities = _roomManager.Rooms.Select(r => r.EntitiesCount).Sum();
-          _logger.Trace($"Rooms: {rooms} Clients: {clients} Entities: {entities}");
-          _statisticsTimer.Restart();
-        }
       }
     }
 

Ragon/Sources/Server/ENet/ENetServer.cs

@@ -94,7 +94,7 @@ namespace Ragon.Core
       {
         if (_host.CheckEvents(out _netEvent) <= 0)
         {
-          if (_host.Service(15, out _netEvent) <= 0)
+          if (_host.Service(0, out _netEvent) <= 0)
             break;
 
           polled = true;