external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed the Goblin Rimerunner improvement.

Browse Source
This commit is contained in:
Sloth
2015-09-28 13:08:18 +00:00
parent a3a9a5d156
commit eeeeb65ecc
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
View File

@@ -88,14 +88,11 @@ public abstract class PumpAiBase extends SpellAbilityAi {
List<Card> attackers = CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), new Predicate<Card>() { List<Card> attackers = CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
if (combat == null) {
return false;
}
if (c.equals(sa.getHostCard()) && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost() if (c.equals(sa.getHostCard()) && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost()
&& !combat.isAttacking(c)) { && (combat == null || !combat.isAttacking(c))) {
return false; return false;
} }
return (c.isCreature() && CombatUtil.canAttack(c, human) || combat.isAttacking(c)); return (c.isCreature() && CombatUtil.canAttack(c, human) || (combat != null && combat.isAttacking(c)));
} }
}); });
if (!CombatUtil.canBlockAtLeastOne(card, attackers)) { if (!CombatUtil.canBlockAtLeastOne(card, attackers)) {
@@ -112,7 +109,7 @@ public abstract class PumpAiBase extends SpellAbilityAi {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
if (c.equals(sa.getHostCard()) && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost() if (c.equals(sa.getHostCard()) && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost()
&& (combat != null && !combat.isAttacking(c))) { && (combat == null || !combat.isAttacking(c))) {
return false; return false;
} }
return (c.isCreature() && CombatUtil.canAttack(c, human) || (combat != null && combat.isAttacking(c))); return (c.isCreature() && CombatUtil.canAttack(c, human) || (combat != null && combat.isAttacking(c)));