Bladeren bron

fixed an issue with xpmax being overwritten on log

tags/v0.2.1^2
Big Bad Waffle 5 jaren geleden
bovenliggende
commit
d5732a1341
4 gewijzigde bestanden met toevoegingen van 9 en 14 verwijderingen
  1. +5
    -7
      src/client/js/components/stats.js
  2. +1
    -1
      src/server/components/stats.js
  3. +2
    -5
      src/server/objects/objects.js
  4. +1
    -1
      src/server/world/atlas.js

+ 5
- 7
src/client/js/components/stats.js Bestand weergeven

@@ -19,9 +19,8 @@ define([
if (this.obj.self)
events.emit('onGetStats', this.values);

let serverId = this.obj.serverId;
if (serverId !== null)
events.emit('onGetPartyStats', serverId, this.values);
if (this.obj.has('serverId'))
events.emit('onGetPartyStats', this.obj.serverId, this.values);

let obj = this.obj;

@@ -79,7 +78,7 @@ define([
this.hpSpriteInner.visible = this.hpSprite.visible;
},

extend: function (blueprint) {
extend: function (blueprint) {
let bValues = blueprint.values || {};

let values = this.values;
@@ -90,9 +89,8 @@ define([
if (this.obj.self)
events.emit('onGetStats', this.values);

let serverId = this.obj.serverId;
if (serverId !== null)
events.emit('onGetPartyStats', serverId, this.values);
if (this.obj.has('serverId'))
events.emit('onGetPartyStats', this.obj.serverId, this.values);

this.updateHpSprite();
},


+ 1
- 1
src/server/components/stats.js Bestand weergeven

@@ -102,7 +102,7 @@ module.exports = {

dead: false,

init: function (blueprint, isTransfer) {
init: function (blueprint) {
this.syncer = this.obj.instance.syncer;

let values = (blueprint || {}).values || {};


+ 2
- 5
src/server/objects/objects.js Bestand weergeven

@@ -175,11 +175,8 @@ module.exports = {
for (let i = 0; i < len; i++) {
let c = components[i];

newO.addComponent(c.type, c);

let newC = newO[c.type];
for (let p in c)
newC[p] = c[p];
let newC = newO.addComponent(c.type, c);
extend(newC, c);
}

this.objects.push(newO);


+ 1
- 1
src/server/world/atlas.js Bestand weergeven

@@ -31,7 +31,7 @@ module.exports = {
method: 'addObject',
args: {
keepPos: keepPos,
obj: obj.getSimple ? obj.getSimple(true) : obj,
obj: obj.getSimple ? obj.getSimple(true, true) : obj,
instanceId: instanceId,
transfer: transfer
}


Laden…
Annuleren
Opslaan