Fix for the PR

ExMod-Team · Aug 22, 2024 · 5c5feb4 · 5c5feb4
1 parent b0416c7
commit 5c5feb4
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/EXILED/Exiled.API/Features/Npc.cs b/EXILED/Exiled.API/Features/Npc.cs
@@ -133,34 +133,21 @@ public Npc(GameObject gameObject)
         /// <param name="userId">The userID of the NPC.</param>
         /// <param name="position">The position to spawn the NPC.</param>
         /// <returns>The <see cref="Npc"/> spawned.</returns>
-        public static Npc Spawn(string name, RoleTypeId role, int id = 0, string userId = "", Vector3? position = null)
+        public static Npc Spawn(string name, RoleTypeId role, int id = 0, string userId = PlayerAuthenticationManager.DedicatedId, Vector3? position = null)
         {
-            GameObject newObject = Object.Instantiate(NetworkManager.singleton.playerPrefab);
+            GameObject newObject = UnityEngine.Object.Instantiate(Mirror.NetworkManager.singleton.playerPrefab);
 
             Npc npc = new(newObject)
             {
-                IsVerified = userId != PlayerAuthenticationManager.DedicatedId && userId != null,
                 IsNPC = true,
             };
 
-            try
-            {
-                npc.ReferenceHub.roleManager.InitializeNewRole(RoleTypeId.None, RoleChangeReason.None);
-            }
-            catch (Exception e)
-            {
-                Log.Debug($"Ignore: {e}");
-            }
-
             if (!RecyclablePlayerId.FreeIds.Contains(id) && RecyclablePlayerId._autoIncrement >= id)
             {
                 Log.Warn($"{Assembly.GetCallingAssembly().GetName().Name} tried to spawn an NPC with a duplicate PlayerID. Using auto-incremented ID instead to avoid issues.");
-                id = new RecyclablePlayerId(false).Value;
+                id = new RecyclablePlayerId(true).Value;
             }
 
-            FakeConnection fakeConnection = new(id);
-            NetworkServer.AddPlayerForConnection(fakeConnection, newObject);
-
             try
             {
                 if (userId == PlayerAuthenticationManager.DedicatedId)
@@ -172,7 +159,7 @@ public static Npc Spawn(string name, RoleTypeId role, int id = 0, string userId
                     }
                     catch (Exception e)
                     {
-                        Log.Debug($"Ignore: {e}");
+                        Log.Debug($"Ignore: {e.Message}");
                     }
                 }
                 else
@@ -182,9 +169,21 @@ public static Npc Spawn(string name, RoleTypeId role, int id = 0, string userId
             }
             catch (Exception e)
             {
-                Log.Debug($"Ignore: {e}");
+                Log.Debug($"Ignore: {e.Message}");
             }
 
+            try
+            {
+                npc.ReferenceHub.roleManager.InitializeNewRole(RoleTypeId.None, RoleChangeReason.None);
+            }
+            catch (Exception e)
+            {
+                Log.Debug($"Ignore: {e.Message}");
+            }
+
+            FakeConnection fakeConnection = new(id);
+            NetworkServer.AddPlayerForConnection(fakeConnection, newObject);
+
             npc.ReferenceHub.nicknameSync.Network_myNickSync = name;
             Dictionary.Add(newObject, npc);