Browse Source

Merge branch 'master' of gitlab.com:Isleward/isleward

tags/v0.11.0
Shaun 1 year ago
parent
commit
679e56325d
4 changed files with 21 additions and 8 deletions
  1. +1
    -0
      .gitlab-ci.yml
  2. +2
    -4
      src/client/ui/templates/createCharacter/styles.less
  3. +9
    -3
      src/server/world/atlas.js
  4. +9
    -1
      src/server/world/instancer.js

+ 1
- 0
.gitlab-ci.yml View File

@@ -9,6 +9,7 @@ audit:
script:
- cd src/server
- npm audit
allow_failure: true
only:
- merge_requests
- master


+ 2
- 4
src/client/ui/templates/createCharacter/styles.less View File

@@ -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;



+ 9
- 3
src/server/world/atlas.js View File

@@ -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 = {
});
});
}

};

+ 9
- 1
src/server/world/instancer.js View File

@@ -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 = {
}
});
}

};

Loading…
Cancel
Save