Oliver/Secret-Hitler-Online-Server
0
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Convert game existence check to not use Object.keys

Browse source
This commit is contained in:
Oliver-Akins 2020-10-09 16:22:42 -06:00
parent d0ed987876
commit 893d139dec
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/events/GetPlayerList.ts
View file

@ -10,7 +10,7 @@ import { active_games } from '../main';
export const GetPlayerList = (io: Server, socket: Socket, data: GetPlayerList) => { export const GetPlayerList = (io: Server, socket: Socket, data: GetPlayerList) => {
try { try {
if (!Object.keys(active_games).includes(data.game_code)) { if (active_games[data.game_code] == null) {
socket.emit(`PlayerList`, { socket.emit(`PlayerList`, {
success: false, success: false,
message: `Error: ${data.game_code} does not have an active game object.`, message: `Error: ${data.game_code} does not have an active game object.`,

2
src/events/HostGame.ts
View file

@ -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 // Get a game code that is not in use to prevent join conflicts
let game_code = generate_game_code(); 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(); game_code = generate_game_code();
} }

2
src/events/JoinGame.ts
View file

@ -13,7 +13,7 @@ import { active_games, log } from '../main';
export const JoinGame = (io: Server, socket: Socket, data: JoinGame) => { export const JoinGame = (io: Server, socket: Socket, data: JoinGame) => {
try { try {
// Check if it's an active game // 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}`); log.debug(`Can't find an active game with code: ${data.game_code}`);
socket.emit(`GameJoined`, { socket.emit(`GameJoined`, {
success: false, success: false,

2
src/events/KickPlayer.ts
View file

@ -14,7 +14,7 @@ import { active_games, log } from '../main';
export const KickPlayer = (io: Server, socket: Socket, data: KickPlayer) => { export const KickPlayer = (io: Server, socket: Socket, data: KickPlayer) => {
try { try {
// Check if it's an active game // 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}`); log.debug(`Can't find an active game with code: ${data.game_code}`);
socket.emit(`PlayerKicked`, { socket.emit(`PlayerKicked`, {
success: false, success: false,