From c1f1ceb9e76d3849a187fefe6408f9e7d9ef69eb Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 30 Apr 2021 09:16:27 -0400 Subject: [PATCH] fixed unnecessary verify warnings for split cards --- .../mage/cards/v/ValentinDeanOfTheVein.java | 2 +- .../java/mage/verify/VerifyCardDataTest.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/cards/v/ValentinDeanOfTheVein.java b/Mage.Sets/src/mage/cards/v/ValentinDeanOfTheVein.java index 1203c71a6af..1420754a5ec 100644 --- a/Mage.Sets/src/mage/cards/v/ValentinDeanOfTheVein.java +++ b/Mage.Sets/src/mage/cards/v/ValentinDeanOfTheVein.java @@ -33,7 +33,7 @@ public final class ValentinDeanOfTheVein extends ModalDoubleFacesCard { public ValentinDeanOfTheVein(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, new SubType[]{SubType.VAMPIRE, SubType.WARLOCK}, "{B}", - "Lisette Dean of the Root", new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.DRUID}, "{2}{G}{G}" + "Lisette, Dean of the Root", new CardType[]{CardType.CREATURE}, new SubType[]{SubType.HUMAN, SubType.DRUID}, "{2}{G}{G}" ); // 1. diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 62e86b767f5..eca11ec3272 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -267,13 +267,13 @@ public class VerifyCardDataTest { for (Card card : CardScanner.getAllCards()) { cardIndex++; if (card instanceof SplitCard) { - check(((SplitCard) card).getLeftHalfCard(), cardIndex); - check(((SplitCard) card).getRightHalfCard(), cardIndex); + check(((SplitCard) card).getLeftHalfCard(), cardIndex, true); + check(((SplitCard) card).getRightHalfCard(), cardIndex, true); } else if (card instanceof ModalDoubleFacesCard) { - check(((ModalDoubleFacesCard) card).getLeftHalfCard(), cardIndex); - check(((ModalDoubleFacesCard) card).getRightHalfCard(), cardIndex); + check(((ModalDoubleFacesCard) card).getLeftHalfCard(), cardIndex, false); + check(((ModalDoubleFacesCard) card).getRightHalfCard(), cardIndex, false); } else { - check(card, cardIndex); + check(card, cardIndex, false); } } @@ -1171,13 +1171,13 @@ public class VerifyCardDataTest { } } - private void check(Card card, int cardIndex) { + private void check(Card card, int cardIndex, boolean skipWarning) { MtgJsonCard ref = MtgJsonService.cardFromSet(card.getExpansionSetCode(), card.getName(), card.getCardNumber()); - if (ref == null) { + if (ref != null) { + checkAll(card, ref, cardIndex); + } else if (!skipWarning) { warn(card, "Missing card reference"); - return; } - checkAll(card, ref, cardIndex); } private boolean contains(Collection options, String value) {