Browse Source

another fix for #1030

tags/v0.3.3^2
Big Bad Waffle 4 years ago
parent
commit
cc5dc61e3e
2 changed files with 8 additions and 4 deletions
  1. +1
    -1
      src/server/config/maps/dungeon.json
  2. +7
    -3
      src/server/objects/objBase.js

+ 1
- 1
src/server/config/maps/dungeon.json View File

@@ -641,4 +641,4 @@
"type":"map",
"version":1,
"width":200
}
}

+ 7
- 3
src/server/objects/objBase.js View File

@@ -190,8 +190,12 @@ module.exports = {
this.actionQueue.spliceWhere(a => a.priority);
this.actionQueue.splice(0, 0, action);
} else {
if (action.priority)
if (action.priority) {
this.spellbook.stopCasting();
this.actionQueue.splice(0, 0, action);
return;
}

this.actionQueue.push(action);
}
},
@@ -289,7 +293,7 @@ module.exports = {
(deltaX === 0) &&
(deltaY === 0)
)
)
)
return false;
}

@@ -300,7 +304,7 @@ module.exports = {

this.x = data.x;
this.y = data.y;
} else
} else
return false;
} else {
physics.removeObject(this, this.x, this.y, data.x, data.y);


Loading…
Cancel
Save