From 65cb59dbcdfab34bfa1aeab3fc03d452d3d95650 Mon Sep 17 00:00:00 2001 From: James Skarzinskas Date: Wed, 17 Nov 2021 22:40:08 -0500 Subject: [PATCH] Do the damage after the fireshield messaging is sent --- scripts/combat.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/combat.js b/scripts/combat.js index 712a010..c50a6a3 100644 --- a/scripts/combat.js +++ b/scripts/combat.js @@ -138,14 +138,6 @@ function onCombatUpdate() { if(victim && victim.combat) { if(victim.affected & Golem.AffectedTypes.AFFECT_FIRESHIELD) { - this.damage( - victim, - vch, - false, - ~~(Math.random() * victim.level), - Golem.Combat.DamageTypeExotic - ); - vch.send("{ROuch! You are burned by " + victim.getShortDescription(vch) + "{R's reactive fireshield!{x\r\n"); victim.send("{RYour reactive fireshield lights up and burns " + vch.getShortDescription(victim) + "{R!{x\r\n"); @@ -160,6 +152,14 @@ function onCombatUpdate() { ); } } + + this.damage( + victim, + vch, + false, + ~~(Math.random() * victim.level), + Golem.Combat.DamageTypeExotic + ); } } }