From e70b1fadbe2d7ee95c9972a2ed08a005171c0722 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 27 Jul 2018 11:38:08 -0400 Subject: [PATCH] updated MTGO 1v1 commander rules to ban partners --- .../Mage.Deck.Constructed/src/mage/deck/Commander.java | 5 ++++- .../src/mage/deck/MTGO1v1Commander.java | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 81e4030d25..439e7bf928 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 @@ -1,4 +1,3 @@ - package mage.deck; import java.util.*; @@ -23,6 +22,7 @@ import mage.filter.FilterMana; public class Commander extends Constructed { protected List bannedCommander = new ArrayList<>(); + protected boolean partnerAllowed = true; public Commander() { this("Commander"); @@ -105,6 +105,9 @@ public class Commander extends Constructed { } if (deck.getSideboard().size() < 1 || deck.getSideboard().size() > 2) { + if ((deck.getSideboard().size() > 1 && !partnerAllowed)) { + invalid.put("Commander", "You may only have one commander"); + } invalid.put("Commander", "Sideboard must contain only the commander(s)"); valid = false; } else { diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/MTGO1v1Commander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/MTGO1v1Commander.java index 1b4a1f3e08..511d0d3f0e 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/MTGO1v1Commander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/MTGO1v1Commander.java @@ -8,6 +8,8 @@ public class MTGO1v1Commander extends Commander { public MTGO1v1Commander() { super("MTGO 1v1 Commander"); + partnerAllowed = false; + banned.add("Ancestral Recall"); banned.add("Back to Basics"); banned.add("Balance");