diff --git a/src/forge/Card.java b/src/forge/Card.java index 873d12a7baa..bd95ad5ea70 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -1,5 +1,6 @@ package forge; import java.util.*; +import java.util.Map.Entry; enum Counters { AGE, BLAZE, CHARGE, DIVINITY, FADE, HOOFPRINT, ICE, LOYALTY, M1M1, MANA, P0M1, P1P1, QUEST, SPORE, TIME @@ -557,7 +558,7 @@ public class Card extends MyObservable public void unEquip() { for (Command var : unEquipCommandList) var.execute(); - } + } public void addEnchantCommand(Command c) {enchantCommandList.add(c); } public void removeEnchantCommand(Command c) {enchantCommandList.add(c); } @@ -602,6 +603,14 @@ public class Card extends MyObservable public void addDamage(HashMap sourcesMap) { + Iterator> iter1 = sourcesMap.entrySet().iterator(); + while(iter1.hasNext()) + { + Entry entry = iter1.next(); + this.addDamage(entry.getValue(), entry.getKey()); + } + + /* Iterator iter = sourcesMap.keySet().iterator(); while(iter.hasNext()) { Card source = iter.next(); @@ -609,6 +618,7 @@ public class Card extends MyObservable this.addDamage(damage, source); } + */ //for(Card source : sources) // this.addDamage(n, source); diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index bcf67bce717..56bf93be100 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -979,7 +979,7 @@ public class CardFactory implements NewConstants { sbD.append(Math.abs(NumDefense[0]) + " and gains " + Keyword[0] + " until end of turn."); } //if (!sbD.toString().isEmpty()) - if (!sbD.toString().trim().equals("")) + if (sbD.toString().trim().length()!=0) d = sbD.toString(); if (k.length > 2) @@ -15999,7 +15999,7 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase(); } }; card.clearSpellAbility(); - spell.setChooseTargetAI(CardFactoryUtil.AI_targetHuman()); + spell.setChooseTargetAI(CardFactoryUtil.AI_targetComputer()); spell.setBeforePayMana(CardFactoryUtil.input_targetPlayer(spell)); card.addSpellAbility(spell); }//*************** END ************ END **************************