cha0s/avocado-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: addTickingPromise

Browse Source
This commit is contained in:
cha0s 2020-01-06 00:39:02 -06:00
parent 320a20e695
commit 5b7e30de04
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/entity/traits/alive.trait.js
View File

@ -74,7 +74,6 @@ export class Alive extends decorate(Trait) {
this._deathActions = behaviorItemFromJSON(this.params.deathActions);
this._deathSound = this.params.deathSound;
this._deathCondition = behaviorItemFromJSON(this.params.deathCondition);
this._dyingTickingPromise = false;
}
destroy() {
@ -133,21 +132,21 @@ export class Alive extends decorate(Trait) {
methods() {
return {
dieIfPossible: () => {
dieIfPrescribed: () => {
if (this._deathCondition.check(this._context)) {
this.entity.forceDeath();
}
},
forceDeath: () => {
if (this._dyingTickingPromise) {
if (this.entity.isDying) {
return;
}
this.entity.isDying = true;
this._dyingTickingPromise = this._deathActions.tickingPromise(
const dyingTickingPromise = this._deathActions.tickingPromise(
this._context
)
this._dyingTickingPromise.then(() => {
this.entity.addTickingPromise(dyingTickingPromise).then(() => {
const diedPromises = this.entity.invokeHookFlat('died');
Promise.all(diedPromises).then(() => {
this.entity.destroy();
@ -159,13 +158,8 @@ export class Alive extends decorate(Trait) {
}
tick(elapsed) {
if (this._dyingTickingPromise) {
this._dyingTickingPromise.tick(elapsed);
}
else {
if (AVOCADO_SERVER) {
this.entity.dieIfPossible();
}
if (AVOCADO_SERVER) {
this.entity.dieIfPrescribed();
}
}