From 4b15df3baecf1ea77c2d0dec4fcd7170321ab724 Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Fri, 23 Sep 2022 12:46:41 -0400 Subject: [PATCH] Remove unneeded code from MulticoloredPredicate (leftover from pre-Amonkhet split card rules) --- .../src/mage/cards/t/ThreefoldSignal.java | 18 +++--------------- .../mageobject/MulticoloredPredicate.java | 14 +------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/Mage.Sets/src/mage/cards/t/ThreefoldSignal.java b/Mage.Sets/src/mage/cards/t/ThreefoldSignal.java index 0df104f144e..9310ad93e9b 100644 --- a/Mage.Sets/src/mage/cards/t/ThreefoldSignal.java +++ b/Mage.Sets/src/mage/cards/t/ThreefoldSignal.java @@ -34,7 +34,7 @@ public class ThreefoldSignal extends CardImpl { // When Threefold Signal enters the battlefield, scry 3. this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(3))); - // Each spell you cast that’s exactly three colors has replicate {3}. + // Each spell you cast that's exactly three colors has replicate {3}. // (When you cast it, copy it for each time you paid its replicate cost. // You may choose new targets for the copies. // A copy of a permanent spell becomes a token.) @@ -59,23 +59,11 @@ enum ThreeColorPredicate implements Predicate { @Override public boolean apply(MageObject input, Game game) { - // 708.3. Each split card that consists of two halves with different colored mana symbols in their mana costs - // is a multicolored card while it's not a spell on the stack. While it's a spell on the stack, it's only the - // color or colors of the half or halves being cast. # - if (input instanceof SplitCardHalf - && game.getState().getZone(input.getId()) != Zone.STACK) { - return 3 == ((SplitCardHalf) input).getMainCard().getColor(game).getColorCount(); - } else if (input instanceof ModalDoubleFacesCardHalf - && (game.getState().getZone(input.getId()) != Zone.STACK && game.getState().getZone(input.getId()) != Zone.BATTLEFIELD)) { - // While a double-faced card isn’t on the stack or battlefield, consider only the characteristics of its front face. - return 3 == ((ModalDoubleFacesCardHalf) input).getMainCard().getColor(game).getColorCount(); - } else { - return 3 == input.getColor(game).getColorCount(); - } + return 3 == input.getColor(game).getColorCount(); } @Override public String toString() { return "Multicolored"; } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java index 59ab086a664..30ae456bd64 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java @@ -15,19 +15,7 @@ public enum MulticoloredPredicate implements Predicate { @Override public boolean apply(MageObject input, Game game) { - // 708.3. Each split card that consists of two halves with different colored mana symbols in their mana costs - // is a multicolored card while it's not a spell on the stack. While it's a spell on the stack, it's only the - // color or colors of the half or halves being cast. # - if (input instanceof SplitCardHalf - && game.getState().getZone(input.getId()) != Zone.STACK) { - return 1 < ((SplitCardHalf) input).getMainCard().getColor(game).getColorCount(); - } else if (input instanceof ModalDoubleFacesCardHalf - && (game.getState().getZone(input.getId()) != Zone.STACK && game.getState().getZone(input.getId()) != Zone.BATTLEFIELD)) { - // While a double-faced card isn’t on the stack or battlefield, consider only the characteristics of its front face. - return 1 < ((ModalDoubleFacesCardHalf) input).getMainCard().getColor(game).getColorCount(); - } else { - return 1 < input.getColor(game).getColorCount(); - } + return 1 < input.getColor(game).getColorCount(); } @Override