From 9fc799b9f69bb2509931185a2887730ee0c31dba Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Thu, 2 May 2019 09:49:24 +1000
Subject: [PATCH] fix siphon order

---
 server/src/skill.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/skill.rs b/server/src/skill.rs
index 997e78f8..c4780dbe 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -74,7 +74,7 @@ pub fn resolve(skill: Skill, source: &mut Cryp, target: &mut Cryp, mut resolutio
         Skill::Strike => strike(source, target, resolutions, Skill::Strike),
         Skill::StrikeII => strike(source, target, resolutions, Skill::StrikeII),
         Skill::StrikeIII => strike(source, target, resolutions, Skill::StrikeIII),
-        
+
         Skill::Stun => stun(source, target, resolutions, Skill::Stun),
         Skill::Taunt => taunt(source, target, resolutions, Skill::Taunt),
         Skill::Throw => throw(source, target, resolutions, Skill::Throw), // no damage stun, adds vulnerable
@@ -1100,6 +1100,8 @@ fn siphon_tick(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions, s
     let siphon_events = target.deal_blue_damage(Skill::SiphonTick, amount);
 
     for e in siphon_events {
+        results.push(Resolution::new(source, target).event(e));
+
         match e {
             Event::Damage { amount, mitigation: _, colour: _, skill: _ } => {
                 let heal = source.deal_green_damage(Skill::Siphon, amount);
@@ -1109,8 +1111,6 @@ fn siphon_tick(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions, s
             },
             _ => (),
         }
-
-        results.push(Resolution::new(source, target).event(e));
     }
 
     return results;