Fix merge items settings
This commit is contained in:
@@ -129,7 +129,7 @@ local function itemDefToLuantiDef(itemDef)
|
|||||||
s._description = description
|
s._description = description
|
||||||
s.description = luantiDescription..core.get_background_escape_sequence('#110F13')
|
s.description = luantiDescription..core.get_background_escape_sequence('#110F13')
|
||||||
|
|
||||||
local luantiDef = defMerge(s, c)
|
local luantiDef = defMerge(s, c, true)
|
||||||
|
|
||||||
return luantiDef
|
return luantiDef
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ end
|
|||||||
---@param defaultDef Node.NodeDefinition
|
---@param defaultDef Node.NodeDefinition
|
||||||
---@return Node
|
---@return Node
|
||||||
function Node:getExtended(defaultDef)
|
function Node:getExtended(defaultDef)
|
||||||
defaultDef = defMerge(defaultDef, self.defaultDef)
|
defaultDef = defMerge(defaultDef, self.defaultDef, true)
|
||||||
|
|
||||||
---@type Node
|
---@type Node
|
||||||
local ChildClass = Class.extend(self, {
|
local ChildClass = Class.extend(self, {
|
||||||
@@ -46,7 +46,7 @@ function Node:getFactory(defaultDef)
|
|||||||
if defaultDef == nil then
|
if defaultDef == nil then
|
||||||
defaultDef = self.defaultDef
|
defaultDef = self.defaultDef
|
||||||
else
|
else
|
||||||
defaultDef = defMerge(self.defaultDef, defaultDef)
|
defaultDef = defMerge(self.defaultDef, defaultDef, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@type ItemFactory
|
---@type ItemFactory
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ end
|
|||||||
---@param defaultDef Item.ItemDefinition
|
---@param defaultDef Item.ItemDefinition
|
||||||
---@return Tool
|
---@return Tool
|
||||||
function Tool:getExtended(defaultDef)
|
function Tool:getExtended(defaultDef)
|
||||||
defaultDef = defMerge(defaultDef, self.defaultDef)
|
defaultDef = defMerge(defaultDef, self.defaultDef, true)
|
||||||
|
|
||||||
---@type Tool
|
---@type Tool
|
||||||
local ChildClass = Class.extend(self, {
|
local ChildClass = Class.extend(self, {
|
||||||
@@ -46,7 +46,7 @@ function Tool:getFactory(defaultDef)
|
|||||||
if defaultDef == nil then
|
if defaultDef == nil then
|
||||||
defaultDef = self.defaultDef
|
defaultDef = self.defaultDef
|
||||||
else
|
else
|
||||||
defaultDef = defMerge(self.defaultDef, defaultDef)
|
defaultDef = defMerge(self.defaultDef, defaultDef, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@type ItemFactory
|
---@type ItemFactory
|
||||||
|
|||||||
Reference in New Issue
Block a user