feat: player/room user data now available on joined event

Ragon.Client/Sources/Handler/JoinSuccessHandler.cs

@@ -39,8 +39,6 @@ public struct RoomParameters
 
 internal class JoinSuccessHandler : IHandler
 {
-  
-  
   private readonly RagonListenerList _listenerList;
   private readonly RagonPlayerCache _playerCache;
   private readonly RagonEntityCache _entityCache;
@@ -62,19 +60,39 @@ internal class JoinSuccessHandler : IHandler
   public void Handle(RagonBuffer reader)
   {
     var roomId = reader.ReadString();
-    var localId = reader.ReadString();
-    var ownerId = reader.ReadString();
     var min = reader.ReadUShort();
     var max = reader.ReadUShort();
     var sceneName = reader.ReadString();
-
+    var localId = reader.ReadString();
+    var ownerId = reader.ReadString();
+    
+    _playerCache.SetOwnerAndLocal(ownerId, localId);
+    
     var scene = new RagonScene(_client, _playerCache, _entityCache, sceneName);
     var roomInfo = new RoomParameters(roomId, localId, ownerId, min, max);
     var room = new RagonRoom(_client, _entityCache, _playerCache, roomInfo, scene);
 
-    _playerCache.SetOwnerAndLocal(ownerId, localId);
-    _client.AssignRoom(room);
+    room.UserData.Read(reader);
+      
+    var playersCount = reader.ReadUShort();
+    RagonLog.Trace("Players: " + playersCount);
+    for (var i = 0; i < playersCount; i++)
+    {
+      var playerPeerId = reader.ReadUShort();
+      var playerId = reader.ReadString();
+      var playerName = reader.ReadString();
+
+      var player = _playerCache.AddPlayer(playerPeerId, playerId, playerName);
+      
+      player.UserData.Read(reader);
+
+      RagonLog.Trace($"Player {playerPeerId} - {playerId} - {playerName}");
+    }
     
+    _client.AssignRoom(room);
+    _client.SetStatus(RagonStatus.ROOM);
+    
+    _listenerList.OnJoined();
     _listenerList.OnSceneRequest(sceneName);
   }
 }

Ragon.Client/Sources/Handler/SnapshotHandler.cs

@@ -27,7 +27,7 @@ internal class SnapshotHandler : IHandler
   private readonly RagonListenerList _listenerList;
   private readonly RagonEntityCache _entityCache;
   private readonly RagonPlayerCache _playerCache;
-  
+
   public SnapshotHandler(
     RagonClient ragonClient,
     RagonListenerList listenerList,
@@ -46,19 +46,6 @@ internal class SnapshotHandler : IHandler
   public void Handle(RagonBuffer buffer)
   {
     var entities = new List<RagonEntity>();
-    var playersCount = buffer.ReadUShort();
-    RagonLog.Trace("Players: " + playersCount);
-    for (var i = 0; i < playersCount; i++)
-    {
-      var playerPeerId = buffer.ReadUShort();
-      var playerId = buffer.ReadString();
-      var playerName = buffer.ReadString();
-
-      _playerCache.AddPlayer(playerPeerId, playerId, playerName);
-
-      RagonLog.Trace($"Player {playerPeerId} - {playerId} - {playerName}");
-    }
-
     var dynamicEntities = buffer.ReadUShort();
     RagonLog.Trace("Dynamic Entities: " + dynamicEntities);
     for (var i = 0; i < dynamicEntities; i++)
@@ -67,7 +54,7 @@ internal class SnapshotHandler : IHandler
       var entityId = buffer.ReadUShort();
       var ownerPeerId = buffer.ReadUShort();
       var payloadSize = buffer.ReadUShort();
-      
+
       var player = _playerCache.GetPlayerByPeer(ownerPeerId);
       if (player == null)
       {
@@ -85,13 +72,13 @@ internal class SnapshotHandler : IHandler
         payload = new RagonPayload(payloadSize);
         payload.Read(buffer);
       }
-      
+
       entity.Prepare(_client, entityId, entityType, hasAuthority, player, payload);
-      
+
       _entityListener.OnEntityCreated(entity);
-      
+
       entity.Read(buffer);
-      
+
       entities.Add(entity);
     }
 
@@ -109,26 +96,20 @@ internal class SnapshotHandler : IHandler
       if (player == null)
       {
         RagonLog.Error($"Player not found with peerId: {ownerPeerId}");
-        
+
         _playerCache.Dump();
         return;
       }
 
       var hasAuthority = _playerCache.Local.Id == player.Id;
       var entity = _entityCache.TryGetEntity(0, entityType, staticId, entityId, hasAuthority, out _);
-      
+
       entity.Prepare(_client, entityId, entityType, hasAuthority, player, RagonPayload.Empty);
       entity.Read(buffer);
-      
+
       entities.Add(entity);
     }
-
-    if (_client.Status == RagonStatus.LOBBY)
-    { 
-      _client.SetStatus(RagonStatus.ROOM);
-      _listenerList.OnJoined();
-    }
-
+    
     foreach (var entity in entities)
       entity.Attach();