From 893d139dece09d95e9b52b1de89621ae917a7287 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Fri, 9 Oct 2020 16:22:42 -0600 Subject: [PATCH] Convert game existence check to not use Object.keys --- src/events/GetPlayerList.ts | 2 +- src/events/HostGame.ts | 2 +- src/events/JoinGame.ts | 2 +- src/events/KickPlayer.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/events/GetPlayerList.ts b/src/events/GetPlayerList.ts index 044196a..1abb48d 100644 --- a/src/events/GetPlayerList.ts +++ b/src/events/GetPlayerList.ts @@ -10,7 +10,7 @@ import { active_games } from '../main'; export const GetPlayerList = (io: Server, socket: Socket, data: GetPlayerList) => { try { - if (!Object.keys(active_games).includes(data.game_code)) { + if (active_games[data.game_code] == null) { socket.emit(`PlayerList`, { success: false, message: `Error: ${data.game_code} does not have an active game object.`, diff --git a/src/events/HostGame.ts b/src/events/HostGame.ts index def9763..954a65b 100644 --- a/src/events/HostGame.ts +++ b/src/events/HostGame.ts @@ -21,7 +21,7 @@ export const HostGame = (io: Server, socket: Socket, data: HostGame) => { // Get a game code that is not in use to prevent join conflicts let game_code = generate_game_code(); - while (Object.keys(active_games).includes(game_code)) { + while (active_games[game_code] != null) { game_code = generate_game_code(); } diff --git a/src/events/JoinGame.ts b/src/events/JoinGame.ts index a330904..8cac21d 100644 --- a/src/events/JoinGame.ts +++ b/src/events/JoinGame.ts @@ -13,7 +13,7 @@ import { active_games, log } from '../main'; export const JoinGame = (io: Server, socket: Socket, data: JoinGame) => { try { // Check if it's an active game - if (!Object.keys(active_games).includes(data.game_code)) { + if (active_games[data.game_code] == null) { log.debug(`Can't find an active game with code: ${data.game_code}`); socket.emit(`GameJoined`, { success: false, diff --git a/src/events/KickPlayer.ts b/src/events/KickPlayer.ts index 9a261bd..fdcbde8 100644 --- a/src/events/KickPlayer.ts +++ b/src/events/KickPlayer.ts @@ -14,7 +14,7 @@ import { active_games, log } from '../main'; export const KickPlayer = (io: Server, socket: Socket, data: KickPlayer) => { try { // Check if it's an active game - if (!Object.keys(active_games).includes(data.game_code)) { + if (active_games[data.game_code] == null) { log.debug(`Can't find an active game with code: ${data.game_code}`); socket.emit(`PlayerKicked`, { success: false,