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

Merge branch 'fixKick' into 'master'

Browse Source 
Fix isKicked

See merge request core-developers/forge!3977
This commit is contained in:
Michael Kamensky
2021-02-22 19:37:27 +00:00
parent ea7921bc4a be26e86737
commit 6af9f1831e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
View File

@@ -1851,7 +1851,7 @@ public class ComputerUtilCard {
if (card.hasSVar("NeedsToPlayEvokedVar")) { if (card.hasSVar("NeedsToPlayEvokedVar")) {
needsToPlayVarName = "NeedsToPlayEvokedVar"; needsToPlayVarName = "NeedsToPlayEvokedVar";
} }
} else if (sa.isKicked() || card.getKickerMagnitude() > 0) { } else if (sa.isKicked()) {
// if the spell is kicked, uses NeedsToPlayKicked if able and locks out the regular NeedsToPlay check // if the spell is kicked, uses NeedsToPlayKicked if able and locks out the regular NeedsToPlay check
// for unkicked spells, uses NeedsToPlay // for unkicked spells, uses NeedsToPlay
if (card.hasSVar("NeedsToPlayKicked")) { if (card.hasSVar("NeedsToPlayKicked")) {

2
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -655,7 +655,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
public boolean isKicked() { public boolean isKicked() {
return isOptionalCostPaid(OptionalCost.Kicker1) || isOptionalCostPaid(OptionalCost.Kicker2) || return isOptionalCostPaid(OptionalCost.Kicker1) || isOptionalCostPaid(OptionalCost.Kicker2) ||
getMultiKickerManaCost() != null; getHostCard().getKickerMagnitude() > 0;
} }
public boolean isEntwine() { public boolean isEntwine() {