Merge branch '1984' into 'master'

move eff.updateStateForView() in other effects

Closes #1984

See merge request core-developers/forge!5526

forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java

@@ -433,11 +433,10 @@ public abstract class SpellAbilityEffect {
             eff.copyChangedTextFrom(card);
         }
 
-        eff.updateStateForView();
-
         // TODO: Add targeting to the effect so it knows who it's dealing with
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
         game.getAction().moveTo(ZoneType.Command, eff, sa);
+        eff.updateStateForView();
         game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
     }
 
@@ -552,11 +551,10 @@ public abstract class SpellAbilityEffect {
 
             game.getEndOfTurn().addUntil(endEffect);
 
-            eff.updateStateForView();
-
             // TODO: Add targeting to the effect so it knows who it's dealing with
             game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
             game.getAction().moveTo(ZoneType.Command, eff, sa);
+            eff.updateStateForView();
             game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
         }
     }

forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffectBase.java

@@ -63,10 +63,10 @@ public abstract class DamagePreventEffectBase extends SpellAbilityEffect {
         if (o instanceof Card) {
             addForgetOnMovedTrigger(eff, "Battlefield");
         }
-        eff.updateStateForView();
 
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
         game.getAction().moveTo(ZoneType.Command, eff, sa);
+        eff.updateStateForView();
         game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
 
         game.getEndOfTurn().addUntil(new GameCommand() {

forge-game/src/main/java/forge/game/ability/effects/FogEffect.java

@@ -31,10 +31,10 @@ public class FogEffect extends SpellAbilityEffect {
         final Card eff = createEffect(sa, hostCard.getController(), name, image);
         ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, eff, true);
         eff.addReplacementEffect(re);
-        eff.updateStateForView();
 
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
         game.getAction().moveTo(ZoneType.Command, eff, sa);
+        eff.updateStateForView();
         game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
 
         game.getEndOfTurn().addUntil(new GameCommand() {

forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java

@@ -427,11 +427,10 @@ public class PlayEffect extends SpellAbilityEffect {
 
         game.getEndOfTurn().addUntil(endEffect);
 
-        eff.updateStateForView();
-
         // TODO: Add targeting to the effect so it knows who it's dealing with
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
         game.getAction().moveTo(ZoneType.Command, eff, sa);
+        eff.updateStateForView();
         game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
     }
 
@@ -465,10 +464,9 @@ public class PlayEffect extends SpellAbilityEffect {
         addExileOnMovedTrigger(eff, "Battlefield");
         addExileOnCounteredTrigger(eff);
 
-        eff.updateStateForView();
-
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
         game.getAction().moveTo(ZoneType.Command, eff, sa);
+        eff.updateStateForView();
         game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
     }
 }

forge-game/src/main/java/forge/game/ability/effects/RegenerateBaseEffect.java

@@ -66,14 +66,13 @@ public abstract class RegenerateBaseEffect extends SpellAbilityEffect {
             eff.copyChangedTextFrom(hostCard);
         }
 
-        eff.updateStateForView();
-
         // add RegenEffect as Shield to the Affected Cards
         for (final Card c : list) {
             c.addShield(eff);
         }
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
         game.getAction().moveTo(ZoneType.Command, eff, sa);
+        eff.updateStateForView();
         game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
         
         final GameCommand untilEOT = new GameCommand() {

forge-game/src/main/java/forge/game/ability/effects/SkipPhaseEffect.java

@@ -113,10 +113,10 @@ public class SkipPhaseEffect extends SpellAbilityEffect {
             addUntilCommand(sa, endEffect);
         }
         eff.addReplacementEffect(re);
-        eff.updateStateForView();
 
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
         game.getAction().moveTo(ZoneType.Command, eff, sa);
+        eff.updateStateForView();
         game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
     }
 }

forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java

@@ -59,10 +59,10 @@ public class SkipTurnEffect extends SpellAbilityEffect {
             re.setLayer(ReplacementLayer.Control);
             re.setOverridingAbility(calcTurn);
             eff.addReplacementEffect(re);
-            eff.updateStateForView();
 
             game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
             game.getAction().moveTo(ZoneType.Command, eff, sa);
+            eff.updateStateForView();
             game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
         }
     }