diff --git a/Mage/src/main/java/mage/abilities/common/delayed/UntilYourNextTurnDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/UntilYourNextTurnDelayedTriggeredAbility.java index 33f9a066f40..86c873bdf00 100644 --- a/Mage/src/main/java/mage/abilities/common/delayed/UntilYourNextTurnDelayedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/delayed/UntilYourNextTurnDelayedTriggeredAbility.java @@ -8,6 +8,7 @@ import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; +import mage.abilities.hint.Hint; import mage.constants.Duration; import mage.constants.EffectType; import mage.game.Game; @@ -15,6 +16,7 @@ import mage.game.events.GameEvent; import mage.util.CardUtil; import mage.watchers.Watcher; +import java.util.ArrayList; import java.util.List; /** @@ -86,6 +88,13 @@ public class UntilYourNextTurnDelayedTriggeredAbility extends DelayedTriggeredAb ability.addWatcher(watcher); } + @Override + public List getHints() { + List res = new ArrayList<>(super.getHints()); + res.addAll(ability.getHints()); + return res; + } + @Override public Effects getEffects(Game game, EffectType effectType) { return ability.getEffects(game, effectType); diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java index ab4e86f5d4d..6a5245ccc44 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java @@ -7,6 +7,7 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.condition.Condition; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; +import mage.abilities.hint.Hint; import mage.constants.EffectType; import mage.constants.Zone; import mage.game.Game; @@ -14,6 +15,7 @@ import mage.game.events.GameEvent; import mage.util.CardUtil; import mage.watchers.Watcher; +import java.util.ArrayList; import java.util.List; /** @@ -111,6 +113,13 @@ public class ConditionalInterveningIfTriggeredAbility extends TriggeredAbilityIm ability.addWatcher(watcher); } + @Override + public List getHints() { + List res = new ArrayList<>(super.getHints()); + res.addAll(ability.getHints()); + return res; + } + @Override public Effects getEffects(Game game, EffectType effectType) { return ability.getEffects(game, effectType); diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java index 4a2b89ce8f5..0eda93cf9e1 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java @@ -8,12 +8,14 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.condition.Condition; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; +import mage.abilities.hint.Hint; import mage.constants.EffectType; import mage.game.Game; import mage.game.events.GameEvent; import mage.util.CardUtil; import mage.watchers.Watcher; +import java.util.ArrayList; import java.util.List; /** @@ -106,6 +108,13 @@ public class ConditionalTriggeredAbility extends TriggeredAbilityImpl { ability.addWatcher(watcher); } + @Override + public List getHints() { + List res = new ArrayList<>(super.getHints()); + res.addAll(ability.getHints()); + return res; + } + @Override public Effects getEffects(Game game, EffectType effectType) { return ability.getEffects(game, effectType); diff --git a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java index 2342564f662..b3d2851fb42 100644 --- a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java @@ -5,6 +5,7 @@ import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.abilities.hint.Hint; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -126,6 +127,13 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl { } } + @Override + public List getHints() { + List res = new ArrayList<>(super.getHints()); + this.triggeredAbilities.forEach(a -> res.addAll(a.getHints())); + return res; + } + @Override public boolean isInUseableZone(Game game, MageObject sourceObject, GameEvent event) { boolean res = false;