From e29718444e727e04f3cf19a4428debee72f9af7d Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 8 Oct 2021 11:06:26 -0400 Subject: [PATCH] move eff.updateStateForView() in other effects --- .../main/java/forge/game/ability/SpellAbilityEffect.java | 6 ++---- .../forge/game/ability/effects/DamagePreventEffectBase.java | 2 +- .../src/main/java/forge/game/ability/effects/FogEffect.java | 2 +- .../main/java/forge/game/ability/effects/PlayEffect.java | 6 ++---- .../forge/game/ability/effects/RegenerateBaseEffect.java | 3 +-- .../java/forge/game/ability/effects/SkipPhaseEffect.java | 2 +- .../java/forge/game/ability/effects/SkipTurnEffect.java | 2 +- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java index c03a2a68651..fe26fa04952 100644 --- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java +++ b/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); } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffectBase.java index 16ea826b9bf..c4490ae68e8 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffectBase.java +++ b/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() { diff --git a/forge-game/src/main/java/forge/game/ability/effects/FogEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FogEffect.java index a9b47f5140b..3d6dd0807b9 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/FogEffect.java +++ b/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() { diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java index 29f4ec66886..87316c9e959 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java +++ b/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); } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/RegenerateBaseEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RegenerateBaseEffect.java index adcb187be84..82bbb917667 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RegenerateBaseEffect.java +++ b/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() { diff --git a/forge-game/src/main/java/forge/game/ability/effects/SkipPhaseEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SkipPhaseEffect.java index df9dcf07549..186636874ff 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SkipPhaseEffect.java +++ b/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); } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java index 0cb399042c8..3c71e7f67b4 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java +++ b/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); } }