Possible fix for #80 by locking access to untracked Entities for thre…

…ad safety
thorwin99 · Apr 4, 2021 · e08cf14 · e08cf14
1 parent e7b15b5
commit e08cf14
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/SEWorldGenPlugin/Generator/MyStarSystemGenerator.cs b/SEWorldGenPlugin/Generator/MyStarSystemGenerator.cs
@@ -12,7 +12,6 @@
 using System.Collections.Generic;
 using VRage.Game;
 using VRage.Game.Components;
-using VRage.Game.Entity;
 using VRage.Library.Utils;
 using VRageMath;
 

diff --git a/SEWorldGenPlugin/Properties/AssemblyInfo.cs b/SEWorldGenPlugin/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.5.1")]
+[assembly: AssemblyVersion("2.0.5.3")]
 [assembly: AssemblyFileVersion("1.0.0")]
diff --git a/SEWorldGenPlugin/Session/MyEntityTrackerComponent.cs b/SEWorldGenPlugin/Session/MyEntityTrackerComponent.cs
@@ -122,7 +122,8 @@ public void TrackEntity(MyEntity entity)
                 m_newTrackedEntities.Add(entity);
                 entity.OnMarkForClose += (e) =>
                 {
-                    m_toUntrackEntities.Add(e);
+                    lock(m_toUntrackEntities)
+                        m_toUntrackEntities.Add(e);
                 };
             }
         }
@@ -157,7 +158,8 @@ private void OnGridPlayerPresenceUpdate(MyCubeGrid grid)
         {
             if(grid.PlayerPresenceTier != VRage.Game.ModAPI.MyUpdateTiersPlayerPresence.Normal)
             {
-                m_toUntrackEntities.Add(grid);
+                lock(m_toUntrackEntities)
+                    m_toUntrackEntities.Add(grid);
             }
         }
     }