From 0009797a6898e5b06f8f7a65655919f4b0adf761 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 27 Mar 2014 00:03:42 +0100 Subject: [PATCH] * Editor / Add Lands - Fixed that sets could be selected, that doesn't have all type of basic lands. So sometimes it was not possible any type of basic land to add to the deck for sealed / draft match. --- Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java | 1 + Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java | 3 +-- Mage.Sets/src/mage/sets/DivineVsDemonic.java | 1 + Mage.Sets/src/mage/sets/ElspethvsTezzeret.java | 1 + Mage.Sets/src/mage/sets/ElvesVsGoblins.java | 1 + Mage.Sets/src/mage/sets/GarrukVsLiliana.java | 1 + Mage.Sets/src/mage/sets/Heroesvsmonsters.java | 1 + Mage.Sets/src/mage/sets/JaceVsChandra.java | 1 + Mage.Sets/src/mage/sets/JaceVsVraska.java | 1 + Mage.Sets/src/mage/sets/KnightsVsDragons.java | 1 + Mage.Sets/src/mage/sets/MagicPlayerRewards.java | 1 + Mage.Sets/src/mage/sets/MirrodinBesieged.java | 1 - Mage.Sets/src/mage/sets/VenserVsKoth.java | 1 + Mage/src/mage/cards/ExpansionSet.java | 2 +- 14 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java b/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java index ec7e7ae972..544528b3d5 100644 --- a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java +++ b/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java @@ -45,5 +45,6 @@ public class AjaniVsNicolBolas extends ExpansionSet { private AjaniVsNicolBolas() { super("Duel Decks: Ajani vs. Nicol Bolas", "DDH", "mage.sets.ajanivsnicolbolas", new GregorianCalendar(2011, 9, 2).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java index 0fa80591b4..ee0847dea9 100644 --- a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java @@ -1,10 +1,9 @@ package mage.sets; +import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; - public class ChampionsOfKamigawa extends ExpansionSet { private static final ChampionsOfKamigawa fINSTANCE = new ChampionsOfKamigawa(); diff --git a/Mage.Sets/src/mage/sets/DivineVsDemonic.java b/Mage.Sets/src/mage/sets/DivineVsDemonic.java index d9369de9ca..174f9addc2 100644 --- a/Mage.Sets/src/mage/sets/DivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/DivineVsDemonic.java @@ -46,5 +46,6 @@ public class DivineVsDemonic extends ExpansionSet { private DivineVsDemonic() { super("Duel Decks: Divine vs. Demonic", "DDC", "mage.sets.divinevsdemonic", new GregorianCalendar(2009, 04, 10).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java b/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java index 593f89d6bf..fd3a5e2782 100644 --- a/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java +++ b/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java @@ -14,5 +14,6 @@ public class ElspethvsTezzeret extends ExpansionSet { private ElspethvsTezzeret() { super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "mage.sets.elspethvstezzeret", new GregorianCalendar(2010, 8, 3).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java b/Mage.Sets/src/mage/sets/ElvesVsGoblins.java index 2060344508..547cd2457d 100644 --- a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/ElvesVsGoblins.java @@ -24,5 +24,6 @@ public class ElvesVsGoblins extends ExpansionSet { private ElvesVsGoblins() { super("Duel Decks: Elves vs. Goblins", "EVG", "mage.sets.elvesvsgoblins", new GregorianCalendar(2007, 11, 16).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java b/Mage.Sets/src/mage/sets/GarrukVsLiliana.java index e231d48842..11ada41817 100644 --- a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/GarrukVsLiliana.java @@ -24,5 +24,6 @@ public class GarrukVsLiliana extends ExpansionSet { private GarrukVsLiliana() { super("Duel Decks: Garruk vs. Liliana", "DDD", "mage.sets.garrukvsliliana", new GregorianCalendar(2009, 10, 30).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/Heroesvsmonsters.java b/Mage.Sets/src/mage/sets/Heroesvsmonsters.java index 37a3026286..06831c9324 100644 --- a/Mage.Sets/src/mage/sets/Heroesvsmonsters.java +++ b/Mage.Sets/src/mage/sets/Heroesvsmonsters.java @@ -45,5 +45,6 @@ public class Heroesvsmonsters extends ExpansionSet { private Heroesvsmonsters() { super("Duel Decks: Heroes vs. Monsters", "DDL", "mage.sets.heroesvsmonsters", new GregorianCalendar(2013, 9, 6).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/JaceVsChandra.java b/Mage.Sets/src/mage/sets/JaceVsChandra.java index 556c8fecfc..a40fd93890 100644 --- a/Mage.Sets/src/mage/sets/JaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/JaceVsChandra.java @@ -24,5 +24,6 @@ public class JaceVsChandra extends ExpansionSet { private JaceVsChandra() { super("Duel Decks: Jace vs. Chandra", "DD2", "mage.sets.jacevschandra", new GregorianCalendar(2008, 11, 07).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/JaceVsVraska.java b/Mage.Sets/src/mage/sets/JaceVsVraska.java index 452dcd3d46..6bbf84acd3 100644 --- a/Mage.Sets/src/mage/sets/JaceVsVraska.java +++ b/Mage.Sets/src/mage/sets/JaceVsVraska.java @@ -46,5 +46,6 @@ public class JaceVsVraska extends ExpansionSet { private JaceVsVraska() { super("Duel Decks: Jace vs. Vraska", "DDM", "mage.sets.jacevsvraska", new GregorianCalendar(2014, 3, 14).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/KnightsVsDragons.java b/Mage.Sets/src/mage/sets/KnightsVsDragons.java index ca62f0798c..e1f7816669 100644 --- a/Mage.Sets/src/mage/sets/KnightsVsDragons.java +++ b/Mage.Sets/src/mage/sets/KnightsVsDragons.java @@ -46,5 +46,6 @@ public class KnightsVsDragons extends ExpansionSet { private KnightsVsDragons() { super("Duel Decks: Knights vs. Dragons", "DDG", "mage.sets.knightsvsdragons", new GregorianCalendar(2011, 4, 1).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java index a4c0996ef4..e196e25f07 100644 --- a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java +++ b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java @@ -15,5 +15,6 @@ public class MagicPlayerRewards extends ExpansionSet { private MagicPlayerRewards() { super("Magic Player Rewards", "MPR", "mage.sets.playerrewards", new GregorianCalendar(1990, 1, 1).getTime(), SetType.EXPANSION); this.hasBoosters = false; + this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/MirrodinBesieged.java b/Mage.Sets/src/mage/sets/MirrodinBesieged.java index ddafe332b2..c90901964a 100644 --- a/Mage.Sets/src/mage/sets/MirrodinBesieged.java +++ b/Mage.Sets/src/mage/sets/MirrodinBesieged.java @@ -50,7 +50,6 @@ public class MirrodinBesieged extends ExpansionSet { super("Mirrodin Besieged", "MBS", "mage.sets.mirrodinbesieged", new GregorianCalendar(2011, 1, 4).getTime(), SetType.EXPANSION); this.blockName = "Scars of Mirrodin"; this.parentSet = ScarsOfMirrodin.getInstance(); - this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/VenserVsKoth.java b/Mage.Sets/src/mage/sets/VenserVsKoth.java index f60917f3f0..29567814e5 100644 --- a/Mage.Sets/src/mage/sets/VenserVsKoth.java +++ b/Mage.Sets/src/mage/sets/VenserVsKoth.java @@ -46,5 +46,6 @@ public class VenserVsKoth extends ExpansionSet { private VenserVsKoth() { super("Duel Decks: Venser vs. Koth", "DDI", "mage.sets.venservskoth", new GregorianCalendar(2012, 3, 30).getTime(), SetType.REPRINT); + this.hasBasicLands = false; } } diff --git a/Mage/src/mage/cards/ExpansionSet.java b/Mage/src/mage/cards/ExpansionSet.java index dd86cb4242..7ac4809d8e 100644 --- a/Mage/src/mage/cards/ExpansionSet.java +++ b/Mage/src/mage/cards/ExpansionSet.java @@ -108,7 +108,7 @@ public abstract class ExpansionSet implements Serializable { } public List createBooster() { - List booster = new ArrayList(); + List booster = new ArrayList<>(); if (!hasBoosters) { return booster; }