fix: Separate levels checking null for artifact assets in case it's n…

…ever generated by the project importer
Cammin · May 12, 2024 · dbded97 · dbded97
1 parent 9121365
commit dbded97
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/Assets/LDtkUnity/Editor/ScriptedImporter/LDtkLevelImporter.cs b/Assets/LDtkUnity/Editor/ScriptedImporter/LDtkLevelImporter.cs
@@ -92,9 +92,13 @@ protected override void Import()
             CacheSchemaDefs(_projectJson, _levelJson);
             Profiler.EndSample();
 
-            Profiler.BeginSample("InitializeDefinitionObjectsFromLevel");
-            var tilesets = MakeTilesetDict(_projectImporter, _projectJson);
-            DefinitionObjects.InitializeFromLevel(_projectImporter.GetArtifactAssets()._definitions, tilesets);
+            Profiler.BeginSample("InitializeDefinitionObjects");
+            if (!InitializeDefinitionObjects())
+            {
+                Profiler.EndSample();
+                FailImport();
+                return;
+            }
             Profiler.EndSample();
 
             Profiler.BeginSample("BuildLevel");
@@ -106,6 +110,18 @@ protected override void Import()
             Profiler.EndSample();
         }
 
+        private bool InitializeDefinitionObjects()
+        {
+            LDtkArtifactAssets artifacts = _projectImporter.GetArtifactAssets();
+            if (artifacts == null)
+            {
+                return false;
+            }
+            var tilesets = MakeTilesetDict(_projectImporter, _projectJson);
+            DefinitionObjects.InitializeFromLevel(artifacts._definitions, tilesets);
+            return true;
+        }
+
         private void BuildLevel()
         {
             var preAction = new LDtkAssetProcessorActionCache();