Add null check in SystemState

Pulsar4xDevs · Apr 18, 2024 · 43b684e · 43b684e
1 parent c739e98
commit 43b684e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Pulsar4X/Pulsar4X.Client/MapRendering/SystemState.cs b/Pulsar4X/Pulsar4X.Client/MapRendering/SystemState.cs
@@ -51,7 +51,7 @@ public SystemState(StarSystem system, Entity faction)
                     SetupEntity(entity, _faction);
                 }
 
-                Func<Message, bool> filterById = msg => msg.SystemId.Equals(StarSystem.ManagerGuid);
+                Func<Message, bool> filterById = msg => msg.SystemId != null && msg.SystemId.Equals(StarSystem.ManagerGuid);
 
                 MessagePublisher.Instance.Subscribe(MessageTypes.EntityAdded, OnEntityAddedMessage, filterById);
                 MessagePublisher.Instance.Subscribe(MessageTypes.EntityRemoved, OnEntityRemovedMessage, filterById);
@@ -65,7 +65,7 @@ public SystemState(StarSystem system, Entity faction)
                     SetupEntity(entityItem, faction);
                 }
 
-                Func<Message, bool> filterById = msg => msg.SystemId.Equals(StarSystem.ManagerGuid);
+                Func<Message, bool> filterById = msg => msg.SystemId != null && msg.SystemId.Equals(StarSystem.ManagerGuid);
 
                 MessagePublisher.Instance.Subscribe(MessageTypes.EntityAdded, OnEntityAddedMessage, filterById);
                 MessagePublisher.Instance.Subscribe(MessageTypes.EntityRemoved, OnEntityRemovedMessage, filterById);