From aaf99a4c1a5b3fe283a6e43a2bad794208c831b5 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Fri, 14 Jul 2023 22:07:30 -0400
Subject: [PATCH] followup fixes

---
 Mage.Sets/src/mage/cards/e/EomerMarshalOfRohan.java       | 8 ++++----
 Mage.Sets/src/mage/cards/r/RelicOfSauron.java             | 2 +-
 .../effects/mana/AddManaInAnyCombinationEffect.java       | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/e/EomerMarshalOfRohan.java b/Mage.Sets/src/mage/cards/e/EomerMarshalOfRohan.java
index f8ac61baa4b..a8666054728 100644
--- a/Mage.Sets/src/mage/cards/e/EomerMarshalOfRohan.java
+++ b/Mage.Sets/src/mage/cards/e/EomerMarshalOfRohan.java
@@ -12,7 +12,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.filter.StaticFilters;
-import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.mageobject.AnotherPredicate;
 import mage.filter.predicate.permanent.AttackingPredicate;
 
@@ -24,8 +24,8 @@ import java.util.UUID;
  */
 public final class EomerMarshalOfRohan extends CardImpl {
 
-    private static final FilterCreaturePermanent filter
-        = new FilterCreaturePermanent("one or more other attacking legendary creatures");
+    private static final FilterControlledCreaturePermanent filter
+        = new FilterControlledCreaturePermanent("one or more other attacking legendary creatures you control");
 
     static {
         filter.add(AnotherPredicate.instance);
@@ -47,7 +47,7 @@ public final class EomerMarshalOfRohan extends CardImpl {
 
         // Whenever one or more other attacking legendary creatures you control die, untap all creatures you control. After this phase, there is an additional combat phase. This ability triggers only once each turn.
         Ability ability = new DiesCreatureTriggeredAbility(
-            new UntapAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURE), false, filter
+            new UntapAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURES), false, filter
         ).setTriggersOnceEachTurn(true);
         ability.addEffect(new AdditionalCombatPhaseEffect());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/r/RelicOfSauron.java b/Mage.Sets/src/mage/cards/r/RelicOfSauron.java
index ea390494618..42b32470571 100644
--- a/Mage.Sets/src/mage/cards/r/RelicOfSauron.java
+++ b/Mage.Sets/src/mage/cards/r/RelicOfSauron.java
@@ -25,7 +25,7 @@ public final class RelicOfSauron extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
         
 
-        // {T}: Add two mana in any combination of {U}, {B} and/or {R}.
+        // {T}: Add two mana in any combination of {U}, {B}, and/or {R}.
         this.addAbility(new SimpleManaAbility(
                 Zone.BATTLEFIELD,
                 new AddManaInAnyCombinationEffect(2, ColoredManaSymbol.U, ColoredManaSymbol.B, ColoredManaSymbol.R),
diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java
index 25ecf495516..fdede98e0e6 100644
--- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java
@@ -176,10 +176,13 @@ public class AddManaInAnyCombinationEffect extends ManaEffect {
             for (ColoredManaSymbol coloredManaSymbol : manaSymbols) {
                 i++;
                 if (i > 1) {
+                    if (manaSymbols.size() > 2) {
+                        sb.append(",");
+                    }
                     if (i == manaSymbols.size()) {
-                        sb.append(", and/or ");
+                        sb.append(" and/or ");
                     } else {
-                        sb.append(", ");
+                        sb.append(" ");
                     }
 
                 }