Merge pull request #227 from UchuServer/bug/player-loading-blocking

Author: MickVermeulen

Uchu.World/Handlers/GameMessages/ModularBuildingHandler.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Uchu.Core;
@@ -43,15 +44,10 @@ public async Task BuildExitConfirmationHandler(BuildExitConfirmationMessage mess
         }
 
         [PacketHandler]
-        public async Task SetLastCustomBuildHandler(SetLastCustomBuildMessage message, Player player)
+        public void SetLastCustomBuildHandler(SetLastCustomBuildMessage message, Player player)
         {
-            await using var ctx = new UchuContext();
-
-            var character = await ctx.Characters.FirstAsync(c => c.Id == player.Id);
-
-            character.Rocket = message.Tokens;
-
-            await ctx.SaveChangesAsync();
+            if (!player.TryGetComponent<CharacterComponent>(out var characterComponent));
+            characterComponent.Rocket = message.Tokens;
         }
 
         [PacketHandler]

Uchu.World/Objects/Components/ReplicaComponents/CharacterComponent.cs

@@ -211,7 +211,7 @@ public async Task SaveAsync(UchuContext context)
         public int InventorySize { get; set; }
         public int BaseImagination { get; set; }
         public int BaseHealth { get; set; }
-        public string Rocket { get; private set; }
+        public string Rocket { get; set; }
         public int LaunchedRocketFrom { get; set; }
         public long LastActivity { get; private set; }
         public bool FreeToPlay { get; private set; }
@@ -575,14 +575,22 @@ public override void Construct(BitWriter writer)
             writer.Write((ulong) TotalFirstPlaceFinishes);
             writer.WriteBit(false);
 
-            writer.WriteBit(LandingByRocket);
+            if (Rocket != default)
+            {
+                // Send the rocket if it is set to land by rocket and rocket is defined.
+                writer.WriteBit(LandingByRocket);
 
-            if (LandingByRocket)
+                if (LandingByRocket)
+                {
+                    var rocketString = Rocket;
+                    writer.Write((ushort) rocketString.Length);
+                    writer.WriteString(rocketString, rocketString.Length, true);
+                }
+            }
+            else
             {
-                var rocketString = Rocket;
-                
-                writer.Write((ushort) rocketString.Length);
-                writer.WriteString(rocketString, rocketString.Length, true);
+                // Set the landing as not by rocket. Even if it is, this prevents a null reference exception.
+                writer.WriteBit(false);
             }
 
             WritePart4(writer);

Uchu.World/Objects/Components/Server/RocketLaunchpadComponent.cs

@@ -12,14 +12,11 @@ protected RocketLaunchpadComponent()
         {
             Listen(OnStart, () =>
             {
-                Listen(GameObject.OnInteract, async player =>
-                {
-                    await OnInteract(player);
-                });
+                Listen(GameObject.OnInteract, OnInteract);
             });
         }
 
-        public async Task OnInteract(Player player)
+        public void OnInteract(Player player)
         {
             var rocket = player.GetComponent<InventoryManagerComponent>()[InventoryType.Models].Items.FirstOrDefault(
                 item => item.Lot == Lot.ModularRocket
@@ -28,7 +25,6 @@ public async Task OnInteract(Player player)
             if (rocket == default)
             {
                 Logger.Error($"Could not find a valid rocket for {player}");
-                
                 return;
             }
 
@@ -42,13 +38,8 @@ public async Task OnInteract(Player player)
                 Sender = player
             });
 
-            await using var ctx = new UchuContext();
-
-            var character = await ctx.Characters.FirstAsync(c => c.Id == player.Id);
-
-            character.LandingByRocket = true;
-            
-            await ctx.SaveChangesAsync();
+            if (!player.TryGetComponent<CharacterComponent>(out var characterComponent));
+            characterComponent.LandingByRocket = true;
         }
     }
 }

Uchu.World/Objects/GameObjects/Player.cs

