diff --git a/src/servers/CNShardServer.cpp b/src/servers/CNShardServer.cpp index 036df15..0c97c9f 100644 --- a/src/servers/CNShardServer.cpp +++ b/src/servers/CNShardServer.cpp @@ -115,6 +115,10 @@ void CNShardServer::kill() { void CNShardServer::onStep() { time_t currTime = getTime(); + // do not evaluate timers if the server is shutting down + if (!active) + return; + for (TimerEvent& event : Timers) { if (event.scheduledEvent == 0) { // event hasn't been queued yet, go ahead and do that