From fedc92977a90be4eecee065720409185ea800e42 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Wed, 24 Mar 2021 21:16:33 +0100 Subject: [PATCH] Fix Suspend & CantBeCast --- .../src/main/java/forge/game/card/CardFactoryUtil.java | 5 +++++ forge-game/src/main/java/forge/game/player/Player.java | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 808cc5a08ff..4a40fbd06ae 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -72,6 +72,7 @@ import forge.game.spellability.Spell; import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityRestriction; import forge.game.staticability.StaticAbility; +import forge.game.staticability.StaticAbilityCantBeCast; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; @@ -4521,6 +4522,10 @@ public class CardFactoryUtil { return false; } + if (StaticAbilityCantBeCast.cantBeCastAbility(this, this.getHostCard(), this.getActivatingPlayer())) { + return false; + } + if (this.getHostCard().isInstant() || this.getHostCard().hasKeyword(Keyword.FLASH)) { return true; } diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 9ead6b4b312..c83ce6d79db 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -625,7 +625,6 @@ public class Player extends GameEntity implements Comparable { if (energyPayment <= 0) return true; - return canPayEnergy(energyPayment) && loseEnergy(energyPayment) > -1; }