Fixed unsupported elements from session
Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
This commit is contained in:
parent
ffb9bfe524
commit
aa08ae9d5a
@ -2928,6 +2928,9 @@ const sendToPlayers = async (game, update) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const getFilteredUnselected = (game) => {
|
const getFilteredUnselected = (game) => {
|
||||||
|
if (!game.unselected) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
return game.unselected
|
return game.unselected
|
||||||
.filter(session => session.live)
|
.filter(session => session.live)
|
||||||
.map(session => session.name);
|
.map(session => session.name);
|
||||||
@ -3154,11 +3157,16 @@ router.ws("/ws/:id", async (ws, req) => {
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (field in game) {
|
if (field in game) {
|
||||||
console.warn(`WARNING: Requested GET not-privatized field: ${field}`);
|
console.warn(`WARNING: Requested GET not-privatized/sanitized field: ${field}`);
|
||||||
update[field] = game.field;
|
update[field] = game.field;
|
||||||
|
} else {
|
||||||
|
if (field in session) {
|
||||||
|
console.warn(`WARNING: Requested GET not-sanitized field: ${field}`);
|
||||||
|
update[field] = session.field;
|
||||||
} else {
|
} else {
|
||||||
console.warn(`WARNING: Requested GET unsupported field: ${field}`);
|
console.warn(`WARNING: Requested GET unsupported field: ${field}`);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -3570,15 +3578,15 @@ const resetGame = (game) => {
|
|||||||
tileOrder: game.tileOrder,
|
tileOrder: game.tileOrder,
|
||||||
signature: game.signature,
|
signature: game.signature,
|
||||||
players: game.players,
|
players: game.players,
|
||||||
stolen: {}
|
stolen: {},
|
||||||
|
longestRoad: undefined,
|
||||||
|
longestRoadLength: 0,
|
||||||
|
largestArmy: undefined,
|
||||||
|
largestArmySize: 0,
|
||||||
|
winner: undefined,
|
||||||
|
longestRoad: undefined
|
||||||
});
|
});
|
||||||
|
|
||||||
delete game.longestRoad;
|
|
||||||
delete game.largestArmy;
|
|
||||||
delete game.longestRoadLength;
|
|
||||||
delete game.winner;
|
|
||||||
delete game.longestRoad;
|
|
||||||
|
|
||||||
/* Reset all player data */
|
/* Reset all player data */
|
||||||
for (let color in game.players) {
|
for (let color in game.players) {
|
||||||
clearPlayer(game.players[color]);
|
clearPlayer(game.players[color]);
|
||||||
@ -3663,7 +3671,9 @@ const createGame = (id) => {
|
|||||||
R: newPlayer(),
|
R: newPlayer(),
|
||||||
B: newPlayer(),
|
B: newPlayer(),
|
||||||
W: newPlayer()
|
W: newPlayer()
|
||||||
}
|
},
|
||||||
|
sessions: {},
|
||||||
|
unselected: []
|
||||||
};
|
};
|
||||||
|
|
||||||
[ "pips", "borders", "tiles" ].forEach((field) => {
|
[ "pips", "borders", "tiles" ].forEach((field) => {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user