AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 01:39:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers

Browse Source
This commit is contained in:
Florian Nücke 2014-08-25 22:04:27 +02:00
commit cc9c38c16d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/resources/assets/opencomputers/loot/OpenOS/lib/process.lua
View File

@ -7,7 +7,10 @@ local coroutine_create = coroutine.create
local function findProcess(co) local function findProcess(co)
co = co or coroutine.running() co = co or coroutine.running()
for _, process in pairs(running) do for main, process in pairs(running) do
if main == co then
return process
end
for _, instance in pairs(process.instances) do for _, instance in pairs(process.instances) do
if instance == co then if instance == co then
return process return process
@ -62,7 +65,7 @@ function process.load(path, env, init, name)
command = name, command = name,
env = env, env = env,
parent = process, parent = process,
instances = setmetatable({thread}, {__mode="v"}) instances = setmetatable({}, {__mode="v"})
} }
return thread return thread
end end
@ -95,7 +98,7 @@ function process.install(path, name)
path = path, path = path,
command = name, command = name,
env = _ENV, env = _ENV,
instances = setmetatable({thread}, {__mode="v"}) instances = setmetatable({}, {__mode="v"})
} }
end end

2
src/main/resources/assets/opencomputers/lua/kernel.lua
View File

@ -469,7 +469,7 @@ end
local libcomponent local libcomponent
local proxyCache = setmetatable({}, {__mode="v"}) local proxyCache = setmetatable({}, {__mode="v"})
local proxyDirectCache = setmetatable({}, {__mode="v"}) local proxyDirectCache = setmetatable({}, {__mode="k"})
local componentCallback = { local componentCallback = {
__call = function(self, ...) __call = function(self, ...)