CraftSystem: first working version #31

Merged
varttist merged 27 commits from craft-system into main 2026-02-18 19:30:39 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit f2af5e725a - Show all commits

View File

@@ -193,7 +193,7 @@ end
---@param defaultDef Item.ItemDefinition
---@return Item
function Item:getExtended(defaultDef)
defaultDef = defMerge(self.defaultDef, defaultDef)
defaultDef = defMerge(defaultDef, self.defaultDef)
---@type Item
local ChildClass = extend(self, {

View File

@@ -35,7 +35,7 @@ end
---@param defaultDef Node.NodeDefinition
---@return Node
function Node:getExtended(defaultDef)
defaultDef = defMerge(self.defaultDef, defaultDef)
defaultDef = defMerge(defaultDef, self.defaultDef)
---@type Node
local ChildClass = Class.extend(self, {