From 11c64a62166088f49111ef0f73187ea883f2afd7 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 1 Sep 2023 12:19:42 +0200 Subject: [PATCH] fix specialize faces on regular cards --- forge-core/src/main/java/forge/card/CardRules.java | 5 +++++ .../java/forge/game/ability/effects/TokenEffectBase.java | 3 +++ forge-game/src/main/java/forge/game/card/Card.java | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java index a199b31349e..29a31ad0b79 100644 --- a/forge-core/src/main/java/forge/card/CardRules.java +++ b/forge-core/src/main/java/forge/card/CardRules.java @@ -395,6 +395,11 @@ public final class CardRules implements ICardCharacteristics { this.curFace = 0; this.faces[0] = null; this.faces[1] = null; + this.faces[2] = null; + this.faces[3] = null; + this.faces[4] = null; + this.faces[5] = null; + this.faces[6] = null; this.handLife = null; this.altMode = CardSplitType.None; diff --git a/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java index 6b1f6ecbce6..ca8453d2875 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java @@ -38,6 +38,9 @@ public abstract class TokenEffectBase extends SpellAbilityEffect { protected TokenCreateTable createTokenTable(Iterable players, String[] tokenScripts, final int finalAmount, final SpellAbility sa) { TokenCreateTable tokenTable = new TokenCreateTable(); for (final Player owner : players) { + if (!owner.isInGame()) { + continue; + } for (String script : tokenScripts) { final Card result = TokenInfo.getProtoType(script, sa, owner); diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index d67698da625..98c7ca8f3e3 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -6377,7 +6377,7 @@ public class Card extends GameEntity implements Comparable, IHasSVars { } public final boolean canBeControlledBy(final Player newController) { - return !(hasKeyword("Other players can't gain control of CARDNAME.") && !getController().equals(newController)); + return newController.isInGame() && !(hasKeyword("Other players can't gain control of CARDNAME.") && !getController().equals(newController)); } @Override