From d49126d95cec11e959f021e6a5768d18b6387c27 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Sat, 1 Jun 2024 18:55:58 +0200
Subject: [PATCH] Fix Emissary of Soulfire (#5350)

---
 forge-game/src/main/java/forge/game/card/Card.java       | 7 ++++++-
 forge-game/src/main/java/forge/game/keyword/Keyword.java | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index dbf59bda9ac..689f3a9736f 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -1657,7 +1657,12 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
 
         long timestamp = game.getNextTimestamp();
         counterTypeTimestamps.put(counterType, timestamp);
-        addChangedCardKeywords(ImmutableList.of(counterType.toString()), null, false, timestamp, 0, updateView);
+
+        int num = 1;
+        if (!Keyword.smartValueOf(counterType.toString().split(":")[0]).isMultipleRedundant()) {
+            num = getCounters(counterType);
+        }
+        addChangedCardKeywords(Collections.nCopies(num, counterType.toString()), null, false, timestamp, 0, updateView);
         return true;
     }
 
diff --git a/forge-game/src/main/java/forge/game/keyword/Keyword.java b/forge-game/src/main/java/forge/game/keyword/Keyword.java
index 153fc8f364b..b14e923d19a 100644
--- a/forge-game/src/main/java/forge/game/keyword/Keyword.java
+++ b/forge-game/src/main/java/forge/game/keyword/Keyword.java
@@ -336,4 +336,8 @@ public enum Keyword {
         }
         return result;
     }
+
+    public boolean isMultipleRedundant() {
+        return isMultipleRedundant;
+    }
 }