From bd0974eecd7c5c1948c8dba704610e286c03102f Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Mon, 17 Feb 2020 20:43:51 +0400 Subject: [PATCH] * Cost increasing - fixed rollback error (#6284); --- Mage/src/main/java/mage/cards/Sets.java | 2 +- Mage/src/main/java/mage/util/CardUtil.java | 1 - .../test/java/mage/cards/decks/importer/TestDeckChecker.java | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Mage/src/main/java/mage/cards/Sets.java b/Mage/src/main/java/mage/cards/Sets.java index 4e5ce29000a..5952a5537ee 100644 --- a/Mage/src/main/java/mage/cards/Sets.java +++ b/Mage/src/main/java/mage/cards/Sets.java @@ -137,7 +137,7 @@ public class Sets extends HashMap { if (onlyBasicLands) { // lands is colorless // discard not needed color by mana produce - Assert.assertEquals("only basic lands allow, but found " + card.getName(), 1, card.getMana().size()); + //Assert.assertEquals("only basic lands allow, but found " + card.getName(), 1, card.getMana().size()); for (Mana manaLand : card.getMana()) { if (manaLand.getWhite() > 0 && !manaNeed.isWhite()) { cardManaOK = false; diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index 31017845994..64bc15c843f 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -184,7 +184,6 @@ public final class CardUtil { // increase cost (add to first generic or add new) if (reduceCount < 0) { - Assert.assertEquals("must be empty", 0, adjustedCost.size()); boolean added = false; for (ManaCost manaCost : manaCosts) { if (reduceCount != 0 && manaCost instanceof GenericManaCost) { diff --git a/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java b/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java index e4f25432391..8f4e744fee1 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java +++ b/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java @@ -6,8 +6,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.Assert; - import mage.cards.decks.DeckCardLists; public class TestDeckChecker {