From b0aad2823adfb655771cae0eefc5c9fbd2af897b Mon Sep 17 00:00:00 2001 From: Vanic Date: Sat, 11 Apr 2026 21:54:49 +0300 Subject: [PATCH] Fix merge items settings --- mods/CORE/Item/src/Item.lua | 2 +- mods/CORE/Node/src/Node.lua | 4 ++-- mods/CORE/Tool/src/Tool.lua | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mods/CORE/Item/src/Item.lua b/mods/CORE/Item/src/Item.lua index 6690a52..536b6a7 100644 --- a/mods/CORE/Item/src/Item.lua +++ b/mods/CORE/Item/src/Item.lua @@ -129,7 +129,7 @@ local function itemDefToLuantiDef(itemDef) s._description = description s.description = luantiDescription..core.get_background_escape_sequence('#110F13') - local luantiDef = defMerge(s, c) + local luantiDef = defMerge(s, c, true) return luantiDef end diff --git a/mods/CORE/Node/src/Node.lua b/mods/CORE/Node/src/Node.lua index 05661f9..b657569 100644 --- a/mods/CORE/Node/src/Node.lua +++ b/mods/CORE/Node/src/Node.lua @@ -29,7 +29,7 @@ end ---@param defaultDef Node.NodeDefinition ---@return Node function Node:getExtended(defaultDef) - defaultDef = defMerge(defaultDef, self.defaultDef) + defaultDef = defMerge(defaultDef, self.defaultDef, true) ---@type Node local ChildClass = Class.extend(self, { @@ -46,7 +46,7 @@ function Node:getFactory(defaultDef) if defaultDef == nil then defaultDef = self.defaultDef else - defaultDef = defMerge(self.defaultDef, defaultDef) + defaultDef = defMerge(self.defaultDef, defaultDef, true) end ---@type ItemFactory diff --git a/mods/CORE/Tool/src/Tool.lua b/mods/CORE/Tool/src/Tool.lua index fae22f2..4f7dfe0 100644 --- a/mods/CORE/Tool/src/Tool.lua +++ b/mods/CORE/Tool/src/Tool.lua @@ -29,7 +29,7 @@ end ---@param defaultDef Item.ItemDefinition ---@return Tool function Tool:getExtended(defaultDef) - defaultDef = defMerge(defaultDef, self.defaultDef) + defaultDef = defMerge(defaultDef, self.defaultDef, true) ---@type Tool local ChildClass = Class.extend(self, { @@ -46,7 +46,7 @@ function Tool:getFactory(defaultDef) if defaultDef == nil then defaultDef = self.defaultDef else - defaultDef = defMerge(self.defaultDef, defaultDef) + defaultDef = defMerge(self.defaultDef, defaultDef, true) end ---@type ItemFactory