chore: update version

Ragon.Common/Sources/RagonAuthority.cs

@@ -2,8 +2,8 @@ namespace Ragon.Common
 {
   public enum RagonAuthority: byte
   {
-    NONE,
-    OWNER_ONLY,
-    ALL,
+    None,
+    OwnerOnly,
+    All,
   }
 }

Ragon.Common/Sources/RagonReplicationMode.cs

@@ -2,9 +2,9 @@ namespace Ragon.Common
 {
   public enum RagonReplicationMode: byte
   {
-    LOCAL,
-    SERVER,
-    LOCAL_AND_SERVER,
-    BUFFERED,
+    Local,
+    Server,
+    LocalAndServer,
+    Buffered,
   }
 }

Ragon.Common/Sources/RagonTarget.cs

@@ -2,8 +2,8 @@ namespace Ragon.Common
 {
   public enum RagonTarget: byte
   {
-    OWNER,
-    EXCEPT_OWNER,
-    ALL,
+    Owner,
+    ExceptOwner,
+    All,
   }
 }

Ragon/Sources/Authorization/AuthorizationManager.cs

@@ -25,7 +25,7 @@ public class AuthorizationManager : IAuthorizationManager
     _playersByPeers = new Dictionary<uint, Player>();
   }
 
-  public void OnAuthorization(uint peerId, string key, string name)
+  public void OnAuthorization(uint peerId, string key, string name, ReadOnlySpan<byte> additionalData)
   {
     if (_playersByPeers.ContainsKey(peerId))
     {
@@ -35,7 +35,7 @@ public class AuthorizationManager : IAuthorizationManager
     
     var dispatcher = _gameThread.ThreadDispatcher;
     
-    _provider.OnAuthorizationRequest(key, name, Array.Empty<byte>(),
+    _provider.OnAuthorizationRequest(key, name, additionalData.ToArray(),
       (playerId, playerName) => { dispatcher.Dispatch(() => Accepted(peerId, playerId, playerName)); },
       (errorCode) => { dispatcher.Dispatch(() => Rejected(peerId, errorCode)); });
   }

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.18-rc";
+    private static readonly string _serverVersion = "1.0.21-rc";
 
     private static void CopyrightInfo()
     {

Ragon/Sources/Entity/Entity.cs

@@ -28,6 +28,8 @@ public class Entity
     Authority = eventAuthority;
   }
 
+  public void UpdateOwner(ushort ownerId) => OwnerId = ownerId;
+
   public void ReplicateProperties(RagonSerializer serializer)
   {
     serializer.WriteUShort(EntityId);

Ragon/Sources/Entity/EntityEvent.cs

@@ -4,6 +4,7 @@ namespace Ragon.Core;
 
 public class EntityEvent
 {
+  public ushort PeerId { get; set; }
   public ushort EventId { get; set; }
   public byte[] EventData { get; set; }
   public RagonTarget Target { set; get; }

Ragon/Sources/Game/GameRoom.cs

@@ -61,7 +61,6 @@ namespace Ragon.Core
       _players.Add(player.PeerId, player);
       _allPlayers = _players.Select(p => p.Key).ToArray();
 
-      {
       _serializer.Clear();
       _serializer.WriteOperation(RagonOperation.JOIN_SUCCESS);
       _serializer.WriteString(Id);
@@ -69,20 +68,10 @@ namespace Ragon.Core
       _serializer.WriteString(GetOwner().Id);
       _serializer.WriteUShort((ushort) PlayersMin);
       _serializer.WriteUShort((ushort) PlayersMax);
-
-        var sendData = _serializer.ToArray();
-        Send(player.PeerId, sendData, DeliveryType.Reliable);
-      }
-
-      {
-        _serializer.Clear();
-        _serializer.WriteOperation(RagonOperation.LOAD_SCENE);
       _serializer.WriteString(Map);
-
       var sendData = _serializer.ToArray();
       Send(player.PeerId, sendData, DeliveryType.Reliable);
     }
-    }
 
     public void RemovePlayer(uint peerId)
     {
@@ -116,9 +105,17 @@ namespace Ragon.Core
           _owner = nextOwnerId;
           var nextOwner = _players[nextOwnerId];
 
+          var entitiesToUpdate = player.Entities.Where(e => e.StaticId > 0).ToArray();
+
           _serializer.Clear();
           _serializer.WriteOperation(RagonOperation.OWNERSHIP_CHANGED);
           _serializer.WriteString(nextOwner.Id);
+          _serializer.WriteUShort((ushort) entitiesToUpdate.Length);
+          foreach (var entity in entitiesToUpdate)
+          {
+            _serializer.WriteUShort(entity.EntityId);
+            entity.UpdateOwner((ushort) nextOwnerId);
+          }
 
           var sendData = _serializer.ToArray();
           Broadcast(_readyPlayers, sendData);
@@ -238,15 +235,16 @@ namespace Ragon.Core
                 _serializer.Clear();
                 _serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
                 _serializer.WriteUShort(bufferedEvent.EventId);
-                _serializer.WriteUShort(peerId);
-                _serializer.WriteByte((byte) RagonReplicationMode.SERVER);
+                _serializer.WriteUShort(bufferedEvent.PeerId);
+                _serializer.WriteByte((byte) RagonReplicationMode.Server);
                 _serializer.WriteUShort(value.EntityId);
 
                 ReadOnlySpan<byte> data = bufferedEvent.EventData.AsSpan();
                 _serializer.WriteData(ref data);
 
+                _logger.Trace($"[{peerId}] Restored buffered event {bufferedEvent.EventId}");
                 var sendData = _serializer.ToArray();
-                SendEvent(value, bufferedEvent.Target, sendData);
+                Send(peerId, sendData, DeliveryType.Reliable);
               }
             }
           }
@@ -318,7 +316,7 @@ namespace Ragon.Core
             return;
           }
 