@@ -24,6 +24,15 @@ public sealed class Player : GameObject
     {
         public static async Task<Player> Instantiate(IRakConnection connection, Zone zone, ObjectId id)
         {
+            // Set up a cancellation token for the connection disconnecting.
+            // This may happen before the object starts.
+            var cancellationToken = new CancellationTokenSource();
+            connection.Disconnected += (disconnectionReason) =>
+            {
+                cancellationToken.Cancel();
+                return Task.CompletedTask;
+            };
+            
             // Create base game object
             var instance = Instantiate<Player>(
                 zone,
@@ -34,7 +43,7 @@ public static async Task<Player> Instantiate(IRakConnection connection, Zone zon
                 lot: 1
             );
 
-            await instance.LoadAsync(connection);
+            await instance.LoadAsync(connection, cancellationToken.Token);
             return instance;
         }
 
@@ -51,6 +60,13 @@ internal Player()
 
             Listen(OnStart, () =>
             {
+                // Destroy the player on disconnect.
+                // Also check if the player disconnected during loading.
+                if (_loadCancellationToken != default && _loadCancellationToken.IsCancellationRequested)
+                {
+                    DestroyAsync().Wait();
+                    return;
+                }
                 Connection.Disconnected += async reason =>
                 {
                     await DestroyAsync();
@@ -132,14 +148,15 @@ public async Task DestroyAsync(CloseReason? reason = CloseReason.ClientDisconnec
         /// <param name="connection">User endpoint for this character</param>
         /// <param name="zone">The zone to spawn in</param>
         /// <returns>The constructed player</returns>
-        public async Task LoadAsync(IRakConnection connection)
+        public async Task LoadAsync(IRakConnection connection, CancellationToken cancellationToken)
         {
             await using var uchuContext = new UchuContext();
             var character = await uchuContext.Characters
                 .SingleAsync(c => c.Id == Id);
 
             Connection = connection;
             Name = character.Name;
+            _loadCancellationToken = cancellationToken;
 
             // Setup layers
             Layer = StandardLayer.Player;
@@ -253,6 +270,12 @@ public override string Name
         /// Internal gravity scale of the player
         /// </summary>
         private float _gravityScale = 1;
+
+        /// <summary>
+        /// Cancellation token for loading the player, such
+        /// as if the player disconnects.
+        /// </summary>
+        private CancellationToken _loadCancellationToken;
 
         /// <summary>
         /// Gravity scale of the player

Uchu.World/Objects/ReplicaManager/ConstructionPacket.cs

@@ -0,0 +1,32 @@
+using RakDotNet;
+using RakDotNet.IO;
+
+namespace Uchu.World.Objects.ReplicaManager
+{
+    public class ConstructionPacket : ISerializable
+    {
+        /// <summary>
+        /// Id to serialize with.
+        /// </summary>
+        public ushort Id { get; set; }
+
+        /// <summary>
+        /// Game object to construct.
+        /// </summary>
+        public GameObject GameObject { get; set; }
+        
+        /// <summary>
+        /// Writes the serialization data.
+        /// </summary>
+        /// <param name="writer">Bit writer for the data.</param>
+        public void Serialize(BitWriter writer)
+        {
+            writer.Write((byte) MessageIdentifier.ReplicaManagerConstruction);
+
+            writer.WriteBit(true);
+            writer.Write(Id);
+
+            GameObject.WriteConstruct(writer);
+        }
+    }
+}

Uchu.World/Objects/ReplicaManager/DestructionPacket.cs

@@ -0,0 +1,24 @@
+using RakDotNet;
+using RakDotNet.IO;
+
+namespace Uchu.World.Objects.ReplicaManager
+{
+    public class DestructionPacket: ISerializable
+    {
+        /// <summary>
+        /// Id to serialize with.
+        /// </summary>
+        public ushort Id { get; set; }
+        
+        /// <summary>
+        /// Writes the serialization data.
+        /// </summary>
+        /// <param name="writer">Bit writer for the data.</param>
+        public void Serialize(BitWriter writer)
+        {
+            writer.Write((byte) MessageIdentifier.ReplicaManagerDestruction);
+
+            writer.Write(Id);
+        }
+    }
+}

Uchu.World/Objects/ReplicaManager/SerializePacket.cs

@@ -0,0 +1,31 @@
+using RakDotNet;
+using RakDotNet.IO;
+
+namespace Uchu.World.Objects.ReplicaManager
+{
+    public class SerializePacket : ISerializable
+    {
+        /// <summary>
+        /// Id to serialize with.
+        /// </summary>
+        public ushort Id { get; set; }
+
+        /// <summary>
+        /// Game object to construct.
+        /// </summary>
+        public GameObject GameObject { get; set; }
+        
+        /// <summary>
+        /// Writes the serialization data.
+        /// </summary>
+        /// <param name="writer">Bit writer for the data.</param>
+        public void Serialize(BitWriter writer)
+        {
+            writer.Write((byte) MessageIdentifier.ReplicaManagerSerialize);
+
+            writer.Write(Id);
+
+            GameObject.WriteSerialize(writer);
+        }
+    }
+}

Uchu.World/Objects/Zone.cs

@@ -19,6 +19,7 @@
 using Uchu.Physics;
 using Uchu.Python;
 using Uchu.World.Client;
+using Uchu.World.Objects.ReplicaManager;
 using Uchu.World.Scripting;
 using Uchu.World.Systems.AI;
 
@@ -440,22 +441,14 @@ internal static void SendConstruction(GameObject gameObject, IEnumerable<Player>
             foreach (var recipient in recipients)
             {
                 if (!recipient.Perspective.View(gameObject)) continue;
-
                 if (!recipient.Perspective.Reveal(gameObject, out var id)) continue;
-
                 if (id == 0) return;
 
-                using var stream = new MemoryStream();
-                using var writer = new BitWriter(stream);
-
-                writer.Write((byte) MessageIdentifier.ReplicaManagerConstruction);
-
-                writer.WriteBit(true);
-                writer.Write(id);
-
-                gameObject.WriteConstruct(writer);
-
-                recipient.Connection.Send(stream);
+                recipient.Connection.Send(new ConstructionPacket()
+                {
+                    Id = id,
+                    GameObject = gameObject,
+                });
             }
         }
 
@@ -465,16 +458,11 @@ internal static void SendSerialization(GameObject gameObject, IEnumerable<Player
             {
                 if (!recipient.Perspective.TryGetNetworkId(gameObject, out var id)) continue;
 
-                using var stream = new MemoryStream();
-                using var writer = new BitWriter(stream);
-
-                writer.Write((byte) MessageIdentifier.ReplicaManagerSerialize);
-
-                writer.Write(id);
-
-                gameObject.WriteSerialize(writer);
-
-                recipient.Connection.Send(stream);
+                recipient.Connection.Send(new SerializePacket()
+                {
+                    Id = id,
+                    GameObject = gameObject,
+                });
             }
         }
 
@@ -488,19 +476,12 @@ internal static void SendDestruction(GameObject gameObject, IEnumerable<Player>
             foreach (var recipient in recipients)
             {
                 if (recipient.Perspective.View(gameObject)) continue;
-
                 if (!recipient.Perspective.TryGetNetworkId(gameObject, out var id)) continue;
 
-                using (var stream = new MemoryStream())
+                recipient.Connection.Send(new DestructionPacket()
                 {
-                    using var writer = new BitWriter(stream);
-
-                    writer.Write((byte) MessageIdentifier.ReplicaManagerDestruction);
-
-                    writer.Write(id);
-
-                    recipient.Connection.Send(stream);
-                }
+                    Id = id,
+                });
 
                 recipient.Perspective.Drop(gameObject);
             }