Merge remote-tracking branch 'refs/remotes/origin/devTestBranch'

GoldWars/GoldWars/RoundTimer.swift

@@ -13,6 +13,7 @@ class RoundTimer: Timer {
     var timer: Timer?
     var timeLeft: Int = 0
     var isHeartbeatLocked = false
+    var isTimerStopped = false
     var calculate = false
     var roundEnded = "Syncing"
     
@@ -31,23 +32,16 @@ class RoundTimer: Timer {
     }
     
     func stopTimer() {
-        guard timer != nil else { return }
+        isTimerStopped = true
-        timer?.invalidate()
-        timer = nil
     }
     
     func resumeTimer() {
-        timer = Timer.scheduledTimer(
+        isTimerStopped = false
-            timeInterval: 1.0,
-            target: self,
-            selector: #selector(onTimerFires),
-            userInfo: nil,
-            repeats: true
-        )
     }
     
     @objc func onTimerFires()
     {
+        if !isTimerStopped {
             timeLeft -= 1
             EntityManager.gameEMInstance.updateTime(time: (timeLeft > 0 ? String(timeLeft) : roundEnded))
             
@@ -75,4 +69,5 @@ class RoundTimer: Timer {
                 isHeartbeatLocked = true;
             }
         }
+    }
 }