From c1b5f09d42409ba586e657984fb6746e252b72bd Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Tue, 30 Jul 2019 17:55:16 +1000
Subject: [PATCH] fix absorb, purge, electrocute, end of game bugs

---
 client/src/components/skill.btn.jsx        | 2 +-
 client/src/components/targeting.arrows.jsx | 1 +
 server/src/net.rs                          | 2 +-
 server/src/skill.rs                        | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/src/components/skill.btn.jsx b/client/src/components/skill.btn.jsx
index 95eeddb6..80fcde36 100644
--- a/client/src/components/skill.btn.jsx
+++ b/client/src/components/skill.btn.jsx
@@ -38,7 +38,7 @@ function Skill(props) {
     const s = construct.skills[i];
     const ko = construct.green_life.value === 0 ? 'ko' : '';
 
-    if (!s) {
+    if (!s || !game) {
         return (
             <button
                 disabled='true'
diff --git a/client/src/components/targeting.arrows.jsx b/client/src/components/targeting.arrows.jsx
index d5bdd9eb..ac087830 100644
--- a/client/src/components/targeting.arrows.jsx
+++ b/client/src/components/targeting.arrows.jsx
@@ -26,6 +26,7 @@ class TargetSvg extends Component {
     render(props, state) {
         const { game, account, animating, animTarget } = props;
         const { width, height } = state;
+        if (!game) return false; // game will be null when battle ends
 
         // resolutions happening
         // just put skill name up
diff --git a/server/src/net.rs b/server/src/net.rs
index b67abe78..a1d2b081 100644
--- a/server/src/net.rs
+++ b/server/src/net.rs
@@ -246,7 +246,7 @@ fn logout(req: &mut Request) -> IronResult<Response> {
 
             tx.commit().or(Err(MnmlHttpError::ServerError))?;
 
-            let mut res = iron_response(status::Ok, "token_res".to_string());
+            let mut res = iron_response(status::Ok, "logout".to_string());
             res.headers.set(SetCookie(vec![AUTH_CLEAR.to_string()]));
             Ok(res)
 
diff --git a/server/src/skill.rs b/server/src/skill.rs
index 949360f8..97cbeacb 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -272,7 +272,7 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
         Skill::Stun => stun(source, target, resolutions, skill),
 
         //Triggered
-        Skill::Electrocute|
+        Skill::Electrocute |
         Skill::ElectrocutePlus |
         Skill::ElectrocutePlusPlus => panic!("should only trigger from electrify hit"),
         Skill::HasteStrike => panic!("should only trigger from haste"),
@@ -314,7 +314,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
                         .find(|e| e.effect == Effect::Absorb).unwrap().clone();
                     match meta {
                         Some(EffectMeta::Skill(s)) => {
-                            resolutions = absorption(&mut target, &mut source, resolutions, skill, amount, s);
+                            resolutions = absorption(&mut source, &mut target, resolutions, skill, amount, s);
                         },
                         _ => panic!("no absorb skill"),
                     };
@@ -1495,7 +1495,7 @@ fn electrocute(source: &mut Construct, target: &mut Construct, mut results: Reso
     let electrocute = ConstructEffect::new(effect, duration).set_tick(Cast::new_tick(source, target, tick_skill));
     results.push(Resolution::new(source, target)
         .event(target.add_effect(skill, electrocute))
-        .stages(EventStages::StartPost));
+        .stages(EventStages::EndPost));
     return electrocute_tick(source, target, results, tick_skill);
 }
 
@@ -1679,7 +1679,7 @@ fn purge(source: &mut Construct, target: &mut Construct, mut results: Resolution
     if turns > 0 {
         let mut effect = skill.effect()[0];
         effect.duration = effect.duration * turns;
-        results.push(Resolution::new(source, target).event(target.add_effect(skill, effect)));
+        results.push(Resolution::new(source, target).event(target.add_effect(skill, effect)).stages(EventStages::PostOnly));
     }
 
     return results;