Added fix for crash that gets caused by one grid being tracked multip…

…le times.
thorwin99 · Oct 12, 2021 · 0e940b8 · 0e940b8
1 parent c26c18e
commit 0e940b8
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/SEWorldGenPlugin/Session/MyEntityTrackerComponent.cs b/SEWorldGenPlugin/Session/MyEntityTrackerComponent.cs
@@ -52,18 +52,7 @@ public override void UpdateBeforeSimulation()
 
             foreach(var entity in entities)
             {
-                if(entity is MyCharacter)
-                {
-                    TrackEntity(entity);
-                }
-                if(entity is MyCubeGrid grid)
-                {
-                    if(grid.PlayerPresenceTier == VRage.Game.ModAPI.MyUpdateTiersPlayerPresence.Normal)
-                    {
-                        TrackEntity(entity);
-                        grid.PlayerPresenceTierChanged += OnGridPlayerPresenceUpdate;
-                    }
-                }
+                TrackEntity(entity);
             }
 
             lock (m_toUntrackEntities) lock (m_entityTrackers)
@@ -120,8 +109,20 @@ public void TrackEntity(MyEntity entity)
         {
             if (m_trackedEntities != null && m_newTrackedEntities != null && !m_trackedEntities.Contains(entity))
             {
-                m_newTrackedEntities.Add(entity);
-                entity.OnMarkForClose += OnEntityClose;
+                if (entity is MyCharacter)
+                {
+                    m_newTrackedEntities.Add(entity);
+                    entity.OnMarkForClose += OnEntityClose;
+                }
+                if (entity is MyCubeGrid grid)
+                {
+                    if (grid.PlayerPresenceTier == VRage.Game.ModAPI.MyUpdateTiersPlayerPresence.Normal)
+                    {
+                        m_newTrackedEntities.Add(entity);
+                        entity.OnMarkForClose += OnEntityClose;
+                        grid.PlayerPresenceTierChanged += OnGridPlayerPresenceUpdate;
+                    }
+                }
             }
         }