enhance: only create a new game when necessary

HasangerGames · Jul 4, 2023 · dbb40ae · dbb40ae
1 parent c220a2e
commit dbb40ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/server/src/game.ts b/server/src/game.ts
@@ -10,7 +10,7 @@ import {
 } from "planck";
 import type { WebSocket } from "uWebSockets.js";
 
-import { createNewGame, endGame, type PlayerContainer } from "./server";
+import { allowJoin, createNewGame, endGame, type PlayerContainer } from "./server";
 import { Map } from "./map";
 
 import { Player } from "./objects/player";
@@ -415,7 +415,8 @@ export class Game {
                 this.over = true;
                 setTimeout(() => {
                     endGame(this.id); // End this game
-                    createNewGame(this.id); // Create a new game
+                    const otherID = this.id === 0 ? 1 : 0;
+                    if (!allowJoin(otherID)) createNewGame(this.id); // Create a new game if the other game isn't allowing players to join
                 }, 1000);
             }
 

diff --git a/server/src/server.ts b/server/src/server.ts
@@ -67,7 +67,7 @@ export function endGame(id: number): void {
     log(`Game #${id} ended`);
 }
 
-function allowJoin(gameID: number): boolean {
+export function allowJoin(gameID: number): boolean {
     return Boolean(games[gameID]?.allowJoin);
 }