-          if (ent.Authority == RagonAuthority.OWNER_ONLY && ent.OwnerId != peerId)
+          if (ent.Authority == RagonAuthority.OwnerOnly && ent.OwnerId != peerId)
           {
             _logger.Warn($"Player have not enought authority for event with Id {eventId}");
             return;
@@ -332,13 +330,14 @@ namespace Ragon.Core
           if (_plugin.InternalHandle(peerId, entityId, eventId, ref payload))
             return;
 
-          if (eventMode == RagonReplicationMode.BUFFERED && targetMode != RagonTarget.OWNER)
+          if (eventMode == RagonReplicationMode.Buffered && targetMode != RagonTarget.Owner)
           {
             var bufferedEvent = new EntityEvent()
             {
               EventData = payload.ToArray(),
               Target = targetMode,
               EventId = eventId,
+              PeerId = peerId,
             };
             ent.BufferedEvents.Add(bufferedEvent);
           }
@@ -352,7 +351,7 @@ namespace Ragon.Core
           _serializer.WriteData(ref payload);
 
           var sendData = _serializer.ToArray();
-          Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
+          SendEvent(ent, targetMode, sendData);
           break;
         }
         case RagonOperation.CREATE_ENTITY:
@@ -408,7 +407,7 @@ namespace Ragon.Core
           var entityId = _serializer.ReadInt();
           if (_entities.TryGetValue(entityId, out var entity))
           {
-            if (entity.Authority == RagonAuthority.OWNER_ONLY && entity.OwnerId != peerId)
+            if (entity.Authority == RagonAuthority.OwnerOnly && entity.OwnerId != peerId)
               return;
 
             var player = _players[peerId];
@@ -431,6 +430,7 @@ namespace Ragon.Core
             var sendData = _serializer.ToArray();
             Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
           }
+
           break;
         }
       }
@@ -543,12 +543,12 @@ namespace Ragon.Core
     {
       switch (targetMode)
       {
-        case RagonTarget.OWNER:
+        case RagonTarget.Owner:
         {
           Send(ent.OwnerId, sendData, DeliveryType.Reliable);
           break;
         }
-        case RagonTarget.EXCEPT_OWNER:
+        case RagonTarget.ExceptOwner:
         {
           _peersCache.Clear();
           foreach (var playerPeerId in _readyPlayers)
@@ -558,7 +558,7 @@ namespace Ragon.Core
           Broadcast(_peersCache.ToArray(), sendData, DeliveryType.Reliable);
           break;
         }
-        case RagonTarget.ALL:
+        case RagonTarget.All:
         {
           Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
           break;

Ragon/Sources/Lobby/Lobby.cs

@@ -28,15 +28,22 @@ public class Lobby
     _serializer.Clear();
     _serializer.FromSpan(ref payload);
 
+    var player = _authorizationManager.GetPlayer(peerId);
     if (op == RagonOperation.AUTHORIZE)
     {
-      var key = _serializer.ReadString();
-      var playerName = _serializer.ReadString();
-      _authorizationManager.OnAuthorization(peerId, key, playerName);
+      if (player != null)
+      {
+        _logger.Warn("Player already authorized");
+        return;
+      }
+      
+      var key = _serializer.ReadString();
+      var playerName = _serializer.ReadString();
+      var additionalData = _serializer.ReadData(_serializer.Size);
+      _authorizationManager.OnAuthorization(peerId, key, playerName, additionalData);
       return;
     }
     
-    var player = _authorizationManager.GetPlayer(peerId);
     if (player == null)
     {
       _logger.Warn($"Peer not authorized {peerId} trying to {op}");

Ragon/Sources/Player/Player.cs

@@ -6,8 +6,8 @@ namespace Ragon.Core
   public class Player
   {
     public string Id { get; set; }
-    public uint PeerId { get; set; }
     public string PlayerName { get; set; }
+    public uint PeerId { get; set; }
     public bool IsLoaded { get; set; }
     
     public List<Entity> Entities;