From 52a4f8e75ea82bc70f4e204d6ad364fcc71dbca6 Mon Sep 17 00:00:00 2001 From: Sol Date: Sun, 21 Oct 2012 13:36:48 +0000 Subject: [PATCH] - If creature hasn't been assigned any damage in Assign Panel, use the minimum value of Lethal Damage and Remaining Damage. --- src/main/java/forge/gui/match/VAssignDamage.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/forge/gui/match/VAssignDamage.java b/src/main/java/forge/gui/match/VAssignDamage.java index 5b945009a1d..227f21841e0 100644 --- a/src/main/java/forge/gui/match/VAssignDamage.java +++ b/src/main/java/forge/gui/match/VAssignDamage.java @@ -162,9 +162,8 @@ public class VAssignDamage { assignedDamage = VAssignDamage.this.damageLeftToAssign; } else if (alreadyAssignDamage == 0) { - assignedDamage = lethal; + assignedDamage = Math.min(lethal, VAssignDamage.this.damageLeftToAssign); } - assignCombatantDamage(source, assignedDamage); }