Git_Mirror/Werewolf
1
0
Fork 0
mirror of https://github.com/AlecM33/Werewolf.git synced 2025-12-26 07:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

display current moderator, fix assignment of spectator

Browse Source
This commit is contained in:
AlecM33
2023-04-01 23:49:21 -04:00
parent daf2fe781f
commit a26b405ffa
8 changed files with 75 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/Events.js
View File

@@ -96,7 +96,7 @@ const Events = [
communicate: async (game, socketArgs, vars) => {
const person = game.people.find((person) => person.id === socketArgs.personId);
if (person) {
vars.gameManager.namespace.in(game.accessCode).emit(globals.EVENT_IDS.KILL_PLAYER, person.id);
vars.gameManager.namespace.in(game.accessCode).emit(globals.EVENT_IDS.KILL_PLAYER, person);
}
}
},
@@ -189,9 +189,9 @@ const Events = [
const moderatorSocket = vars.gameManager.namespace.sockets.get(moderator?.socketId);
if (moderator && moderatorSocket) {
vars.gameManager.namespace.to(moderator.socketId).emit(globals.EVENTS.SYNC_GAME_STATE);
moderatorSocket.to(game.accessCode).emit(globals.EVENT_IDS.KILL_PLAYER, game.currentModeratorId);
moderatorSocket.to(game.accessCode).emit(globals.EVENT_IDS.KILL_PLAYER, moderator);
} else {
vars.gameManager.namespace.in(game.accessCode).emit(globals.EVENT_IDS.KILL_PLAYER, game.currentModeratorId);
vars.gameManager.namespace.in(game.accessCode).emit(globals.EVENT_IDS.KILL_PLAYER, moderator);
}
const previousModerator = vars.gameManager.findPersonByField(game, 'id', game.previousModeratorId);
if (previousModerator && previousModerator.id !== moderator.id && vars.gameManager.namespace.sockets.get(previousModerator.socketId)) {

2
server/modules/ServerBootstrapper.js
View File

@@ -140,7 +140,7 @@ const ServerBootstrapper = {
app.use('', router);
app.use('/dist', (req, res, next) => {
if (req.url !== '/521-bundle.js') { // this is the bundled web worker, which was introducing compatibility problems with webpack compression.
if (req.url.includes('.js.gz')) {
res.set('Content-Encoding', 'gzip');
}
next();

1
server/modules/singletons/GameManager.js
View File

@@ -393,6 +393,7 @@ async function addSpectator (game, name, logger, namespace, eventManager, instan
name,
globals.USER_TYPES.SPECTATOR
);
spectator.assigned = true;
logger.trace('new spectator: ' + spectator.name);
game.people.push(spectator);
await refreshGame(game);