From 0634ae78fc20194ab594ca61a26b8bf8ac94c564 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Thu, 25 Jul 2024 07:04:21 +1000 Subject: Object::init - avoid throwing if 'scripts' parameter isn't an array for some reason --- source/game/StarObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/game/StarObject.cpp') diff --git a/source/game/StarObject.cpp b/source/game/StarObject.cpp index 3172c97..847f7c5 100644 --- a/source/game/StarObject.cpp +++ b/source/game/StarObject.cpp @@ -188,7 +188,7 @@ void Object::init(World* world, EntityId entityId, EntityMode mode) { setKeepAlive(configValue("keepAlive", false).toBool()); - auto scripts = jsonToStringList(configValue("scripts", JsonArray()).toArray()); + StringList scripts = configValue("scripts", JsonArray()).optArray().apply(jsonToStringList).value(m_config->scripts); m_scriptComponent.setScripts(scripts.transformed(bind(AssetPath::relativeTo, m_config->path, _1))); m_scriptComponent.setUpdateDelta(configValue("scriptDelta", 5).toInt()); -- cgit v1.2.3