Fix #197

Dorian Stoll · Dorian Stoll · commit 2705ffb03fb6 · 2017-08-16T15:53:13.000+02:00
diff --git a/Kopernicus/Kopernicus/Configuration/Loader.cs b/Kopernicus/Kopernicus/Configuration/Loader.cs
@@ -256,9 +256,16 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
                     body.Value.generatedBody.transform.parent = systemPrefab.transform;
 
                     // Delete ghost space centers
-                    if (!body.Value.generatedBody.celestialBody.isHomeWorld)
+                    if (!body.Value.generatedBody.celestialBody.isHomeWorld && body.Value.generatedBody.pqsVersion != null)
                     {
-                        UnityEngine.Object.Destroy(body.Value.generatedBody.pqsVersion.GetComponentInChildren<SpaceCenter>());
+                        SpaceCenter[] centers = body.Value.generatedBody.pqsVersion.GetComponentsInChildren<SpaceCenter>(true);
+                        if (centers != null)
+                        {
+                            foreach (SpaceCenter c in centers)
+                            {
+                                UnityEngine.Object.Destroy(c);
+                            }
+                        }
                     }
                 }
 
diff --git a/Kopernicus/Kopernicus/Injector.cs b/Kopernicus/Kopernicus/Injector.cs
@@ -118,7 +118,7 @@ public void PostSpawnFixups()
             Debug.Log("[Kopernicus]: Post-Spawn");
 
             // Fix the SpaceCenter
-            SpaceCenter.Instance = PSystemManager.Instance.localBodies.First(cb => cb.isHomeWorld).GetComponentInChildren<SpaceCenter>();
+            SpaceCenter.Instance = PSystemManager.Instance.localBodies.First(cb => cb.isHomeWorld).GetComponentsInChildren<SpaceCenter>(true).FirstOrDefault();
             SpaceCenter.Instance.Start();
 
             // Fix the flight globals index of each body and patch it's SOI

Original file line number	Diff line number	Diff line change
`@@ -256,9 +256,16 @@ void IParserEventSubscriber.PostApply(ConfigNode node)`
`256`	`256`	`body.Value.generatedBody.transform.parent = systemPrefab.transform;`
`257`	`257`
`258`	`258`	`// Delete ghost space centers`
`259`		`- if (!body.Value.generatedBody.celestialBody.isHomeWorld)`
	`259`	`+ if (!body.Value.generatedBody.celestialBody.isHomeWorld && body.Value.generatedBody.pqsVersion != null)`
`260`	`260`	`{`
`261`		`- UnityEngine.Object.Destroy(body.Value.generatedBody.pqsVersion.GetComponentInChildren<SpaceCenter>());`
	`261`	`+ SpaceCenter[] centers = body.Value.generatedBody.pqsVersion.GetComponentsInChildren<SpaceCenter>(true);`
	`262`	`+ if (centers != null)`
	`263`	`+ {`
	`264`	`+ foreach (SpaceCenter c in centers)`
	`265`	`+ {`
	`266`	`+ UnityEngine.Object.Destroy(c);`
	`267`	`+ }`
	`268`	`+ }`
`262`	`269`	`}`
`263`	`270`	`}`
`264`	`271`