New Join & Leave events, added a fix for duplicate ExPlayer instances

Author: marchellcx

LabExtended/Events/ExPlayerEvents.cs

@@ -1,4 +1,5 @@
 using LabExtended.API;
+
 using LabExtended.Extensions;
 
 using LabExtended.Events.Player;
@@ -20,16 +21,46 @@ public static class ExPlayerEvents
     /// </summary>
     public static event Action<ExPlayer>? Joined;
 
+    /// <summary>
+    /// Gets called when a new NPC joins the server.
+    /// </summary>
+    public static event Action<ExPlayer>? NpcJoined;
+
+    /// <summary>
+    /// Gets called when the local server player joins the server.
+    /// </summary>
+    public static event Action<ExPlayer>? HostJoined;
+
     /// <summary>
     /// Gets called when a player finishes authentification.
     /// </summary>
-    public static event Action<ExPlayer>? Verified; 
+    public static event Action<ExPlayer>? Verified;
+
+    /// <summary>
+    /// Gets called when an NPC player finishes authentification.
+    /// </summary>
+    public static event Action<ExPlayer>? NpcVerified;
+
+    /// <summary>
+    /// Gets called when the local server player finishes authentification.
+    /// </summary>
+    public static event Action<ExPlayer>? HostVerified;
 
     /// <summary>
     /// Gets called after the player's object is destroyed.
     /// </summary>
-    public static event Action<ExPlayer>? Left; 
-    
+    public static event Action<ExPlayer>? Left;
+
+    /// <summary>
+    /// Gets called after an NPC player's object is destroyed.
+    /// </summary>
+    public static event Action<ExPlayer>? NpcLeft;
+
+    /// <summary>
+    /// Gets called after the local server player's object is destroyed.
+    /// </summary>
+    public static event Action<ExPlayer>? HostLeft;
+
     /// <inheritdoc cref="PlayerLeavingEventArgs"/>
     public static event Action<PlayerLeavingEventArgs>? Leaving;
     #endregion
@@ -139,21 +170,63 @@ public static class ExPlayerEvents
     /// <param name="player">Player who joined.</param>
     public static void OnJoined(ExPlayer player)
         => Joined.InvokeSafe(player);
-    
+
+    /// <summary>
+    /// Invokes the <see cref="NpcJoined"/> event.
+    /// </summary>
+    /// <param name="player">Player who joined.</param>
+    public static void OnNpcJoined(ExPlayer player)
+        => NpcJoined.InvokeSafe(player);
+
+    /// <summary>
+    /// Invokes the <see cref="HostJoined"/> event.
+    /// </summary>
+    /// <param name="player">Player who joined.</param>
+    public static void OnHostJoined(ExPlayer player)
+        => HostJoined.InvokeSafe(player);
+
     /// <summary>
     /// Invokes the <see cref="Verified"/> event.
     /// </summary>
     /// <param name="player">The player who just verified.</param>
     public static void OnVerified(ExPlayer player)
         => Verified.InvokeSafe(player);
-    
+
+    /// <summary>
+    /// Invokes the <see cref="NpcVerified"/> event.
+    /// </summary>
+    /// <param name="player">Player who joined.</param>
+    public static void OnNpcVerified(ExPlayer player)
+        => NpcJoined.InvokeSafe(player);
+
+    /// <summary>
+    /// Invokes the <see cref="HostVerified"/> event.
+    /// </summary>
+    /// <param name="player">Player who joined.</param>
+    public static void OnHostVerified(ExPlayer player)
+        => HostJoined.InvokeSafe(player);
+
     /// <summary>
     /// Invokes the <see cref="Left"/> event.
     /// </summary>
     /// <param name="player">Player who left.</param>
     public static void OnLeft(ExPlayer player)
         => Left.InvokeSafe(player);
 
+    /// <summary>
+    /// Invokes the <see cref="NpcLeft"/> event.
+    /// </summary>
+    /// <param name="player">Player who left.</param>
+    public static void OnNpcLeft(ExPlayer player)
+        => NpcLeft.InvokeSafe(player);
+
+    /// <summary>
+    /// Invokes the <see cref="HostLeft"/> event.
+    /// </summary>
+    /// <param name="player">Player who left.</param>
+    public static void OnHostLeft(ExPlayer player)
+        => HostLeft.InvokeSafe(player);
+
     /// <summary>
     /// Invokes the <see cref="Leaving"/> event.
     /// </summary>

LabExtended/Events/InternalEvents.cs

@@ -1,17 +1,15 @@
 using LabApi.Events;
 using LabApi.Events.Handlers;
+
 using LabApi.Events.Arguments.PlayerEvents;
 using LabApi.Events.Arguments.ServerEvents;
 
 using LabExtended.API;
 using LabExtended.API.Enums;
 
 using LabExtended.Core;
-
-using LabExtended.Attributes;
 using LabExtended.Extensions;
 
-using NetworkManagerUtils;
 using NetworkManagerUtils.Dummies;
 
 #pragma warning disable CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
@@ -40,12 +38,18 @@ internal static class InternalEvents
         internal static void HandlePlayerVerified(ExPlayer player)
         {
             if (player.IsServer)
+            {
+                ExPlayerEvents.OnHostVerified(player);
                 return;
+            }
 
             OnPlayerVerified.InvokeSafe(player);
 
-            if (player.IsNpc) 
+            if (player.IsNpc)
+            {
+                ExPlayerEvents.OnNpcVerified(player);
                 return;
+            }
 
             if (!string.IsNullOrWhiteSpace(player.UserId))
             {
@@ -80,12 +84,24 @@ internal static void HandlePlayerVerified(ExPlayer player)
         internal static void HandlePlayerJoin(ExPlayer player)
         {
             if (!player.IsServer)
+            {
                 OnPlayerJoined.InvokeSafe(player);
+            }
             else
+            {
                 OnHostJoined.InvokeSafe(player);
 
-            if (!player.IsNpc) 
+                ExPlayerEvents.OnHostJoined(player);
+            }
+
+            if (!player.IsNpc)
+            {
                 ExPlayerEvents.OnJoined(player);
+            }
+            else
+            {
+                ExPlayerEvents.OnNpcJoined(player);
+            }
         }
 
         internal static void HandlePlayerLeave(ExPlayer? player)
@@ -119,6 +135,12 @@ internal static void HandlePlayerLeave(ExPlayer? player)
             else if (player.IsServer)
             {
                 OnHostLeft.InvokeSafe(player);
+
+                ExPlayerEvents.OnHostLeft(player);
+            }
+            else if (player.IsNpc)
+            {
+                ExPlayerEvents.OnNpcLeft(player);
             }
         }
 

LabExtended/Patches/Functions/Players/PlayerConstructorPatch.cs

@@ -23,10 +23,11 @@ private static bool JoinPrefix(ReferenceHub referenceHub)
     {
         if (referenceHub != null)
         {
-            var player = new ExPlayer(referenceHub,
-                referenceHub.isLocalPlayer || referenceHub.connectionToClient.GetType() != typeof(NetworkConnectionToClient)
-                    ? GetNewNpcToggles()
-                    : GetNewPlayerToggles());
+            if (!ExPlayer.TryGet(referenceHub, out var player))
+                player = new ExPlayer(referenceHub,
+                    referenceHub.isLocalPlayer || referenceHub.connectionToClient.GetType() != typeof(NetworkConnectionToClient)
+                        ? GetNewNpcToggles()
+                        : GetNewPlayerToggles());
 
             if (referenceHub.isLocalPlayer)
             {