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

Fix Suspend & CantBeCast

Browse Source
This commit is contained in:
tool4EvEr
2021-03-24 21:16:33 +01:00
parent 3a5f85009c
commit fedc92977a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -72,6 +72,7 @@ import forge.game.spellability.Spell;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.spellability.SpellAbilityRestriction; import forge.game.spellability.SpellAbilityRestriction;
import forge.game.staticability.StaticAbility; import forge.game.staticability.StaticAbility;
import forge.game.staticability.StaticAbilityCantBeCast;
import forge.game.trigger.Trigger; import forge.game.trigger.Trigger;
import forge.game.trigger.TriggerHandler; import forge.game.trigger.TriggerHandler;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
@@ -4521,6 +4522,10 @@ public class CardFactoryUtil {
return false; return false;
} }
if (StaticAbilityCantBeCast.cantBeCastAbility(this, this.getHostCard(), this.getActivatingPlayer())) {
return false;
}
if (this.getHostCard().isInstant() || this.getHostCard().hasKeyword(Keyword.FLASH)) { if (this.getHostCard().isInstant() || this.getHostCard().hasKeyword(Keyword.FLASH)) {
return true; return true;
} }

1
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -625,7 +625,6 @@ public class Player extends GameEntity implements Comparable<Player> {
if (energyPayment <= 0) if (energyPayment <= 0)
return true; return true;
return canPayEnergy(energyPayment) && loseEnergy(energyPayment) > -1; return canPayEnergy(energyPayment) && loseEnergy(energyPayment) > -1;
} }