From 5bd2c871908fc0ec11edf729ee3a611d0767c98e Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Wed, 7 Aug 2019 13:27:45 -0700
Subject: [PATCH] Properly clear timer in nextRequest

---
 server/room-battle.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/room-battle.js b/server/room-battle.js
index 3a843c088a..a6a6fa7b57 100644
--- a/server/room-battle.js
+++ b/server/room-battle.js
@@ -256,7 +256,10 @@ class RoomBattleTimer {
 		return true;
 	}
 	nextRequest() {
-		if (this.timer) clearTimeout(this.timer);
+		if (this.timer) {
+			clearTimeout(this.timer);
+			this.timer = null;
+		}
 		if (!this.timerRequesters.size) return;
 		const players = this.battle.players;
 		if (players.some(player => player.secondsLeft <= 0)) return;