From 0da1f11fc57c85c39b37215eaf2c839cb698951e Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 14:36:16 +0000 Subject: [PATCH] - Fix bug with assigning 0 damage to multiple blockers. --- src/forge/AbilityFactory_ZoneAffecting.java | 1 - src/forge/GuiDisplay3.java | 2 ++ src/forge/GuiDisplay4.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/forge/AbilityFactory_ZoneAffecting.java b/src/forge/AbilityFactory_ZoneAffecting.java index 4fccc550c46..bb7e5e83653 100644 --- a/src/forge/AbilityFactory_ZoneAffecting.java +++ b/src/forge/AbilityFactory_ZoneAffecting.java @@ -511,7 +511,6 @@ public class AbilityFactory_ZoneAffecting { ////////////////////// //NumCards - the number of cards to be discarded (may be integer or X) - //Opponent - set to True if "target opponent" - hopefully will be obsolete soon //Mode - the mode of discard - should match spDiscard // -Random // -TgtChoose diff --git a/src/forge/GuiDisplay3.java b/src/forge/GuiDisplay3.java index 9d333aa7920..c0f244e5856 100644 --- a/src/forge/GuiDisplay3.java +++ b/src/forge/GuiDisplay3.java @@ -121,6 +121,8 @@ public class GuiDisplay3 extends JFrame implements CardContainer, Display, NewCo } public void assignDamage(Card attacker, CardList blockers, int damage) { + if (damage == 0) + return; new Gui_MultipleBlockers3(attacker, blockers, damage, this); } diff --git a/src/forge/GuiDisplay4.java b/src/forge/GuiDisplay4.java index 805a1d6bbce..aa24c2848cb 100644 --- a/src/forge/GuiDisplay4.java +++ b/src/forge/GuiDisplay4.java @@ -127,6 +127,8 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo } public void assignDamage(Card attacker, CardList blockers, int damage) { + if (damage == 0) + return; new Gui_MultipleBlockers4(attacker, blockers, damage, this); }