- Attempting to fix Suspend by making it exempt from the canPlay() check in HumanPlay.

- Better place for IsCastFromPlayEffect SVar assignment + cleanup
- Adding some previously missed card fixes from Marek.
This commit is contained in:
Agetian
2017-06-30 07:11:56 +00:00
parent 4b4396bd09
commit 986f95b46b
13 changed files with 40 additions and 28 deletions

View File

@@ -84,7 +84,16 @@ public class HumanPlay {
// extra play check
if (sa.isSpell() && !sa.canPlay()) {
return false;
// Exceptional cases where canPlay should not run
boolean exemptFromCheck = false;
if (source.hasSuspend() && p.getGame().isCardExiled(source) && source.getCounters(CounterType.TIME) == 0) {
// A card is about to ETB from Suspend
exemptFromCheck = true;
}
if (!exemptFromCheck) {
return false;
}
}
if (flippedToCast && !castFaceDown) {

View File

@@ -1506,7 +1506,6 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override
public boolean playSaFromPlayEffect(final SpellAbility tgtSA) {
tgtSA.setSVar("IsCastFromPlayEffect", "True");
return HumanPlay.playSpellAbility(this, player, tgtSA);
}