bump version number; fix: game never starts after a player joins & le…

…aves; edge case causing "Game in progress" to appear; enhance: improve gas debug mode
HasangerGames · Jul 4, 2023 · c220a2e · c220a2e
1 parent a8de6a1
commit c220a2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "suroi",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "An open-source 2D battle royale game inspired by surviv.io",
   "private": true,
   "scripts": {

diff --git a/server/src/game.ts b/server/src/game.ts
@@ -413,11 +413,10 @@ export class Game {
                 // End the game in 1 second
                 this.allowJoin = false;
                 this.over = true;
-                setTimeout(() => endGame(this.id), 1000);
-
-                // Create a new game
-                const id = this.id === 0 ? 1 : 0;
-                createNewGame(id);
+                setTimeout(() => {
+                    endGame(this.id); // End this game
+                    createNewGame(this.id); // Create a new game
+                }, 1000);
             }
 
             // Record performance and start the next tick
@@ -524,7 +523,10 @@ export class Game {
                 console.error("Error destroying player body. Details: ", e);
             }
         }
-        if (this.aliveCount < 2) clearTimeout(this.startTimeoutID);
+        if (this.aliveCount < 2) {
+            clearTimeout(this.startTimeoutID);
+            this.startTimeoutID = undefined;
+        }
         try {
             player.socket.close();
         } catch (e) { }
@@ -607,7 +609,7 @@ export class Game {
         if (currentStage.state === GasState.Waiting) {
             this.gas.oldPosition = vClone(this.gas.newPosition);
             if (currentStage.newRadius !== 0) {
-                this.gas.newPosition = randomPointInsideCircle(this.gas.oldPosition, currentStage.oldRadius - currentStage.newRadius);
+                this.gas.newPosition = Config.gas.mode !== GasMode.Debug ? randomPointInsideCircle(this.gas.oldPosition, currentStage.oldRadius - currentStage.newRadius) : v(360, 360);
             } else {
                 this.gas.newPosition = vClone(this.gas.oldPosition);
             }