🐛 empty payload

Ragon.Client/Sources/Entity/RagonEntity.cs

@@ -22,16 +22,17 @@ namespace Ragon.Client
   public sealed class RagonEntity
   {
     private delegate void OnEventDelegate(RagonPlayer player, RagonBuffer serializer);
+
     private RagonClient _client;
-    
+
     public ushort Id { get; private set; }
     public ushort Type { get; private set; }
     public bool Replication { get; private set; }
-    
+
     public RagonAuthority Authority { get; private set; }
     public RagonPlayer Owner { get; private set; }
     public RagonEntityState State { get; private set; }
-    
+
     public bool IsAttached { get; private set; }
     public bool HasAuthority { get; private set; }
 
@@ -41,7 +42,7 @@ namespace Ragon.Client
 
     internal bool PropertiesChanged => _propertiesChanged;
     internal ushort SceneId => _sceneId;
-    
+
     private ushort _sceneId;
     private bool _propertiesChanged;
 
@@ -55,7 +56,7 @@ namespace Ragon.Client
     {
       State = new RagonEntityState(this);
       Type = type;
-      
+
       _sceneId = sceneId;
     }
 
@@ -67,30 +68,44 @@ namespace Ragon.Client
       IsAttached = true;
       Replication = true;
       HasAuthority = hasAuthority;
-      
+
-      _client = client; 
+      _client = client;
       _spawnPayload = payload;
-      
+
       Attached?.Invoke(this);
     }
 
     internal void Detach(RagonPayload payload)
     {
       _destroyPayload = payload;
-      
+
       Detached?.Invoke();
     }
 
     internal T GetPayload<T>(RagonPayload data) where T : IRagonPayload, new()
     {
-      var buffer = new RagonBuffer();
-      data.Write(buffer);
-
       var payload = new T();
+      if (data.Size <= 0) return payload;
+      
+      var buffer = new RagonBuffer();
+      
+      data.Write(buffer);
+      
       payload.Deserialize(buffer);
-
+      
       return payload;
     }
+    
+    public void AttachPayload(IRagonPayload? payload)
+    {
+      if (payload == null) return;
+      
+      var buffer = new RagonBuffer();
+      payload.Serialize(buffer);
+
+      _spawnPayload = new RagonPayload();
+      _spawnPayload.Read(buffer);
+    } 
 
     public T GetAttachPayload<T>() where T : IRagonPayload, new()
     {
@@ -110,7 +125,7 @@ namespace Ragon.Client
         RagonLog.Error("Entity not attached");
         return;
       }
-      
+
       var evntId = _client.Event.GetEventCode(evnt);
       var buffer = _client.Buffer;
 
@@ -118,12 +133,12 @@ namespace Ragon.Client
       buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
       buffer.WriteUShort(Id);
       buffer.WriteUShort(evntId);
-      buffer.WriteByte((byte) replicationMode);
+      buffer.WriteByte((byte)replicationMode);
-      buffer.WriteByte((byte) RagonTarget.Player);
+      buffer.WriteByte((byte)RagonTarget.Player);
       buffer.WriteUShort(target.PeerId);
 
       evnt.Serialize(buffer);
-      
+
       var sendData = buffer.ToArray();
       _client.Reliable.Send(sendData);
     }
@@ -139,7 +154,7 @@ namespace Ragon.Client
         RagonLog.Error("Entity not attached");
         return;
       }
-      
+
       if (target != RagonTarget.ExceptOwner)
       {
         if (replicationMode == RagonReplicationMode.Local)
@@ -163,8 +178,8 @@ namespace Ragon.Client
       buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
       buffer.WriteUShort(Id);
       buffer.WriteUShort(evntId);
-      buffer.WriteByte((byte) replicationMode);
+      buffer.WriteByte((byte)replicationMode);
-      buffer.WriteByte((byte) target);
+      buffer.WriteByte((byte)target);
 
       evnt.Serialize(buffer);
 
@@ -181,18 +196,18 @@ namespace Ragon.Client
       {
         _events.Remove(eventCode);
         _localEvents.Remove(eventCode);
-        
+
         RagonLog.Warn($"Event already {eventCode} subscribed, removed old one!");
       }
-    
+
-      _localEvents.Add(eventCode, (player, eventData) => { callback.Invoke(player, (TEvent) eventData); });
+      _localEvents.Add(eventCode, (player, eventData) => { callback.Invoke(player, (TEvent)eventData); });
       _events.Add(eventCode, (player, serializer) =>
       {
         t.Deserialize(serializer);
         callback.Invoke(player, t);
       });
     }
