diff --git a/mods/SYSTEM/Class/init.lua b/mods/SYSTEM/Class/init.lua index 7eeeea4..6bf2726 100644 --- a/mods/SYSTEM/Class/init.lua +++ b/mods/SYSTEM/Class/init.lua @@ -1,4 +1,4 @@ -local setMetaTable, tableCopy = setmetatable, table.copy_with_metatables +local tableMerge, setmetatable, tableCopy = table.merge, setmetatable, table.copy_with_metatables ---@class Class Class = {} @@ -7,7 +7,7 @@ Class = {} ---@param parent table ---@param child table? function Class.extend(parent, child) - return setMetaTable(child or {}, { __index = tableCopy(parent) }) + return tableMerge(child or {}, tableCopy(parent)) end ---Intended for class constructors. @@ -25,7 +25,7 @@ function Class.getInstance(self, params, metatable) metatable.__index = tableCopy(self) - local instance = setMetaTable(params, metatable) + local instance = setmetatable(params, metatable) return instance end \ No newline at end of file diff --git a/mods/SYSTEM/Class/mod.conf b/mods/SYSTEM/Class/mod.conf index 923d467..15d74bf 100644 --- a/mods/SYSTEM/Class/mod.conf +++ b/mods/SYSTEM/Class/mod.conf @@ -1 +1,2 @@ name = smc__system__class +depends = smc__system__table