From 31f0b0e84d7fc3154aca75e31bfbeb5f5d8a47c2 Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Tue, 23 Aug 2011 06:06:18 +0000 Subject: [PATCH] fix Gideon Jura's Lure-like ability not working properly when the Human is low on life. (bAssault was taking over before the 'must attack entity' logic was being run.) --- src/main/java/forge/ComputerUtil_Attack2.java | 13 ++++++------- .../card/abilityFactory/AbilityFactory_Combat.java | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/forge/ComputerUtil_Attack2.java b/src/main/java/forge/ComputerUtil_Attack2.java index 34d9f5a2128..b9937421149 100644 --- a/src/main/java/forge/ComputerUtil_Attack2.java +++ b/src/main/java/forge/ComputerUtil_Attack2.java @@ -276,12 +276,7 @@ public class ComputerUtil_Attack2 { // TODO: split attackers to different planeswalker/human // AI will only attack one Defender per combat for now ArrayList defs = c.getDefenders(); - - if (defs.size() == 1 || bAssault) { - c.setCurrentDefender(0); - return; - } - + // Randomly determine who EVERYONE is attacking // would be better to determine more individually int n = MyRandom.random.nextInt(defs.size()); @@ -292,13 +287,17 @@ public class ComputerUtil_Attack2 { n = defenders.indexOf(entity); if(-1 == n) { System.out.println("getMustAttackEntity() returned something not in defenders."); + c.setCurrentDefender(0); } else { c.setCurrentDefender(n); } } else { - c.setCurrentDefender(n); + if (defs.size() == 1 || bAssault) { + c.setCurrentDefender(0); + } + else c.setCurrentDefender(n); } return; diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java index 9b4b0b39253..9e6562a862f 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java @@ -435,7 +435,7 @@ public class AbilityFactory_Combat { else { entity = p.getOpponent(); } - System.out.println("Setting mustAttackEntity to: "+entity); + //System.out.println("Setting mustAttackEntity to: "+entity); p.setMustAttackEntity(entity); } }