From 2cace1a479d72ea5b31e427a6a6ee204a5539013 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 24 Jan 2024 00:03:07 +0300 Subject: [PATCH] script-name property fix --- src/content/ContentLoader.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index 21ea9dc4..96dc6620 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -250,8 +250,9 @@ void ContentLoader::loadBlock(Block* def, std::string full, std::string name) { auto folder = pack->folder; fs::path configFile = folder/fs::path("blocks/"+name+".json"); - fs::path scriptfile = folder/fs::path("scripts/"+def->scriptName+".lua"); loadBlock(def, full, configFile); + + fs::path scriptfile = folder/fs::path("scripts/"+def->scriptName+".lua"); if (fs::is_regular_file(scriptfile)) { scripting::load_block_script(full, scriptfile, &def->rt.funcsset); } @@ -261,8 +262,9 @@ void ContentLoader::loadItem(ItemDef* def, std::string full, std::string name) { auto folder = pack->folder; fs::path configFile = folder/fs::path("items/"+name+".json"); - fs::path scriptfile = folder/fs::path("scripts/"+def->scriptName+".lua"); loadItem(def, full, configFile); + + fs::path scriptfile = folder/fs::path("scripts/"+def->scriptName+".lua"); if (fs::is_regular_file(scriptfile)) { scripting::load_item_script(full, scriptfile, &def->rt.funcsset); }