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

refactor: simplify

Browse Source
This commit is contained in:
cha0s 2020-06-19 15:30:45 -05:00
parent 84affcbc64
commit 42fe27f0a3
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,20 +165,12 @@ export default class Alive extends decorate(Trait) {
methods() { methods() {
return { return {
dieIfPrescribed: () => {
if (this._deathCondition.check(this._context)) {
this.entity.forceDeath();
}
},
forceDeath: () => { forceDeath: () => {
if (this.entity.isDying) { if (this.entity.isDying) {
return; return;
} }
this.entity.isDying = true; this.entity.isDying = true;
const dyingTickingPromise = this._deathActions.tickingPromise( const dyingTickingPromise = this._deathActions.tickingPromise(this._context);
this._context
)
this.entity.addTickingPromise(dyingTickingPromise).then(() => { this.entity.addTickingPromise(dyingTickingPromise).then(() => {
const diedPromises = this.entity.invokeHookFlat('died'); const diedPromises = this.entity.invokeHookFlat('died');
Promise.all(diedPromises).then(() => { Promise.all(diedPromises).then(() => {
@ -192,7 +184,9 @@ export default class Alive extends decorate(Trait) {
tick(elapsed) { tick(elapsed) {
if (AVOCADO_SERVER) { if (AVOCADO_SERVER) {
this.entity.dieIfPrescribed(); if (!this.entity.isDying && this._deathCondition.check(this._context)) {
this.entity.forceDeath();
}
} }
} }