From 9748136723d0f634cb0b6c64eff13c4b9d301c70 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 7 Dec 2019 21:55:45 +0400 Subject: [PATCH] Fixed dates --- .../java/mage/client/util/sets/ConstructedFormats.java | 8 ++++---- .../Mage.Deck.Constructed/src/mage/deck/Frontier.java | 3 ++- .../Mage.Deck.Constructed/src/mage/deck/Modern.java | 3 ++- .../src/mage/deck/ModernNoBannedList.java | 3 ++- .../Mage.Deck.Constructed/src/mage/deck/Pioneer.java | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java index 854f6d51957..0e356b99a92 100644 --- a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java +++ b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java @@ -28,10 +28,10 @@ public final class ConstructedFormats { public static final Standard STANDARD_CARDS = new Standard(); // Attention -Month is 0 Based so Feb = 1 for example. // - private static final Date extendedDate = new GregorianCalendar(2009, 7, 20).getTime(); - private static final Date frontierDate = new GregorianCalendar(2014, 6, 17).getTime(); - private static final Date pioneerDate = new GregorianCalendar(2012, 10, 5).getTime(); - private static final Date modernDate = new GregorianCalendar(2003, 6, 20).getTime(); + private static final Date extendedDate = new GregorianCalendar(2009, Calendar.AUGUST, 20).getTime(); + private static final Date frontierDate = new GregorianCalendar(2014, Calendar.JULY, 17).getTime(); + private static final Date pioneerDate = new GregorianCalendar(2012, Calendar.NOVEMBER, 5).getTime(); + private static final Date modernDate = new GregorianCalendar(2003, Calendar.JULY, 20).getTime(); // for all sets just return empty list private static final List all = new ArrayList<>(); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Frontier.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Frontier.java index 28aa7cc776f..cb4c6a0b1da 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Frontier.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Frontier.java @@ -4,6 +4,7 @@ import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; +import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -15,7 +16,7 @@ public class Frontier extends Constructed { public Frontier() { super("Constructed - Frontier"); - Date cutoff = new GregorianCalendar(2014, 6, 18).getTime(); // M15 release date + Date cutoff = new GregorianCalendar(2014, Calendar.JULY, 18).getTime(); // M15 release date for (ExpansionSet set : Sets.getInstance().values()) { if (set.getSetType().isStandardLegal() && (set.getReleaseDate().after(cutoff) || set.getReleaseDate().equals(cutoff))) { setCodes.add(set.getCode()); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java index ad712c16cfd..ba7cb19a0cf 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java @@ -4,6 +4,7 @@ import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; +import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -15,7 +16,7 @@ public class Modern extends Constructed { public Modern() { super("Constructed - Modern"); - Date cutoff = new GregorianCalendar(2003, 6, 28).getTime(); // Eight edition release date + Date cutoff = new GregorianCalendar(2003, Calendar.JULY, 28).getTime(); // Eight edition release date for (ExpansionSet set : Sets.getInstance().values()) { if (set.getSetType().isModernLegal() && (set.getReleaseDate().after(cutoff) || set.getReleaseDate().equals(cutoff))) { setCodes.add(set.getCode()); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ModernNoBannedList.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ModernNoBannedList.java index 1718cc3b3a0..682f8727fdb 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ModernNoBannedList.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ModernNoBannedList.java @@ -4,6 +4,7 @@ import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; +import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -15,7 +16,7 @@ public class ModernNoBannedList extends Constructed { public ModernNoBannedList() { super("Constructed - Modern - No Banned List"); - Date cutoff = new GregorianCalendar(2003, 6, 28).getTime(); // Eight edition release date + Date cutoff = new GregorianCalendar(2003, Calendar.JULY, 28).getTime(); // Eight edition release date for (ExpansionSet set : Sets.getInstance().values()) { if (set.getSetType().isModernLegal() && (set.getReleaseDate().after(cutoff) || set.getReleaseDate().equals(cutoff))) { setCodes.add(set.getCode()); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java index 0769631e64c..e4a8c12fe65 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java @@ -4,6 +4,7 @@ import mage.cards.ExpansionSet; import mage.cards.Sets; import mage.cards.decks.Constructed; +import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -15,7 +16,7 @@ public class Pioneer extends Constructed { public Pioneer() { super("Constructed - Pioneer"); - Date cutoff = new GregorianCalendar(2012, 10, 5).getTime(); // RTR release date + Date cutoff = new GregorianCalendar(2012, Calendar.OCTOBER, 5).getTime(); // RTR release date for (ExpansionSet set : Sets.getInstance().values()) { if (set.getSetType().isStandardLegal() && (set.getReleaseDate().after(cutoff) || set.getReleaseDate().equals(cutoff))) { setCodes.add(set.getCode());