Merge pull request #221 from UchuServer/enhancement/player-leave-event

Add Player Leave Event

Author: MickVermeulen

Uchu.Char/Handlers/CharacterHandler.cs

@@ -6,6 +6,7 @@
 using RakDotNet;
 using Uchu.Core;
 using Uchu.Core.Client;
+using Uchu.World;
 
 namespace Uchu.Char.Handlers
 {
@@ -69,7 +70,17 @@ private static async Task SendCharacterList(IRakConnection connection, long user
         [PacketHandler]
         public async Task CharacterList(CharacterListRequest packet, IRakConnection connection)
         {
+            // Remove the player from the zone.
             var session = UchuServer.SessionCache.GetSession(connection.EndPoint);
+            if (UchuServer is WorldUchuServer worldUchuServer) {
+                var player = worldUchuServer.FindPlayer(connection);
+                if (player != null)
+                {
+                    await player.DestroyAsync();
+                }
+            }
+            
+            // Send the character list.
             await SendCharacterList(connection, session.UserId);
         }
 

Uchu.Char/Uchu.Char.csproj

@@ -7,6 +7,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Uchu.Core\Uchu.Core.csproj" />
+      <ProjectReference Include="..\Uchu.World\Uchu.World.csproj" />
     </ItemGroup>
 
 </Project>

Uchu.World/Objects/GameObjects/Player.cs

@@ -53,10 +53,7 @@ internal Player()
             {
                 Connection.Disconnected += async reason =>
                 {
-                    Logger.Information($"{this} left: {reason}.");
-                    await GetComponent<SaveComponent>().SaveAsync(false);
-                    Connection = default;
-                    Destroy(this);
+                    await DestroyAsync();
                 };
 
                 Listen(OnPositionUpdate, UpdatePhysics);
@@ -117,6 +114,17 @@ internal Player()
             });
         }
 
+        /// <summary>
+        /// Destroys the player.
+        /// </summary>
+        public async Task DestroyAsync(CloseReason? reason = CloseReason.ClientDisconnect)
+        {
+            Logger.Information($"{this} left: {reason}.");
+            await GetComponent<SaveComponent>().SaveAsync(false);
+            Connection = default;
+            Destroy(this);
+        }
+
         /// <summary>
         /// Constructs the player, settings spawn parameters and masks
         /// </summary>

Uchu.World/Objects/Zone.cs

@@ -83,6 +83,7 @@ public class Zone : Object
 
         // Events
         public Event<Player> OnPlayerLoad { get; }
+        public Event<Player> OnPlayerLeave { get; }
         public Event<Object> OnObject { get; }
         public Event OnTick { get; }
         public Event<Player, string> OnChatMessage { get; }
@@ -98,6 +99,7 @@ public Zone(ZoneInfo zoneInfo, UchuServer uchuServer, ushort instanceId = defaul
             EarlyPhysics = new Event();
             LatePhysics = new Event();
             OnPlayerLoad = new Event<Player>();
+            OnPlayerLeave = new Event<Player>();
             OnObject = new Event<Object>();
             OnTick = new Event();
             OnChatMessage = new Event<Player, string>();
@@ -401,6 +403,12 @@ internal void UnregisterObject(Object obj)
 
                 ManagedObjects.Remove(obj);
 
+                // Invoke the player left event if the object is an event.
+                if (obj is Player player)
+                {
+                    OnPlayerLeave.Invoke(player);
+                }
+
                 if (obj is GameObject gameObject)
                 {
                     if ((gameObject.Id.Flags & ObjectIdFlags.Spawned) != 0)