fix(gameplaymanager): precountdown being counted in games other than …

…first
tetrjs · Aug 11, 2021 · 1bc2a3b · 1bc2a3b
1 parent 02ded93
commit 1bc2a3b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/gameplay/GameplayManager.ts b/src/gameplay/GameplayManager.ts
@@ -20,7 +20,7 @@ export default class GameplayManager extends EventEmitter {
         this.started = new Date();
 
         this.start();
-      }, (this.options.countdown ? this.options.countdown_count * this.options.countdown_interval : 0) + this.options.precountdown + this.options.prestart);
+      }, (this.options.countdown ? this.options.countdown_count * this.options.countdown_interval : 0) + (this.first ? this.options.precountdown : 0) + this.options.prestart);
     });
   }
 
@@ -78,7 +78,7 @@ export default class GameplayManager extends EventEmitter {
 
   public currentFrame() {
     if (!this.started) this.started = new Date();
-    return ((new Date().getTime() - this.started.getTime()) / 1000) * 60;
+    return Math.round(((new Date().getTime() - this.started.getTime()) / 1000) * 60);
   }
 
   public async inGameEvent(data: any) {
@@ -284,6 +284,7 @@ export default class GameplayManager extends EventEmitter {
             const currentFrame = this.currentFrame();
 
             const sendFrames: (KeyEvent | StartEvent | Targets | InGameEvent)[] = [];
+            console.log(this.nextFrames);
             for (const [i, frame] of this.nextFrames.entries()) {
               if (frame.frame < currentFrame) sendFrames.push(...this.nextFrames.splice(i, 1));
             }

diff --git a/src/websocket/WebSocketManager.ts b/src/websocket/WebSocketManager.ts
@@ -107,7 +107,7 @@ export default class WebSocketManager {
    */
   public send_packet(data: any): void {
     // console.log("Client:", data);
-    // fs.appendFile("./send.log", `[${new Date().toString()}] ${JSON.stringify(data)}\n`, () => {
+    // fs.appendFile("./send.log", `[O ${new Date().toString()}] ${JSON.stringify(data)}\n`, () => {
     //   return;
     // });
 
@@ -190,6 +190,9 @@ export default class WebSocketManager {
     }
 
     // console.log("Server:", packet);
+    // fs.appendFile("./send.log", `[I ${new Date().toString()}] ${JSON.stringify(packet)}\n`, () => {
+    //   return;
+    // });
 
     const message = this.messages.get(packet.data.command);