Move null body node check to BodyResourceData.Load()

Fixes NRE with ResetBodyData()
Majiir · Sep 7, 2014 · 3a8f47e · 3a8f47e
1 parent e9297dd
commit 3a8f47e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Plugin/Kethane/BodyResourceData.cs b/Plugin/Kethane/BodyResourceData.cs
@@ -28,6 +28,7 @@ public void ScanCell(Cell cell)
 
         public static BodyResourceData Load(IResourceGenerator generator, CelestialBody body, ConfigNode bodyNode)
         {
+            if (bodyNode == null) { bodyNode = new ConfigNode(); }
             var resources = generator.Load(body, bodyNode.GetNode("GeneratorData"));
             var scans = new CellSet(KethaneData.GridLevel);
 

diff --git a/Plugin/Kethane/ResourceData.cs b/Plugin/Kethane/ResourceData.cs
@@ -45,7 +45,7 @@ public static ResourceData Load(ResourceDefinition resource, ConfigNode resource
 
             foreach (var body in FlightGlobals.Bodies)
             {
-                var bodyNode = bodyNodes.SingleOrDefault(n => n.GetValue("Name") == body.name) ?? new ConfigNode();
+                var bodyNode = bodyNodes.SingleOrDefault(n => n.GetValue("Name") == body.name);
                 bodyResources[body] = BodyResourceData.Load(generator, body, bodyNode);
             }