From e814e806824dcf8bf8defc9ab2a25b4fec1f4947 Mon Sep 17 00:00:00 2001 From: cha0s Date: Mon, 25 Nov 2019 03:33:10 -0600 Subject: [PATCH] refactor: iterateForEach --- common/combat/vulnerable.trait.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/common/combat/vulnerable.trait.js b/common/combat/vulnerable.trait.js index 71dd034..e94c58b 100644 --- a/common/combat/vulnerable.trait.js +++ b/common/combat/vulnerable.trait.js @@ -5,6 +5,7 @@ import { buildTraversal, Context, } from '@avocado/behavior'; +import {iterateForEach} from '@avocado/core'; import {hasGraphics, TextNodeRenderer} from '@avocado/graphics'; import {randomNumber, Vector} from '@avocado/math'; @@ -345,13 +346,7 @@ export class Vulnerable extends Trait { this.damageTickingPromises[i].tick(elapsed); } if (AVOCADO_SERVER) { - const keyIterator = this.locks.keys(); - for ( - let thisKey = keyIterator.next(); - thisKey.done !== true; - thisKey = keyIterator.next() - ) { - const {value: key} = thisKey; + iterateForEach(this.locks.keys(), (key) => { const remaining = this.locks.get(key) - elapsed; if (remaining <= 0) { this.locks.delete(key); @@ -359,7 +354,7 @@ export class Vulnerable extends Trait { else { this.locks.set(key, remaining); } - } + }); } }