From fa8abb6d7cd8b407d08200fa27330afb5ec7b93f Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 27 Sep 2019 08:37:43 +0800
Subject: [PATCH] We need to pass it as a list to update correctly

---
 .../java/forge/game/event/GameEventTokenStateUpdate.java    | 6 +++---
 forge-game/src/main/java/forge/game/phase/PhaseHandler.java | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/event/GameEventTokenStateUpdate.java b/forge-game/src/main/java/forge/game/event/GameEventTokenStateUpdate.java
index 0aa22fe26a8..37bbe5ef287 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventTokenStateUpdate.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventTokenStateUpdate.java
@@ -2,14 +2,14 @@ package forge.game.event;
 
 import forge.game.card.Card;
 
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 
 public class GameEventTokenStateUpdate extends GameEvent {
 
     public final Collection<Card> cards;
-    public GameEventTokenStateUpdate(Card affected) {
-        cards = Arrays.asList(affected);
+    public GameEventTokenStateUpdate(List<Card> affected) {
+        cards = affected;
     }
 
     @Override
diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index 1ce81e14925..a40e0976e84 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -177,14 +177,16 @@ public class PhaseHandler implements java.io.Serializable {
 
             // Tokens starting game in play should suffer from Sum. Sickness
             final CardCollectionView list = playerTurn.getCardsIncludePhasingIn(ZoneType.Battlefield);
+            final List<Card> toupdate = new ArrayList<>();
             for (final Card c : list) {
                 if (playerTurn.getTurn() > 0 || !c.isStartsGameInPlay()) {
                     if (c.isToken()) //update token stacking on battlefield
-                        game.fireEvent(new GameEventTokenStateUpdate(c));
+                        toupdate.add(c);
 
                     c.setSickness(false);
                 }
             }
+            game.fireEvent(new GameEventTokenStateUpdate(toupdate));
             playerTurn.incrementTurn();
 
             game.getAction().resetActivationsPerTurn();