diff --git a/Mage.Sets/src/mage/cards/a/AminatousAugury.java b/Mage.Sets/src/mage/cards/a/AminatousAugury.java index 0a3291cd22b..c1054bfbcfc 100644 --- a/Mage.Sets/src/mage/cards/a/AminatousAugury.java +++ b/Mage.Sets/src/mage/cards/a/AminatousAugury.java @@ -78,7 +78,7 @@ class AminatousAuguryEffect extends OneShotEffect { } // move cards from library to exile - controller.moveCardsToExile(controller.getLibrary().getTopCards(game, 8), source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null)); + controller.moveCardsToExile(controller.getLibrary().getTopCards(game, 8), source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, null)); ExileZone auguryExileZone = game.getExile().getExileZone(source.getSourceId()); if (auguryExileZone == null) { return true; diff --git a/Mage.Sets/src/mage/cards/a/AnzragsRampage.java b/Mage.Sets/src/mage/cards/a/AnzragsRampage.java index c3f432f792b..c44f0cf95af 100644 --- a/Mage.Sets/src/mage/cards/a/AnzragsRampage.java +++ b/Mage.Sets/src/mage/cards/a/AnzragsRampage.java @@ -144,7 +144,7 @@ class AnzragsRampageEffect extends OneShotEffect { controller.moveCardsToExile( cards.getCards(game), source, game, true, CardUtil.getExileZoneId(game, source), - CardUtil.createObjectRealtedWindowTitle(source, game, null)); + CardUtil.createObjectRelatedWindowTitle(source, game, null)); // You may put a creature card exiled this way onto the battlefield. TargetCard targetCard = new TargetCardInExile( diff --git a/Mage.Sets/src/mage/cards/a/AsmodeusTheArchfiend.java b/Mage.Sets/src/mage/cards/a/AsmodeusTheArchfiend.java index c6411c3acbf..86c60be73de 100644 --- a/Mage.Sets/src/mage/cards/a/AsmodeusTheArchfiend.java +++ b/Mage.Sets/src/mage/cards/a/AsmodeusTheArchfiend.java @@ -92,7 +92,7 @@ class AsmodeusTheArchfiendReplacementEffect extends ReplacementEffectImpl { Card card = controller.getLibrary().getFromTop(game); if (card != null) { UUID exileZoneId = CardUtil.getExileZoneId(game, sourcePermanent.getId(), sourcePermanent.getZoneChangeCounter(game)); - String exileName = CardUtil.createObjectRealtedWindowTitle(source, game, null); + String exileName = CardUtil.createObjectRelatedWindowTitle(source, game, null); controller.moveCardsToExile(card, source, game, false, exileZoneId, exileName); card.setFaceDown(true, game); } diff --git a/Mage.Sets/src/mage/cards/c/CloneShell.java b/Mage.Sets/src/mage/cards/c/CloneShell.java index 150ab310aea..fdd7af887ab 100644 --- a/Mage.Sets/src/mage/cards/c/CloneShell.java +++ b/Mage.Sets/src/mage/cards/c/CloneShell.java @@ -73,7 +73,7 @@ class CloneShellEffect extends OneShotEffect { Card card = cards.get(target1.getFirstTarget(), game); if (card != null) { cards.remove(card); - controller.moveCardsToExile(card, source, game, false, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, "(Imprint)")); + controller.moveCardsToExile(card, source, game, false, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRelatedWindowTitle(source, game, "(Imprint)")); card.setFaceDown(true, game); Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java b/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java index 41f78f45962..bcf6c27e2d7 100644 --- a/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java +++ b/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java @@ -73,7 +73,7 @@ class ColfenorsPlansExileEffect extends OneShotEffect { Cards toExile = new CardsImpl(controller.getLibrary().getTopCards(game, 7)); UUID exileId = CardUtil.getCardExileZoneId(game, source); controller.moveCardsToExile(toExile.getCards(game), source, game, false, - exileId, CardUtil.createObjectRealtedWindowTitle(source, game, null)); + exileId, CardUtil.createObjectRelatedWindowTitle(source, game, null)); ExileZone exileZone = game.getExile().getExileZone(exileId); if (exileZone != null) { for (Card card : exileZone.getCards(game)) { diff --git a/Mage.Sets/src/mage/cards/e/ElkinBottle.java b/Mage.Sets/src/mage/cards/e/ElkinBottle.java index b06c672926f..8c691844c0e 100644 --- a/Mage.Sets/src/mage/cards/e/ElkinBottle.java +++ b/Mage.Sets/src/mage/cards/e/ElkinBottle.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; @@ -64,7 +63,7 @@ class ElkinBottleExileEffect extends OneShotEffect { if (controller != null) { Card card = controller.getLibrary().getFromTop(game); if (card != null) { - controller.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null)); + controller.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, null)); CardUtil.makeCardPlayable(game, source, card, false, Duration.UntilYourNextUpkeepStep, false); } return true; diff --git a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java index 47c9ed2393e..f233d7d7850 100644 --- a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java +++ b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java @@ -77,7 +77,7 @@ class FlamesOfRemembranceExileEffect extends OneShotEffect { if (controller != null) { Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, amount.calculate(game, source, this))); if (!cards.isEmpty()) { - controller.moveCardsToExile(cards.getCards(game), source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, "")); + controller.moveCardsToExile(cards.getCards(game), source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, "")); ContinuousEffect effect = new FlamesOfRemembranceMayPlayExiledEffect(); effect.setTargetPointer(new FixedTargets(cards, game)); game.addEffect(effect, source); diff --git a/Mage.Sets/src/mage/cards/k/KingNarfisBetrayal.java b/Mage.Sets/src/mage/cards/k/KingNarfisBetrayal.java index 8a53fcf26ad..c6174250f9b 100644 --- a/Mage.Sets/src/mage/cards/k/KingNarfisBetrayal.java +++ b/Mage.Sets/src/mage/cards/k/KingNarfisBetrayal.java @@ -95,7 +95,7 @@ class KingNarfisBetrayalFirstEffect extends OneShotEffect { TargetCard target = new TargetCardInYourGraveyard(filter); target.withNotTarget(true); if (controller.chooseTarget(outcome, controller.getGraveyard(), target, source, game)) { - controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, null)); + controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRelatedWindowTitle(source, game, null)); } } } @@ -112,7 +112,7 @@ class KingNarfisBetrayalFirstEffect extends OneShotEffect { TargetCard target = new TargetCardInOpponentsGraveyard(1, 1, filter, true); target.withNotTarget(true); if (controller.chooseTarget(outcome, opponent.getGraveyard(), target, source, game)) { - controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, null)); + controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRelatedWindowTitle(source, game, null)); } } } diff --git a/Mage.Sets/src/mage/cards/n/Necropotence.java b/Mage.Sets/src/mage/cards/n/Necropotence.java index b833ca208ed..5350122373a 100644 --- a/Mage.Sets/src/mage/cards/n/Necropotence.java +++ b/Mage.Sets/src/mage/cards/n/Necropotence.java @@ -22,7 +22,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; @@ -111,7 +110,7 @@ class NecropotenceEffect extends OneShotEffect { Card card = controller.getLibrary().getFromTop(game); if (card != null && controller.moveCardsToExile(card, source, game, false, CardUtil.getCardExileZoneId(game, source), - CardUtil.createObjectRealtedWindowTitle(source, game, null))) { + CardUtil.createObjectRelatedWindowTitle(source, game, null))) { card.setFaceDown(true, game); Effect returnToHandEffect = new ReturnToHandTargetEffect(); returnToHandEffect.setText("put that face down card into your hand"); diff --git a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java index 11a910f50bb..fb7eda89e0b 100644 --- a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java +++ b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java @@ -83,7 +83,7 @@ class NightveilSpecterExileEffect extends OneShotEffect { if (player != null) { Card card = player.getLibrary().getFromTop(game); if (card != null) { - player.moveCardsToExile(card, source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, null)); + player.moveCardsToExile(card, source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRelatedWindowTitle(source, game, null)); return true; } } diff --git a/Mage.Sets/src/mage/cards/n/NivixAerieOfTheFiremind.java b/Mage.Sets/src/mage/cards/n/NivixAerieOfTheFiremind.java index c11dae866d8..4734c80e598 100644 --- a/Mage.Sets/src/mage/cards/n/NivixAerieOfTheFiremind.java +++ b/Mage.Sets/src/mage/cards/n/NivixAerieOfTheFiremind.java @@ -72,7 +72,7 @@ class NivixAerieOfTheFiremindEffect extends OneShotEffect { if (library.hasCards()) { Card card = library.getFromTop(game); if (card != null - && controller.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null)) + && controller.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, null)) && card.isInstantOrSorcery(game)) { ContinuousEffect effect = new NivixAerieOfTheFiremindCanCastEffect(); effect.setTargetPointer(new FixedTarget(card.getId())); diff --git a/Mage.Sets/src/mage/cards/p/PropheticFlamespeaker.java b/Mage.Sets/src/mage/cards/p/PropheticFlamespeaker.java index 8da8f413370..ea853ff4b48 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticFlamespeaker.java +++ b/Mage.Sets/src/mage/cards/p/PropheticFlamespeaker.java @@ -78,7 +78,7 @@ class PropheticFlamespeakerExileEffect extends OneShotEffect { Card card = controller.getLibrary().getFromTop(game); if (card != null) { if (controller.moveCardsToExile(card, source, game, true, source.getSourceId(), - CardUtil.createObjectRealtedWindowTitle(source, game, ""))) { + CardUtil.createObjectRelatedWindowTitle(source, game, ""))) { ContinuousEffect effect = new PropheticFlamespeakerCastFromExileEffect(); effect.setTargetPointer(new FixedTarget(card.getId())); game.addEffect(effect, source); diff --git a/Mage.Sets/src/mage/cards/s/StolenGoods.java b/Mage.Sets/src/mage/cards/s/StolenGoods.java index bfdd86470ed..8f374f432c5 100644 --- a/Mage.Sets/src/mage/cards/s/StolenGoods.java +++ b/Mage.Sets/src/mage/cards/s/StolenGoods.java @@ -3,8 +3,6 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.effects.AsThoughEffectImpl; -import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.asthought.PlayFromNotOwnHandZoneTargetEffect; import mage.cards.Card; @@ -14,7 +12,6 @@ import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; -import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; /** @@ -69,7 +66,7 @@ class StolenGoodsEffect extends OneShotEffect { break; } if (card.isLand(game)) { - if (!opponent.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null))) { + if (!opponent.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, null))) { break; } } else { diff --git a/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java b/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java index 39075607b9f..1f8d1edca2e 100644 --- a/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java +++ b/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java @@ -93,7 +93,7 @@ class TibaltsTrickeryEffect extends OneShotEffect { } } controller.moveCardsToExile(cardsToExile, source, game, true, source.getSourceId(), - CardUtil.createObjectRealtedWindowTitle(source, game, null)); + CardUtil.createObjectRelatedWindowTitle(source, game, null)); if (cardToCast != null) { if (controller.chooseUse(Outcome.PlayForFree, "Cast " + cardToCast.getLogName() + " for free?", source, game)) { game.getState().setValue("PlayFromNotOwnHandZone" + cardToCast.getId(), Boolean.TRUE); diff --git a/Mage.Sets/src/mage/cards/v/VivienChampionOfTheWilds.java b/Mage.Sets/src/mage/cards/v/VivienChampionOfTheWilds.java index 6966faece0b..b0cdeddfd1e 100644 --- a/Mage.Sets/src/mage/cards/v/VivienChampionOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/v/VivienChampionOfTheWilds.java @@ -109,7 +109,7 @@ class VivienChampionOfTheWildsEffect extends OneShotEffect { Card cardToExile = game.getCard(target.getFirstTarget()); if (!player.moveCardsToExile(cardToExile, source, game, false, CardUtil.getCardExileZoneId(game, source), - CardUtil.createObjectRealtedWindowTitle(source, game, " (look and cast)"))) { + CardUtil.createObjectRelatedWindowTitle(source, game, " (look and cast)"))) { return false; } cardToExile.setFaceDown(true, game); diff --git a/Mage.Sets/src/mage/cards/y/YggdrasilRebirthEngine.java b/Mage.Sets/src/mage/cards/y/YggdrasilRebirthEngine.java index 9939de08649..7d771534a02 100644 --- a/Mage.Sets/src/mage/cards/y/YggdrasilRebirthEngine.java +++ b/Mage.Sets/src/mage/cards/y/YggdrasilRebirthEngine.java @@ -86,7 +86,7 @@ class YggdrasilRebirthEngineExileAllCreaturesGraveyardEffect extends OneShotEffe return false; } UUID exileZoneId = CardUtil.getExileZoneId(game, source); - String exileZoneName = CardUtil.createObjectRealtedWindowTitle(source, game, null); + String exileZoneName = CardUtil.createObjectRelatedWindowTitle(source, game, null); Cards cards = new CardsImpl(controller.getGraveyard().getCards(StaticFilters.FILTER_CARD_CREATURE, game)); if (cards.isEmpty()){ return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryControllerEffect.java index 62567f40912..dfc5e0532cc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryControllerEffect.java @@ -76,7 +76,7 @@ public class ExileCardsFromTopOfLibraryControllerEffect extends OneShotEffect { return false; } exileZoneId = CardUtil.getExileZoneId(game, source); - exileZoneName = CardUtil.createObjectRealtedWindowTitle(source, game, null); + exileZoneName = CardUtil.createObjectRelatedWindowTitle(source, game, null); } Set cards = controller.getLibrary().getTopCards(game, amount); diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 4afac403234..b1b3434cf55 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -1895,9 +1895,9 @@ public abstract class PlayerImpl implements Player, Serializable { return; } if (postToLog) { - game.getState().getRevealed().add(CardUtil.createObjectRealtedWindowTitle(source, game, titleSuffix), cards); + game.getState().getRevealed().add(CardUtil.createObjectRelatedWindowTitle(source, game, titleSuffix), cards); } else { - game.getState().getRevealed().update(CardUtil.createObjectRealtedWindowTitle(source, game, titleSuffix), cards); + game.getState().getRevealed().update(CardUtil.createObjectRelatedWindowTitle(source, game, titleSuffix), cards); } if (postToLog && !game.isSimulation()) { StringBuilder sb = new StringBuilder(getLogName()).append(" reveals "); @@ -1928,7 +1928,7 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public void lookAtCards(Ability source, String titleSuffix, Cards cards, Game game) { - game.getState().getLookedAt(this.playerId).add(CardUtil.createObjectRealtedWindowTitle(source, game, titleSuffix), cards); + game.getState().getLookedAt(this.playerId).add(CardUtil.createObjectRelatedWindowTitle(source, game, titleSuffix), cards); game.fireUpdatePlayersEvent(); } diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index dcabf68a6db..7b81b895d68 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -749,7 +749,7 @@ public final class CardUtil { return true; } - public static String createObjectRealtedWindowTitle(Ability source, Game game, String textSuffix) { + public static String createObjectRelatedWindowTitle(Ability source, Game game, String textSuffix) { String title; if (source != null) { MageObject sourceObject = game.getObject(source);