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

CostUntap change keyword check to static check

Browse Source
This commit is contained in:
Northmoc
2022-05-26 13:59:19 -04:00
parent a10e906ddb
commit a1dcb3617c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-game/src/main/java/forge/game/cost/CostUntap.java
View File

@@ -20,6 +20,7 @@ package forge.game.cost;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.staticability.StaticAbilityActivateAbilityAsIfHaste;
/** /**
* The Class CostUntap. * The Class CostUntap.
@@ -72,7 +73,7 @@ public class CostUntap extends CostPart {
@Override @Override
public final boolean canPay(final SpellAbility ability, final Player payer, final boolean effect) { public final boolean canPay(final SpellAbility ability, final Player payer, final boolean effect) {
final Card source = ability.getHostCard(); final Card source = ability.getHostCard();
return source.isTapped() && (!source.isSick() || source.hasKeyword("CARDNAME may activate abilities as though it has haste.")); return source.isTapped() && !isAbilitySick(source);
} }
@Override @Override
@@ -85,4 +86,10 @@ public class CostUntap extends CostPart {
return visitor.visit(this); return visitor.visit(this);
} }
public boolean isAbilitySick(final Card source) {
if (!source.isSick()) {
return false;
}
return !StaticAbilityActivateAbilityAsIfHaste.canActivate(source);
}
} }