1.0.7

* Obtaining the victim will now check if the player is null and move on to the next player instead of throwing an exception and preventing the SCP-575 from spawning.

Author: SrLicht-1

Cerberus.props

@@ -16,7 +16,7 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">1.0.6</Version>
+    <Version Condition="$(Version) == ''">1.0.7</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 

SCP575/Scp575.cs

@@ -52,7 +52,7 @@ public class Scp575
         /// <summary>
         /// Plugin version
         /// </summary>
-        private const string Version = "1.0.6";
+        private const string Version = "1.0.7";
 
         [PluginEntryPoint("SCP-575", Version, "Add SCP-575 to SCP:SL", "SrLicht")]
         private void OnLoadPlugin()
@@ -244,7 +244,7 @@ private void Spawn575(float duration)
             }
             catch (Exception e)
             {
-                Log.Error($"Error on {nameof(Spawn575)}: {e} -- {e.StackTrace}");
+                Log.Error($"Error on {nameof(Spawn575)}: {e} -- {e.Message}");
             }
         }
 
@@ -254,49 +254,66 @@ private void Spawn575(float duration)
         /// <returns></returns>
         private Player GetVictim()
         {
-            var players = new List<Player>();
-            var playerList = Player.GetPlayers();
-
-            if (Config.ActiveInLight)
+            try
             {
-                foreach (var player in playerList)
-                {
-                    if (player.IsAlive && !player.IsSCP && !player.IsTutorial &&
-                        player.Zone == FacilityZone.LightContainment
-                        && !player.IsInInvalidRoom())
+                var players = new List<Player>();
+                var playerList = Player.GetPlayers();
 
+                if (Config.ActiveInLight)
+                {
+                    foreach (var player in playerList)
                     {
-                        players.Add(player);
+                        if (player?.Room is null) continue;
+                        
+                        if (player.IsAlive && !player.IsSCP && !player.IsTutorial &&
+                            player.Zone == FacilityZone.LightContainment
+                            && !player.IsInInvalidRoom())
+
+                        {
+                            players.Add(player);
+                        }
                     }
                 }
-            }
 
-            if (Config.ActiveInHeavy)
-            {
-                foreach (var player in playerList)
+                if (Config.ActiveInHeavy)
                 {
-                    if (player.IsAlive && !player.IsSCP && !player.IsTutorial &&
-                        player.Zone == FacilityZone.HeavyContainment
-                        && !player.IsInInvalidRoom())
+                    foreach (var player in playerList)
                     {
-                        players.Add(player);
+                        if (player?.Room is null) continue;
+                        
+                        if (player.IsAlive && !player.IsSCP && !player.IsTutorial &&
+                            player.Zone == FacilityZone.HeavyContainment
+                            && !player.IsInInvalidRoom())
+                        {
+                            players.Add(player);
+                        }
                     }
                 }
-            }
 
-            if (Config.ActiveInEntrance)
-            {
-                foreach (var player in playerList)
+                if (!Config.ActiveInEntrance)
+                    return players.Any()
+                        ? players.ElementAtOrDefault(UnityEngine.Random.Range(0, players.Count))
+                        : null;
                 {
-                    if (player.IsAlive && !player.IsSCP && !player.IsTutorial && player.Zone == FacilityZone.Entrance
-                        && !player.IsInInvalidRoom())
+                    foreach (var player in playerList)
                     {
-                        players.Add(player);
+                        if (player?.Room is null) continue;
+                        
+                        if (player.IsAlive && !player.IsSCP && !player.IsTutorial && player.Zone == FacilityZone.Entrance
+                            && !player.IsInInvalidRoom())
+                        {
+                            players.Add(player);
+                        }
                     }
                 }
-            }
 
-            return players.Any() ? players.ElementAtOrDefault(UnityEngine.Random.Range(0, players.Count)) : null;
+                return players.Any() ? players.ElementAtOrDefault(UnityEngine.Random.Range(0, players.Count)) : null;
+            }
+            catch (Exception e)
+            {
+                Log.Error($"Error on {nameof(GetVictim)}: {e} -- {e.Message}");
+                return null;
+            }
         }
 
         /// <summary>