Merge branch 'core'

This commit is contained in:
Cooldude2606
2018-02-12 12:04:49 +00:00
3 changed files with 3 additions and 2 deletions

View File

@@ -157,7 +157,7 @@ function Gui.cam_link(data)
end
Event.register(defines.events.on_tick, function(event)
if (event.tick/(3600*game.speed)) % 15 == 0 then
if gui.left and ((event.tick+10)/(3600*game.speed)) % 15 == 0 then
Gui.left.update()
end
if Gui._global().cams and is_type(Gui._global().cams,'table') and #Gui._global().cams > 0 then

View File

@@ -347,7 +347,7 @@ Event.register(-1,function(event)
end)
Event.register(defines.events.on_tick,function(event)
if ((event.tick/(3600*game.speed))+(15/2))% 15 == 0 then
if (((event.tick+10)/(3600*game.speed))+(15/2))% 15 == 0 then
-- this is the system to auto rank players
if not Server or not Server._thread then
for _,player in pairs(game.connected_players) do

View File

@@ -374,6 +374,7 @@ function Server._thread:on_event(event,callback)
end
Event.register(defines.events.on_tick,function(event)
if event.tick < 10 then return end
local threads = Server._threads()
if #threads.tick > 0 then Server.run_tick_threads() end
if #threads.timeout > 0 then Server.check_timeouts() end