Fixed crash when ScriptComponent has no Instance in Play Mode

This commit is contained in:
Simon Lübeß
2023-07-31 16:36:02 +02:00
parent 11a57f5285
commit 803fd7f8ba
+6 -1
View File
@@ -106,7 +106,9 @@ namespace GlitchyEngine.World
for (let (handle, script) in target._ecsWorld.Enumerate<ScriptComponent>())
{
Entity entity = .(handle, this);
ScriptEngine.CopyEditorFieldsToInstance(entity, script);
if (script.Instance != null)
ScriptEngine.CopyEditorFieldsToInstance(entity, script);
}
// Copy transforms... needs special handling for the Parent<->Child relations
@@ -284,6 +286,9 @@ namespace GlitchyEngine.World
if (!script.IsInitialized)
ScriptEngine.InitializeInstance(Entity(entity, this), script);
if (script.Instance == null)
continue;
if (mode.HasFlag(.Runtime))
script.Instance.InvokeOnCreate();
}