Merge pull request #38 from DeadLeavez/decouple-despawn-from-spawning

decouple despawnbot from spawning bots.
project-fika · May 7, 2024 · adc194e · adc194e
2 parents afa3690 + c82be89
commit adc194e
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs
@@ -443,13 +443,19 @@ private bool TryDespawnFurthest(Profile profile, Vector3 position, CoopHandler c
 #endif
                 return false;
             }
-
             Player bot = Bots[botKey];
-
 #if DEBUG
             Logger.LogWarning($"Removing {bot.Profile.Info.Settings.Role} at a distance of {Math.Sqrt(furthestDistance)}m from ITs nearest player.");
 #endif
+            DespawnBot(coopHandler, bot);
+#if DEBUG
+            Logger.LogWarning($"Bot {bot.Profile.Info.Settings.Role} despawned successfully.");
+#endif
+            return true;
+        }
 
+        private void DespawnBot(CoopHandler coopHandler, Player bot)
+        {
             IBotGame botGame = Singleton<IBotGame>.Instance;
             BotOwner botOwner = bot.AIData.BotOwner;
 
@@ -458,13 +464,9 @@ private bool TryDespawnFurthest(Profile profile, Vector3 position, CoopHandler c
             BotUnspawn(botOwner);
             botOwner?.Dispose();
 
-            Bots.Remove(botKey);
             CoopPlayer coopPlayer = (CoopPlayer)bot;
             coopHandler.Players.Remove(coopPlayer.NetId);
-#if DEBUG
-            Logger.LogWarning($"Bot {bot.Profile.Info.Settings.Role} despawned successfully.");
-#endif
-            return true;
+            Bots.Remove(bot.ProfileId);
         }
 
         /// <summary>