From c5c3591471f76b1189e62e13ee94c289537d432a Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sun, 4 Mar 2018 11:59:48 +0100 Subject: [PATCH] TokenEffect: use sa instead of root --- .../java/forge/game/ability/effects/TokenEffect.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java index ee15c6f7b2c..2181ed28ba6 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java @@ -18,9 +18,7 @@ package forge.game.ability.effects; import java.util.Arrays; -import java.util.HashSet; import java.util.List; -import java.util.Set; import forge.StaticData; import forge.card.MagicColor; @@ -281,10 +279,10 @@ public class TokenEffect extends SpellAbilityEffect { if (prototype == null) { tokens = tokenInfo.makeTokenWithMultiplier(controller, finalAmount, cause != null); grantHiddenKeywords(tokens); - grantSvars(tokens, root); - grantAbilities(tokens, root); - grantTriggers(tokens, root); - grantStatics(tokens, root); + grantSvars(tokens, sa); + grantAbilities(tokens, sa); + grantTriggers(tokens, sa); + grantStatics(tokens, sa); } else { tokens = TokenInfo.makeTokensFromPrototype(prototype, controller, finalAmount, cause != null); } @@ -352,7 +350,6 @@ public class TokenEffect extends SpellAbilityEffect { } private String determineTokenColor(Card host) { - Set colorSet = new HashSet<>(); final String[] substitutedColors = Arrays.copyOf(this.tokenColors, this.tokenColors.length); for (int i = 0; i < substitutedColors.length; i++) { if (substitutedColors[i].equals("ChosenColor")) {