From e6f5046b55dcbdc209a56e62f96b5ee638089912 Mon Sep 17 00:00:00 2001
From: cha0s <git@cha0s.io>
Date: Mon, 6 Jan 2020 00:38:59 -0600
Subject: [PATCH] refactor: addTickingPromise

---
 common/combat/vulnerable.trait.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/common/combat/vulnerable.trait.js b/common/combat/vulnerable.trait.js
index 6eaeca1..526c806 100644
--- a/common/combat/vulnerable.trait.js
+++ b/common/combat/vulnerable.trait.js
@@ -38,7 +38,6 @@ export class Vulnerable extends Trait {
 
   constructor(entity, params, state) {
     super(entity, params, state);
-    this.harmTickingPromises = [];
     this.harms = [];
     this._isInvulnerable = false;
     this.locks = new Map();
@@ -49,7 +48,6 @@ export class Vulnerable extends Trait {
 
   destroy() {
     this.locks.clear();
-    this.harmTickingPromises = [];
   }
 
   acceptHarm(harm) {
@@ -61,7 +59,7 @@ export class Vulnerable extends Trait {
     tickingPromise.then(() => {
       context.destroy();
     });
-    this.harmTickingPromises.push(tickingPromise);
+    this.entity.addTickingPromise(tickingPromise);
     if (harm.from) {
       harm.from.emitHarmfulParticles(this.entity);
     }
@@ -342,9 +340,6 @@ export class Vulnerable extends Trait {
   }
 
   tick(elapsed) {
-    for (let i = 0; i < this.harmTickingPromises.length; ++i) {
-      this.harmTickingPromises[i].tick(elapsed);
-    }
     if (AVOCADO_SERVER) {
       iterateForEach(this.locks.keys(), (key) => {
         const remaining = this.locks.get(key) - elapsed;