From 6aa793d53d024605b751ce82caa68dbe34d63213 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Wed, 11 May 2022 19:09:27 -0400
Subject: [PATCH] [SNC] fixed Ballroom Brawlers targeting restriction (fixes
 #8906)

---
 Mage.Sets/src/mage/cards/b/BallroomBrawlers.java    |  5 ++---
 Mage.Sets/src/mage/cards/d/DwarvenSeaClan.java      |  2 +-
 Mage.Sets/src/mage/cards/s/SigilOfValor.java        | 13 ++++---------
 .../ControllerControlsIslandPredicate.java          | 10 +++++-----
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/b/BallroomBrawlers.java b/Mage.Sets/src/mage/cards/b/BallroomBrawlers.java
index 0615c3e151b..5dbe42a864e 100644
--- a/Mage.Sets/src/mage/cards/b/BallroomBrawlers.java
+++ b/Mage.Sets/src/mage/cards/b/BallroomBrawlers.java
@@ -13,6 +13,7 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.SubType;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -24,8 +25,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
-import static mage.filter.predicate.permanent.ControllerControlsIslandPredicate.filter;
-
 /**
  * @author TheElk801
  */
@@ -41,7 +40,7 @@ public final class BallroomBrawlers extends CardImpl {
 
         // Whenever Ballroom Brawlers attacks, Ballroom Brawlers and up to one other target creature you control each gain your choice of first strike or lifelink until end of turn.
         Ability ability = new AttacksTriggeredAbility(new BallroomBrawlersEffect());
-        ability.addTarget(new TargetPermanent(0, 1, filter));
+        ability.addTarget(new TargetPermanent(0, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/cards/d/DwarvenSeaClan.java b/Mage.Sets/src/mage/cards/d/DwarvenSeaClan.java
index c5eed289139..d831766e919 100644
--- a/Mage.Sets/src/mage/cards/d/DwarvenSeaClan.java
+++ b/Mage.Sets/src/mage/cards/d/DwarvenSeaClan.java
@@ -30,7 +30,7 @@ public final class DwarvenSeaClan extends CardImpl {
     private static final FilterAttackingOrBlockingCreature filter = new FilterAttackingOrBlockingCreature();
 
     static {
-        filter.add(new ControllerControlsIslandPredicate());
+        filter.add(ControllerControlsIslandPredicate.instance);
     }
 
     public DwarvenSeaClan(UUID ownerId, CardSetInfo setInfo) {
diff --git a/Mage.Sets/src/mage/cards/s/SigilOfValor.java b/Mage.Sets/src/mage/cards/s/SigilOfValor.java
index 2a401fb3b4b..aea9436e7d6 100644
--- a/Mage.Sets/src/mage/cards/s/SigilOfValor.java
+++ b/Mage.Sets/src/mage/cards/s/SigilOfValor.java
@@ -1,6 +1,5 @@
 package mage.cards.s;
 
-import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.costs.mana.GenericManaCost;
@@ -10,23 +9,19 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.abilities.keyword.EquipAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.constants.Zone;
+import mage.constants.*;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardIdPredicate;
-import static mage.filter.predicate.permanent.ControllerControlsIslandPredicate.filter;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
 
+import java.util.UUID;
+
 /**
- *
  * @author LevelX2
  */
 public final class SigilOfValor extends CardImpl {
@@ -127,6 +122,6 @@ class SigilOfValorCount implements DynamicValue {
 
     @Override
     public String getMessage() {
-        return filter.getMessage();
+        return "";
     }
 }
diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java
index ab9f182c049..dcac4f1c9f9 100644
--- a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java
+++ b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java
@@ -1,4 +1,3 @@
-
 package mage.filter.predicate.permanent;
 
 import mage.constants.SubType;
@@ -8,20 +7,21 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 
 /**
- *
  * @author KholdFuzion
  */
 
-public class ControllerControlsIslandPredicate implements Predicate<Permanent> {
+public enum ControllerControlsIslandPredicate implements Predicate<Permanent> {
+    instance;
+
+    private static final FilterLandPermanent filter = new FilterLandPermanent("Island");
 
-    public static final FilterLandPermanent filter = new FilterLandPermanent("Island");
     static {
         filter.add(SubType.ISLAND.getPredicate());
     }
 
     @Override
     public boolean apply(Permanent input, Game game) {
-        return (game.getBattlefield().countAll(filter, input.getControllerId(), game) > 0);
+        return game.getBattlefield().countAll(filter, input.getControllerId(), game) > 0;
     }
 
     @Override