From baef4114d248228163d44f3426da5109be994f22 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sat, 22 Dec 2018 11:26:15 -0500 Subject: [PATCH] fixed silver bordered cards being legal in various formats --- .../src/mage/deck/AusHighlander.java | 3 +-- .../src/mage/deck/CanadianHighlander.java | 3 +-- .../src/mage/deck/Commander.java | 4 +--- .../src/mage/deck/Eternal.java | 3 +-- .../src/mage/deck/Legacy.java | 2 +- .../src/mage/deck/Pauper.java | 4 +--- .../src/mage/deck/PennyDreadfulCommander.java | 9 ++++----- .../src/mage/deck/TinyLeaders.java | 17 +++++++---------- .../src/mage/deck/Vintage.java | 4 +--- Mage/src/main/java/mage/cards/ExpansionSet.java | 12 ++++++++---- 10 files changed, 26 insertions(+), 35 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java index ed5a331ce34..460a3f9c9a9 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java @@ -4,7 +4,6 @@ import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; import mage.cards.decks.Deck; -import mage.constants.SetType; import java.util.HashMap; import java.util.Map; @@ -82,7 +81,7 @@ public class AusHighlander extends Constructed { public AusHighlander() { this("Australian Highlander"); for (ExpansionSet set : Sets.getInstance().values()) { - if (set.getSetType() != SetType.CUSTOM_SET) { + if (set.isEternalLegal()) { setCodes.add(set.getCode()); } } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java index da4955be6ab..5ec2856facd 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java @@ -4,7 +4,6 @@ import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; import mage.cards.decks.Deck; -import mage.constants.SetType; import java.util.HashMap; import java.util.Map; @@ -64,7 +63,7 @@ public class CanadianHighlander extends Constructed { public CanadianHighlander() { this("Canadian Highlander"); for (ExpansionSet set : Sets.getInstance().values()) { - if (set.getSetType() != SetType.CUSTOM_SET) { + if (set.isEternalLegal()) { setCodes.add(set.getCode()); } } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java index fb7c315fa2b..bbd28dcfa7a 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java @@ -11,7 +11,6 @@ import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; import mage.cards.decks.Deck; -import mage.constants.SetType; import mage.filter.FilterMana; import java.util.*; @@ -27,8 +26,7 @@ public class Commander extends Constructed { public Commander() { this("Commander"); for (ExpansionSet set : Sets.getInstance().values()) { - if (set.getSetType() != SetType.CUSTOM_SET - && set.getSetType() != SetType.JOKESET) { + if (set.isEternalLegal()) { setCodes.add(set.getCode()); } } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Eternal.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Eternal.java index c9fd0ae21af..9f84e84deaa 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Eternal.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Eternal.java @@ -4,7 +4,6 @@ package mage.deck; import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; -import mage.constants.SetType; /** * This class implements the new casual format "Eternal", which is legacy with @@ -18,7 +17,7 @@ public class Eternal extends Constructed { public Eternal() { super("Constructed - Eternal"); for (ExpansionSet set : Sets.getInstance().values()) { - if (set.getSetType() != SetType.CUSTOM_SET) { + if (set.isEternalLegal()) { setCodes.add(set.getCode()); } } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Legacy.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Legacy.java index 90f4ee51ba8..0b9b55a451e 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Legacy.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Legacy.java @@ -14,7 +14,7 @@ public class Legacy extends Constructed { public Legacy() { super("Constructed - Legacy"); for (ExpansionSet set : Sets.getInstance().values()) { - if (set.getSetType() != SetType.CUSTOM_SET) { + if (set.isEternalLegal()) { setCodes.add(set.getCode()); } } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pauper.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pauper.java index 7e14fd84802..d0425c8d8d1 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pauper.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pauper.java @@ -9,10 +9,8 @@ import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; import mage.constants.Rarity; -import mage.constants.SetType; /** - * * @author LevelX2 */ public class Pauper extends Constructed { @@ -22,7 +20,7 @@ public class Pauper extends Constructed { //TODO: Add only Magic Online sets for pauper for (ExpansionSet set : Sets.getInstance().values()) { - if (set.getSetType() != SetType.CUSTOM_SET) { + if (set.isEternalLegal()) { setCodes.add(set.getCode()); } } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/PennyDreadfulCommander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/PennyDreadfulCommander.java index bf23f9f9dd1..164cf8c1cf4 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/PennyDreadfulCommander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/PennyDreadfulCommander.java @@ -1,8 +1,6 @@ package mage.deck; -import java.util.*; -import java.util.Map.Entry; import mage.abilities.Ability; import mage.abilities.common.CanBeYourCommanderAbility; import mage.abilities.keyword.PartnerAbility; @@ -12,11 +10,12 @@ import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; import mage.cards.decks.Deck; -import mage.constants.SetType; import mage.filter.FilterMana; +import java.util.*; +import java.util.Map.Entry; + /** - * * @author spjspj */ public class PennyDreadfulCommander extends Constructed { @@ -28,7 +27,7 @@ public class PennyDreadfulCommander extends Constructed { public PennyDreadfulCommander() { this("Penny Dreadful Commander"); for (ExpansionSet set : Sets.getInstance().values()) { - if (set.getSetType() != SetType.CUSTOM_SET) { + if (set.isEternalLegal()) { setCodes.add(set.getCode()); } } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java index ab94951f680..f2250b79fb9 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java @@ -1,10 +1,6 @@ package mage.deck; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import mage.abilities.common.CanBeYourCommanderAbility; import mage.cards.Card; import mage.cards.ExpansionSet; @@ -12,12 +8,15 @@ import mage.cards.Sets; import mage.cards.SplitCard; import mage.cards.decks.Constructed; import mage.cards.decks.Deck; -import mage.constants.SetType; import mage.filter.FilterMana; import mage.game.GameTinyLeadersImpl; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** - * * @author JRHerlehy */ public class TinyLeaders extends Constructed { @@ -27,7 +26,7 @@ public class TinyLeaders extends Constructed { public TinyLeaders() { this("Tiny Leaders"); for (ExpansionSet set : Sets.getInstance().values()) { - if (set.getSetType() != SetType.CUSTOM_SET) { + if (set.isEternalLegal()) { setCodes.add(set.getCode()); } } @@ -85,7 +84,6 @@ public class TinyLeaders extends Constructed { } /** - * * @param deck * @return - True if deck is valid */ @@ -212,9 +210,8 @@ public class TinyLeaders extends Constructed { } /** - * * @param commander FilterMana object with Color Identity of Commander set - * @param card Card to validate + * @param card Card to validate * @return True if card has a valid color identity */ public boolean cardHasValideColor(FilterMana commander, Card card) { diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java index 5c8ac0ec49f..6ce5836ca87 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java @@ -4,10 +4,8 @@ package mage.deck; import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; -import mage.constants.SetType; /** - * * @author BetaSteward_at_googlemail.com */ public class Vintage extends Constructed { @@ -15,7 +13,7 @@ public class Vintage extends Constructed { public Vintage() { super("Constructed - Vintage"); for (ExpansionSet set : Sets.getInstance().values()) { - if (set.getSetType() != SetType.CUSTOM_SET) { + if (set.isEternalLegal()) { setCodes.add(set.getCode()); } } diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java index 488b32b0441..bc0bdc90593 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -2,22 +2,21 @@ package mage.cards; import mage.ObjectColor; +import mage.abilities.Ability; +import mage.abilities.keyword.PartnerWithAbility; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import mage.abilities.Ability; import mage.constants.Rarity; import mage.constants.SetType; import mage.util.CardUtil; import mage.util.RandomUtil; +import org.apache.log4j.Logger; import java.io.Serializable; import java.util.*; import java.util.stream.Collectors; -import mage.abilities.keyword.PartnerWithAbility; -import org.apache.log4j.Logger; - /** * @author BetaSteward_at_googlemail.com */ @@ -610,6 +609,11 @@ public abstract class ExpansionSet implements Serializable { return setType == SetType.CUSTOM_SET; } + public boolean isEternalLegal() { + return setType != SetType.CUSTOM_SET + && setType != SetType.JOKESET; + } + public void removeSavedCards() { savedCards.clear(); }