From fed433657c0d849b17b83b6e1810f66081abe36a Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Fri, 5 Apr 2019 12:46:54 +0400 Subject: [PATCH] Fixed deck size check --- .../Mage.Deck.Constructed/src/mage/deck/Commander.java | 6 +++--- .../src/mage/deck/FreeformCommander.java | 6 +++--- .../src/mage/deck/PennyDreadfulCommander.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) 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 8798896e6aa..d944f8068f9 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 @@ -76,7 +76,7 @@ public class Commander extends Constructed { @Override public int getDeckMinSize() { - return 99; + return 98; } @Override @@ -89,8 +89,8 @@ public class Commander extends Constructed { boolean valid = true; FilterMana colorIdentity = new FilterMana(); - if (deck.getCards().size() + deck.getSideboard().size() != getDeckMinSize() + getSideboardMinSize()) { - invalid.put("Deck", "Must contain " + getDeckMinSize() + getSideboardMinSize() + " cards: has " + (deck.getCards().size() + deck.getSideboard().size()) + " cards"); + if (deck.getCards().size() + deck.getSideboard().size() != 100) { + invalid.put("Deck", "Must contain " + 100 + " cards: has " + (deck.getCards().size() + deck.getSideboard().size()) + " cards"); valid = false; } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/FreeformCommander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/FreeformCommander.java index 0172a141336..0c9cce272fb 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/FreeformCommander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/FreeformCommander.java @@ -36,7 +36,7 @@ public class FreeformCommander extends Constructed { @Override public int getDeckMinSize() { - return 99; + return 98; } @Override @@ -49,8 +49,8 @@ public class FreeformCommander extends Constructed { boolean valid = true; FilterMana colorIdentity = new FilterMana(); - if (deck.getCards().size() + deck.getSideboard().size() != getDeckMinSize() + getSideboardMinSize()) { - invalid.put("Deck", "Must contain " + getDeckMinSize() + getSideboardMinSize() + " cards: has " + (deck.getCards().size() + deck.getSideboard().size()) + " cards"); + if (deck.getCards().size() + deck.getSideboard().size() != 100) { + invalid.put("Deck", "Must contain " + 100 + " cards: has " + (deck.getCards().size() + deck.getSideboard().size()) + " cards"); valid = false; } 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 6629b25dc39..6479df83be2 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 @@ -38,7 +38,7 @@ public class PennyDreadfulCommander extends Constructed { @Override public int getDeckMinSize() { - return 99; + return 98; } @Override @@ -51,8 +51,8 @@ public class PennyDreadfulCommander extends Constructed { boolean valid = true; FilterMana colorIdentity = new FilterMana(); - if (deck.getCards().size() + deck.getSideboard().size() != getDeckMinSize() + getSideboardMinSize()) { - invalid.put("Deck", "Must contain " + getDeckMinSize() + +getSideboardMinSize() + " cards: has " + (deck.getCards().size() + deck.getSideboard().size()) + " cards"); + if (deck.getCards().size() + deck.getSideboard().size() != 100) { + invalid.put("Deck", "Must contain " + 100 + " cards: has " + (deck.getCards().size() + deck.getSideboard().size()) + " cards"); valid = false; }