aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 04:51:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

Removed pcall in place of sandbox in Server

Browse Source
This commit is contained in:
Cooldude2606
2018-12-30 23:06:52 +00:00
parent 2ca1f57946
commit f0b1f51c0b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ function Server.run_tick_threads()
table.each(global.tick,function(uuid) table.each(global.tick,function(uuid)
local next_thread = Server.get_thread(uuid) local next_thread = Server.get_thread(uuid)
if next_thread and next_thread:valid() and next_thread._tick then if next_thread and next_thread:valid() and next_thread._tick then
local success, err = pcall(next_thread._tick,next_thread) local success, err = Manager.sandbox(next_thread._tick,next_thread._env,next_thread)
if not success then next_thread:error(err) end if not success then next_thread:error(err) end
end end
end) end)
@@ -361,7 +361,7 @@ function Server._thread:close()
local uuid = self.uuid local uuid = self.uuid
local _return = false local _return = false
-- if there is a call to the threads on close event, will later return true -- if there is a call to the threads on close event, will later return true
if is_type(self._close,'function') then pcall(self._close,self) _return = true end if is_type(self._close,'function') then Manager.sandbox(self._close,self._env,self) _return = true end
-- will search every possible location for this thread and remove it -- will search every possible location for this thread and remove it
local value,key = table.find(global.queue,function(v,k,uuid) return v == uuid end,uuid) local value,key = table.find(global.queue,function(v,k,uuid) return v == uuid end,uuid)
if key then table.remove(global.queue,key) end -- queue if key then table.remove(global.queue,key) end -- queue
@@ -449,7 +449,7 @@ end
function Server._thread:error(err) function Server._thread:error(err)
local _return = false local _return = false
if is_type(self._error,'function') then if is_type(self._error,'function') then
pcall(self._error,self,err) Manager.sandbox(self._error,self._env,self,err)
_return = true _return = true
else error(err) end else error(err) end
return _return return _return

1
modules/ExpGamingPlayer/afkKick/src/server.lua
View File

@@ -1,6 +1,7 @@
local Sync = Sync local Sync = Sync
local get_allowed_afk_time = self local get_allowed_afk_time = self
local Server = require('ExpGamingCore.Server') local Server = require('ExpGamingCore.Server')
local Color = require('FactorioStdLib.Color')
Event[defines.events.on_tick] = nil Event[defines.events.on_tick] = nil
script.on_init(function(event) script.on_init(function(event)