From 1021443b2aad900b92aa27ef05bc455967098570 Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Thu, 13 Apr 2023 16:23:58 -0400
Subject: [PATCH] [NCC] fix Gavel of the Righteous alternate equip
---
.../costs/common/RemoveCountersSourceCost.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java
index 987b0dedbf..d6f7982a26 100644
--- a/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java
+++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java
@@ -7,7 +7,6 @@ import mage.choices.Choice;
import mage.choices.ChoiceImpl;
import mage.constants.Outcome;
import mage.counters.Counter;
-import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@@ -47,7 +46,16 @@ public class RemoveCountersSourceCost extends CostImpl {
@Override
public boolean canPay(Ability ability, Ability source, UUID controllerId, Game game) {
Permanent permanent = game.getPermanent(source.getSourceId());
- return permanent != null && permanent.getCounters(game).getCount(name) >= amount;
+ return permanent != null && name.isEmpty()
+ ? permanent
+ .getCounters(game)
+ .values()
+ .stream()
+ .map(Counter::getCount)
+ .anyMatch(i -> i > 0)
+ : permanent
+ .getCounters(game)
+ .getCount(name) >= amount;
}
@Override