From 4893705ff40003737b3708f975e333846ee955ad Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 22:23:16 +0300 Subject: [PATCH] fix overriden content units scripts overriding --- src/content/loading/BlockLoader.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/content/loading/BlockLoader.cpp b/src/content/loading/BlockLoader.cpp index a8615e3f..6866443b 100644 --- a/src/content/loading/BlockLoader.cpp +++ b/src/content/loading/BlockLoader.cpp @@ -247,5 +247,7 @@ template<> void ContentUnitLoader::loadUnit( if (def.hidden && def.pickingItem == def.name + BLOCK_ITEM_SUFFIX) { def.pickingItem = CORE_EMPTY; } - def.scriptFile = pack.id + ":scripts/" + def.scriptName + ".lua"; + if (root.has("script-name") || def.scriptFile.empty()) { + def.scriptFile = pack.id + ":scripts/" + def.scriptName + ".lua"; + } }