diff --git a/QSB/HUD/MultiplayerHUDManager.cs b/QSB/HUD/MultiplayerHUDManager.cs index 8bf58ae1..e16d62d1 100644 --- a/QSB/HUD/MultiplayerHUDManager.cs +++ b/QSB/HUD/MultiplayerHUDManager.cs @@ -396,6 +396,16 @@ public class MultiplayerHUDManager : MonoBehaviour, IAddComponentOnStart foreach (var trigger in planetTriggers) { + if (trigger == null) + { + continue; + } + + if (trigger._sector == null) + { + continue; + } + if (!trigger._sector.ContainsOccupant(DynamicOccupant.Player)) { continue; @@ -573,6 +583,7 @@ public class MultiplayerHUDManager : MonoBehaviour, IAddComponentOnStart triggerGO.transform.SetParent(parent.transform, false); triggerGO.SetActive(false); var trigger = triggerGO.AddComponent(); + trigger.Reset(); // Force _sector to be found immediately trigger.PlanetID = name; triggerGO.SetActive(true); return trigger;