Fix run issues

vck3000 · Feb 11, 2024 · ae500a9 · ae500a9
1 parent 3a5dd28
commit ae500a9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/gameplay/commonPhases/pickingTeam.js b/src/gameplay/commonPhases/pickingTeam.js
@@ -1,5 +1,6 @@
 import usernamesIndexes from '../../myFunctions/usernamesIndexes';
 import Phase from '../avalon/phases/phases';
+import { MIN_PLAYERS } from '../game';
 
 function PickingTeam(thisRoom_) {
   this.thisRoom = thisRoom_;
@@ -39,7 +40,7 @@ PickingTeam.prototype.gameMove = function (
 
     let num =
       this.thisRoom.numPlayersOnMission[
-        this.thisRoom.playersInGame.length - this.thisRoom.minPlayers
+        this.thisRoom.playersInGame.length - MIN_PLAYERS
       ][this.thisRoom.missionNum - 1];
     // console.log("Num player for this.thisRoom mission : " + num);
 
@@ -135,7 +136,7 @@ PickingTeam.prototype.buttonSettings = function (indexOfPlayer) {
 PickingTeam.prototype.numOfTargets = function (indexOfPlayer) {
   let num =
     this.thisRoom.numPlayersOnMission[
-      this.thisRoom.playersInGame.length - this.thisRoom.minPlayers
+      this.thisRoom.playersInGame.length - MIN_PLAYERS
     ][this.thisRoom.missionNum - 1];
   // console.log("Num player for this.thisRoom mission : " + num);
 
@@ -161,7 +162,7 @@ PickingTeam.prototype.getStatusMessage = function (indexOfPlayer) {
   ) {
     const num =
       this.thisRoom.numPlayersOnMission[
-        this.thisRoom.playersInGame.length - this.thisRoom.minPlayers
+        this.thisRoom.playersInGame.length - MIN_PLAYERS
       ][this.thisRoom.missionNum - 1];
 
     return `Your turn to pick a team. Pick ${num} players.`;

diff --git a/src/gameplay/game.ts b/src/gameplay/game.ts
@@ -17,7 +17,7 @@ import { gameModeObj } from './gameModes';
 import Phase from './avalon/phases/phases';
 
 export const WAITING = 'Waiting';
-const MIN_PLAYERS = 5;
+export const MIN_PLAYERS = 5;
 
 class Game extends Room {
   gameStarted = false;

diff --git a/src/gameplay/room.ts b/src/gameplay/room.ts
@@ -3,6 +3,7 @@ import { AVALON, AVALON_BOT, GAME_MODE_NAMES, gameModeObj } from './gameModes';
 import commonPhasesIndex from './indexCommonPhases';
 import usernamesIndexes from '../myFunctions/usernamesIndexes';
 import { SocketUser } from '../sockets/types';
+import { MIN_PLAYERS } from './game';
 
 class Room {
   host: string;
@@ -656,7 +657,7 @@ class Room {
 
     if (this.canJoin === true) {
       // check before starting
-      if (this.socketsOfPlayers.length < this.minPlayers) {
+      if (this.socketsOfPlayers.length < MIN_PLAYERS) {
         // NEED AT LEAST FIVE PLAYERS, SHOW ERROR MESSAGE BACK
         // console.log("Not enough players.");
         this.socketsOfPlayers[0].emit(

diff --git a/src/sockets/sockets.ts b/src/sockets/sockets.ts
@@ -143,6 +143,10 @@ setTimeout(async () => {
         .skip(i)
         .limit(1)
         .exec((err, foundSaveGameArr) => {
+          if (!foundSaveGameArr || foundSaveGameArr.length === 0) {
+            run = false;
+            return;
+          }
           const foundSaveGame = foundSaveGameArr[0];
 
           if (foundSaveGame && foundSaveGame.room) {