diff --git a/client/src/scenes/combat.render.resolutions.js b/client/src/scenes/combat.render.resolutions.js index 29eeeb61..ea1bc8be 100644 --- a/client/src/scenes/combat.render.resolutions.js +++ b/client/src/scenes/combat.render.resolutions.js @@ -46,7 +46,10 @@ function calculateTweenParams(sourceSpawn, targetSpawn, account) { function animatePhase(scene, game, resolution, cb) { // return early for disabled skills - if (resolution.resolution.disable.disabled) return cb(); + const { resolution: { results } } = resolution; + if (results.length === 0) return cb(); + if (results[0][0] === 'Disable') return cb(); + const group = scene.scene.get('CombatCryps').cryps; const animations = new CombatAnimations(scene); const account = scene.registry.get('account'); @@ -65,10 +68,6 @@ function animatePhase(scene, game, resolution, cb) { }; const castLocation = castParams(); - const { resolution: { results } } = resolution; - - if (results.length === 0) return cb(); - // Move cryps into position if (moveSourceBattle) scene.tweens.add(moveSourceBattle); scene.tweens.add(moveTargetBattle);