Fixed bug where moons could spawn beyond the world limit

thorwin99 · Apr 23, 2020 · 9d06d1f · 9d06d1f · Death666Machine · Apr 23, 2020
1 parent a0d4b5a
commit 9d06d1f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/SEWorldGenPlugin/Generator/SystemGenerator.cs b/SEWorldGenPlugin/Generator/SystemGenerator.cs
@@ -203,13 +203,13 @@ private void GeneratePlanet(int index, long distance, int totalObjects, ref int
             planet.PlanetRing = GenerateRing(def.SurfaceGravity, planet.Size);
             planet.OffsetPosition = pos;
             planet.CenterPosition = pos;
-            planet.PlanetMoons = GenerateMoons(planet.Size, def.SurfaceGravity, planet.DisplayName);
+            planet.PlanetMoons = GenerateMoons(planet.Size, def.SurfaceGravity, planet.DisplayName, distance);
             planet.Generated = false;
 
             m_objects.Add(planet);
         }
 
-        private MyPlanetMoonItem[] GenerateMoons(float planetSize, float surfaceGravity, string planetName)
+        private MyPlanetMoonItem[] GenerateMoons(float planetSize, float surfaceGravity, string planetName, long distance)
         {
             if (MyRandom.Instance.NextFloat() > m_settings.PlanetSettings.MoonProbability) return new MyPlanetMoonItem[0];
 
@@ -221,6 +221,8 @@ private MyPlanetMoonItem[] GenerateMoons(float planetSize, float surfaceGravity,
                 var dist = planetSize * (i + 1) + planetSize / 2 * MyRandom.Instance.GetRandomFloat(0.5f, 1.5f);
                 var def = GetPlanetMoonDefinition(planetSize * 0.8f);
 
+                if (dist + distance > m_settings.WorldSize) return moons;
+
                 MyPlanetMoonItem item = new MyPlanetMoonItem();
                 item.Type = SystemObjectType.MOON;
                 item.DefName = def.Id.SubtypeName.ToString();