-    
+
     internal void Write(RagonBuffer buffer)
     {
       buffer.WriteUShort(Id);
@@ -212,7 +227,7 @@ namespace Ragon.Client
     {
       if (_events.TryGetValue(eventCode, out var evnt))
         evnt?.Invoke(caller, buffer);
-      else 
+      else
         RagonLog.Warn($"Handler event on entity {Id} with eventCode {eventCode} not defined");
     }
 
@@ -224,10 +239,10 @@ namespace Ragon.Client
     public void OnOwnershipChanged(RagonPlayer player)
     {
       var prevOwner = Owner;
-      
+
       Owner = player;
       HasAuthority = player.IsLocal;
-      
+
       OwnershipChanged?.Invoke(prevOwner, player);
     }
   }

Ragon.Client/Sources/Entity/RagonPayload.cs

@@ -21,8 +21,8 @@ namespace Ragon.Client;
 
 public struct RagonPayload
 {
-  private uint[] _data = new uint[128];
+  private readonly uint[] _data = new uint[128];
-  private int _size = 0;
+  private readonly int _size = 0;
 
   public RagonPayload(int capacity)
   {

Ragon.Client/Sources/RagonClient.cs

@@ -21,8 +21,8 @@ namespace Ragon.Client
   public sealed class RagonClient
   {
     private readonly INetworkConnection _connection;
-    private readonly IRagonEntityListener _entityListener;
+    private IRagonEntityListener _entityListener;
-    private readonly IRagonSceneCollector _sceneCollector;
+    private IRagonSceneCollector _sceneCollector;
     private Handler[] _handlers;
     private RagonBuffer _readBuffer;
     private RagonBuffer _writeBuffer;
@@ -52,21 +52,15 @@ namespace Ragon.Client
 
     #region PUBLIC
 
-    public RagonClient(
+    public RagonClient(INetworkConnection connection, int rate)
-      INetworkConnection connection, 
-      IRagonEntityListener entityListener,
-      IRagonSceneCollector sceneCollector, 
-      int rate)
     {
-      _listenerList = new RagonListenerList(this);
-      _entityListener = entityListener;
-      _sceneCollector = sceneCollector;
-      
       _connection = connection;
       _connection.OnData += OnData;
       _connection.OnConnected += OnConnected;
       _connection.OnDisconnected += OnDisconnected;
-
+      
+      _listenerList = new RagonListenerList(this);
+      
       _replicationRate = (1000.0f / rate) / 1000.0f;
       _replicationTime = 0;
 
@@ -74,9 +68,32 @@ namespace Ragon.Client
       _stats = new NetworkStatistics();
       _status = RagonStatus.DISCONNECTED;
     }
+
+
+    public void Configure(IRagonSceneCollector sceneCollector)
+    {
+      _sceneCollector = sceneCollector;
+    }
+
+    public void Configure(IRagonEntityListener listener)
+    {
+      _entityListener = listener;
+    }
     
     public void Connect(string address, ushort port, string protocol)
     {
+      if (_sceneCollector == null)
+      {
+        RagonLog.Error("Scene collector is not defined!");
+        return;
+      }
+
+      if (_entityListener == null)
+      {
+        RagonLog.Error("Entity Listener is not defined!");
+        return;
+      }
+      
       _writeBuffer = new RagonBuffer();
       _readBuffer = new RagonBuffer();
       _session = new RagonSession(this, _readBuffer);

Ragon.Client/Sources/RagonEntityCache.cs

@@ -45,9 +45,9 @@ public sealed class RagonEntityCache
     _playerCache = playerCache;
   }
 
-  public RagonEntity FindById(ushort id)
+  public bool TryGetEntity(ushort id, out RagonEntity entity)
   {
-    return _entityMap[id];
+    return _entityMap.TryGetValue(id, out entity);
   }
 
   public void Create(RagonEntity entity, IRagonPayload? spawnPayload)

Ragon.Protocol/Ragon.Protocol.csproj

@@ -4,8 +4,16 @@
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <LangVersion>8</LangVersion>
-        <TargetFramework>netstandard2.1</TargetFramework>
         <RootNamespace>Ragon.Common</RootNamespace>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Version>1.2.4-rc</Version>
+        <Title>Ragon.Protocol</Title>
+        <Copyright>Eduard Kargin</Copyright>
+        <PackageProjectUrl>https://ragon-server.com</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
+        <RepositoryType>Source</RepositoryType>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <TargetFramework>netstandard2.1</TargetFramework>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -16,8 +24,8 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <OutputPath>C:\Users\edmand46\RagonProjects\ragon-unity-sdk\Assets\Ragon-Unity-SDK\Runtime\Plugins</OutputPath>
+      <OutputPath></OutputPath>
-      <DefineConstants>TRACE;NETSTACK_SPAN</DefineConstants>
+      <DefineConstants>TRACE;</DefineConstants>
       <DebugType>none</DebugType>
     </PropertyGroup>
 </Project>

Ragon.Protocol/Sources/RagonVersion.cs

@@ -21,7 +21,7 @@ namespace Ragon.Protocol
   {
     public static uint Parse(string version)
     {
-      var strings = version.Split(".");
+      var strings = version.Split('.');
       if (strings.Length < 3)
         return 0;
       

Ragon.Server.ENet/Ragon.Server.ENet.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Ragon.ENet</RootNamespace>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="ENet-CSharp" Version="2.4.8" />
-      <PackageReference Include="NLog" Version="5.1.1" />
+      <PackageReference Include="NLog" Version="5.2.2" />
     </ItemGroup>
 
     <ItemGroup>

Ragon.Server.WebSocketServer/Ragon.Server.WebSocketServer.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Ragon.WebSockets</RootNamespace>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="NLog" Version="5.1.1" />
+      <PackageReference Include="NLog" Version="5.2.2" />
     </ItemGroup>
 
     <ItemGroup>

Ragon.Server/Ragon.Server.csproj

@@ -1,19 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Ragon.Core</RootNamespace>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Version>1.2.4-rc</Version>
+        <Title>Ragon.Server</Title>
+        <Copyright>Eduard Kargin</Copyright>
+        <PackageProjectUrl>https://ragon-server.com</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
+        <RepositoryType>Source</RepositoryType>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <LangVersion>10</LangVersion>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-      <PackageReference Include="NLog" Version="5.1.1" />
+        <PackageReference Include="NLog" Version="5.2.2" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Ragon.Protocol\Ragon.Protocol.csproj" />
+        <ProjectReference Include="..\Ragon.Protocol\Ragon.Protocol.csproj" />
     </ItemGroup>
 
 </Project>

Ragon.Server/Sources/Handler/EntityCreateOperation.cs

@@ -54,8 +54,8 @@ public sealed class EntityCreateOperation : IRagonOperation
     if (reader.Capacity > 0)
       entity.Payload.Read(reader);
     
-    var roomPlugin = room.Plugin;
+    var plugin = room.Plugin;
-    if (!roomPlugin.OnEntityCreate(player, entity))
+    if (!plugin.OnEntityCreate(player, entity))
       return;
     
     entity.Attach(player);

Ragon.Server/Sources/Handler/EntityEventOperation.cs

@@ -40,20 +40,19 @@ public sealed class EntityEventOperation : IRagonOperation
     var eventMode = (RagonReplicationMode)reader.ReadByte();
     var targetMode = (RagonTarget)reader.ReadByte();
     var targetPlayerPeerId = (ushort)0;
-
+    
     if (targetMode == RagonTarget.Player)
       targetPlayerPeerId = reader.ReadUShort();
 
-    var ragonEvent = new RagonEvent(player, eventId);
+    var @event = new RagonEvent(player, eventId);
-    ragonEvent.Read(reader);
+    @event.Read(reader);
 
-    if (targetMode == RagonTarget.Player &&
+    if (targetMode == RagonTarget.Player && room.Players.TryGetValue(targetPlayerPeerId, out var targetPlayer))
-        context.Room.Players.TryGetValue(targetPlayerPeerId, out var targetPlayer))
     {
-      ent.ReplicateEvent(player, ragonEvent, eventMode, targetPlayer);
+      ent.ReplicateEvent(player, @event, eventMode, targetPlayer);
       return;
     }
 
-    ent.ReplicateEvent(player, ragonEvent, eventMode, targetMode);
+    ent.ReplicateEvent(player, @event, eventMode, targetMode);
   }
 }