aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 11:35:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix to loading modules inside threads

Browse Source
This commit is contained in:
Cooldude2606
2018-10-25 15:36:54 +01:00
parent 5b9a55113c
commit e0d69f63b0
3 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/ExpGamingCore/Server/control.lua
View File

@@ -271,8 +271,11 @@ function Server._thread:create(obj)
local obj = obj or {}
setmetatable(obj,{__index=Server._thread})
obj.uuid = tostring(Server.uuid)
obj._env = get_env()
obj._env.obj = nil -- provents infinte recusion
obj._env = get_upvalues(2)
obj._env._modules = {}
for name,value in pairs(obj._env) do if value._module_name and loaded_modules[value._module_name] == value then obj._env._modules[name] = value._module_name obj._env[name] = nil end end
obj._env._env = true
obj._env._ENV = nil -- provents infinte recusion
local name = obj.name or 'Anon'
verbose('Created new thread: '..name..' ('..obj.uuid..')')
return obj
@@ -480,7 +483,7 @@ end)
script.on_event(-2,function(event)
-- sets up metatable again so that threads contiune to work
for uuid,thread in pairs(Server.threads) do setmetatable(thread,{__index=Server._thread}) end
for uuid,thread in pairs(Server.threads) do setmetatable(thread,{__index=Server._thread}) setmetatable(thread._env,{__index=function(tbl,key) if rawget(tbl,'_modules') and tbl._modules[key] then return require(tbl._modules[key]) end end}) end
end)
function Server:on_init()

21
modules/ExpGamingLib/control.lua
View File

@@ -28,11 +28,11 @@ function ExpLib.get_env(level)
local level = level and level+1 or 2
local env = setmetatable({},{__index=_G})
while true do
if not debug.getinfo(level) or debug.getinfo(level).namewhat == 'global' then break end
if not debug.getinfo(level) then break end
local i = 1
while true do
local name, value = debug.getlocal(level,i)
if not name then break else env[name] = value end
if not name or _G[name] == value then break else env[name] = value end
i=i+1
end
level=level+1
@@ -40,6 +40,23 @@ function ExpLib.get_env(level)
return env
end
--- Used to get the current ENV with all _G keys removed; useful when saving function to global
-- @usage get_env() returns current ENV with _G keys removed
-- @treturn table the env table with _G keys removed
-- @warning does not work from console
function ExpLib.get_upvalues(level)
local level = level and level+1 or 2
local func = debug.getinfo(level).func
local upvalues = setmetatable({},{__index=_G})
local i = 1
while true do
local name, value = debug.getupvalue(func,i)
if not name then break else upvalues[name] = value end
i=i+1
end
return upvalues
end
--- Creats a table that will act like a string and a function
-- @usage add_metatable({},function) -- returns table
-- @tparam table tbl the table that will have its metatable set