Unstable 0.1500.2.0 (Rokvach's dog edition)

2021-09-10 04:52:34 +09:00
parent e7b7c1a748
commit 1231170fce
126 changed files with 2424 additions and 1083 deletions
@@ -659,9 +659,9 @@ namespace Barotrauma
        public static IEnumerable<Character> GetSessionCrewCharacters()
        {
 #if SERVER
-            return GameMain.Server.ConnectedClients.Select(c => c.Character).Where(c => c.Info != null);
+            return GameMain.Server.ConnectedClients.Select(c => c.Character).Where(c => c?.Info != null);
 #else
-            return GameMain.GameSession.CrewManager.GetCharacters().Where(c => c.Info != null);
+            return GameMain.GameSession.CrewManager.GetCharacters().Where(c => c?.Info != null);
 #endif        
        }