diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index d6c9b5b5bb7..69b16b5c907 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -506,7 +506,7 @@ public class CombatUtil { int damage = 0; int poison = 0; CardList attackers = new CardList(combat.getAttackers()); - CardList unblocked = new CardList(combat.getAttackers()); + CardList unblocked = new CardList(); CardList blockers = new CardList(); Card attacker = new Card(); diff --git a/src/forge/ComputerUtil_Block2.java b/src/forge/ComputerUtil_Block2.java index 7a486b7deef..f1eac30064b 100644 --- a/src/forge/ComputerUtil_Block2.java +++ b/src/forge/ComputerUtil_Block2.java @@ -560,7 +560,7 @@ public class ComputerUtil_Block2 //Begin with the weakest blockers CardListUtil.sortAttackLowFirst(blockersLeft); - CardList currentAttackers = attackersLeft; + CardList currentAttackers = new CardList(attackersLeft.toArray()); //first choose good blocks only for(int i = 0; i < attackersLeft.size(); i++) { @@ -602,7 +602,7 @@ public class ComputerUtil_Block2 } } - attackersLeft = currentAttackers; + attackersLeft = new CardList(currentAttackers.toArray()); if(blockersLeft.size() == 0) return combat; @@ -619,7 +619,7 @@ public class ComputerUtil_Block2 } } - attackersLeft = currentAttackers; + attackersLeft = new CardList(currentAttackers.toArray()); //choose necessary chump blocks if life is still in danger if (CombatUtil.lifeInDanger(combat)) diff --git a/src/forge/MagicStack.java b/src/forge/MagicStack.java index 8eb1f87b3eb..4e8800fe175 100644 --- a/src/forge/MagicStack.java +++ b/src/forge/MagicStack.java @@ -181,8 +181,7 @@ public class MagicStack extends MyObservable { String k[] = parse.split(":"); if (k[1].equals("ActualSpell") && ActualEffectTriggered == false) { - AllZone.GameAction.checkWheneverKeyword(sp.getSourceCard(), - "ActualSpell", null); + AllZone.GameAction.checkWheneverKeyword(sp.getSourceCard(),"ActualSpell", null); sp.getSourceCard().removeIntrinsicKeyword(parse); ActualEffectTriggered = true; } diff --git a/src/forge/PlayerZone_ComesIntoPlay.java b/src/forge/PlayerZone_ComesIntoPlay.java index a838581a622..ef7d18ac5ac 100644 --- a/src/forge/PlayerZone_ComesIntoPlay.java +++ b/src/forge/PlayerZone_ComesIntoPlay.java @@ -437,7 +437,7 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone { } - public void setTrigger(boolean b) { + public void setTrigger(boolean b) {% trigger = b; }