From ec8499ff763e2a61f3adfa394fd95d03ae19554c Mon Sep 17 00:00:00 2001 From: Vanic Date: Mon, 9 Feb 2026 18:15:22 +0300 Subject: [PATCH] `Item` & `Node`: add merge defaults defs to `getExtended` and `getFactory` --- mods/CORE/Item/src/Item.lua | 4 ++++ mods/CORE/Node/src/Node.lua | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mods/CORE/Item/src/Item.lua b/mods/CORE/Item/src/Item.lua index 01b30c0..30d7559 100644 --- a/mods/CORE/Item/src/Item.lua +++ b/mods/CORE/Item/src/Item.lua @@ -193,6 +193,8 @@ end ---@param defaultDef Item.ItemDefinition ---@return Item function Item:getExtended(defaultDef) + defaultDef = defMerge(self.defaultDef, defaultDef) + ---@type Item local ChildClass = extend(self, { defaultDef = defaultDef, @@ -207,6 +209,8 @@ end function Item:getFactory(defaultDef) if defaultDef == nil then defaultDef = self.defaultDef + else + defaultDef = defMerge(self.defaultDef, defaultDef) end ---@type ItemFactory diff --git a/mods/CORE/Node/src/Node.lua b/mods/CORE/Node/src/Node.lua index d6ac38d..41cfec9 100644 --- a/mods/CORE/Node/src/Node.lua +++ b/mods/CORE/Node/src/Node.lua @@ -35,6 +35,8 @@ end ---@param defaultDef Node.NodeDefinition ---@return Node function Node:getExtended(defaultDef) + defaultDef = defMerge(self.defaultDef, defaultDef) + ---@type Node local ChildClass = Class.extend(self, { defaultDef = defaultDef, @@ -49,6 +51,8 @@ end function Node:getFactory(defaultDef) if defaultDef == nil then defaultDef = self.defaultDef + else + defaultDef = defMerge(self.defaultDef, defaultDef) end ---@type ItemFactory @@ -57,4 +61,4 @@ function Node:getFactory(defaultDef) return instance end -return Node \ No newline at end of file +return Node