diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b4c96d6..6ac7bb50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ audit: script: - cd src/server - npm audit + allow_failure: true only: - merge_requests - master diff --git a/src/client/ui/templates/createCharacter/styles.less b/src/client/ui/templates/createCharacter/styles.less index 72744f94..64e47d23 100644 --- a/src/client/ui/templates/createCharacter/styles.less +++ b/src/client/ui/templates/createCharacter/styles.less @@ -24,8 +24,7 @@ width: 613px; background-color: #3a3b4a; - .left, - .right { + .left, .right { float: left; height: 100%; } @@ -34,8 +33,7 @@ width: calc(100% - (@boxPadding * 2) - 160px); padding: @boxPadding 0px @boxPadding @boxPadding; - .txtClass, - .txtCostume { + .txtClass, .txtCostume { cursor: pointer; -webkit-user-select: none; diff --git a/src/server/world/atlas.js b/src/server/world/atlas.js index 85c07451..9d3cb62c 100644 --- a/src/server/world/atlas.js +++ b/src/server/world/atlas.js @@ -192,9 +192,14 @@ module.exports = { return thread; }, onMessage: function (thread, message) { - if (message.module) - global[message.module][message.method](message); - else if (message.event === 'onCrashed') { + if (message.module) { + try { + global[message.module][message.method](message); + } catch (e) { + console.log('No global method found', message.module, message.method); + process.exit(); + } + } else if (message.event === 'onCrashed') { thread.worker.kill(); process.exit(); } else @@ -332,4 +337,5 @@ module.exports = { }); }); } + }; diff --git a/src/server/world/instancer.js b/src/server/world/instancer.js index e769df6c..7e198dda 100644 --- a/src/server/world/instancer.js +++ b/src/server/world/instancer.js @@ -362,8 +362,15 @@ module.exports = { forceSavePlayer: async function ({ playerName, callbackId }) { const player = objects.objects.find(o => o.player && o.name === playerName); - if (!player?.auth) + if (!player?.auth) { + await io.setAsync({ + key: new Date(), + table: 'error', + value: 'no auth found for forcesave ' + playerName + }); + return; + } await player.auth.doSave(); @@ -375,4 +382,5 @@ module.exports = { } }); } + };