diff --git a/lib/game/server/installer.js b/lib/game/server/installer.js index 23f25238..4eb1c883 100644 --- a/lib/game/server/installer.js +++ b/lib/game/server/installer.js @@ -54,8 +54,8 @@ class Installer } } )); - // @NOTE: do not use session secret like this in the app, it is not secure. - // Include "secure: true" for that case (that only works through SSL): + // @IMPORTANT: do not use session secret like this in the app, it is not secure. + // @NOTE: Include "secure: true" for that case (that only works through SSL). // app.use(session({secret: this.secretKey, resave: true, saveUninitialized: true, cookie: {secure: true}})); app.use(session({secret: this.secretKey, resave: true, saveUninitialized: true})); app.use(async (req, res, next) => { diff --git a/lib/objects/server/object/type/enemy-object.js b/lib/objects/server/object/type/enemy-object.js index 334afa64..b9ede3b6 100644 --- a/lib/objects/server/object/type/enemy-object.js +++ b/lib/objects/server/object/type/enemy-object.js @@ -335,8 +335,7 @@ class EnemyObject extends NpcObject this.objectBody.originalCol = currentCol; this.objectBody.originalRow = currentRow; await this.events.emit('reldens.restoreObjectAfter', {enemyObject: this, room}); - let respawnTime = this.respawnTime || 1000; - //Logger.debug('Respawn: '+this.uid+ ' - Time: '+respawnTime+' - Position x/y: '+x+' / '+y); + //Logger.debug('Respawn: '+this.uid+ ' - Time: '+(this.respawnTime || 1000)+' - Position x/y: '+x+' / '+y); if(0 === this.respawnStateTime){ this.setActiveObjectState(room); return; diff --git a/lib/objects/server/object/type/trader-object.js b/lib/objects/server/object/type/trader-object.js index cf215969..3b0d206f 100644 --- a/lib/objects/server/object/type/trader-object.js +++ b/lib/objects/server/object/type/trader-object.js @@ -182,8 +182,8 @@ class TraderObject extends NpcObject // @TODO - BETA - Refactor when include false conditions in the shortcuts. if(ItemsConst.TRADE_ACTIONS.SELL === tradeAction){ inventoryItems = [ - ...inventory.findItemsByPropertyValue('equipped', false), - ...inventory.findItemsByPropertyValue('equipped', undefined)]; + ...(inventory.findItemsByPropertyValue('equipped', false) || []), + ...(inventory.findItemsByPropertyValue('equipped', undefined) || [])]; } let sendData = { act: GameConst.UI, @@ -231,8 +231,8 @@ class TraderObject extends NpcObject // @TODO - BETA - Refactor when include false conditions in the shortcuts and a new property "canBeTraded". if(ItemsConst.TRADE_ACTIONS.SELL === tradeAction){ inventoryItems = [ - ...inventory.findItemsByPropertyValue('equipped', false), - ...inventory.findItemsByPropertyValue('equipped', undefined) + ...(inventory.findItemsByPropertyValue('equipped', false) || []), + ...(inventory.findItemsByPropertyValue('equipped', undefined) || []) ]; } let sendData = { diff --git a/lib/rooms/server/world-config.js b/lib/rooms/server/world-config.js index 81ddf4e7..ca5a516e 100644 --- a/lib/rooms/server/world-config.js +++ b/lib/rooms/server/world-config.js @@ -70,7 +70,7 @@ class WorldConfig }), groupWallsVertically: sc.get(globalWorldConfig, 'groupWallsVertically', false), groupWallsHorizontally: sc.get(globalWorldConfig, 'groupWallsHorizontally', false) - } + }; let applyGravity = sc.get(room.customData, 'applyGravity', globalConfig.applyGravity); let defaultsVariations = { useFixedWorldStep: null !== globalConfig.useFixedWorldStep ? globalConfig.useFixedWorldStep : !applyGravity, diff --git a/lib/teams/server/event-handlers/end-player-hit-change-point-team-handler.js b/lib/teams/server/event-handlers/end-player-hit-change-point-team-handler.js index 64107dcc..9e1e402c 100644 --- a/lib/teams/server/event-handlers/end-player-hit-change-point-team-handler.js +++ b/lib/teams/server/event-handlers/end-player-hit-change-point-team-handler.js @@ -4,8 +4,6 @@ * */ -const { Logger } = require('@reldens/utils'); - class EndPlayerHitChangePointTeamHandler { @@ -13,7 +11,6 @@ class EndPlayerHitChangePointTeamHandler { let teamId = playerSchema.currentTeam; if(!teamId){ - //Logger.debug('Player "'+playerSchema?.playerName+'" ('+playerSchema?.player_id+'), team not saved.'); return false; } teamsPlugin.teamChangingRoomPlayers[playerSchema.player_id] = { diff --git a/lib/teams/server/event-handlers/stats-update-handler.js b/lib/teams/server/event-handlers/stats-update-handler.js index 6259c7e9..6bdab1da 100644 --- a/lib/teams/server/event-handlers/stats-update-handler.js +++ b/lib/teams/server/event-handlers/stats-update-handler.js @@ -6,7 +6,7 @@ const { ClanUpdatesHandler } = require('../clan-updates-handler'); const { TeamUpdatesHandler } = require('../team-updates-handler'); -const { Logger, sc } = require('@reldens/utils'); +const { sc } = require('@reldens/utils'); class StatsUpdateHandler @@ -20,7 +20,7 @@ class StatsUpdateHandler } let currentTeam = sc.get(props.teamsPlugin.teams, currentTeamId, false); if(!currentTeam){ - //Logger.debug('Expected, Team not found: '+currentTeamId); + // expected, team not found return false; } return TeamUpdatesHandler.updateTeamPlayers(currentTeam); diff --git a/lib/teams/server/team-message-actions.js b/lib/teams/server/team-message-actions.js index 84a50169..0f1fa95d 100644 --- a/lib/teams/server/team-message-actions.js +++ b/lib/teams/server/team-message-actions.js @@ -8,7 +8,7 @@ const { TryTeamStart } = require('./message-actions/try-team-start'); const { TeamJoin } = require('./message-actions/team-join'); const { TeamLeave } = require('./message-actions/team-leave'); const { TeamsConst } = require('../constants'); -const { Logger, sc } = require('@reldens/utils'); +const { sc } = require('@reldens/utils'); class TeamMessageActions { @@ -36,7 +36,6 @@ class TeamMessageActions let playerSendingInvite = room.activePlayerByPlayerId(data.id, room.roomId); if(!playerSendingInvite){ // expected when the player disconnects in between the invitation is sent: - //Logger.debug('Team invitation declined, player owner client not found.', data); return false; } let playerRejectingName = playerSchema.playerName; diff --git a/lib/users/client/lifebar-ui.js b/lib/users/client/lifebar-ui.js index fddbf909..c08783f2 100644 --- a/lib/users/client/lifebar-ui.js +++ b/lib/users/client/lifebar-ui.js @@ -9,7 +9,7 @@ const { ActionsConst } = require('../../actions/constants'); const { GameConst } = require('../../game/constants'); const { ObjectsConst } = require('../../objects/constants'); const { ObjectsHandler } = require('./objects-handler'); -const { sc, Logger} = require('@reldens/utils'); +const { sc } = require('@reldens/utils'); class LifebarUi { @@ -170,7 +170,7 @@ class LifebarUi { let currentPlayer = this.gameManager.getCurrentPlayer(); if(!sc.isFunction(currentPlayer?.isDeath)){ - //Logger.debug('Expected, when changing scenes the next scene could not be active yet.', currentPlayer); + // expected, when changing scenes the next scene could not be active yet return false; } let isCurrentPlayer = playerId === currentPlayer?.playerId; diff --git a/lib/world/server/collisions-manager.js b/lib/world/server/collisions-manager.js index e5f02c4d..4bf8743f 100644 --- a/lib/world/server/collisions-manager.js +++ b/lib/world/server/collisions-manager.js @@ -47,7 +47,6 @@ class CollisionsManager let bulletB = false; let player = false; let roomObject = false; - let roomWall = false; for(let body of pairs){ if(body.playerId && body.pStop){ body.stopFull(); @@ -58,9 +57,6 @@ class CollisionsManager if(body.playerId){ player = body; } - if(body.isWall){ - roomWall = body; - } if(body.isBullet){ if(bulletA && !bulletB){ bulletB = body;