From b8106cd5545f54ddfab53ebf9270e52e1e8baaae Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sat, 31 Oct 2020 09:01:25 -0400 Subject: [PATCH] [CMR] updated implementation of War Room --- Mage.Sets/src/mage/cards/w/WarRoom.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/w/WarRoom.java b/Mage.Sets/src/mage/cards/w/WarRoom.java index 5b9e5ff3df9..3d73f81e6c3 100644 --- a/Mage.Sets/src/mage/cards/w/WarRoom.java +++ b/Mage.Sets/src/mage/cards/w/WarRoom.java @@ -62,6 +62,8 @@ enum WarRoomValue implements DynamicValue { return 0; } ObjectColor color = new ObjectColor(); + // if no commander then cost can't be paid + boolean hasCommander = false; for (UUID commanderId : game.getCommandersIds(controller)) { Card commander = game.getCard(commanderId); if (commander == null) { @@ -83,8 +85,9 @@ enum WarRoomValue implements DynamicValue { if (commanderMana.isGreen()) { color.setGreen(true); } + hasCommander = true; } - return color.getColorCount(); + return hasCommander ? color.getColorCount() : Integer.MAX_VALUE; } @Override