Browse Source

work

tags/v0.11.0
Shaun 2 years ago
parent
commit
77ac3a3443
2 changed files with 5 additions and 3 deletions
  1. +1
    -1
      src/server/config/serverConfig.js
  2. +4
    -2
      src/server/world/atlas.js

+ 1
- 1
src/server/config/serverConfig.js View File

@@ -7,7 +7,7 @@ module.exports = {
// sqlite
// rethink
//eslint-disable-next-line no-process-env
db: process.env.IWD_DB || 'rethink',
db: process.env.IWD_DB || 'sqlite',
//eslint-disable-next-line no-process-env
dbHost: process.env.IWD_DB_HOST || 'localhost',
//eslint-disable-next-line no-process-env


+ 4
- 2
src/server/world/atlas.js View File

@@ -17,6 +17,10 @@ module.exports = {
},

addObject: async function (obj, keepPos, transfer) {
const serverObj = objects.objects.find(o => o.id === obj.id);
if (!serverObj)
return;

events.emit('onBeforePlayerEnterWorld', obj);

let thread;
@@ -39,8 +43,6 @@ module.exports = {
thread = this.getThreadFromName(map.name);
}

const serverObj = objects.objects.find(o => o.id === obj.id);

obj.zoneName = thread.name;
obj.zoneId = thread.id;



Loading…
Cancel
Save