From 4581364afdf316fe9768e79414a1238edbec7049 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 3 Feb 2018 21:57:58 -0600 Subject: [PATCH] mso suggested remedy --- code/controllers/subsystem/timer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index fbe681d0d4..6bf63130d9 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -458,7 +458,7 @@ SUBSYSTEM_DEF(timer) if (wait >= 1 && callback && callback.object && callback.object != GLOBAL_PROC && QDELETED(callback.object)) stack_trace("addtimer called with a callback assigned to a qdeleted object") - wait = max(wait, 0) + wait = max(wait, world.tick_lag) if(wait >= INFINITY) CRASH("Attempted to create timer with INFINITY delay")