Bläddra i källkod

enhancement #1741

tags/v0.9.0^2
Shaun 3 år sedan
förälder
incheckning
01b6e60c2e
2 ändrade filer med 10 tillägg och 0 borttagningar
  1. +4
    -0
      src/server/objects/objects.js
  2. +6
    -0
      src/server/world/instancer.js

+ 4
- 0
src/server/objects/objects.js Visa fil

@@ -148,6 +148,10 @@ module.exports = {
return this.objects.find(callback);
},

filter: function (callback) {
return this.objects.filter(callback);
},

removeObject: function (obj, callback, useServerId) {
let found = this.objects.spliceFirstWhere(o => obj.id === (useServerId ? o.serverId : o.id));
if (!found)


+ 6
- 0
src/server/world/instancer.js Visa fil

@@ -190,6 +190,12 @@ module.exports = {
changed: false
};
eventEmitter.emitNoSticky('onBeforePlayerSpawn', { name: obj.name, instance: { physics } }, spawnEvent);
//If a player is added, destroy any player objects with the same name
const existing = objects.filter(o => o.player && o.name === msg.obj.name);
existing.forEach(o => {
o.destroyed = true;
});

if (spawnEvent.changed)
msg.keepPos = false;



Laddar…
Avbryt
Spara