From b6ce6a527742a24609a592aeea67b897c42d77c0 Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 13 Nov 2019 19:05:10 +1000 Subject: [PATCH] post_resolve --- 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 f7e95c89..c67e86b9 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -299,8 +299,8 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut } fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) -> Resolutions { - for Resolution { source, target: event_target, event, stages: _ } in resolutions.clone() { - let mut source = game.construct_by_id(source.id).unwrap().clone(); + for Resolution { source: event_source, target: event_target, event, stages: _ } in resolutions.clone() { + let mut source = game.construct_by_id(event_source.id).unwrap().clone(); let mut target = game.construct_by_id(event_target.id).unwrap().clone(); match event { @@ -353,7 +353,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) -> }; if target.is_ko() && event_target.green == 0 { - // Check target is actually ko if sending ko event + // Make sure target ko is from this event target.effects.clear(); resolutions.push(Resolution::new(&source, &target).event(Event::Ko()).stages(EventStages::PostOnly)); }