diff --git a/Mage.Sets/src/mage/cards/a/AcademicDispute.java b/Mage.Sets/src/mage/cards/a/AcademicDispute.java index 580f41daeb8..bcb24f8f16d 100644 --- a/Mage.Sets/src/mage/cards/a/AcademicDispute.java +++ b/Mage.Sets/src/mage/cards/a/AcademicDispute.java @@ -68,7 +68,7 @@ class AcademicDisputeEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - Permanent permanent = game.getPermanent(this.targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (permanent != null) { if (player.chooseUse(outcome, "Have " + permanent.getLogName() + " gain reach until end of turn?", source, game)) { GainAbilityTargetEffect effect = new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/a/AcademicProbation.java b/Mage.Sets/src/mage/cards/a/AcademicProbation.java index 0f5a9c505e3..03163d0bd78 100644 --- a/Mage.Sets/src/mage/cards/a/AcademicProbation.java +++ b/Mage.Sets/src/mage/cards/a/AcademicProbation.java @@ -75,7 +75,7 @@ class AcademicProbationRestrictionEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return this.targetPointer.getTargets(game, source).contains(permanent.getId()); + return this.getTargetPointer().getTargets(game, source).contains(permanent.getId()); } @Override diff --git a/Mage.Sets/src/mage/cards/a/AccessDenied.java b/Mage.Sets/src/mage/cards/a/AccessDenied.java index 0776f2cd386..f8e6262dfe0 100644 --- a/Mage.Sets/src/mage/cards/a/AccessDenied.java +++ b/Mage.Sets/src/mage/cards/a/AccessDenied.java @@ -55,7 +55,7 @@ class AccessDeniedEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject stackObject = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (stackObject != null) { game.getStack().counter(source.getFirstTarget(), source, game); return new ThopterColorlessToken().putOntoBattlefield(stackObject.getManaValue(), game, source); diff --git a/Mage.Sets/src/mage/cards/a/AccursedWitch.java b/Mage.Sets/src/mage/cards/a/AccursedWitch.java index a6ad8937615..beb098a87d5 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedWitch.java +++ b/Mage.Sets/src/mage/cards/a/AccursedWitch.java @@ -73,7 +73,7 @@ class AccursedWitchReturnTransformedEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player attachTo = game.getPlayer(targetPointer.getFirst(game, source)); + Player attachTo = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || !(game.getState().getZone(source.getSourceId()) == Zone.GRAVEYARD) || attachTo == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/a/ActOfAuthority.java b/Mage.Sets/src/mage/cards/a/ActOfAuthority.java index 3a462e6d2a9..3f7c434efb1 100644 --- a/Mage.Sets/src/mage/cards/a/ActOfAuthority.java +++ b/Mage.Sets/src/mage/cards/a/ActOfAuthority.java @@ -109,10 +109,9 @@ class ActOfAuthorityGainControlEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { Permanent permanent; - if (targetPointer == null) { + permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); + if (permanent == null) { permanent = game.getPermanent(source.getFirstTarget()); - } else { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); } if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/a/Aethertow.java b/Mage.Sets/src/mage/cards/a/Aethertow.java index ff79b20ea2e..7db15f9b34d 100644 --- a/Mage.Sets/src/mage/cards/a/Aethertow.java +++ b/Mage.Sets/src/mage/cards/a/Aethertow.java @@ -57,7 +57,7 @@ class AethertowEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (targetCreature != null) { return controller.putCardsOnTopOfLibrary(targetCreature, game, source, true); diff --git a/Mage.Sets/src/mage/cards/a/AkroanHorse.java b/Mage.Sets/src/mage/cards/a/AkroanHorse.java index 2b627273b1f..e7926e5275d 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanHorse.java +++ b/Mage.Sets/src/mage/cards/a/AkroanHorse.java @@ -112,11 +112,9 @@ class AkroanHorseGainControlEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Permanent permanent; - if (targetPointer == null) { + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); + if (permanent == null) { permanent = game.getPermanent(source.getFirstTarget()); - } else { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); } if (permanent == null) { return false; diff --git a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java index f52fe1b3285..d28bd70a201 100644 --- a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java +++ b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java @@ -87,7 +87,7 @@ class AnaBattlemageKickerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { boolean applied = false; - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { applied = targetCreature.tap(source, game); Player controller = game.getPlayer(targetCreature.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/a/AncientRunes.java b/Mage.Sets/src/mage/cards/a/AncientRunes.java index 46c0d5fb413..4a7f4c98602 100644 --- a/Mage.Sets/src/mage/cards/a/AncientRunes.java +++ b/Mage.Sets/src/mage/cards/a/AncientRunes.java @@ -51,9 +51,9 @@ class AncientRunesDamageTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { - int damage = game.getBattlefield().getAllActivePermanents(new FilterControlledArtifactPermanent("artifacts"), targetPointer.getFirst(game, source), game).size(); + int damage = game.getBattlefield().getAllActivePermanents(new FilterControlledArtifactPermanent("artifacts"), getTargetPointer().getFirst(game, source), game).size(); player.damage(damage, source.getSourceId(), source, game); return true; } diff --git a/Mage.Sets/src/mage/cards/a/AngelOfDestiny.java b/Mage.Sets/src/mage/cards/a/AngelOfDestiny.java index 77b2c0e9d5a..80152ebea56 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfDestiny.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfDestiny.java @@ -95,7 +95,7 @@ class AngelOfDestinyGainLifeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); int damage = (int) getValue("damage"); if (controller != null) { controller.gainLife(damage, game, source); diff --git a/Mage.Sets/src/mage/cards/a/AnowonTheRuinThief.java b/Mage.Sets/src/mage/cards/a/AnowonTheRuinThief.java index 10a354ceae1..f67c0e38339 100644 --- a/Mage.Sets/src/mage/cards/a/AnowonTheRuinThief.java +++ b/Mage.Sets/src/mage/cards/a/AnowonTheRuinThief.java @@ -72,7 +72,7 @@ class AnowonTheRuinThiefEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java b/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java index 7376ee06c04..116b67a7324 100644 --- a/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java +++ b/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java @@ -55,7 +55,7 @@ class AnvilOfBogardanEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { targetPlayer.drawCards(1, source, game); targetPlayer.discard(1, false, false, source, game); diff --git a/Mage.Sets/src/mage/cards/a/AquitectsWill.java b/Mage.Sets/src/mage/cards/a/AquitectsWill.java index c1f9df1e485..ebe43b05299 100644 --- a/Mage.Sets/src/mage/cards/a/AquitectsWill.java +++ b/Mage.Sets/src/mage/cards/a/AquitectsWill.java @@ -72,7 +72,7 @@ class AquitectsWillEffect extends BecomesBasicLandTargetEffect { @Override public boolean apply(Game game, Ability source) { - Permanent land = game.getPermanent(this.targetPointer.getFirst(game, source)); + Permanent land = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (land == null || land.getCounters(game).getCount(CounterType.FLOOD) < 1) { discard(); return false; diff --git a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java index 83a837a2b4f..44d05f59024 100644 --- a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java +++ b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java @@ -97,7 +97,7 @@ class ArahboEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (creature != null && creature.isCreature(game)) { int pow = creature.getPower().getValue(); ContinuousEffect effect = new BoostTargetEffect(pow, pow, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/a/AraumiOfTheDeadTide.java b/Mage.Sets/src/mage/cards/a/AraumiOfTheDeadTide.java index 8f1cf5a4f2f..271610b34ae 100644 --- a/Mage.Sets/src/mage/cards/a/AraumiOfTheDeadTide.java +++ b/Mage.Sets/src/mage/cards/a/AraumiOfTheDeadTide.java @@ -68,7 +68,7 @@ class AraumiOfTheDeadTideEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/a/AtemsisAllSeeing.java b/Mage.Sets/src/mage/cards/a/AtemsisAllSeeing.java index 31c071e71b0..10a1e54e688 100644 --- a/Mage.Sets/src/mage/cards/a/AtemsisAllSeeing.java +++ b/Mage.Sets/src/mage/cards/a/AtemsisAllSeeing.java @@ -80,7 +80,7 @@ class AtemsisAllSeeingEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || opponent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/a/AuraGraft.java b/Mage.Sets/src/mage/cards/a/AuraGraft.java index 6c3fcb64e73..9410f5860da 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGraft.java +++ b/Mage.Sets/src/mage/cards/a/AuraGraft.java @@ -101,7 +101,7 @@ class AuraGraftMoveAuraEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent enchantment = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent enchantment = game.getPermanent(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (enchantment == null || controller == null) { return false; diff --git a/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java b/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java index d0c53a1667a..67dd573d74b 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java @@ -66,7 +66,7 @@ class AuriokSurvivorsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent p = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent p = game.getPermanent(getTargetPointer().getFirst(game, source)); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); Player player = game.getPlayer(source.getControllerId()); if (p != null && player != null && sourcePermanent != null) { diff --git a/Mage.Sets/src/mage/cards/b/Backlash.java b/Mage.Sets/src/mage/cards/b/Backlash.java index 9827ef1ceb5..526ad3e8ede 100644 --- a/Mage.Sets/src/mage/cards/b/Backlash.java +++ b/Mage.Sets/src/mage/cards/b/Backlash.java @@ -62,7 +62,7 @@ class BacklashEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { targetCreature.tap(source, game); Player controller = game.getPlayer(targetCreature.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java b/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java index 547a63552ea..8a371ff5329 100644 --- a/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java +++ b/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java @@ -66,7 +66,7 @@ class BalshanBeguilerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Player you = game.getPlayer(source.getControllerId()); if (player == null || you == null) { return false; diff --git a/Mage.Sets/src/mage/cards/b/BarbedShocker.java b/Mage.Sets/src/mage/cards/b/BarbedShocker.java index c921f095ef5..0bcbb7d2a5a 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedShocker.java +++ b/Mage.Sets/src/mage/cards/b/BarbedShocker.java @@ -66,7 +66,7 @@ class BarbedShockerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer == null || targetPlayer.getHand().isEmpty()) { return false; } diff --git a/Mage.Sets/src/mage/cards/b/BarbedWire.java b/Mage.Sets/src/mage/cards/b/BarbedWire.java index 844df035f61..d5b838e92b2 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedWire.java +++ b/Mage.Sets/src/mage/cards/b/BarbedWire.java @@ -71,7 +71,7 @@ class BarbwireDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player activePlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player activePlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (activePlayer != null) { activePlayer.damage(1, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/b/BasaltGolem.java b/Mage.Sets/src/mage/cards/b/BasaltGolem.java index ece46148a57..f13c6b69fe7 100644 --- a/Mage.Sets/src/mage/cards/b/BasaltGolem.java +++ b/Mage.Sets/src/mage/cards/b/BasaltGolem.java @@ -72,7 +72,7 @@ class BasaltGolemEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (creature == null) return false; diff --git a/Mage.Sets/src/mage/cards/b/BazaarOfWonders.java b/Mage.Sets/src/mage/cards/b/BazaarOfWonders.java index 301be0507db..21b4231ef81 100644 --- a/Mage.Sets/src/mage/cards/b/BazaarOfWonders.java +++ b/Mage.Sets/src/mage/cards/b/BazaarOfWonders.java @@ -70,7 +70,7 @@ class BazaarOfWondersEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getSpell(getTargetPointer().getFirst(game, source)); if (spell == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/b/BillFernyBreeSwindler.java b/Mage.Sets/src/mage/cards/b/BillFernyBreeSwindler.java index 9baef301cc1..873621fd2fe 100644 --- a/Mage.Sets/src/mage/cards/b/BillFernyBreeSwindler.java +++ b/Mage.Sets/src/mage/cards/b/BillFernyBreeSwindler.java @@ -88,7 +88,7 @@ class BillFernyEffect extends OneShotEffect { if (permanent == null) { return false; } - UUID opponentToGainControl = targetPointer.getFirst(game, source); + UUID opponentToGainControl = getTargetPointer().getFirst(game, source); game.addEffect(new GainControlTargetEffect( Duration.Custom, true, opponentToGainControl ).setTargetPointer(new FixedTarget(permanent.getId(), game)), source); diff --git a/Mage.Sets/src/mage/cards/b/BiolumeEgg.java b/Mage.Sets/src/mage/cards/b/BiolumeEgg.java index bc49e8359fd..9f5b8140020 100644 --- a/Mage.Sets/src/mage/cards/b/BiolumeEgg.java +++ b/Mage.Sets/src/mage/cards/b/BiolumeEgg.java @@ -81,7 +81,7 @@ class BiolumeEggEffect extends OneShotEffect { if (controller == null) { return false; } - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { game.getState().setValue(TransformAbility.VALUE_KEY_ENTER_TRANSFORMED + card.getId(), Boolean.TRUE); controller.moveCards(card, Zone.BATTLEFIELD, source, game, false, false, true, null); diff --git a/Mage.Sets/src/mage/cards/b/BiomancersFamiliar.java b/Mage.Sets/src/mage/cards/b/BiomancersFamiliar.java index ec6e5e04d5e..48d44e5cf51 100644 --- a/Mage.Sets/src/mage/cards/b/BiomancersFamiliar.java +++ b/Mage.Sets/src/mage/cards/b/BiomancersFamiliar.java @@ -126,7 +126,7 @@ class BiomancersFamiliarReplacementEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - return event.getTargetId().equals(targetPointer.getFirst(game, source)); + return event.getTargetId().equals(getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage.Sets/src/mage/cards/b/BlazeOfGlory.java b/Mage.Sets/src/mage/cards/b/BlazeOfGlory.java index d28d802762e..b77aee8c7f5 100644 --- a/Mage.Sets/src/mage/cards/b/BlazeOfGlory.java +++ b/Mage.Sets/src/mage/cards/b/BlazeOfGlory.java @@ -65,7 +65,7 @@ class BlazeOfGloryRequirementEffect extends RequirementEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return permanent.getId().equals(targetPointer.getFirst(game, source)); + return permanent.getId().equals(getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage.Sets/src/mage/cards/b/BlazingSalvo.java b/Mage.Sets/src/mage/cards/b/BlazingSalvo.java index 818d556341c..9e0fa2c53cd 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingSalvo.java +++ b/Mage.Sets/src/mage/cards/b/BlazingSalvo.java @@ -54,7 +54,7 @@ class BlazingSalvoEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/cards/b/BlightwingBandit.java b/Mage.Sets/src/mage/cards/b/BlightwingBandit.java index 2a50140e244..dde41a1de56 100644 --- a/Mage.Sets/src/mage/cards/b/BlightwingBandit.java +++ b/Mage.Sets/src/mage/cards/b/BlightwingBandit.java @@ -80,7 +80,7 @@ class BlightwingBanditEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = source.getSourceObject(game); if (controller == null || opponent == null || sourceObject == null) { diff --git a/Mage.Sets/src/mage/cards/b/BlimComedicGenius.java b/Mage.Sets/src/mage/cards/b/BlimComedicGenius.java index 8d92041d0e9..36e5a26313a 100644 --- a/Mage.Sets/src/mage/cards/b/BlimComedicGenius.java +++ b/Mage.Sets/src/mage/cards/b/BlimComedicGenius.java @@ -84,7 +84,7 @@ class BlimComedicGeniusEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { game.addEffect(new GainControlTargetEffect( - Duration.Custom, true, targetPointer.getFirst(game, source) + Duration.Custom, true, getTargetPointer().getFirst(game, source) ).setTargetPointer(new FixedTarget(source.getFirstTarget(), game)), source); game.getState().processAction(game); Map cardsMap = new HashMap<>(); diff --git a/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java b/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java index 2432953707d..75a517f76d2 100644 --- a/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java +++ b/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java @@ -74,7 +74,7 @@ class ReturnToHandEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/b/BloodClock.java b/Mage.Sets/src/mage/cards/b/BloodClock.java index 9cf15efdd0a..1389a74f50e 100644 --- a/Mage.Sets/src/mage/cards/b/BloodClock.java +++ b/Mage.Sets/src/mage/cards/b/BloodClock.java @@ -60,7 +60,7 @@ class BloodClockEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java b/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java index ee4a0001242..b545e6e2658 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java +++ b/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java @@ -82,7 +82,7 @@ class BloodlordOfVaasgothEffect extends ContinuousEffectImpl { @Override public void init(Ability source, Game game) { super.init(source, game); - Spell object = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell object = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (object != null) { zoneChangeCounter = game.getState().getZoneChangeCounter(object.getSourceId()) + 1; permanentId = object.getSourceId(); @@ -98,7 +98,7 @@ class BloodlordOfVaasgothEffect extends ContinuousEffectImpl { if (game.getState().getZoneChangeCounter(permanentId) >= zoneChangeCounter) { discard(); } - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null) { // Bloodthirst checked while spell is on the stack so needed to give it already to the spell game.getState().addOtherAbility(spell.getCard(), ability, true); } diff --git a/Mage.Sets/src/mage/cards/b/BloodthirstyAdversary.java b/Mage.Sets/src/mage/cards/b/BloodthirstyAdversary.java index f8b2fcc7adb..6aa6b4d61f4 100644 --- a/Mage.Sets/src/mage/cards/b/BloodthirstyAdversary.java +++ b/Mage.Sets/src/mage/cards/b/BloodthirstyAdversary.java @@ -124,7 +124,7 @@ class BloodthirstyAdversaryCopyEffect extends OneShotEffect { return false; } Set cardsToExile = new LinkedHashSet<>(); - for (UUID cardId : targetPointer.getTargets(game, source)) { + for (UUID cardId : getTargetPointer().getTargets(game, source)) { Card card = game.getCard(cardId); if (card != null) { cardsToExile.add(card); diff --git a/Mage.Sets/src/mage/cards/b/BoneDancer.java b/Mage.Sets/src/mage/cards/b/BoneDancer.java index b19628d7aac..2b4b62846f5 100644 --- a/Mage.Sets/src/mage/cards/b/BoneDancer.java +++ b/Mage.Sets/src/mage/cards/b/BoneDancer.java @@ -61,7 +61,7 @@ class BoneDancerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player defendingPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player defendingPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller != null && defendingPlayer != null) { Card lastCreatureCard = null; for (Card card : defendingPlayer.getGraveyard().getCards(game)) { diff --git a/Mage.Sets/src/mage/cards/b/BrainPry.java b/Mage.Sets/src/mage/cards/b/BrainPry.java index 8da4705054a..c4eed9a37ca 100644 --- a/Mage.Sets/src/mage/cards/b/BrainPry.java +++ b/Mage.Sets/src/mage/cards/b/BrainPry.java @@ -53,7 +53,7 @@ class BrainPryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + ChooseACardNameEffect.INFO_KEY); diff --git a/Mage.Sets/src/mage/cards/b/Brightflame.java b/Mage.Sets/src/mage/cards/b/Brightflame.java index 4dfbe521dcf..063f3b13711 100644 --- a/Mage.Sets/src/mage/cards/b/Brightflame.java +++ b/Mage.Sets/src/mage/cards/b/Brightflame.java @@ -66,7 +66,7 @@ class BrightflameEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int damageDealt = 0; - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); if (target == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/b/BuildersBane.java b/Mage.Sets/src/mage/cards/b/BuildersBane.java index 1fd01a0f3ae..4b038804802 100644 --- a/Mage.Sets/src/mage/cards/b/BuildersBane.java +++ b/Mage.Sets/src/mage/cards/b/BuildersBane.java @@ -73,7 +73,7 @@ class BuildersBaneEffect extends OneShotEffect { Map destroyedArtifactPerPlayer = new HashMap<>(); // Destroy X target artifacts. - for (UUID targetID : this.targetPointer.getTargets(game, source)) { + for (UUID targetID : this.getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(targetID); if (permanent != null) { if (permanent.destroy(source, game, false)) { diff --git a/Mage.Sets/src/mage/cards/b/Bulwark.java b/Mage.Sets/src/mage/cards/b/Bulwark.java index 9ea0ae852ab..cc2c9e5b825 100644 --- a/Mage.Sets/src/mage/cards/b/Bulwark.java +++ b/Mage.Sets/src/mage/cards/b/Bulwark.java @@ -58,7 +58,7 @@ class BulwarkDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (opponent != null && controller != null) { int amount = controller.getHand().size() - opponent.getHand().size(); diff --git a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java index 2ec78087c2b..b63e7d8bde5 100644 --- a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java +++ b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java @@ -69,13 +69,13 @@ class BurnAtTheStakeEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int amount = (GetXValue.instance).calculate(game, source, this) * 3; - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.damage(amount, source.getSourceId(), source, game, false, true); return true; } - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.damage(amount, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/b/BurningCinderFuryOfCrimsonChaosFire.java b/Mage.Sets/src/mage/cards/b/BurningCinderFuryOfCrimsonChaosFire.java index 99d0977adbf..da003aac2ba 100644 --- a/Mage.Sets/src/mage/cards/b/BurningCinderFuryOfCrimsonChaosFire.java +++ b/Mage.Sets/src/mage/cards/b/BurningCinderFuryOfCrimsonChaosFire.java @@ -162,9 +162,7 @@ class BurningCinderFuryOfCrimsonChaosFireCreatureGainControlEffect extends Conti @Override public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanent(source.getFirstTarget()); - if (targetPointer != null) { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); - } + permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null && controller != null) { return permanent.changeControllerId(controller, game, source); } diff --git a/Mage.Sets/src/mage/cards/c/CabalTherapist.java b/Mage.Sets/src/mage/cards/c/CabalTherapist.java index 56315f5366f..7145b75bc30 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTherapist.java +++ b/Mage.Sets/src/mage/cards/c/CabalTherapist.java @@ -78,7 +78,7 @@ class CabalTherapistDiscardEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + ChooseACardNameEffect.INFO_KEY); diff --git a/Mage.Sets/src/mage/cards/c/CabalTherapy.java b/Mage.Sets/src/mage/cards/c/CabalTherapy.java index fb2ed1c4154..6b9eb15dfa2 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTherapy.java +++ b/Mage.Sets/src/mage/cards/c/CabalTherapy.java @@ -61,7 +61,7 @@ class CabalTherapyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + ChooseACardNameEffect.INFO_KEY); diff --git a/Mage.Sets/src/mage/cards/c/CatacombDragon.java b/Mage.Sets/src/mage/cards/c/CatacombDragon.java index eb8f7dcd63e..fbc8a66964a 100644 --- a/Mage.Sets/src/mage/cards/c/CatacombDragon.java +++ b/Mage.Sets/src/mage/cards/c/CatacombDragon.java @@ -73,7 +73,7 @@ class CatacombDragonEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null || !permanent.isCreature(game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/CavalcadeOfCalamity.java b/Mage.Sets/src/mage/cards/c/CavalcadeOfCalamity.java index 4a9c8dbb660..f5e4588da6b 100644 --- a/Mage.Sets/src/mage/cards/c/CavalcadeOfCalamity.java +++ b/Mage.Sets/src/mage/cards/c/CavalcadeOfCalamity.java @@ -64,7 +64,7 @@ class CavalcadeOfCalamityEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { return game.damagePlayerOrPermanent( - game.getCombat().getDefenderId(targetPointer.getFirst(game, source)), 1, + game.getCombat().getDefenderId(getTargetPointer().getFirst(game, source)), 1, source.getSourceId(), source, game, false, true ) > 0; } diff --git a/Mage.Sets/src/mage/cards/c/CemeteryRecruitment.java b/Mage.Sets/src/mage/cards/c/CemeteryRecruitment.java index a9e0bee55de..0366b73af26 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryRecruitment.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryRecruitment.java @@ -60,7 +60,7 @@ class CemeteryRecruitmentEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { if (controller.moveCards(card, Zone.HAND, source, game) && card.hasSubtype(SubType.ZOMBIE, game)) { diff --git a/Mage.Sets/src/mage/cards/c/CephalidSnitch.java b/Mage.Sets/src/mage/cards/c/CephalidSnitch.java index 3d544b65f96..334b8a8c050 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidSnitch.java +++ b/Mage.Sets/src/mage/cards/c/CephalidSnitch.java @@ -81,7 +81,7 @@ class CephalidSnitchEffect extends LoseAbilityTargetEffect{ @Override public boolean apply(Game game, Ability source) { - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { List toRemove = new ArrayList<>(); //Go through protection abilities and sort out any containing black diff --git a/Mage.Sets/src/mage/cards/c/ChampionsOfMinasTirith.java b/Mage.Sets/src/mage/cards/c/ChampionsOfMinasTirith.java index 36721be5f5e..2b3b91eb68c 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionsOfMinasTirith.java +++ b/Mage.Sets/src/mage/cards/c/ChampionsOfMinasTirith.java @@ -111,6 +111,6 @@ class ChampionsOfMinasTirithDoIfCostPaid extends DoIfCostPaid { @Override protected Player getPayingPlayer(Game game, Ability source) { - return game.getPlayer(targetPointer.getFirst(game, source)); + return game.getPlayer(getTargetPointer().getFirst(game, source)); } } diff --git a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java index 99b33e592f6..4826388a400 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java +++ b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java @@ -120,13 +120,13 @@ class ChandraAblazeEffect2 extends OneShotEffect { public boolean apply(Game game, Ability source) { Card card = (Card) this.getValue("discardedCard"); if (card != null && card.getColor(game).isRed()) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.damage(4, source.getSourceId(), source, game, false, true); return true; } - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.damage(4, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/c/ChaosWarp.java b/Mage.Sets/src/mage/cards/c/ChaosWarp.java index 2dd3c89e098..e93589dbadb 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosWarp.java +++ b/Mage.Sets/src/mage/cards/c/ChaosWarp.java @@ -62,7 +62,7 @@ class ChaosWarpShuffleIntoLibraryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { Player owner = game.getPlayer(permanent.getOwnerId()); if (owner != null) { @@ -93,7 +93,7 @@ class ChaosWarpRevealEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); + Permanent permanent = (Permanent) game.getLastKnownInformation(getTargetPointer().getFirst(game, source), Zone.BATTLEFIELD); if (permanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java b/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java index 65c3354f910..c288aa6d30f 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java +++ b/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java @@ -95,7 +95,7 @@ class ChargingCinderhornDamageTargetEffect extends OneShotEffect { } DynamicValue amount = new CountersSourceCount(CounterType.FURY); - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.damage(amount.calculate(game, source, this), source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/c/ChariotOfTheSun.java b/Mage.Sets/src/mage/cards/c/ChariotOfTheSun.java index 053725016e0..ce2056672af 100644 --- a/Mage.Sets/src/mage/cards/c/ChariotOfTheSun.java +++ b/Mage.Sets/src/mage/cards/c/ChariotOfTheSun.java @@ -71,7 +71,7 @@ class ChariotOfTheSunEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { this.discard(); return false; diff --git a/Mage.Sets/src/mage/cards/c/CheckForTraps.java b/Mage.Sets/src/mage/cards/c/CheckForTraps.java index 53742e29855..fbbd677a08a 100644 --- a/Mage.Sets/src/mage/cards/c/CheckForTraps.java +++ b/Mage.Sets/src/mage/cards/c/CheckForTraps.java @@ -62,7 +62,7 @@ class CheckForTrapsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || opponent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/ChoiceOfDamnations.java b/Mage.Sets/src/mage/cards/c/ChoiceOfDamnations.java index 46240137c61..80a0c602bff 100644 --- a/Mage.Sets/src/mage/cards/c/ChoiceOfDamnations.java +++ b/Mage.Sets/src/mage/cards/c/ChoiceOfDamnations.java @@ -62,7 +62,7 @@ class ChoiceOfDamnationsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { int numberPermanents = game.getState().getBattlefield().countAll(new FilterPermanent(), targetPlayer.getId(), game); diff --git a/Mage.Sets/src/mage/cards/c/CleansingBeam.java b/Mage.Sets/src/mage/cards/c/CleansingBeam.java index 0693f56b247..9ed4c04c41b 100644 --- a/Mage.Sets/src/mage/cards/c/CleansingBeam.java +++ b/Mage.Sets/src/mage/cards/c/CleansingBeam.java @@ -52,7 +52,7 @@ class CleansingBeamEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); if (target != null) { ObjectColor color = target.getColor(game); target.damage(2, source, game); diff --git a/Mage.Sets/src/mage/cards/c/CloneLegion.java b/Mage.Sets/src/mage/cards/c/CloneLegion.java index 6c7266d122b..8787203eeae 100644 --- a/Mage.Sets/src/mage/cards/c/CloneLegion.java +++ b/Mage.Sets/src/mage/cards/c/CloneLegion.java @@ -60,7 +60,7 @@ class CloneLegionEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller != null && targetPlayer != null) { for (Permanent permanent : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, targetPlayer.getId(), game)) { if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/c/CoercedConfession.java b/Mage.Sets/src/mage/cards/c/CoercedConfession.java index 2a19647e98c..5cb082bdd42 100644 --- a/Mage.Sets/src/mage/cards/c/CoercedConfession.java +++ b/Mage.Sets/src/mage/cards/c/CoercedConfession.java @@ -55,7 +55,7 @@ class CoercedConfessionMillEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/ColdSnap.java b/Mage.Sets/src/mage/cards/c/ColdSnap.java index 4164d22096b..0d87c6a49c9 100644 --- a/Mage.Sets/src/mage/cards/c/ColdSnap.java +++ b/Mage.Sets/src/mage/cards/c/ColdSnap.java @@ -59,9 +59,9 @@ class ColdSnapDamageTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { - int damage = game.getBattlefield().getAllActivePermanents(filter, targetPointer.getFirst(game, source), game).size(); + int damage = game.getBattlefield().getAllActivePermanents(filter, getTargetPointer().getFirst(game, source), game).size(); player.damage(damage, source.getSourceId(), source, game); return true; } diff --git a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java index e1980b0d26a..b38e425645d 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java @@ -86,7 +86,7 @@ class CollectiveDefianceEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java b/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java index 95de8138caa..5d3b806454e 100644 --- a/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java +++ b/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java @@ -111,7 +111,7 @@ class CombustibleGearhulkMillAndDamageEffect extends OneShotEffect { .stream() .mapToInt(MageObject::getManaValue) .sum(); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { targetPlayer.damage(sumCMC, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/c/Commandeer.java b/Mage.Sets/src/mage/cards/c/Commandeer.java index bbb659b2df6..b22d5e57bf2 100644 --- a/Mage.Sets/src/mage/cards/c/Commandeer.java +++ b/Mage.Sets/src/mage/cards/c/Commandeer.java @@ -76,7 +76,7 @@ class CommandeerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (controller != null && spell != null) { spell.setControllerId(controller.getId()); spell.chooseNewTargets(game, controller.getId(), false, false, null); diff --git a/Mage.Sets/src/mage/cards/c/CommandersPlate.java b/Mage.Sets/src/mage/cards/c/CommandersPlate.java index 7a4a0bae432..90fc3e39ac1 100644 --- a/Mage.Sets/src/mage/cards/c/CommandersPlate.java +++ b/Mage.Sets/src/mage/cards/c/CommandersPlate.java @@ -107,7 +107,7 @@ class CommandersPlateEffect extends ContinuousEffectImpl { } Permanent permanent = null; if (affectedObjectsSet) { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); + permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { discard(); return true; diff --git a/Mage.Sets/src/mage/cards/c/ConfoundingConundrum.java b/Mage.Sets/src/mage/cards/c/ConfoundingConundrum.java index ced9f3a7ff4..dea670eae21 100644 --- a/Mage.Sets/src/mage/cards/c/ConfoundingConundrum.java +++ b/Mage.Sets/src/mage/cards/c/ConfoundingConundrum.java @@ -100,7 +100,7 @@ class ConfoundingConundrumEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/ContainmentConstruct.java b/Mage.Sets/src/mage/cards/c/ContainmentConstruct.java index fd6889ef895..da590c1c4b0 100644 --- a/Mage.Sets/src/mage/cards/c/ContainmentConstruct.java +++ b/Mage.Sets/src/mage/cards/c/ContainmentConstruct.java @@ -98,7 +98,7 @@ class ContainmentConstructEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Card discardedCard = game.getCard(targetPointer.getFirst(game, source)); + Card discardedCard = game.getCard(getTargetPointer().getFirst(game, source)); Card containmentConstruct = game.getCard(source.getSourceId()); if (discardedCard != null && containmentConstruct != null) { diff --git a/Mage.Sets/src/mage/cards/c/CoralFighters.java b/Mage.Sets/src/mage/cards/c/CoralFighters.java index b1c4e107bb0..f4e3713a23d 100644 --- a/Mage.Sets/src/mage/cards/c/CoralFighters.java +++ b/Mage.Sets/src/mage/cards/c/CoralFighters.java @@ -60,7 +60,7 @@ class CoralFightersEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player defendingPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player defendingPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if(controller != null && defendingPlayer != null) { Card card = defendingPlayer.getLibrary().getFromTop(game); if(card != null) { diff --git a/Mage.Sets/src/mage/cards/c/CorruptedResolve.java b/Mage.Sets/src/mage/cards/c/CorruptedResolve.java index c794893a4f9..b9e8ef5f6ce 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedResolve.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedResolve.java @@ -51,11 +51,11 @@ class CorruptedResolveEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); if (player != null && player.getCounters().containsKey(CounterType.POISON)) - return game.getStack().counter(targetPointer.getFirst(game, source), source, game); + return game.getStack().counter(getTargetPointer().getFirst(game, source), source, game); } return false; } diff --git a/Mage.Sets/src/mage/cards/c/CosimaGodOfTheVoyage.java b/Mage.Sets/src/mage/cards/c/CosimaGodOfTheVoyage.java index e667d481c41..2b996ed7197 100644 --- a/Mage.Sets/src/mage/cards/c/CosimaGodOfTheVoyage.java +++ b/Mage.Sets/src/mage/cards/c/CosimaGodOfTheVoyage.java @@ -258,7 +258,7 @@ class TheOmenkeelEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); int damage = (Integer) getValue("damage"); if (player == null || damage < 1) { return false; diff --git a/Mage.Sets/src/mage/cards/c/Counterbalance.java b/Mage.Sets/src/mage/cards/c/Counterbalance.java index 7182ae8b17a..6f103acf7de 100644 --- a/Mage.Sets/src/mage/cards/c/Counterbalance.java +++ b/Mage.Sets/src/mage/cards/c/Counterbalance.java @@ -64,7 +64,7 @@ class CounterbalanceEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (controller != null && sourcePermanent != null) { - Spell spell = (Spell) game.getStack().getStackObject(targetPointer.getFirst(game, source)); + Spell spell = (Spell) game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (spell != null) { Card topcard = controller.getLibrary().getFromTop(game); if (topcard != null) { diff --git a/Mage.Sets/src/mage/cards/c/Countermand.java b/Mage.Sets/src/mage/cards/c/Countermand.java index 7dd02bf6ed5..bbb86532444 100644 --- a/Mage.Sets/src/mage/cards/c/Countermand.java +++ b/Mage.Sets/src/mage/cards/c/Countermand.java @@ -58,7 +58,7 @@ class CountermandEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { boolean countered = false; - StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject stackObject = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (game.getStack().counter(source.getFirstTarget(), source, game)) { countered = true; } diff --git a/Mage.Sets/src/mage/cards/c/CowardKiller.java b/Mage.Sets/src/mage/cards/c/CowardKiller.java index e7717532831..fdd1cfd0467 100644 --- a/Mage.Sets/src/mage/cards/c/CowardKiller.java +++ b/Mage.Sets/src/mage/cards/c/CowardKiller.java @@ -59,7 +59,7 @@ class KillerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); if (target != null) { target.damage(3, source, game); for (Permanent p : game.getBattlefield().getActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), game)) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java b/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java index e9cfe4ae7e4..08e928f2c3a 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java @@ -57,7 +57,7 @@ class CrownOfEmpiresEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); boolean scepter = false; boolean throne = false; for (Permanent permanent : game.getBattlefield().getAllActivePermanents(source.getControllerId())) { @@ -103,7 +103,7 @@ class CrownOfEmpiresControlEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); UUID controllerId = (UUID) game.getState().getValue(source.getSourceId().toString()); if (permanent != null && controllerId != null) { return permanent.changeControllerId(controllerId, game, source); diff --git a/Mage.Sets/src/mage/cards/c/CruelReality.java b/Mage.Sets/src/mage/cards/c/CruelReality.java index 9a7fa48fb40..3470bcf2aea 100644 --- a/Mage.Sets/src/mage/cards/c/CruelReality.java +++ b/Mage.Sets/src/mage/cards/c/CruelReality.java @@ -80,7 +80,7 @@ class CruelRealityEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player cursedPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player cursedPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (cursedPlayer == null || controller == null) { return false; diff --git a/Mage.Sets/src/mage/cards/c/CulturalExchange.java b/Mage.Sets/src/mage/cards/c/CulturalExchange.java index 648df0fad48..8e6820e0200 100644 --- a/Mage.Sets/src/mage/cards/c/CulturalExchange.java +++ b/Mage.Sets/src/mage/cards/c/CulturalExchange.java @@ -63,8 +63,8 @@ class CulturalExchangeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player1 = game.getPlayer(targetPointer.getTargets(game, source).get(0)); - Player player2 = game.getPlayer(targetPointer.getTargets(game, source).get(1)); + Player player1 = game.getPlayer(getTargetPointer().getTargets(game, source).get(0)); + Player player2 = game.getPlayer(getTargetPointer().getTargets(game, source).get(1)); Player controller = game.getPlayer(source.getControllerId()); if (player1 == null || player2 == null || controller == null) { return false; diff --git a/Mage.Sets/src/mage/cards/c/CunningAbduction.java b/Mage.Sets/src/mage/cards/c/CunningAbduction.java index 78db0ec6321..2923881982f 100644 --- a/Mage.Sets/src/mage/cards/c/CunningAbduction.java +++ b/Mage.Sets/src/mage/cards/c/CunningAbduction.java @@ -65,7 +65,7 @@ class CunningAbductionExileEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); if (opponent != null && sourceObject != null) { opponent.revealCards(sourceObject.getName(), opponent.getHand(), game); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java index 64e99750d21..3f69fae7843 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java @@ -74,7 +74,7 @@ class CurseOfThePiercedHeartEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || opponent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheWerefox.java b/Mage.Sets/src/mage/cards/c/CurseOfTheWerefox.java index 007341d08ef..a9e2e82d4ed 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheWerefox.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheWerefox.java @@ -100,7 +100,7 @@ class CurseOfTheWerefoxFightEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent triggeredCreature = game.getPermanent(this.targetPointer.getFirst(game, source)); + Permanent triggeredCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); Permanent target = game.getPermanent(source.getFirstTarget()); if (triggeredCreature != null && target != null diff --git a/Mage.Sets/src/mage/cards/c/CursedScroll.java b/Mage.Sets/src/mage/cards/c/CursedScroll.java index ac858f68b09..3d3f1fb38c5 100644 --- a/Mage.Sets/src/mage/cards/c/CursedScroll.java +++ b/Mage.Sets/src/mage/cards/c/CursedScroll.java @@ -71,12 +71,12 @@ class CursedScrollEffect extends OneShotEffect { revealed.add(card); controller.revealCards(sourceObject.getIdName(), revealed, game); if (CardUtil.haveSameNames(card, cardName, game)) { - Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (creature != null) { creature.damage(2, source.getSourceId(), source, game, false, true); return true; } - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.damage(2, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java b/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java index 56ed5e0ec75..86a1f7440d1 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java @@ -79,7 +79,7 @@ class BecomeSwampEffect extends BecomesBasicLandTargetEffect { @Override public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { - Permanent land = game.getPermanent(this.targetPointer.getFirst(game, source)); + Permanent land = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (land == null || land.getCounters(game).getCount(CounterType.MIRE) < 1) { this.discard(); return false; diff --git a/Mage.Sets/src/mage/cards/d/DamnablePact.java b/Mage.Sets/src/mage/cards/d/DamnablePact.java index b5f048dff3f..1706b04ba43 100644 --- a/Mage.Sets/src/mage/cards/d/DamnablePact.java +++ b/Mage.Sets/src/mage/cards/d/DamnablePact.java @@ -50,7 +50,7 @@ class DamnablePactEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { targetPlayer.drawCards(source.getManaCostsToPay().getX(), source, game); targetPlayer.loseLife(source.getManaCostsToPay().getX(), game, source, false); diff --git a/Mage.Sets/src/mage/cards/d/DarkTemper.java b/Mage.Sets/src/mage/cards/d/DarkTemper.java index e6596f69222..0e3e7e66a18 100644 --- a/Mage.Sets/src/mage/cards/d/DarkTemper.java +++ b/Mage.Sets/src/mage/cards/d/DarkTemper.java @@ -58,7 +58,7 @@ class DarkTemperEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/d/DarthTyranusCountOfSerenno.java b/Mage.Sets/src/mage/cards/d/DarthTyranusCountOfSerenno.java index 73be6c0a396..9302468a0ec 100644 --- a/Mage.Sets/src/mage/cards/d/DarthTyranusCountOfSerenno.java +++ b/Mage.Sets/src/mage/cards/d/DarthTyranusCountOfSerenno.java @@ -81,8 +81,8 @@ class DarthTyranusEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player1 = game.getPlayer(targetPointer.getTargets(game, source).get(0)); - Player player2 = game.getPlayer(targetPointer.getTargets(game, source).get(1)); + Player player1 = game.getPlayer(getTargetPointer().getTargets(game, source).get(0)); + Player player2 = game.getPlayer(getTargetPointer().getTargets(game, source).get(1)); if (player1 != null && player2 != null) { player1.setLife(5, game, source); player1.setLife(30, game, source); diff --git a/Mage.Sets/src/mage/cards/d/DazzlingSphinx.java b/Mage.Sets/src/mage/cards/d/DazzlingSphinx.java index 50f72e6b55e..5fe0c65e95d 100644 --- a/Mage.Sets/src/mage/cards/d/DazzlingSphinx.java +++ b/Mage.Sets/src/mage/cards/d/DazzlingSphinx.java @@ -68,7 +68,7 @@ class DazzlingSphinxEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || opponent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java b/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java index 7c0ce78279c..44bf071a318 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java @@ -82,7 +82,7 @@ class DeathbringerLiegeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent p = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent p = game.getPermanent(getTargetPointer().getFirst(game, source)); if (p != null && p.isTapped()) { p.destroy(source, game, false); } diff --git a/Mage.Sets/src/mage/cards/d/DebtOfLoyalty.java b/Mage.Sets/src/mage/cards/d/DebtOfLoyalty.java index 6f1b00c86cf..495cfd9c22e 100644 --- a/Mage.Sets/src/mage/cards/d/DebtOfLoyalty.java +++ b/Mage.Sets/src/mage/cards/d/DebtOfLoyalty.java @@ -55,7 +55,7 @@ class DebtOfLoyaltyEffect extends RegenerateTargetEffect { @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (super.replaceEvent(event, source, game) && permanent != null) { GainControlTargetEffect effect = new GainControlTargetEffect(Duration.EndOfGame); effect.setTargetPointer(this.getTargetPointer().copy()); diff --git a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java index a1e0f90634b..c6c991bc857 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java +++ b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java @@ -128,7 +128,7 @@ class DefiantVanguardEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { boolean result = false; - Permanent blockedCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent blockedCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); Permanent defiantVanguard = game.getPermanent(source.getSourceId()); if (blockedCreature != null) { if (game.getState().getValue(blockedCreature.toString()).equals(blockedCreature.getZoneChangeCounter(game))) { // true if it did not change zones diff --git a/Mage.Sets/src/mage/cards/d/DelifsCone.java b/Mage.Sets/src/mage/cards/d/DelifsCone.java index 346d6f5778c..620156b8529 100644 --- a/Mage.Sets/src/mage/cards/d/DelifsCone.java +++ b/Mage.Sets/src/mage/cards/d/DelifsCone.java @@ -99,7 +99,7 @@ class DelifsConeLifeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (player != null || permanent != null) { player.gainLife(permanent.getPower().getValue(), game, source); return true; diff --git a/Mage.Sets/src/mage/cards/d/DementiaSliver.java b/Mage.Sets/src/mage/cards/d/DementiaSliver.java index 9307702169f..ea88b06ec96 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaSliver.java +++ b/Mage.Sets/src/mage/cards/d/DementiaSliver.java @@ -76,7 +76,7 @@ class DementiaSliverEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + ChooseACardNameEffect.INFO_KEY); if (opponent != null && sourceObject != null && cardName != null && !cardName.isEmpty()) { diff --git a/Mage.Sets/src/mage/cards/d/DescendantsFury.java b/Mage.Sets/src/mage/cards/d/DescendantsFury.java index 108cbf3295c..68fb6ca171e 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantsFury.java +++ b/Mage.Sets/src/mage/cards/d/DescendantsFury.java @@ -75,11 +75,7 @@ class DescendantsFurySacrificeCost extends CostImpl implements SacrificeCost { if (watcher == null) { return false; } - TargetPointer targetPointer = source.getEffects().get(0).getTargetPointer(); - if (targetPointer == null) { - return false; - } - Player damagedPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player damagedPlayer = game.getPlayer(source.getEffects().get(0).getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (controller == null || damagedPlayer == null) { return false; @@ -114,11 +110,7 @@ class DescendantsFurySacrificeCost extends CostImpl implements SacrificeCost { if (watcher == null) { return false; } - TargetPointer targetPointer = source.getEffects().get(0).getTargetPointer(); - if (targetPointer == null) { - return false; - } - Player damagedPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player damagedPlayer = game.getPlayer(source.getEffects().get(0).getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (controller == null || damagedPlayer == null) { return false; diff --git a/Mage.Sets/src/mage/cards/d/Desertion.java b/Mage.Sets/src/mage/cards/d/Desertion.java index 1e6d40ce236..ab9cb1b0fe6 100644 --- a/Mage.Sets/src/mage/cards/d/Desertion.java +++ b/Mage.Sets/src/mage/cards/d/Desertion.java @@ -55,7 +55,7 @@ class DesertionEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (spell == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/d/DevourFlesh.java b/Mage.Sets/src/mage/cards/d/DevourFlesh.java index 0489225be6c..750c575f8c7 100644 --- a/Mage.Sets/src/mage/cards/d/DevourFlesh.java +++ b/Mage.Sets/src/mage/cards/d/DevourFlesh.java @@ -59,7 +59,7 @@ class DevourFleshSacrificeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/d/DimirCutpurse.java b/Mage.Sets/src/mage/cards/d/DimirCutpurse.java index 5dde825b1bd..bd68423ee31 100644 --- a/Mage.Sets/src/mage/cards/d/DimirCutpurse.java +++ b/Mage.Sets/src/mage/cards/d/DimirCutpurse.java @@ -54,7 +54,7 @@ class DimirCutpurseEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player you = game.getPlayer(source.getControllerId()); - Player damagedPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player damagedPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (damagedPlayer != null) { damagedPlayer.discard(1, false, false, source, game); } diff --git a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java index 868fb0abd17..f9244f04725 100644 --- a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java +++ b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java @@ -78,7 +78,7 @@ class DinOfTheFireherdEffect extends OneShotEffect { int blackCreaturesControllerControls = game.getBattlefield().countAll(blackCreatureFilter, source.getControllerId(), game); int redCreaturesControllerControls = game.getBattlefield().countAll(redCreatureFilter, source.getControllerId(), game); - Player targetOpponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetOpponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetOpponent != null) { Effect effect = new SacrificeEffect(new FilterControlledCreaturePermanent(), blackCreaturesControllerControls, "Target Opponent"); effect.setTargetPointer(new FixedTarget(targetOpponent.getId())); diff --git a/Mage.Sets/src/mage/cards/d/DireBlunderbuss.java b/Mage.Sets/src/mage/cards/d/DireBlunderbuss.java index e78d4d2576f..a33698c751d 100644 --- a/Mage.Sets/src/mage/cards/d/DireBlunderbuss.java +++ b/Mage.Sets/src/mage/cards/d/DireBlunderbuss.java @@ -89,7 +89,7 @@ class DireBlunderbussGainAbilityEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { Permanent permanent = null; if (affectedObjectsSet) { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); + permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { discard(); return true; diff --git a/Mage.Sets/src/mage/cards/d/DispersalShield.java b/Mage.Sets/src/mage/cards/d/DispersalShield.java index 73b6ce4f020..172ca4223c3 100644 --- a/Mage.Sets/src/mage/cards/d/DispersalShield.java +++ b/Mage.Sets/src/mage/cards/d/DispersalShield.java @@ -56,7 +56,7 @@ class DispersalShieldEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { DynamicValue amount = new HighestManaValueCount(); - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null && spell.getManaValue() <= amount.calculate(game, source, this)) { return game.getStack().counter(source.getFirstTarget(), source, game); } diff --git a/Mage.Sets/src/mage/cards/d/Dispossess.java b/Mage.Sets/src/mage/cards/d/Dispossess.java index a83add2e891..05260d16bb0 100644 --- a/Mage.Sets/src/mage/cards/d/Dispossess.java +++ b/Mage.Sets/src/mage/cards/d/Dispossess.java @@ -51,7 +51,7 @@ class DispossessEffect extends SearchTargetGraveyardHandLibraryForCardNameAndExi if (cardName == null) { return false; } - return super.applySearchAndExile(game, source, cardName, targetPointer.getFirst(game, source)); + return super.applySearchAndExile(game, source, cardName, getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage.Sets/src/mage/cards/d/DisruptingShoal.java b/Mage.Sets/src/mage/cards/d/DisruptingShoal.java index 94376172621..c9bb5dfca47 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptingShoal.java +++ b/Mage.Sets/src/mage/cards/d/DisruptingShoal.java @@ -77,7 +77,7 @@ class DisruptingShoalCounterTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null && isManaValueEqual(source, spell.getManaValue())) { return game.getStack().counter(source.getFirstTarget(), source, game); } diff --git a/Mage.Sets/src/mage/cards/d/DistortingLens.java b/Mage.Sets/src/mage/cards/d/DistortingLens.java index fd5a5bc2900..b77f97118ce 100644 --- a/Mage.Sets/src/mage/cards/d/DistortingLens.java +++ b/Mage.Sets/src/mage/cards/d/DistortingLens.java @@ -59,7 +59,7 @@ class ChangeColorEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(source.getSourceId()); - Permanent chosen = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent chosen = game.getPermanent(getTargetPointer().getFirst(game, source)); if (player != null && permanent != null) { ContinuousEffect effect = new BecomesColorTargetEffect(null, Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(chosen.getId(), game)); diff --git a/Mage.Sets/src/mage/cards/d/DragonsFire.java b/Mage.Sets/src/mage/cards/d/DragonsFire.java index f0a3843881f..3492742a074 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsFire.java +++ b/Mage.Sets/src/mage/cards/d/DragonsFire.java @@ -186,7 +186,7 @@ class DragonsFireEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent targetedPermanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetedPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetedPermanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/d/DralnuLichLord.java b/Mage.Sets/src/mage/cards/d/DralnuLichLord.java index b8ddf74c981..42daa2c7573 100644 --- a/Mage.Sets/src/mage/cards/d/DralnuLichLord.java +++ b/Mage.Sets/src/mage/cards/d/DralnuLichLord.java @@ -116,7 +116,7 @@ class DralnuLichLordFlashbackEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { FlashbackAbility ability = new FlashbackAbility(card, card.getManaCost()); ability.setSourceId(card.getId()); diff --git a/Mage.Sets/src/mage/cards/d/DranaTheLastBloodchief.java b/Mage.Sets/src/mage/cards/d/DranaTheLastBloodchief.java index 4438442dd41..cc908e2334c 100644 --- a/Mage.Sets/src/mage/cards/d/DranaTheLastBloodchief.java +++ b/Mage.Sets/src/mage/cards/d/DranaTheLastBloodchief.java @@ -86,7 +86,7 @@ class DranaTheLastBloodchiefEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || player == null || controller.getGraveyard().count(filter, game) < 1) { return false; diff --git a/Mage.Sets/src/mage/cards/d/DreadSlaver.java b/Mage.Sets/src/mage/cards/d/DreadSlaver.java index cd51a4dc076..8b3cf98e16e 100644 --- a/Mage.Sets/src/mage/cards/d/DreadSlaver.java +++ b/Mage.Sets/src/mage/cards/d/DreadSlaver.java @@ -64,7 +64,7 @@ class DreadSlaverEffect extends OneShotEffect { if (controller == null) { return false; } - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { if (controller.moveCards(card, Zone.BATTLEFIELD, source, game)) { ContinuousEffect effect = new AddCreatureTypeAdditionEffect(SubType.ZOMBIE, true); diff --git a/Mage.Sets/src/mage/cards/d/DreadWight.java b/Mage.Sets/src/mage/cards/d/DreadWight.java index 295f670bc26..34aaf80fe29 100644 --- a/Mage.Sets/src/mage/cards/d/DreadWight.java +++ b/Mage.Sets/src/mage/cards/d/DreadWight.java @@ -121,7 +121,7 @@ class DreadWightEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { // add paralyzation counter Effect effect = new AddCountersTargetEffect(CounterType.PARALYZATION.createInstance()); diff --git a/Mage.Sets/src/mage/cards/d/DreamTides.java b/Mage.Sets/src/mage/cards/d/DreamTides.java index 35fc5f8af57..46d2dc3c56a 100644 --- a/Mage.Sets/src/mage/cards/d/DreamTides.java +++ b/Mage.Sets/src/mage/cards/d/DreamTides.java @@ -75,7 +75,7 @@ class DreamTidesEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (player != null && sourcePermanent != null) { int countBattlefield = game.getBattlefield().getAllActivePermanents(filter, game.getActivePlayerId(), game).size(); diff --git a/Mage.Sets/src/mage/cards/d/Duplicant.java b/Mage.Sets/src/mage/cards/d/Duplicant.java index 02f11bb762b..a49eca838fa 100644 --- a/Mage.Sets/src/mage/cards/d/Duplicant.java +++ b/Mage.Sets/src/mage/cards/d/Duplicant.java @@ -76,7 +76,7 @@ class DuplicantExileTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); MageObject sourceObject = source.getSourceObject(game); if (permanent != null && sourceObject instanceof Permanent) { if (permanent.moveToExile(null, null, source, game) diff --git a/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java b/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java index 85c13c02805..d22fa0f8f27 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java @@ -100,7 +100,7 @@ class EaterOfVirtueExileEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); Permanent eaterOfVirtue = game.getPermanent(source.getSourceId()); - Card exiledCard = game.getCard(targetPointer.getFirst(game, source)); + Card exiledCard = game.getCard(getTargetPointer().getFirst(game, source)); if (controller != null && eaterOfVirtue != null && exiledCard != null) { diff --git a/Mage.Sets/src/mage/cards/e/EchoMage.java b/Mage.Sets/src/mage/cards/e/EchoMage.java index bd4e5f24e64..4f0450aebb6 100644 --- a/Mage.Sets/src/mage/cards/e/EchoMage.java +++ b/Mage.Sets/src/mage/cards/e/EchoMage.java @@ -92,7 +92,7 @@ class EchoMageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null) { spell.createCopyOnStack(game, source, source.getControllerId(), true, 2); return true; diff --git a/Mage.Sets/src/mage/cards/e/EchoingCourage.java b/Mage.Sets/src/mage/cards/e/EchoingCourage.java index aaa380283b1..819a311b6fd 100644 --- a/Mage.Sets/src/mage/cards/e/EchoingCourage.java +++ b/Mage.Sets/src/mage/cards/e/EchoingCourage.java @@ -61,7 +61,7 @@ class EchoingCourageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent targetPermanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetPermanent != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); if (CardUtil.haveEmptyName(targetPermanent)) { diff --git a/Mage.Sets/src/mage/cards/e/EchoingDecay.java b/Mage.Sets/src/mage/cards/e/EchoingDecay.java index b9910b06dc0..74dc1b019af 100644 --- a/Mage.Sets/src/mage/cards/e/EchoingDecay.java +++ b/Mage.Sets/src/mage/cards/e/EchoingDecay.java @@ -60,7 +60,7 @@ class EchoingDecayEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent targetPermanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetPermanent != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); if (CardUtil.haveEmptyName(targetPermanent)) { diff --git a/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java b/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java index 3f1b987f495..3e7eeabc30c 100644 --- a/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java +++ b/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java @@ -128,7 +128,7 @@ class EdificeOfAuthorityRestrictionEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return this.targetPointer.getTargets(game, source).contains(permanent.getId()); + return this.getTargetPointer().getTargets(game, source).contains(permanent.getId()); } @Override diff --git a/Mage.Sets/src/mage/cards/e/ElderCathar.java b/Mage.Sets/src/mage/cards/e/ElderCathar.java index 20b1e8fe63f..7c0590f1ac5 100644 --- a/Mage.Sets/src/mage/cards/e/ElderCathar.java +++ b/Mage.Sets/src/mage/cards/e/ElderCathar.java @@ -66,7 +66,7 @@ class ElderCatharAddCountersTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { if (counter != null) { if (permanent.hasSubtype(SubType.HUMAN, game)) { diff --git a/Mage.Sets/src/mage/cards/e/EmeriaShepherd.java b/Mage.Sets/src/mage/cards/e/EmeriaShepherd.java index 547a6b377c5..8670a3fd121 100644 --- a/Mage.Sets/src/mage/cards/e/EmeriaShepherd.java +++ b/Mage.Sets/src/mage/cards/e/EmeriaShepherd.java @@ -86,7 +86,7 @@ class EmeriaShepherdReturnToHandTargetEffect extends OneShotEffect { && controller.chooseUse(Outcome.PutCardInPlay, "Put the card to battlefield instead?", source, game)) { toZone = Zone.BATTLEFIELD; } - return controller.moveCards(new CardsImpl(targetPointer.getTargets(game, source)), toZone, source, game); + return controller.moveCards(new CardsImpl(getTargetPointer().getTargets(game, source)), toZone, source, game); } } diff --git a/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java b/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java index 9abaade88aa..cb779e32273 100644 --- a/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java +++ b/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java @@ -64,7 +64,7 @@ class EmissaryOfHopeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Player sourcePlayer = game.getPlayer(source.getControllerId()); if (targetPlayer != null && sourcePlayer != null) { int amount = game.getBattlefield().count(filter, targetPlayer.getId(), source, game); diff --git a/Mage.Sets/src/mage/cards/e/EnergyTap.java b/Mage.Sets/src/mage/cards/e/EnergyTap.java index c13981070e3..a1c89e44828 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyTap.java +++ b/Mage.Sets/src/mage/cards/e/EnergyTap.java @@ -69,7 +69,7 @@ class EnergyTapEffect extends OneShotEffect { } boolean applied = false; - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { applied = targetCreature.tap(source, game); if (applied) { diff --git a/Mage.Sets/src/mage/cards/e/EntrapmentManeuver.java b/Mage.Sets/src/mage/cards/e/EntrapmentManeuver.java index 05a278a0252..bb2ab0da234 100644 --- a/Mage.Sets/src/mage/cards/e/EntrapmentManeuver.java +++ b/Mage.Sets/src/mage/cards/e/EntrapmentManeuver.java @@ -61,7 +61,7 @@ class EntrapmentManeuverSacrificeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/e/EssenceSliver.java b/Mage.Sets/src/mage/cards/e/EssenceSliver.java index e8dd26d3150..3dc7c6e3dfc 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceSliver.java +++ b/Mage.Sets/src/mage/cards/e/EssenceSliver.java @@ -103,7 +103,7 @@ class EssenceSliverEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player controllerOfSliver = game.getPlayer(targetPointer.getFirst(game, source)); + Player controllerOfSliver = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controllerOfSliver != null) { int amount = (Integer) getValue("damage"); if (amount > 0) { diff --git a/Mage.Sets/src/mage/cards/e/Excavator.java b/Mage.Sets/src/mage/cards/e/Excavator.java index c715817f6d2..056e770f9ab 100644 --- a/Mage.Sets/src/mage/cards/e/Excavator.java +++ b/Mage.Sets/src/mage/cards/e/Excavator.java @@ -106,7 +106,7 @@ class ExcavatorEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanentOrLKIBattlefield(permanentId); if (permanent != null) { for(Ability ability : abilities) diff --git a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java index eb1db60b4a2..b41ee9dd0b1 100644 --- a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java +++ b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java @@ -67,7 +67,7 @@ class ExclusionRitualImprintEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); - Permanent targetPermanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (controller != null && sourcePermanent != null && targetPermanent != null) { controller.moveCardToExileWithInfo(targetPermanent, getId(), sourcePermanent.getIdName(), source, game, Zone.BATTLEFIELD, true); diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java index 470a3b6241a..de320db2082 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java @@ -78,7 +78,7 @@ class ExplosiveRevelationEffect extends OneShotEffect { // the nonland card int damage = nonLandCard == null ? 0 : nonLandCard.getManaValue(); // assign damage to target - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { Permanent targetedCreature = game.getPermanent(targetId); if (targetedCreature != null) { targetedCreature.damage(damage, source.getSourceId(), source, game, false, true); diff --git a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java index 1ee099c866a..01e61c0f9fd 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java @@ -97,10 +97,10 @@ class EyeOfTheStormEffect1 extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); boolean noLongerOnStack = false;// spell was exiled already by another effect, for example NivMagus Elemental if (spell == null) { - spell = ((Spell) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.STACK)); + spell = ((Spell) game.getLastKnownInformation(getTargetPointer().getFirst(game, source), Zone.STACK)); noLongerOnStack = true; } Permanent eyeOfTheStorm = game.getPermanentOrLKIBattlefield(source.getSourceId()); diff --git a/Mage.Sets/src/mage/cards/f/FallenShinobi.java b/Mage.Sets/src/mage/cards/f/FallenShinobi.java index bf9a7720880..2215e405298 100644 --- a/Mage.Sets/src/mage/cards/f/FallenShinobi.java +++ b/Mage.Sets/src/mage/cards/f/FallenShinobi.java @@ -66,7 +66,7 @@ class FallenShinobiEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java b/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java index 9a5bf20e7e9..b045bd9d4fb 100644 --- a/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java +++ b/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java @@ -75,7 +75,7 @@ class FiendOfTheShadowsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null || player.getHand().isEmpty()) { return false; } diff --git a/Mage.Sets/src/mage/cards/f/Fireball.java b/Mage.Sets/src/mage/cards/f/Fireball.java index 62e5287ad5e..db7580636dd 100644 --- a/Mage.Sets/src/mage/cards/f/Fireball.java +++ b/Mage.Sets/src/mage/cards/f/Fireball.java @@ -66,12 +66,12 @@ class FireballEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - int numTargets = targetPointer.getTargets(game, source).size(); + int numTargets = getTargetPointer().getTargets(game, source).size(); int damage = source.getManaCostsToPay().getX(); if (numTargets > 0) { int damagePer = damage / numTargets; if (damagePer > 0) { - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(targetId); if (permanent != null) { permanent.damage(damagePer, source.getSourceId(), source, game, false, true); diff --git a/Mage.Sets/src/mage/cards/f/ForgottenLore.java b/Mage.Sets/src/mage/cards/f/ForgottenLore.java index d514832255b..ef6bffd2ad8 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenLore.java @@ -61,7 +61,7 @@ class ForgottenLoreEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player you = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (you != null && opponent != null) { FilterCard filter = new FilterCard(); filter.add(new OwnerIdPredicate(you.getId())); diff --git a/Mage.Sets/src/mage/cards/f/FoulRenewal.java b/Mage.Sets/src/mage/cards/f/FoulRenewal.java index 7d835838b32..0734de2c83b 100644 --- a/Mage.Sets/src/mage/cards/f/FoulRenewal.java +++ b/Mage.Sets/src/mage/cards/f/FoulRenewal.java @@ -65,7 +65,7 @@ class FoulRenewalEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { int xValue = card.getToughness().getValue() * -1; controller.moveCards(card, Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/f/FractalHarness.java b/Mage.Sets/src/mage/cards/f/FractalHarness.java index 25efcc29d69..38c5396c9a6 100644 --- a/Mage.Sets/src/mage/cards/f/FractalHarness.java +++ b/Mage.Sets/src/mage/cards/f/FractalHarness.java @@ -107,7 +107,7 @@ class FractalHarnessDoubleEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/f/FrightfulDelusion.java b/Mage.Sets/src/mage/cards/f/FrightfulDelusion.java index 8fa7ae3f62b..de0b59cafc2 100644 --- a/Mage.Sets/src/mage/cards/f/FrightfulDelusion.java +++ b/Mage.Sets/src/mage/cards/f/FrightfulDelusion.java @@ -58,7 +58,7 @@ class FrightfulDelusionEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { StackObject spell = game.getStack().getStackObject( - targetPointer.getFirst(game, source)); + getTargetPointer().getFirst(game, source)); Cost cost = ManaUtil.createManaCost(1, false); if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/f/FulgentDistraction.java b/Mage.Sets/src/mage/cards/f/FulgentDistraction.java index 1fa0cb7e906..a4209b808e8 100644 --- a/Mage.Sets/src/mage/cards/f/FulgentDistraction.java +++ b/Mage.Sets/src/mage/cards/f/FulgentDistraction.java @@ -51,7 +51,7 @@ class FulgentDistractionEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for ( UUID target : targetPointer.getTargets(game, source) ) { + for ( UUID target : getTargetPointer().getTargets(game, source) ) { Permanent creature = game.getPermanent(target); List copiedAttachments = new ArrayList<>(creature.getAttachments()); diff --git a/Mage.Sets/src/mage/cards/g/GOTOJAIL.java b/Mage.Sets/src/mage/cards/g/GOTOJAIL.java index 7fd2a3b1958..7f4fa3d699f 100644 --- a/Mage.Sets/src/mage/cards/g/GOTOJAIL.java +++ b/Mage.Sets/src/mage/cards/g/GOTOJAIL.java @@ -70,7 +70,7 @@ class GoToJailExileEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent permanent = source.getSourcePermanentIfItStillExists(game); - Permanent targetPermanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); // If GO TO JAIL leaves the battlefield before its triggered ability resolves, // the target creature won't be exiled. diff --git a/Mage.Sets/src/mage/cards/g/GandalfWestwardVoyager.java b/Mage.Sets/src/mage/cards/g/GandalfWestwardVoyager.java index 4e6da0c815e..8e76d93738b 100644 --- a/Mage.Sets/src/mage/cards/g/GandalfWestwardVoyager.java +++ b/Mage.Sets/src/mage/cards/g/GandalfWestwardVoyager.java @@ -73,7 +73,7 @@ class GandalfWestwardVoyagerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getSpellOrLKIStack(targetPointer.getFirst(game, source)); + Spell spell = game.getSpellOrLKIStack(getTargetPointer().getFirst(game, source)); List typesSpell = spell == null ? new ArrayList<>() : spell.getCardType(game); boolean foundCard = false; diff --git a/Mage.Sets/src/mage/cards/g/GarrukRelentless.java b/Mage.Sets/src/mage/cards/g/GarrukRelentless.java index 3de96b421f1..5a26e6a9fab 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukRelentless.java +++ b/Mage.Sets/src/mage/cards/g/GarrukRelentless.java @@ -98,7 +98,7 @@ class GarrukRelentlessDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { int damage = permanent.getPower().getValue(); permanent.damage(3, source.getSourceId(), source, game, false, true); diff --git a/Mage.Sets/src/mage/cards/g/Geistwave.java b/Mage.Sets/src/mage/cards/g/Geistwave.java index 869dfed9f0f..d0e51aca361 100644 --- a/Mage.Sets/src/mage/cards/g/Geistwave.java +++ b/Mage.Sets/src/mage/cards/g/Geistwave.java @@ -57,7 +57,7 @@ class GeistwaveEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (player == null || permanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/g/GhoulsNightOut.java b/Mage.Sets/src/mage/cards/g/GhoulsNightOut.java index f49c99f95f0..5229a87fdf2 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulsNightOut.java +++ b/Mage.Sets/src/mage/cards/g/GhoulsNightOut.java @@ -123,7 +123,7 @@ class GhoulsNightOutTypeChangingEffect extends ContinuousEffectImpl { @Override public boolean apply(Layer layer, SubLayer subLayer, Ability source, Game game) { boolean isActive = false; - for (UUID permId : targetPointer.getTargets(game, source)) { + for (UUID permId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(permId); if (permanent != null) { switch (layer) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfFangs.java b/Mage.Sets/src/mage/cards/g/GiftOfFangs.java index d65fce68fb2..6d0159ee676 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfFangs.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfFangs.java @@ -82,7 +82,7 @@ class GiftOfFangsEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { Permanent permanent = null; if (affectedObjectsSet) { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); + permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { discard(); return true; diff --git a/Mage.Sets/src/mage/cards/g/GildedDrake.java b/Mage.Sets/src/mage/cards/g/GildedDrake.java index 260fc6f21eb..20c836ec93d 100644 --- a/Mage.Sets/src/mage/cards/g/GildedDrake.java +++ b/Mage.Sets/src/mage/cards/g/GildedDrake.java @@ -81,7 +81,7 @@ class GildedDrakeEffect extends OneShotEffect { return false; } - if (targetPointer.getFirst(game, source) == null || game.getPermanent(targetPointer.getFirst(game, source)) == null) { + if (getTargetPointer().getFirst(game, source) == null || game.getPermanent(getTargetPointer().getFirst(game, source)) == null) { sourceObject.sacrifice(source, game); return true; } diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java b/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java index 4349324ef8c..857208cbb1a 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java @@ -93,7 +93,7 @@ class GiltLeafArchdruidEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller != null && targetPlayer != null) { for (Permanent permanent : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_LANDS, targetPlayer.getId(), game)) { if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/g/GiveTake.java b/Mage.Sets/src/mage/cards/g/GiveTake.java index 89a32bc735f..2e0a6a5b8ba 100644 --- a/Mage.Sets/src/mage/cards/g/GiveTake.java +++ b/Mage.Sets/src/mage/cards/g/GiveTake.java @@ -65,7 +65,7 @@ class TakeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (creature != null) { int numberCounters = creature.getCounters(game).getCount(CounterType.P1P1); if (numberCounters > 0) { diff --git a/Mage.Sets/src/mage/cards/g/GixYawgmothPraetor.java b/Mage.Sets/src/mage/cards/g/GixYawgmothPraetor.java index 644f84797e4..9ea5894c518 100644 --- a/Mage.Sets/src/mage/cards/g/GixYawgmothPraetor.java +++ b/Mage.Sets/src/mage/cards/g/GixYawgmothPraetor.java @@ -114,7 +114,7 @@ class GixYawgmothPraetorDrawEffect extends DoIfCostPaid { @Override protected Player getPayingPlayer(Game game, Ability source) { - return game.getPlayer(targetPointer.getFirst(game, source)); + return game.getPlayer(getTargetPointer().getFirst(game, source)); } } diff --git a/Mage.Sets/src/mage/cards/g/GleefulDemolition.java b/Mage.Sets/src/mage/cards/g/GleefulDemolition.java index 8c021912f98..f054c330921 100644 --- a/Mage.Sets/src/mage/cards/g/GleefulDemolition.java +++ b/Mage.Sets/src/mage/cards/g/GleefulDemolition.java @@ -58,7 +58,7 @@ class GleefulDemolitionEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null || player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java index dc1b3fbe6d9..930c4c67f34 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java @@ -63,12 +63,12 @@ class GoblinBangchuckersEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { if (controller.flipCoin(source, game, true)) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.damage(2, source.getSourceId(), source, game, false, true); return true; } - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.damage(2, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java index 8e4f73941af..9a020f87837 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java @@ -93,11 +93,11 @@ class GoblinCharbelcherEffect extends OneShotEffect { damage *= 2; } - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.damage(damage, source.getSourceId(), source, game, false, true); } else { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { targetPlayer.damage(damage, source.getSourceId(), source, game); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinFestival.java b/Mage.Sets/src/mage/cards/g/GoblinFestival.java index 3df9861c8c8..867d480e63f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFestival.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFestival.java @@ -114,9 +114,7 @@ class GoblinFestivalGainControlEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanent(source.getFirstTarget()); - if (targetPointer != null) { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); - } + permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { return permanent.changeControllerId(controller, game, source); } diff --git a/Mage.Sets/src/mage/cards/g/GolemArtisan.java b/Mage.Sets/src/mage/cards/g/GolemArtisan.java index ed1c14d6fcd..caf2a80f937 100644 --- a/Mage.Sets/src/mage/cards/g/GolemArtisan.java +++ b/Mage.Sets/src/mage/cards/g/GolemArtisan.java @@ -77,7 +77,7 @@ class GolemArtisanEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); Player playerControls = game.getPlayer(source.getControllerId()); if (permanent != null && playerControls != null) { Choice abilityChoice = new ChoiceImpl(); diff --git a/Mage.Sets/src/mage/cards/g/GoryosVengeance.java b/Mage.Sets/src/mage/cards/g/GoryosVengeance.java index 1e6fd5d6551..33a9d0421e3 100644 --- a/Mage.Sets/src/mage/cards/g/GoryosVengeance.java +++ b/Mage.Sets/src/mage/cards/g/GoryosVengeance.java @@ -79,7 +79,7 @@ class GoryosVengeanceEffect extends OneShotEffect { if (controller == null) { return false; } - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card == null || !controller.moveCards(card, Zone.BATTLEFIELD, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/g/GrandMoffTarkin.java b/Mage.Sets/src/mage/cards/g/GrandMoffTarkin.java index 0564bdced47..0699b72694d 100644 --- a/Mage.Sets/src/mage/cards/g/GrandMoffTarkin.java +++ b/Mage.Sets/src/mage/cards/g/GrandMoffTarkin.java @@ -102,7 +102,7 @@ class GrandMoffTarkinEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/g/GraveBetrayal.java b/Mage.Sets/src/mage/cards/g/GraveBetrayal.java index 9181f2d5791..af4674f4632 100644 --- a/Mage.Sets/src/mage/cards/g/GraveBetrayal.java +++ b/Mage.Sets/src/mage/cards/g/GraveBetrayal.java @@ -114,7 +114,7 @@ class GraveBetrayalEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { ContinuousEffect effect = new GraveBetrayalReplacementEffect(); effect.setTargetPointer(new FixedTarget(card.getId())); diff --git a/Mage.Sets/src/mage/cards/g/GravityWell.java b/Mage.Sets/src/mage/cards/g/GravityWell.java index 89294f130b8..cb581457ce4 100644 --- a/Mage.Sets/src/mage/cards/g/GravityWell.java +++ b/Mage.Sets/src/mage/cards/g/GravityWell.java @@ -91,7 +91,7 @@ class GravityWellEffect extends ContinuousEffectImpl { @Override public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { switch (layer) { case AbilityAddingRemovingEffects_6: diff --git a/Mage.Sets/src/mage/cards/g/GriefTyrant.java b/Mage.Sets/src/mage/cards/g/GriefTyrant.java index 9a0fcea3f88..b0558374f4e 100644 --- a/Mage.Sets/src/mage/cards/g/GriefTyrant.java +++ b/Mage.Sets/src/mage/cards/g/GriefTyrant.java @@ -68,7 +68,7 @@ class GriefTyrantEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); Permanent griefTyrant = game.getPermanentOrLKIBattlefield(source.getSourceId()); int countersOnGriefTyrant = griefTyrant.getCounters(game).getCount(CounterType.M1M1); if (targetCreature != null) { diff --git a/Mage.Sets/src/mage/cards/g/GrimaSarumansFootman.java b/Mage.Sets/src/mage/cards/g/GrimaSarumansFootman.java index 41902bf0c38..3bcc1ddfcdc 100644 --- a/Mage.Sets/src/mage/cards/g/GrimaSarumansFootman.java +++ b/Mage.Sets/src/mage/cards/g/GrimaSarumansFootman.java @@ -67,7 +67,7 @@ class GrimaSarumansFootmanEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (player == null || controller == null) { return false; diff --git a/Mage.Sets/src/mage/cards/g/GrolnokTheOmnivore.java b/Mage.Sets/src/mage/cards/g/GrolnokTheOmnivore.java index 1e790d416c4..f09516530cf 100644 --- a/Mage.Sets/src/mage/cards/g/GrolnokTheOmnivore.java +++ b/Mage.Sets/src/mage/cards/g/GrolnokTheOmnivore.java @@ -111,7 +111,7 @@ class GrolnokTheOmnivoreExileEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (controller != null && card != null) { return CardUtil.moveCardWithCounter(game, source, controller, card, Zone.EXILED, CounterType.CROAK.createInstance()); } diff --git a/Mage.Sets/src/mage/cards/g/GruulRagebeast.java b/Mage.Sets/src/mage/cards/g/GruulRagebeast.java index 801776fe013..1f51c5882f4 100644 --- a/Mage.Sets/src/mage/cards/g/GruulRagebeast.java +++ b/Mage.Sets/src/mage/cards/g/GruulRagebeast.java @@ -93,8 +93,9 @@ class GruulRagebeastTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { // that triggers depends on stack order, so make each trigger unique with extra info String triggeredInfo = ""; - if (this.getEffects().get(0).getTargetPointer() != null) { - triggeredInfo = " Your fighting creature: " + this.getEffects().get(0).getTargetPointer().getData("triggeredName") + "."; + String triggeredMana = this.getEffects().get(0).getTargetPointer().getData("triggeredName"); + if (!triggeredMana.isEmpty()) { + triggeredInfo = " Your fighting creature: " + triggeredMana + "."; } return "Whenever {this} or another creature enters the battlefield under your control, " + "that creature fights target creature an opponent controls." + triggeredInfo; @@ -113,7 +114,7 @@ class GruulRagebeastEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent triggeredCreature = game.getPermanent(this.targetPointer.getFirst(game, source)); + Permanent triggeredCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); Permanent target = game.getPermanent(source.getFirstTarget()); if (triggeredCreature != null && target != null diff --git a/Mage.Sets/src/mage/cards/g/GuildFeud.java b/Mage.Sets/src/mage/cards/g/GuildFeud.java index e59845e5b0f..70fa84cd03c 100644 --- a/Mage.Sets/src/mage/cards/g/GuildFeud.java +++ b/Mage.Sets/src/mage/cards/g/GuildFeud.java @@ -60,7 +60,7 @@ class GuildFeudEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); Permanent opponentCreature = null; Permanent controllerCreature = null; diff --git a/Mage.Sets/src/mage/cards/h/HalanaKessigRanger.java b/Mage.Sets/src/mage/cards/h/HalanaKessigRanger.java index 0621a1d8573..8f3231bcc1b 100644 --- a/Mage.Sets/src/mage/cards/h/HalanaKessigRanger.java +++ b/Mage.Sets/src/mage/cards/h/HalanaKessigRanger.java @@ -79,7 +79,7 @@ class HalanaKessigRangerTriggerEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility( new HalanaKessigRangerDamageEffect( - new MageObjectReference(targetPointer.getFirst(game, source), game) + new MageObjectReference(getTargetPointer().getFirst(game, source), game) ), false, "that creature deals damage equal to its power to target creature" ); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/h/HellholeRats.java b/Mage.Sets/src/mage/cards/h/HellholeRats.java index 4caaf4394a0..e6cc39d4c6a 100644 --- a/Mage.Sets/src/mage/cards/h/HellholeRats.java +++ b/Mage.Sets/src/mage/cards/h/HellholeRats.java @@ -68,7 +68,7 @@ class HellholeRatsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int damage = 0; - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { Cards cards = targetPlayer.discard(1, false, false, source, game); if (!cards.isEmpty()) { diff --git a/Mage.Sets/src/mage/cards/h/HellkiteTyrant.java b/Mage.Sets/src/mage/cards/h/HellkiteTyrant.java index c5efc54f896..62afc71eb41 100644 --- a/Mage.Sets/src/mage/cards/h/HellkiteTyrant.java +++ b/Mage.Sets/src/mage/cards/h/HellkiteTyrant.java @@ -132,7 +132,7 @@ class HellkiteTyrantControlEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null && controllerId != null) { return permanent.changeControllerId(controllerId, game, source); } diff --git a/Mage.Sets/src/mage/cards/h/HereticsPunishment.java b/Mage.Sets/src/mage/cards/h/HereticsPunishment.java index 27356b6985f..333d37bedb2 100644 --- a/Mage.Sets/src/mage/cards/h/HereticsPunishment.java +++ b/Mage.Sets/src/mage/cards/h/HereticsPunishment.java @@ -66,12 +66,12 @@ class HereticsPunishmentEffect extends OneShotEffect { .mapToInt(MageObject::getManaValue) .max() .orElse(0); - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.damage(maxCost, source.getSourceId(), source, game, false, true); return true; } - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { targetPlayer.damage(maxCost, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/h/HidetsugusSecondRite.java b/Mage.Sets/src/mage/cards/h/HidetsugusSecondRite.java index ecd617d688e..c39c70f3930 100644 --- a/Mage.Sets/src/mage/cards/h/HidetsugusSecondRite.java +++ b/Mage.Sets/src/mage/cards/h/HidetsugusSecondRite.java @@ -54,7 +54,7 @@ class HidetsugusSecondRiteEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { if (targetPlayer.getLife() == 10) { targetPlayer.damage(10, source.getSourceId(), source, game); diff --git a/Mage.Sets/src/mage/cards/h/HiredTorturer.java b/Mage.Sets/src/mage/cards/h/HiredTorturer.java index 213c1b9fe18..5771667f67a 100644 --- a/Mage.Sets/src/mage/cards/h/HiredTorturer.java +++ b/Mage.Sets/src/mage/cards/h/HiredTorturer.java @@ -73,7 +73,7 @@ class HiredTorturerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null && !player.getHand().isEmpty()) { Cards revealed = new CardsImpl(); revealed.add(player.getHand().getRandom(game)); diff --git a/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java b/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java index e10d9ca39d9..fb47fcbed7c 100644 --- a/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java +++ b/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java @@ -62,7 +62,7 @@ class HisokaMinamoSenseiCounterEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell == null) { return false; } @@ -70,7 +70,7 @@ class HisokaMinamoSenseiCounterEffect extends OneShotEffect { .map(DiscardTargetCost::getCards) .flatMap(Collection::stream) .anyMatch(card -> card.getManaValue() == spell.getManaValue())) { - return game.getStack().counter(targetPointer.getFirst(game, source), source, game); + return game.getStack().counter(getTargetPointer().getFirst(game, source), source, game); } return false; } diff --git a/Mage.Sets/src/mage/cards/h/HofriGhostforge.java b/Mage.Sets/src/mage/cards/h/HofriGhostforge.java index 1ef5d0e009b..1a5a7d8b30a 100644 --- a/Mage.Sets/src/mage/cards/h/HofriGhostforge.java +++ b/Mage.Sets/src/mage/cards/h/HofriGhostforge.java @@ -102,7 +102,7 @@ class HofriGhostforgeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (player == null || card == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/h/HoldForRansom.java b/Mage.Sets/src/mage/cards/h/HoldForRansom.java index 72de32e956c..705da1e0c95 100644 --- a/Mage.Sets/src/mage/cards/h/HoldForRansom.java +++ b/Mage.Sets/src/mage/cards/h/HoldForRansom.java @@ -95,7 +95,7 @@ class HoldForRansomSacrificeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent aura = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent aura = game.getPermanent(getTargetPointer().getFirst(game, source)); if (aura == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/h/HornOfPlenty.java b/Mage.Sets/src/mage/cards/h/HornOfPlenty.java index d2a0098ce43..38b4f89c1ff 100644 --- a/Mage.Sets/src/mage/cards/h/HornOfPlenty.java +++ b/Mage.Sets/src/mage/cards/h/HornOfPlenty.java @@ -62,7 +62,7 @@ class HornOfPlentyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player caster = game.getPlayer(targetPointer.getFirst(game, source)); + Player caster = game.getPlayer(getTargetPointer().getFirst(game, source)); if (caster != null) { if (caster.chooseUse(Outcome.DrawCard, "Pay {1} to draw a card at the beginning of the next end step?", source, game)) { Cost cost = new ManaCostsImpl<>("{1}"); diff --git a/Mage.Sets/src/mage/cards/h/Hubris.java b/Mage.Sets/src/mage/cards/h/Hubris.java index b47ab577722..9251b25a0cb 100644 --- a/Mage.Sets/src/mage/cards/h/Hubris.java +++ b/Mage.Sets/src/mage/cards/h/Hubris.java @@ -69,7 +69,7 @@ class HubrisReturnEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { Permanent creature = game.getPermanent(targetId); if (creature != null) { Cards cardsToHand = new CardsImpl(); diff --git a/Mage.Sets/src/mage/cards/h/HurkylsRecall.java b/Mage.Sets/src/mage/cards/h/HurkylsRecall.java index 4faff28b02a..08d5554078b 100644 --- a/Mage.Sets/src/mage/cards/h/HurkylsRecall.java +++ b/Mage.Sets/src/mage/cards/h/HurkylsRecall.java @@ -52,9 +52,9 @@ class HurkylsRecallReturnToHandEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (targetPointer.getFirst(game, source) != null) { + if (getTargetPointer().getFirst(game, source) != null) { FilterPermanent filter = new FilterArtifactPermanent(); - filter.add(new OwnerIdPredicate(targetPointer.getFirst(game, source))); + filter.add(new OwnerIdPredicate(getTargetPointer().getFirst(game, source))); return new ReturnToHandFromBattlefieldAllEffect(filter).apply(game, source); } return false; diff --git a/Mage.Sets/src/mage/cards/h/HurlIntoHistory.java b/Mage.Sets/src/mage/cards/h/HurlIntoHistory.java index 31fc165c81c..f317747763f 100644 --- a/Mage.Sets/src/mage/cards/h/HurlIntoHistory.java +++ b/Mage.Sets/src/mage/cards/h/HurlIntoHistory.java @@ -69,7 +69,7 @@ class HurlIntoHistoryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject stackObject = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (stackObject == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/i/IceCauldron.java b/Mage.Sets/src/mage/cards/i/IceCauldron.java index b2f0a7ac604..ceff7dcc9dd 100644 --- a/Mage.Sets/src/mage/cards/i/IceCauldron.java +++ b/Mage.Sets/src/mage/cards/i/IceCauldron.java @@ -137,7 +137,7 @@ class IceCauldronCastFromExileEffect extends AsThoughEffectImpl { @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { - if (targetPointer.getTargets(game, source).contains(objectId) + if (getTargetPointer().getTargets(game, source).contains(objectId) && game.getState().getZone(objectId) == Zone.EXILED) { Player player = game.getPlayer(source.getControllerId()); Card card = game.getCard(objectId); diff --git a/Mage.Sets/src/mage/cards/i/IceCave.java b/Mage.Sets/src/mage/cards/i/IceCave.java index 307803c7c43..e5f6028fae1 100644 --- a/Mage.Sets/src/mage/cards/i/IceCave.java +++ b/Mage.Sets/src/mage/cards/i/IceCave.java @@ -62,7 +62,7 @@ class IceCaveEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); - Spell spell = (Spell) game.getStack().getStackObject(targetPointer.getFirst(game, source)); + Spell spell = (Spell) game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (sourcePermanent != null && spell != null && controller != null) { Player spellController = game.getPlayer(spell.getControllerId()); Cost cost = new ManaCostsImpl<>(spell.getSpellAbility() == null ? "" : spell.getSpellAbility().getManaCosts().getText()); diff --git a/Mage.Sets/src/mage/cards/i/IgniteMemories.java b/Mage.Sets/src/mage/cards/i/IgniteMemories.java index 67f4b784edb..5c97fb75013 100644 --- a/Mage.Sets/src/mage/cards/i/IgniteMemories.java +++ b/Mage.Sets/src/mage/cards/i/IgniteMemories.java @@ -51,7 +51,7 @@ class IgniteMemoriesEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player controller = game.getPlayer(targetPointer.getFirst(game, source)); + Player controller = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = source.getSourceObject(game); if (controller != null && sourceObject != null) { if (!controller.getHand().isEmpty()) { diff --git a/Mage.Sets/src/mage/cards/i/Illumination.java b/Mage.Sets/src/mage/cards/i/Illumination.java index 6081b1f439c..31280d5dbd6 100644 --- a/Mage.Sets/src/mage/cards/i/Illumination.java +++ b/Mage.Sets/src/mage/cards/i/Illumination.java @@ -80,7 +80,7 @@ class IlluminationEffect extends OneShotEffect { countered = true; } if (controller != null) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); int cost = spell.getManaValue(); Player player = game.getPlayer(spell.getControllerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java b/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java index 54b86cd49c2..0fcf5a0df72 100644 --- a/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java +++ b/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java @@ -63,7 +63,7 @@ class InTheEyeOfChaosEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/cards/i/IncreasingSavagery.java b/Mage.Sets/src/mage/cards/i/IncreasingSavagery.java index 485da2d21cf..7d35d6be67a 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingSavagery.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingSavagery.java @@ -62,7 +62,7 @@ class IncreasingSavageryEffect extends OneShotEffect { if (spell.getFromZone() == Zone.GRAVEYARD) { amount = 10; } - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.addCounters(CounterType.P1P1.createInstance(amount), source.getControllerId(), source, game); } diff --git a/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java b/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java index 014d871bda0..5b33dd8191c 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java @@ -71,7 +71,7 @@ class IncreasingVengeanceEffect extends OneShotEffect { if (controller == null) { return false; } - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/i/InduceDespair.java b/Mage.Sets/src/mage/cards/i/InduceDespair.java index dd21690f123..4a3a5dccef2 100644 --- a/Mage.Sets/src/mage/cards/i/InduceDespair.java +++ b/Mage.Sets/src/mage/cards/i/InduceDespair.java @@ -61,7 +61,7 @@ class InduceDespairEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { RevealTargetFromHandCost cost = (RevealTargetFromHandCost) source.getCosts().get(0); - Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (cost != null && creature != null) { int cmcBoost = -1 * cost.manaValues; ContinuousEffect effect = new BoostTargetEffect(cmcBoost, cmcBoost, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/i/InduceParanoia.java b/Mage.Sets/src/mage/cards/i/InduceParanoia.java index d7c266852a1..53478fbefec 100644 --- a/Mage.Sets/src/mage/cards/i/InduceParanoia.java +++ b/Mage.Sets/src/mage/cards/i/InduceParanoia.java @@ -64,7 +64,7 @@ class InduceParanoiaEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (spell != null) { game.getStack().counter(spell.getId(), source, game); int spellCMC = spell.getManaValue(); diff --git a/Mage.Sets/src/mage/cards/i/InvaderParasite.java b/Mage.Sets/src/mage/cards/i/InvaderParasite.java index 435bbc1922e..16bf0109e77 100644 --- a/Mage.Sets/src/mage/cards/i/InvaderParasite.java +++ b/Mage.Sets/src/mage/cards/i/InvaderParasite.java @@ -65,7 +65,7 @@ class InvaderParasiteImprintEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); - Permanent targetPermanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (sourcePermanent != null && targetPermanent != null) { targetPermanent.moveToExile(getId(), "Invader Parasite (Imprint)", source, game); sourcePermanent.imprint(targetPermanent.getId(), game); diff --git a/Mage.Sets/src/mage/cards/i/InvertInvent.java b/Mage.Sets/src/mage/cards/i/InvertInvent.java index 3fe1e6e40e0..e6e41bf2a39 100644 --- a/Mage.Sets/src/mage/cards/i/InvertInvent.java +++ b/Mage.Sets/src/mage/cards/i/InvertInvent.java @@ -66,7 +66,7 @@ class InvertEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { ContinuousEffect effect = new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(targetId, game)); game.addEffect(effect, source); diff --git a/Mage.Sets/src/mage/cards/i/IronMaiden.java b/Mage.Sets/src/mage/cards/i/IronMaiden.java index db3611c4aa7..5a7fa900937 100644 --- a/Mage.Sets/src/mage/cards/i/IronMaiden.java +++ b/Mage.Sets/src/mage/cards/i/IronMaiden.java @@ -50,7 +50,7 @@ class IronMaidenEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { int amount = player.getHand().size() - 4; if (amount > 0) { diff --git a/Mage.Sets/src/mage/cards/i/IsolationCell.java b/Mage.Sets/src/mage/cards/i/IsolationCell.java index 9fafc407551..71d68317deb 100644 --- a/Mage.Sets/src/mage/cards/i/IsolationCell.java +++ b/Mage.Sets/src/mage/cards/i/IsolationCell.java @@ -97,7 +97,7 @@ class IsolationCellEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { Cost cost = ManaUtil.createManaCost(2, false); if (!cost.pay(source, game, source, player.getId(), false)) { diff --git a/Mage.Sets/src/mage/cards/i/IzzetStaticaster.java b/Mage.Sets/src/mage/cards/i/IzzetStaticaster.java index d6c5c7a0964..47b212807e1 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetStaticaster.java +++ b/Mage.Sets/src/mage/cards/i/IzzetStaticaster.java @@ -76,7 +76,7 @@ class IzzetStaticasterDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent targetPermanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetPermanent != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); if (CardUtil.haveEmptyName(targetPermanent)) { diff --git a/Mage.Sets/src/mage/cards/j/JaceMemoryAdept.java b/Mage.Sets/src/mage/cards/j/JaceMemoryAdept.java index 6d606770239..18926d7f61c 100644 --- a/Mage.Sets/src/mage/cards/j/JaceMemoryAdept.java +++ b/Mage.Sets/src/mage/cards/j/JaceMemoryAdept.java @@ -68,7 +68,7 @@ class JaceMemoryAdeptEffect extends DrawCardTargetEffect { @Override public boolean apply(Game game, Ability source) { - for (UUID target : targetPointer.getTargets(game, source)) { + for (UUID target : getTargetPointer().getTargets(game, source)) { Player player = game.getPlayer(target); if (player != null) { player.drawCards(amount.calculate(game, source, this), source, game); diff --git a/Mage.Sets/src/mage/cards/j/JaredCarthalion.java b/Mage.Sets/src/mage/cards/j/JaredCarthalion.java index a3843982a38..01e051d72f9 100644 --- a/Mage.Sets/src/mage/cards/j/JaredCarthalion.java +++ b/Mage.Sets/src/mage/cards/j/JaredCarthalion.java @@ -118,7 +118,7 @@ class JaredCarthalionUltimateEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (controller != null && card != null) { if (controller.moveCards(card, Zone.HAND, source, game) && card.getColor().getColorCount() == 5) { diff --git a/Mage.Sets/src/mage/cards/j/JeskaThriceReborn.java b/Mage.Sets/src/mage/cards/j/JeskaThriceReborn.java index 22fe9e4edd0..c2475cec878 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaThriceReborn.java +++ b/Mage.Sets/src/mage/cards/j/JeskaThriceReborn.java @@ -136,7 +136,7 @@ class JeskaThriceRebornEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { if (!((DamagePlayerEvent) event).isCombatDamage() - || !event.getSourceId().equals(targetPointer.getFirst(game, source))) { + || !event.getSourceId().equals(getTargetPointer().getFirst(game, source))) { return false; } Player player = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/j/JestersScepter.java b/Mage.Sets/src/mage/cards/j/JestersScepter.java index 07486c3de1a..ae56998df61 100644 --- a/Mage.Sets/src/mage/cards/j/JestersScepter.java +++ b/Mage.Sets/src/mage/cards/j/JestersScepter.java @@ -204,13 +204,13 @@ class JestersScepterCounterEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null) { String nameOfExiledCardPayment = (String) game.getState().getValue(source.getSourceId() + "_nameOfExiledCardPayment"); String nameOfExiledCardPayment2 = (String) game.getState().getValue(source.getSourceId() + "_nameOfExiledCardPayment2"); if (CardUtil.haveSameNames(spell.getCard(), nameOfExiledCardPayment, game) || CardUtil.haveSameNames(spell.getCard(), nameOfExiledCardPayment2, game)) { - return game.getStack().counter(targetPointer.getFirst(game, source), source, game); + return game.getStack().counter(getTargetPointer().getFirst(game, source), source, game); } } return false; diff --git a/Mage.Sets/src/mage/cards/j/JointAssault.java b/Mage.Sets/src/mage/cards/j/JointAssault.java index bcb2db7e2d4..74f55cd692e 100644 --- a/Mage.Sets/src/mage/cards/j/JointAssault.java +++ b/Mage.Sets/src/mage/cards/j/JointAssault.java @@ -66,7 +66,7 @@ class JointAssaultBoostTargetEffect extends ContinuousEffectImpl { @Override public void init(Ability source, Game game) { super.init(source, game); - UUID permanentId = targetPointer.getFirst(game, source); + UUID permanentId = getTargetPointer().getFirst(game, source); Permanent target = game.getPermanent(permanentId); if (target != null) { if (target.getPairedCard() != null) { @@ -78,7 +78,7 @@ class JointAssaultBoostTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - UUID permanentId = targetPointer.getFirst(game, source); + UUID permanentId = getTargetPointer().getFirst(game, source); Permanent target = game.getPermanent(permanentId); if (target != null) { diff --git a/Mage.Sets/src/mage/cards/j/Justice.java b/Mage.Sets/src/mage/cards/j/Justice.java index 6c9b0be27ec..8ef95622285 100644 --- a/Mage.Sets/src/mage/cards/j/Justice.java +++ b/Mage.Sets/src/mage/cards/j/Justice.java @@ -108,7 +108,7 @@ class JusticeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Integer damageAmount = (Integer) this.getValue("damageAmount"); - UUID targetId = this.targetPointer.getFirst(game, source); + UUID targetId = this.getTargetPointer().getFirst(game, source); if (damageAmount != null && targetId != null) { Player player = game.getPlayer(targetId); if (player != null) { diff --git a/Mage.Sets/src/mage/cards/j/Juxtapose.java b/Mage.Sets/src/mage/cards/j/Juxtapose.java index a7b0f829e62..9bcc03e6cc6 100644 --- a/Mage.Sets/src/mage/cards/j/Juxtapose.java +++ b/Mage.Sets/src/mage/cards/j/Juxtapose.java @@ -77,7 +77,7 @@ class JuxtaposeEffect extends ContinuousEffectImpl { public void init(Ability source, Game game) { super.init(source, game); Player you = game.getPlayer(source.getControllerId()); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (you != null && targetPlayer != null) { Permanent permanent1 = chooseOnePermanentsWithTheHighestCMC(you, filter, source, game); diff --git a/Mage.Sets/src/mage/cards/k/KaitoDancingShadow.java b/Mage.Sets/src/mage/cards/k/KaitoDancingShadow.java index 92f7f0b4a95..80a07cd088c 100644 --- a/Mage.Sets/src/mage/cards/k/KaitoDancingShadow.java +++ b/Mage.Sets/src/mage/cards/k/KaitoDancingShadow.java @@ -88,7 +88,7 @@ class KaitoDancingShadowEffect extends OneShotEffect { if (watcher == null) { return false; } - Player damagedPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player damagedPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (controller == null || damagedPlayer == null) { return false; diff --git a/Mage.Sets/src/mage/cards/k/Karma.java b/Mage.Sets/src/mage/cards/k/Karma.java index 9e72015d5eb..87451c32779 100644 --- a/Mage.Sets/src/mage/cards/k/Karma.java +++ b/Mage.Sets/src/mage/cards/k/Karma.java @@ -60,9 +60,9 @@ class KarmaDamageTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { - int damage = game.getBattlefield().getAllActivePermanents(filter, targetPointer.getFirst(game, source), game).size(); + int damage = game.getBattlefield().getAllActivePermanents(filter, getTargetPointer().getFirst(game, source), game).size(); player.damage(damage, source.getSourceId(), source, game); return true; } diff --git a/Mage.Sets/src/mage/cards/k/KarnLiberated.java b/Mage.Sets/src/mage/cards/k/KarnLiberated.java index 38a03f45ba1..8e46cccba02 100644 --- a/Mage.Sets/src/mage/cards/k/KarnLiberated.java +++ b/Mage.Sets/src/mage/cards/k/KarnLiberated.java @@ -231,7 +231,7 @@ class KarnPlayerExileEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = source.getSourceObject(game); if (sourceObject == null) { return false; diff --git a/Mage.Sets/src/mage/cards/k/KatildaAndLier.java b/Mage.Sets/src/mage/cards/k/KatildaAndLier.java index 12fca40958f..c2395fa495e 100644 --- a/Mage.Sets/src/mage/cards/k/KatildaAndLier.java +++ b/Mage.Sets/src/mage/cards/k/KatildaAndLier.java @@ -75,7 +75,7 @@ class KatildaAndLierEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { FlashbackAbility ability = new FlashbackAbility(card, card.getManaCost()); ability.setSourceId(card.getId()); diff --git a/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java b/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java index fde22fa783e..939a53815a5 100644 --- a/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java +++ b/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java @@ -99,7 +99,7 @@ class KazuulTyrantOfTheCliffsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player payee = game.getPlayer(targetPointer.getFirst(game, source)); + Player payee = game.getPlayer(getTargetPointer().getFirst(game, source)); if (payee == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/k/KheruMindEater.java b/Mage.Sets/src/mage/cards/k/KheruMindEater.java index ad34182ad1d..78e16f7c8ad 100644 --- a/Mage.Sets/src/mage/cards/k/KheruMindEater.java +++ b/Mage.Sets/src/mage/cards/k/KheruMindEater.java @@ -74,7 +74,7 @@ class KheruMindEaterExileEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null && !player.getHand().isEmpty()) { Target target = new TargetCardInHand(1, new FilterCard()); target.chooseTarget(Outcome.Exile, player.getId(), source, game); diff --git a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java index 98c6be1f7b6..189a5f55400 100644 --- a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java +++ b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java @@ -71,9 +71,9 @@ class KheruSpellsnatcherEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { MageObject sourceObject = source.getSourceObject(game); - StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject stackObject = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (stackObject != null && sourceObject != null - && game.getStack().counter(targetPointer.getFirst(game, source), source, game, PutCards.EXILED)) { + && game.getStack().counter(getTargetPointer().getFirst(game, source), source, game, PutCards.EXILED)) { if (!stackObject.isCopy()) { MageObject card = game.getObject(stackObject.getSourceId()); if (card instanceof Card) { diff --git a/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java b/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java index 748b2c0d081..22d3e422582 100644 --- a/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java +++ b/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java @@ -75,7 +75,7 @@ class KikuNightsFlowerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.damage(permanent.getPower().getValue(), permanent.getId(), source, game, false, true); return true; diff --git a/Mage.Sets/src/mage/cards/k/KillSuitCultist.java b/Mage.Sets/src/mage/cards/k/KillSuitCultist.java index ce0f9b0633d..384789b555a 100644 --- a/Mage.Sets/src/mage/cards/k/KillSuitCultist.java +++ b/Mage.Sets/src/mage/cards/k/KillSuitCultist.java @@ -77,12 +77,12 @@ class KillSuitCultistEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - return event.getTargetId().equals(targetPointer.getFirst(game, source)); + return event.getTargetId().equals(getTargetPointer().getFirst(game, source)); } @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if(permanent != null) { permanent.destroy(source, game, false); return true; diff --git a/Mage.Sets/src/mage/cards/k/KithkinZealot.java b/Mage.Sets/src/mage/cards/k/KithkinZealot.java index 1eddeb02344..b367fafa205 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinZealot.java +++ b/Mage.Sets/src/mage/cards/k/KithkinZealot.java @@ -75,7 +75,7 @@ class KithkinZealotEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player you = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (you!= null && opponent != null) { int amount = game.getBattlefield().countAll(filter, opponent.getId(), game); diff --git a/Mage.Sets/src/mage/cards/k/KnacksawClique.java b/Mage.Sets/src/mage/cards/k/KnacksawClique.java index a5d1e7cfef9..23c97ddb412 100644 --- a/Mage.Sets/src/mage/cards/k/KnacksawClique.java +++ b/Mage.Sets/src/mage/cards/k/KnacksawClique.java @@ -79,7 +79,7 @@ class KnacksawCliqueEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); if (sourceObject != null && opponent != null) { if (opponent.getLibrary().hasCards()) { diff --git a/Mage.Sets/src/mage/cards/k/KnollspineDragon.java b/Mage.Sets/src/mage/cards/k/KnollspineDragon.java index 58358dad250..4c573bdcd54 100644 --- a/Mage.Sets/src/mage/cards/k/KnollspineDragon.java +++ b/Mage.Sets/src/mage/cards/k/KnollspineDragon.java @@ -64,7 +64,7 @@ class KnollspineDragonEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player targetOpponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetOpponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller != null) { new DiscardHandControllerEffect().apply(game, source); if (targetOpponent != null) { diff --git a/Mage.Sets/src/mage/cards/k/KnowledgePool.java b/Mage.Sets/src/mage/cards/k/KnowledgePool.java index ae63b78f594..356eeb493c7 100644 --- a/Mage.Sets/src/mage/cards/k/KnowledgePool.java +++ b/Mage.Sets/src/mage/cards/k/KnowledgePool.java @@ -150,7 +150,7 @@ class KnowledgePoolExileAndPlayEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/l/LayBare.java b/Mage.Sets/src/mage/cards/l/LayBare.java index 155d911aac2..83a9aaa49b3 100644 --- a/Mage.Sets/src/mage/cards/l/LayBare.java +++ b/Mage.Sets/src/mage/cards/l/LayBare.java @@ -55,7 +55,7 @@ class LayBareEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Card target = (Card) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.STACK); + Card target = (Card) game.getLastKnownInformation(getTargetPointer().getFirst(game, source), Zone.STACK); if (target != null) { Player controller = game.getPlayer(target.getOwnerId()); if (controller != null && player != null) { diff --git a/Mage.Sets/src/mage/cards/l/LeaveNoTrace.java b/Mage.Sets/src/mage/cards/l/LeaveNoTrace.java index 497c1cebae7..0d414da28c9 100644 --- a/Mage.Sets/src/mage/cards/l/LeaveNoTrace.java +++ b/Mage.Sets/src/mage/cards/l/LeaveNoTrace.java @@ -62,7 +62,7 @@ class LeaveNoTraceEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); if (target != null) { ObjectColor color = target.getColor(game); target.destroy(source, game, false); diff --git a/Mage.Sets/src/mage/cards/l/LesserWerewolf.java b/Mage.Sets/src/mage/cards/l/LesserWerewolf.java index d32e5b5a589..5b0d51b003f 100644 --- a/Mage.Sets/src/mage/cards/l/LesserWerewolf.java +++ b/Mage.Sets/src/mage/cards/l/LesserWerewolf.java @@ -79,7 +79,7 @@ class LesserWerewolfEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); - Permanent targetPermanent = game.getPermanent(targetPointer.getFirst(game, source)); // must be valid target + Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); // must be valid target if (controller == null || sourcePermanent == null || targetPermanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java index 2f64b1c4644..764568e9dd5 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java @@ -107,7 +107,7 @@ class LiegeOfTheTangleEffect extends ContinuousEffectImpl { public void init(Ability source, Game game) { super.init(source, game); if (this.affectedObjectsSet) { - for (UUID permId : targetPointer.getTargets(game, source)) { + for (UUID permId : getTargetPointer().getTargets(game, source)) { affectedObjectList.add(new MageObjectReference(permId, game)); } } diff --git a/Mage.Sets/src/mage/cards/l/LightningDart.java b/Mage.Sets/src/mage/cards/l/LightningDart.java index 6e4d9c0afab..05b1a28aada 100644 --- a/Mage.Sets/src/mage/cards/l/LightningDart.java +++ b/Mage.Sets/src/mage/cards/l/LightningDart.java @@ -54,7 +54,7 @@ public final class LightningDart extends CardImpl { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { int damage = 1; ObjectColor color = permanent.getColor(game); diff --git a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java index 482ccbda693..a5ad9c70afb 100644 --- a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java +++ b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java @@ -84,7 +84,7 @@ class LimDulTheNecromancerEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { if (controller.moveCards(card, Zone.BATTLEFIELD, source, game) && card.isCreature(game)) { diff --git a/Mage.Sets/src/mage/cards/l/LinvalaShieldOfSeaGate.java b/Mage.Sets/src/mage/cards/l/LinvalaShieldOfSeaGate.java index 52797ea1b2c..e21f5638289 100644 --- a/Mage.Sets/src/mage/cards/l/LinvalaShieldOfSeaGate.java +++ b/Mage.Sets/src/mage/cards/l/LinvalaShieldOfSeaGate.java @@ -99,7 +99,7 @@ class LinvalaShieldOfSeaGateRestrictionEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return this.targetPointer.getTargets(game, source).contains(permanent.getId()); + return this.getTargetPointer().getTargets(game, source).contains(permanent.getId()); } @Override diff --git a/Mage.Sets/src/mage/cards/l/LiquidFire.java b/Mage.Sets/src/mage/cards/l/LiquidFire.java index 00838592a50..76247f1b5bb 100644 --- a/Mage.Sets/src/mage/cards/l/LiquidFire.java +++ b/Mage.Sets/src/mage/cards/l/LiquidFire.java @@ -60,7 +60,7 @@ public final class LiquidFire extends CardImpl { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); int creatureDamage = choiceValue.calculate(game, source, this); int playerDamage = 5 - creatureDamage; if (target != null) { diff --git a/Mage.Sets/src/mage/cards/l/LithomancersFocus.java b/Mage.Sets/src/mage/cards/l/LithomancersFocus.java index 47eabaf867e..32ec68a6ca1 100644 --- a/Mage.Sets/src/mage/cards/l/LithomancersFocus.java +++ b/Mage.Sets/src/mage/cards/l/LithomancersFocus.java @@ -59,7 +59,7 @@ class LithomancersFocusPreventDamageToTargetEffect extends PreventionEffectImpl @Override public boolean applies(GameEvent event, Ability source, Game game) { - if (super.applies(event, source, game) && event.getTargetId().equals(targetPointer.getFirst(game, source))) { + if (super.applies(event, source, game) && event.getTargetId().equals(getTargetPointer().getFirst(game, source))) { MageObject object = game.getObject(event.getSourceId()); return object != null && object.getColor(game).isColorless(); } diff --git a/Mage.Sets/src/mage/cards/l/LongRest.java b/Mage.Sets/src/mage/cards/l/LongRest.java index a19c653e228..2efba798956 100644 --- a/Mage.Sets/src/mage/cards/l/LongRest.java +++ b/Mage.Sets/src/mage/cards/l/LongRest.java @@ -115,7 +115,7 @@ class LongRestEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { Set cardsToHand = new HashSet<>(); - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { Card card = game.getCard(targetId); if (card != null && game.getState().getZone(targetId) == Zone.GRAVEYARD) { cardsToHand.add(card); diff --git a/Mage.Sets/src/mage/cards/l/LostHours.java b/Mage.Sets/src/mage/cards/l/LostHours.java index ad0956e50af..2153287c52e 100644 --- a/Mage.Sets/src/mage/cards/l/LostHours.java +++ b/Mage.Sets/src/mage/cards/l/LostHours.java @@ -59,7 +59,7 @@ class LostHoursEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (targetPlayer != null && controller != null) { targetPlayer.revealCards(source, targetPlayer.getHand(), game); diff --git a/Mage.Sets/src/mage/cards/l/LostInTheWoods.java b/Mage.Sets/src/mage/cards/l/LostInTheWoods.java index dee42dc9d61..c5b2e0959b3 100644 --- a/Mage.Sets/src/mage/cards/l/LostInTheWoods.java +++ b/Mage.Sets/src/mage/cards/l/LostInTheWoods.java @@ -62,7 +62,7 @@ class LostInTheWoodsEffect extends OneShotEffect { if (card != null) { if (card.hasSubtype(SubType.FOREST, game)) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.removeFromCombat(game); } diff --git a/Mage.Sets/src/mage/cards/l/LostLegacy.java b/Mage.Sets/src/mage/cards/l/LostLegacy.java index 09ba47fb7db..6d2eb43b7d0 100644 --- a/Mage.Sets/src/mage/cards/l/LostLegacy.java +++ b/Mage.Sets/src/mage/cards/l/LostLegacy.java @@ -59,7 +59,7 @@ class LostLegacyEffect extends SearchTargetGraveyardHandLibraryForCardNameAndExi FilterCard filter = new FilterCard(); filter.add(new NamePredicate(cardName)); int cardsInHandBefore = targetPlayer.getHand().count(filter, game); - boolean result = super.applySearchAndExile(game, source, cardName, targetPointer.getFirst(game, source)); + boolean result = super.applySearchAndExile(game, source, cardName, getTargetPointer().getFirst(game, source)); int cardsExiled = cardsInHandBefore - targetPlayer.getHand().count(filter, game); if (cardsExiled > 0) { targetPlayer.drawCards(cardsExiled, source, game); diff --git a/Mage.Sets/src/mage/cards/l/LuxArtillery.java b/Mage.Sets/src/mage/cards/l/LuxArtillery.java index 35f2725752e..cc3b5dfa2b9 100644 --- a/Mage.Sets/src/mage/cards/l/LuxArtillery.java +++ b/Mage.Sets/src/mage/cards/l/LuxArtillery.java @@ -86,7 +86,7 @@ class LuxArtilleryEffect extends ContinuousEffectImpl { @Override public void init(Ability source, Game game) { super.init(source, game); - Spell object = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell object = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (object != null) { zoneChangeCounter = game.getState().getZoneChangeCounter(object.getSourceId()) + 1; permanentId = object.getSourceId(); @@ -102,7 +102,7 @@ class LuxArtilleryEffect extends ContinuousEffectImpl { if (game.getState().getZoneChangeCounter(permanentId) >= zoneChangeCounter) { discard(); } - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null) { game.getState().addOtherAbility(spell.getCard(), ability, true); } diff --git a/Mage.Sets/src/mage/cards/m/MagneticMountain.java b/Mage.Sets/src/mage/cards/m/MagneticMountain.java index ee77a0e8615..5daf2930657 100644 --- a/Mage.Sets/src/mage/cards/m/MagneticMountain.java +++ b/Mage.Sets/src/mage/cards/m/MagneticMountain.java @@ -81,7 +81,7 @@ class MagneticMountainEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (player != null && sourcePermanent != null) { int countBattlefield = game.getBattlefield().getAllActivePermanents(filter2, game.getActivePlayerId(), game).size(); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java index cf5201b1bc4..e81d8b88672 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java @@ -77,12 +77,12 @@ class MagusOfTheScrollEffect extends OneShotEffect { revealed.add(card); you.revealCards(sourceObject.getName(), revealed, game); if (CardUtil.haveSameNames(card, cardName, game)) { - Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (creature != null) { creature.damage(2, source.getSourceId(), source, game, false, true); return true; } - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.damage(2, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/m/ManaBreach.java b/Mage.Sets/src/mage/cards/m/ManaBreach.java index 706a3921b9d..c0fc44852cb 100644 --- a/Mage.Sets/src/mage/cards/m/ManaBreach.java +++ b/Mage.Sets/src/mage/cards/m/ManaBreach.java @@ -58,7 +58,7 @@ class ManaBreachEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null || game.getBattlefield().count( StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND, player.getId(), source, game diff --git a/Mage.Sets/src/mage/cards/m/MaraudingRaptor.java b/Mage.Sets/src/mage/cards/m/MaraudingRaptor.java index 34eb561ec33..947004023ea 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingRaptor.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingRaptor.java @@ -70,7 +70,7 @@ class MaraudingRaptorEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java b/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java index 770924e5af9..6aeecef0b48 100644 --- a/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java +++ b/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java @@ -78,7 +78,7 @@ class MathasFiendSeekerGainAbilityEffect extends GainAbilityTargetEffect { @Override public boolean isInactive(Ability source, Game game) { - Permanent creature = game.getPermanent(this.targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (creature != null && creature.getCounters(game).getCount(CounterType.BOUNTY) < 1) { return true; } diff --git a/Mage.Sets/src/mage/cards/m/Meglonoth.java b/Mage.Sets/src/mage/cards/m/Meglonoth.java index 8d352e23847..be81e58eed7 100644 --- a/Mage.Sets/src/mage/cards/m/Meglonoth.java +++ b/Mage.Sets/src/mage/cards/m/Meglonoth.java @@ -68,7 +68,7 @@ class MeglonothEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent meglonoth = game.getPermanent(source.getSourceId()); - Permanent blocked = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent blocked = game.getPermanent(getTargetPointer().getFirst(game, source)); if (blocked != null && meglonoth != null) { game.getPlayer(blocked.getControllerId()).damage(meglonoth.getPower().getValue(), source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/m/MeletisCharlatan.java b/Mage.Sets/src/mage/cards/m/MeletisCharlatan.java index 2e752379c6b..09c3865f608 100644 --- a/Mage.Sets/src/mage/cards/m/MeletisCharlatan.java +++ b/Mage.Sets/src/mage/cards/m/MeletisCharlatan.java @@ -65,7 +65,7 @@ class MeletisCharlatanCopyTargetSpellEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null) { spell.createCopyOnStack(game, source, spell.getControllerId(), true); return true; diff --git a/Mage.Sets/src/mage/cards/m/Memoricide.java b/Mage.Sets/src/mage/cards/m/Memoricide.java index ba198e1cfdc..4e6b0fe2c9e 100644 --- a/Mage.Sets/src/mage/cards/m/Memoricide.java +++ b/Mage.Sets/src/mage/cards/m/Memoricide.java @@ -54,7 +54,7 @@ class MemoricideEffect extends SearchTargetGraveyardHandLibraryForCardNameAndExi if (cardName == null) { return false; } - return super.applySearchAndExile(game, source, cardName, targetPointer.getFirst(game, source)); + return super.applySearchAndExile(game, source, cardName, getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java index 3d01b1c5047..12ac00e7406 100644 --- a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java +++ b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java @@ -74,7 +74,7 @@ class MerenOfClanNelTothEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (player == null || card == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/m/MerfolkSpy.java b/Mage.Sets/src/mage/cards/m/MerfolkSpy.java index ce493c02a8a..8d42e7f6f2e 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkSpy.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkSpy.java @@ -60,7 +60,7 @@ class MerfolkSpyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null && !player.getHand().isEmpty()) { Cards revealed = new CardsImpl(); revealed.add(player.getHand().getRandom(game)); diff --git a/Mage.Sets/src/mage/cards/m/MinasMorgulDarkFortress.java b/Mage.Sets/src/mage/cards/m/MinasMorgulDarkFortress.java index 3ef0a3dae90..406fbb0d0fe 100644 --- a/Mage.Sets/src/mage/cards/m/MinasMorgulDarkFortress.java +++ b/Mage.Sets/src/mage/cards/m/MinasMorgulDarkFortress.java @@ -74,7 +74,7 @@ class MinasMorgulEffect extends AddCardSubTypeTargetEffect { @Override public boolean apply(Game game, Ability source) { - Permanent creature = game.getPermanent(this.targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (creature == null || creature.getCounters(game).getCount(CounterType.SHADOW) < 1) { discard(); return false; diff --git a/Mage.Sets/src/mage/cards/m/MindWhip.java b/Mage.Sets/src/mage/cards/m/MindWhip.java index 0059fd33bf6..e56e53a8498 100644 --- a/Mage.Sets/src/mage/cards/m/MindWhip.java +++ b/Mage.Sets/src/mage/cards/m/MindWhip.java @@ -75,7 +75,7 @@ class MindWhipEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player controllerOfEnchantedCreature = game.getPlayer(targetPointer.getFirst(game, source)); + Player controllerOfEnchantedCreature = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent mindWhip = game.getPermanent(source.getSourceId()); if (controllerOfEnchantedCreature != null && mindWhip != null) { diff --git a/Mage.Sets/src/mage/cards/m/Mindblaze.java b/Mage.Sets/src/mage/cards/m/Mindblaze.java index cdcf70ffa02..f3b45ffb051 100644 --- a/Mage.Sets/src/mage/cards/m/Mindblaze.java +++ b/Mage.Sets/src/mage/cards/m/Mindblaze.java @@ -64,7 +64,7 @@ class MindblazeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Player playerControls = game.getPlayer(source.getControllerId()); MageObject sourceObject = source.getSourceObject(game); if (player == null || playerControls == null || sourceObject == null) { diff --git a/Mage.Sets/src/mage/cards/m/Mindsparker.java b/Mage.Sets/src/mage/cards/m/Mindsparker.java index e21a1485fdf..3876e8ff432 100644 --- a/Mage.Sets/src/mage/cards/m/Mindsparker.java +++ b/Mage.Sets/src/mage/cards/m/Mindsparker.java @@ -76,7 +76,7 @@ class MindsparkerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { targetPlayer.damage(2, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/m/MirkwoodElk.java b/Mage.Sets/src/mage/cards/m/MirkwoodElk.java index f6ccc5fa324..5fdb4288592 100644 --- a/Mage.Sets/src/mage/cards/m/MirkwoodElk.java +++ b/Mage.Sets/src/mage/cards/m/MirkwoodElk.java @@ -75,7 +75,7 @@ class MirkwoodElkEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Card targetElf = game.getCard(targetPointer.getFirst(game, source)); + Card targetElf = game.getCard(getTargetPointer().getFirst(game, source)); if (targetElf != null) { controller.moveCards(targetElf, Zone.HAND, source, game); controller.gainLife(targetElf.getPower().getValue(), game, source); diff --git a/Mage.Sets/src/mage/cards/m/Mudslide.java b/Mage.Sets/src/mage/cards/m/Mudslide.java index 26fe578a3ac..2f09d1d3ea8 100644 --- a/Mage.Sets/src/mage/cards/m/Mudslide.java +++ b/Mage.Sets/src/mage/cards/m/Mudslide.java @@ -81,7 +81,7 @@ class MudslideEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (player != null && sourcePermanent != null) { int countBattlefield = game.getBattlefield().getAllActivePermanents(filter, game.getActivePlayerId(), game).size(); diff --git a/Mage.Sets/src/mage/cards/m/MuseVessel.java b/Mage.Sets/src/mage/cards/m/MuseVessel.java index d83069d02f7..e05e43e9e39 100644 --- a/Mage.Sets/src/mage/cards/m/MuseVessel.java +++ b/Mage.Sets/src/mage/cards/m/MuseVessel.java @@ -71,7 +71,7 @@ class MuseVesselExileEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = source.getSourceObject(game); if (sourceObject == null) { return false; diff --git a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java index f2449332505..3dc111c3488 100644 --- a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java @@ -142,7 +142,7 @@ class MyrBattlesphereEffect extends OneShotEffect { // boost effect game.addEffect(new BoostSourceEffect(tappedAmount, 0, Duration.EndOfTurn), source); // damage to defender - return game.damagePlayerOrPermanent(targetPointer.getFirst(game, source), tappedAmount, myr.getId(), source, game, false, true) > 0; + return game.damagePlayerOrPermanent(getTargetPointer().getFirst(game, source), tappedAmount, myr.getId(), source, game, false, true) > 0; } return true; } diff --git a/Mage.Sets/src/mage/cards/m/MysticGenesis.java b/Mage.Sets/src/mage/cards/m/MysticGenesis.java index 49947d2466e..0b053494df7 100644 --- a/Mage.Sets/src/mage/cards/m/MysticGenesis.java +++ b/Mage.Sets/src/mage/cards/m/MysticGenesis.java @@ -57,7 +57,7 @@ class MysticGenesisEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject stackObject = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (stackObject != null) { game.getStack().counter(source.getFirstTarget(), source, game); return new CreateTokenEffect(new OozeToken(stackObject.getManaValue(), stackObject.getManaValue())).apply(game, source); diff --git a/Mage.Sets/src/mage/cards/m/MysticRemora.java b/Mage.Sets/src/mage/cards/m/MysticRemora.java index a9924b22808..ff00eb435d4 100644 --- a/Mage.Sets/src/mage/cards/m/MysticRemora.java +++ b/Mage.Sets/src/mage/cards/m/MysticRemora.java @@ -113,7 +113,7 @@ class MysticRemoraEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = source.getSourceObject(game); if (controller != null && opponent != null && sourceObject != null) { if (controller.chooseUse(Outcome.DrawCard, "Draw a card (" + sourceObject.getLogName() + ')', source, game)) { diff --git a/Mage.Sets/src/mage/cards/m/MythosOfVadrok.java b/Mage.Sets/src/mage/cards/m/MythosOfVadrok.java index a18cd254903..fe65693100a 100644 --- a/Mage.Sets/src/mage/cards/m/MythosOfVadrok.java +++ b/Mage.Sets/src/mage/cards/m/MythosOfVadrok.java @@ -97,7 +97,7 @@ class MythosOfVadrokRestrictionEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return this.targetPointer.getTargets(game, source).contains(permanent.getId()); + return this.getTargetPointer().getTargets(game, source).contains(permanent.getId()); } @Override diff --git a/Mage.Sets/src/mage/cards/n/NarciFableSinger.java b/Mage.Sets/src/mage/cards/n/NarciFableSinger.java index 809a1a595bf..a2b15173ce7 100644 --- a/Mage.Sets/src/mage/cards/n/NarciFableSinger.java +++ b/Mage.Sets/src/mage/cards/n/NarciFableSinger.java @@ -79,7 +79,7 @@ class NarciFableSingerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - FixedTarget fixedTarget = targetPointer.getFirstAsFixedTarget(game, source); + FixedTarget fixedTarget = getTargetPointer().getFirstAsFixedTarget(game, source); if (fixedTarget == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/n/Nebuchadnezzar.java b/Mage.Sets/src/mage/cards/n/Nebuchadnezzar.java index 56d5d8506fd..b9594554644 100644 --- a/Mage.Sets/src/mage/cards/n/Nebuchadnezzar.java +++ b/Mage.Sets/src/mage/cards/n/Nebuchadnezzar.java @@ -63,7 +63,7 @@ class NebuchadnezzarEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + ChooseACardNameEffect.INFO_KEY); if (opponent == null || sourceObject == null || cardName.isEmpty()) { diff --git a/Mage.Sets/src/mage/cards/n/NeeraWildMage.java b/Mage.Sets/src/mage/cards/n/NeeraWildMage.java index 86228e28c61..be4bf5d1b04 100644 --- a/Mage.Sets/src/mage/cards/n/NeeraWildMage.java +++ b/Mage.Sets/src/mage/cards/n/NeeraWildMage.java @@ -65,7 +65,7 @@ class NeeraWildMageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/n/NewBlood.java b/Mage.Sets/src/mage/cards/n/NewBlood.java index 2f0092bf567..19402099a53 100644 --- a/Mage.Sets/src/mage/cards/n/NewBlood.java +++ b/Mage.Sets/src/mage/cards/n/NewBlood.java @@ -140,7 +140,7 @@ class ChangeCreatureTypeTargetEffect extends ContinuousEffectImpl { throw new UnsupportedOperationException("No subtype to change set"); } boolean objectFound = false; - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { MageObject targetObject = game.getObject(targetId); if (targetObject != null) { objectFound = true; diff --git a/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java b/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java index 299fd00aee6..0e8c8978a75 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java +++ b/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java @@ -74,7 +74,7 @@ class NezumiGraverobberFlipEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { Player player = game.getPlayer(card.getOwnerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java index e915b137d34..5700f909cc5 100644 --- a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java @@ -153,7 +153,7 @@ class NicolBolasGodPharaohPlusTwoEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (opponent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/n/Nightsnare.java b/Mage.Sets/src/mage/cards/n/Nightsnare.java index 51797073edf..e8c6abcebee 100644 --- a/Mage.Sets/src/mage/cards/n/Nightsnare.java +++ b/Mage.Sets/src/mage/cards/n/Nightsnare.java @@ -50,7 +50,7 @@ class NightsnareDiscardEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (player == null || controller == null) { return false; diff --git a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java index eaa82d43d97..7029580f915 100644 --- a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java +++ b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java @@ -79,7 +79,7 @@ class NightveilSpecterExileEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { Card card = player.getLibrary().getFromTop(game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/n/NimDeathmantle.java b/Mage.Sets/src/mage/cards/n/NimDeathmantle.java index b228c8ec8fc..3dcefa47b45 100644 --- a/Mage.Sets/src/mage/cards/n/NimDeathmantle.java +++ b/Mage.Sets/src/mage/cards/n/NimDeathmantle.java @@ -131,7 +131,7 @@ class NimDeathmantleEffect extends OneShotEffect { if (controller.chooseUse(Outcome.Benefit, equipment.getName() + " - Pay " + cost.getText() + '?', source, game)) { cost.clearPaid(); if (cost.pay(source, game, source, source.getControllerId(), false)) { - UUID target = targetPointer.getFirst(game, source); + UUID target = getTargetPointer().getFirst(game, source); if (target != null) { Card card = game.getCard(target); // check if it's still in graveyard diff --git a/Mage.Sets/src/mage/cards/o/Oblation.java b/Mage.Sets/src/mage/cards/o/Oblation.java index 5665e250225..8fd0b5b9cbe 100644 --- a/Mage.Sets/src/mage/cards/o/Oblation.java +++ b/Mage.Sets/src/mage/cards/o/Oblation.java @@ -56,7 +56,7 @@ class OblationEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { Player player = game.getPlayer(permanent.getOwnerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java index 4524d59ef79..d36d5725dae 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java @@ -134,7 +134,7 @@ class ObsidianFireheartGainAbilityEffect extends GainAbilityTargetEffect { @Override public boolean isInactive(Ability source, Game game) { - Permanent targetLand = game.getPermanent(this.targetPointer.getFirst(game, source)); + Permanent targetLand = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (targetLand != null && targetLand.getCounters(game).getCount(CounterType.BLAZE) < 1) { return true; diff --git a/Mage.Sets/src/mage/cards/o/Occupation.java b/Mage.Sets/src/mage/cards/o/Occupation.java index 53d0c84e57d..8b4e10f5a2c 100644 --- a/Mage.Sets/src/mage/cards/o/Occupation.java +++ b/Mage.Sets/src/mage/cards/o/Occupation.java @@ -159,7 +159,7 @@ class OccupationRestrictionEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return this.targetPointer.getTargets(game, source).contains(permanent.getId()); + return this.getTargetPointer().getTargets(game, source).contains(permanent.getId()); } @Override diff --git a/Mage.Sets/src/mage/cards/o/OmenMachine.java b/Mage.Sets/src/mage/cards/o/OmenMachine.java index 5e2d820a6ab..53252bbce4f 100644 --- a/Mage.Sets/src/mage/cards/o/OmenMachine.java +++ b/Mage.Sets/src/mage/cards/o/OmenMachine.java @@ -87,7 +87,7 @@ class OmenMachineEffect2 extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { Card card = player.getLibrary().getFromTop(game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/o/OpalTitan.java b/Mage.Sets/src/mage/cards/o/OpalTitan.java index 27b8f90f373..2f7e0167e9d 100644 --- a/Mage.Sets/src/mage/cards/o/OpalTitan.java +++ b/Mage.Sets/src/mage/cards/o/OpalTitan.java @@ -66,7 +66,7 @@ class OpalTitanBecomesCreatureEffect extends ContinuousEffectImpl { public void init(Ability source, Game game) { super.init(source, game); affectedObjectList.add(new MageObjectReference(source.getSourceId(), game)); - Spell creatureSpellCast = game.getSpell(targetPointer.getFirst(game, source)); + Spell creatureSpellCast = game.getSpell(getTargetPointer().getFirst(game, source)); if (creatureSpellCast != null && creatureSpellCast.getColor(game).hasColor()) { game.getState().setValue("opalTitanColor" + source.getSourceId(), creatureSpellCast.getColor(game)); diff --git a/Mage.Sets/src/mage/cards/o/OppressiveWill.java b/Mage.Sets/src/mage/cards/o/OppressiveWill.java index 2929570bb26..4eb94ee6e70 100644 --- a/Mage.Sets/src/mage/cards/o/OppressiveWill.java +++ b/Mage.Sets/src/mage/cards/o/OppressiveWill.java @@ -58,7 +58,7 @@ class SpellSyphonEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); if (sourceObject != null && spell != null) { Player player = game.getPlayer(spell.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java b/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java index 4163ccf43b8..28522d235f1 100644 --- a/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java +++ b/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java @@ -71,7 +71,7 @@ class OrnateKanzashiEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); if (sourceObject != null && opponent != null) { if (opponent.getLibrary().hasCards()) { diff --git a/Mage.Sets/src/mage/cards/o/Outmaneuver.java b/Mage.Sets/src/mage/cards/o/Outmaneuver.java index 378585bfa82..d3c5f503a33 100644 --- a/Mage.Sets/src/mage/cards/o/Outmaneuver.java +++ b/Mage.Sets/src/mage/cards/o/Outmaneuver.java @@ -70,7 +70,7 @@ class OutmaneuverEffect extends AsThoughEffectImpl { @Override public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) { - return targetPointer.getTargets(game, source).contains(sourceId); + return getTargetPointer().getTargets(game, source).contains(sourceId); } @Override diff --git a/Mage.Sets/src/mage/cards/o/OverrideCard.java b/Mage.Sets/src/mage/cards/o/OverrideCard.java index e99588336cb..187de85d4b8 100644 --- a/Mage.Sets/src/mage/cards/o/OverrideCard.java +++ b/Mage.Sets/src/mage/cards/o/OverrideCard.java @@ -59,7 +59,7 @@ class OverrideEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); if (sourceObject != null && spell != null) { Player player = game.getPlayer(spell.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/p/PainfulQuandary.java b/Mage.Sets/src/mage/cards/p/PainfulQuandary.java index bb19a7666c0..30bd2151440 100644 --- a/Mage.Sets/src/mage/cards/p/PainfulQuandary.java +++ b/Mage.Sets/src/mage/cards/p/PainfulQuandary.java @@ -60,7 +60,7 @@ class PainfulQuandryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { boolean paid = false; Cost cost = new DiscardTargetCost(new TargetCardInHand()); diff --git a/Mage.Sets/src/mage/cards/p/PerplexingChimera.java b/Mage.Sets/src/mage/cards/p/PerplexingChimera.java index 6802f024a9d..6df97cfb5f8 100644 --- a/Mage.Sets/src/mage/cards/p/PerplexingChimera.java +++ b/Mage.Sets/src/mage/cards/p/PerplexingChimera.java @@ -146,7 +146,7 @@ class PerplexingChimeraControlExchangeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (spell != null && controller != null) { Player spellCaster = game.getPlayer(spell.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/p/PetraSphinx.java b/Mage.Sets/src/mage/cards/p/PetraSphinx.java index 3fbfaab094b..9766ce8cf30 100644 --- a/Mage.Sets/src/mage/cards/p/PetraSphinx.java +++ b/Mage.Sets/src/mage/cards/p/PetraSphinx.java @@ -61,7 +61,7 @@ class PetraSphinxEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || player == null || !player.getLibrary().hasCards()) { return true; } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianTyranny.java b/Mage.Sets/src/mage/cards/p/PhyrexianTyranny.java index be7a873862c..bb5e78de179 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianTyranny.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianTyranny.java @@ -95,7 +95,7 @@ class PhyrexianTyrannyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { Cost cost = ManaUtil.createManaCost(2, false); if (!cost.pay(source, game, source, player.getId(), false, null)) { diff --git a/Mage.Sets/src/mage/cards/p/PlagueReaver.java b/Mage.Sets/src/mage/cards/p/PlagueReaver.java index 5848c334ef0..81391af130a 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueReaver.java +++ b/Mage.Sets/src/mage/cards/p/PlagueReaver.java @@ -182,7 +182,7 @@ class PlagueReaverReturnEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(playerId); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); return player != null && card != null && player.moveCards(card, Zone.BATTLEFIELD, source, game); diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java index cf7a85ca3e3..dca3c1b02c5 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java @@ -51,7 +51,7 @@ class PlaneswalkersFuryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (opponent != null && !opponent.getHand().isEmpty()) { Cards revealed = new CardsImpl(); Card card = opponent.getHand().getRandom(game); diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java index 4bfb0ea7183..30c55f2f6d1 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java @@ -56,7 +56,7 @@ class PlaneswalkersMirthEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); Player player = game.getPlayer(source.getControllerId()); if (opponent != null && player!= null && !opponent.getHand().isEmpty()) { Cards revealed = new CardsImpl(); diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java index ee97947fcaf..0b9d61d0add 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java @@ -115,7 +115,7 @@ class PlaneswalkersMischiefCastFromExileEffect extends AsThoughEffectImpl { @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { - if (targetPointer.getTargets(game, source).contains(objectId) + if (getTargetPointer().getTargets(game, source).contains(objectId) && game.getState().getZone(objectId) == Zone.EXILED) { Player player = game.getPlayer(source.getControllerId()); Card card = game.getCard(objectId); diff --git a/Mage.Sets/src/mage/cards/p/PossibilityStorm.java b/Mage.Sets/src/mage/cards/p/PossibilityStorm.java index 2fe84f83490..7a17a85ea6e 100644 --- a/Mage.Sets/src/mage/cards/p/PossibilityStorm.java +++ b/Mage.Sets/src/mage/cards/p/PossibilityStorm.java @@ -100,10 +100,10 @@ class PossibilityStormEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); boolean noLongerOnStack = false; // spell was exiled already by another effect, for example NivMagus Elemental if (spell == null) { - spell = ((Spell) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.STACK)); + spell = ((Spell) game.getLastKnownInformation(getTargetPointer().getFirst(game, source), Zone.STACK)); noLongerOnStack = true; } if (spell == null) { diff --git a/Mage.Sets/src/mage/cards/p/PowerSink.java b/Mage.Sets/src/mage/cards/p/PowerSink.java index dd32f3187d0..354870701b1 100644 --- a/Mage.Sets/src/mage/cards/p/PowerSink.java +++ b/Mage.Sets/src/mage/cards/p/PowerSink.java @@ -62,7 +62,7 @@ class PowerSinkCounterUnlessPaysEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); Player controller = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/p/PowerSurge.java b/Mage.Sets/src/mage/cards/p/PowerSurge.java index c8173971c7a..45e4bbf0421 100644 --- a/Mage.Sets/src/mage/cards/p/PowerSurge.java +++ b/Mage.Sets/src/mage/cards/p/PowerSurge.java @@ -51,7 +51,7 @@ class PowerSurgeDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { PowerSurgeWatcher watcher = game.getState().getWatcher(PowerSurgeWatcher.class); if (watcher != null) { diff --git a/Mage.Sets/src/mage/cards/p/PredatorsHour.java b/Mage.Sets/src/mage/cards/p/PredatorsHour.java index 040665b84f8..9fd682a76af 100644 --- a/Mage.Sets/src/mage/cards/p/PredatorsHour.java +++ b/Mage.Sets/src/mage/cards/p/PredatorsHour.java @@ -88,7 +88,7 @@ class PredatorsHourEffect extends OneShotEffect { return false; } - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (opponent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java b/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java index 36367d74832..53dee313077 100644 --- a/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java @@ -56,7 +56,7 @@ class PriceOfKnowledgeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { int xValue = targetPlayer.getHand().size(); if (xValue > 0) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalOrder.java b/Mage.Sets/src/mage/cards/p/PrimalOrder.java index 46f384bf22a..cfdf4d983a2 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalOrder.java +++ b/Mage.Sets/src/mage/cards/p/PrimalOrder.java @@ -53,9 +53,9 @@ class PrimalOrderDamageTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { - int damage = game.getBattlefield().getAllActivePermanents(filter, targetPointer.getFirst(game, source), game).size(); + int damage = game.getBattlefield().getAllActivePermanents(filter, getTargetPointer().getFirst(game, source), game).size(); player.damage(damage, source.getSourceId(), source, game); return true; } diff --git a/Mage.Sets/src/mage/cards/p/PrimordialMist.java b/Mage.Sets/src/mage/cards/p/PrimordialMist.java index 70ace77575e..49b4fc05ee4 100644 --- a/Mage.Sets/src/mage/cards/p/PrimordialMist.java +++ b/Mage.Sets/src/mage/cards/p/PrimordialMist.java @@ -141,7 +141,7 @@ class PrimordialMistCastFromExileEffect extends AsThoughEffectImpl { @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { return source.isControlledBy(affectedControllerId) - && (game.getCard(targetPointer.getFirst(game, source)) != null) - && objectId == targetPointer.getFirst(game, source); + && (game.getCard(getTargetPointer().getFirst(game, source)) != null) + && objectId == getTargetPointer().getFirst(game, source); } } diff --git a/Mage.Sets/src/mage/cards/p/PrinceOfThralls.java b/Mage.Sets/src/mage/cards/p/PrinceOfThralls.java index 426180bbd39..3fd32f3d9e5 100644 --- a/Mage.Sets/src/mage/cards/p/PrinceOfThralls.java +++ b/Mage.Sets/src/mage/cards/p/PrinceOfThralls.java @@ -106,8 +106,8 @@ class PrinceOfThrallsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Card card = game.getCard(targetPointer.getFirst(game, source)); - Permanent permanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); + Permanent permanent = (Permanent) game.getLastKnownInformation(getTargetPointer().getFirst(game, source), Zone.BATTLEFIELD); if (controller != null && card != null && permanent != null) { Player opponent = game.getPlayer(permanent.getControllerId()); if (opponent != null) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicAllergy.java b/Mage.Sets/src/mage/cards/p/PsychicAllergy.java index 587d2d34196..7364504e1af 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicAllergy.java +++ b/Mage.Sets/src/mage/cards/p/PsychicAllergy.java @@ -73,7 +73,7 @@ class PsychicAllergyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { FilterPermanent filter = new FilterPermanent(); filter.add(new ColorPredicate((ObjectColor) game.getState().getValue(source.getSourceId() + "_color"))); diff --git a/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java b/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java index ac0282545b9..b0d420eb465 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java +++ b/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java @@ -67,7 +67,7 @@ class PsychicIntrusionExileEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); if (opponent != null && sourceObject != null) { opponent.revealCards(sourceObject.getName(), opponent.getHand(), game); diff --git a/Mage.Sets/src/mage/cards/p/PsychicMiasma.java b/Mage.Sets/src/mage/cards/p/PsychicMiasma.java index d824fa66c07..1890745fcfe 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicMiasma.java +++ b/Mage.Sets/src/mage/cards/p/PsychicMiasma.java @@ -52,7 +52,7 @@ class PsychicMiasmaEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { Card discardedCard = player.discardOne(false, false, source, game); if (discardedCard != null && discardedCard.isLand(game)) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicStrike.java b/Mage.Sets/src/mage/cards/p/PsychicStrike.java index 208c50fe765..c82aec9931f 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicStrike.java +++ b/Mage.Sets/src/mage/cards/p/PsychicStrike.java @@ -55,7 +55,7 @@ class PsychicStrikeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { boolean countered = false; - StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject stackObject = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (game.getStack().counter(source.getFirstTarget(), source, game)) { countered = true; } diff --git a/Mage.Sets/src/mage/cards/p/PsychicTheft.java b/Mage.Sets/src/mage/cards/p/PsychicTheft.java index d2017792631..20b6179dc37 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicTheft.java +++ b/Mage.Sets/src/mage/cards/p/PsychicTheft.java @@ -69,7 +69,7 @@ class PsychicTheftEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (opponent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java b/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java index ed9dc2a92be..5cdee0e6bd3 100644 --- a/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java +++ b/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java @@ -60,7 +60,7 @@ class PsychoticEpisodeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = source.getSourceObject(game); if (player != null && controller != null && sourceObject != null) { diff --git a/Mage.Sets/src/mage/cards/p/Pyramids.java b/Mage.Sets/src/mage/cards/p/Pyramids.java index a2576668942..24002b8bab7 100644 --- a/Mage.Sets/src/mage/cards/p/Pyramids.java +++ b/Mage.Sets/src/mage/cards/p/Pyramids.java @@ -89,7 +89,7 @@ class PyramidsEffect extends ReplacementEffectImpl { @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { return false; } @@ -105,7 +105,7 @@ class PyramidsEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - return event.getTargetId().equals(targetPointer.getFirst(game, source)) && !this.used; + return event.getTargetId().equals(getTargetPointer().getFirst(game, source)) && !this.used; } } diff --git a/Mage.Sets/src/mage/cards/r/Rackling.java b/Mage.Sets/src/mage/cards/r/Rackling.java index 3915d944812..f102b76ab91 100644 --- a/Mage.Sets/src/mage/cards/r/Rackling.java +++ b/Mage.Sets/src/mage/cards/r/Rackling.java @@ -57,7 +57,7 @@ class RacklingEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { int damage = 3 - player.getHand().size(); if (damage > 0) { diff --git a/Mage.Sets/src/mage/cards/r/RagMan.java b/Mage.Sets/src/mage/cards/r/RagMan.java index 9d04369f140..7bfdf48b6a2 100644 --- a/Mage.Sets/src/mage/cards/r/RagMan.java +++ b/Mage.Sets/src/mage/cards/r/RagMan.java @@ -71,7 +71,7 @@ class RagManDiscardEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { Cards creatureCardsInHand = new CardsImpl(); for (UUID cardId : player.getHand()) { diff --git a/Mage.Sets/src/mage/cards/r/RakdosAugermage.java b/Mage.Sets/src/mage/cards/r/RakdosAugermage.java index d9c5091300e..fa868bf0ab0 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosAugermage.java +++ b/Mage.Sets/src/mage/cards/r/RakdosAugermage.java @@ -66,7 +66,7 @@ class RakdosAugermageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (player != null && controller != null) { Cards revealedCards = new CardsImpl(); diff --git a/Mage.Sets/src/mage/cards/r/RatadrabikOfUrborg.java b/Mage.Sets/src/mage/cards/r/RatadrabikOfUrborg.java index 09e2ca1db6c..f86da51f7d6 100644 --- a/Mage.Sets/src/mage/cards/r/RatadrabikOfUrborg.java +++ b/Mage.Sets/src/mage/cards/r/RatadrabikOfUrborg.java @@ -94,7 +94,7 @@ class RatadrabikOfUrborgEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Permanent copyFrom = targetPointer.getFirstTargetPermanentOrLKI(game, source); + Permanent copyFrom = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if(controller == null || copyFrom == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/r/Recommission.java b/Mage.Sets/src/mage/cards/r/Recommission.java index afa0b10cd2c..757b1f25a18 100644 --- a/Mage.Sets/src/mage/cards/r/Recommission.java +++ b/Mage.Sets/src/mage/cards/r/Recommission.java @@ -71,7 +71,7 @@ class RecommissionEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (controller == null || card == null) { return false; } @@ -103,7 +103,7 @@ class RecommissionCounterEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - return targetPointer.getTargets(game, source).contains(event.getTargetId()); + return getTargetPointer().getTargets(game, source).contains(event.getTargetId()); } @Override diff --git a/Mage.Sets/src/mage/cards/r/Recoup.java b/Mage.Sets/src/mage/cards/r/Recoup.java index dcaf2adcd05..049265e3588 100644 --- a/Mage.Sets/src/mage/cards/r/Recoup.java +++ b/Mage.Sets/src/mage/cards/r/Recoup.java @@ -69,7 +69,7 @@ class RecoupEffect extends ContinuousEffectImpl { if (player == null) { return false; } - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { FlashbackAbility ability = new FlashbackAbility(card, card.getManaCost()); ability.setSourceId(card.getId()); diff --git a/Mage.Sets/src/mage/cards/r/RedSunsTwilight.java b/Mage.Sets/src/mage/cards/r/RedSunsTwilight.java index 4db5a3bd170..cc360864b77 100644 --- a/Mage.Sets/src/mage/cards/r/RedSunsTwilight.java +++ b/Mage.Sets/src/mage/cards/r/RedSunsTwilight.java @@ -86,7 +86,7 @@ class RedSunsTwilightEffect extends OneShotEffect { } // Try to destroy the artifacts List destroyedArtifacts = new ArrayList<>(); - for (UUID targetID : this.targetPointer.getTargets(game, source)) { + for (UUID targetID : this.getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(targetID); if (permanent != null) { if (permanent.destroy(source, game, false)) { diff --git a/Mage.Sets/src/mage/cards/r/RepeatedReverberation.java b/Mage.Sets/src/mage/cards/r/RepeatedReverberation.java index 4763a16e24f..36c497c79cc 100644 --- a/Mage.Sets/src/mage/cards/r/RepeatedReverberation.java +++ b/Mage.Sets/src/mage/cards/r/RepeatedReverberation.java @@ -122,7 +122,7 @@ class RepeatedReverberationEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackAbility stackAbility = (StackAbility) game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackAbility stackAbility = (StackAbility) game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (stackAbility == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/r/ResplendentMarshal.java b/Mage.Sets/src/mage/cards/r/ResplendentMarshal.java index d246fe85b07..3421512625b 100644 --- a/Mage.Sets/src/mage/cards/r/ResplendentMarshal.java +++ b/Mage.Sets/src/mage/cards/r/ResplendentMarshal.java @@ -90,7 +90,7 @@ class ResplendentMarshalEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source); - Card exiledCard = game.getCard(targetPointer.getFirst(game, source)); + Card exiledCard = game.getCard(getTargetPointer().getFirst(game, source)); if (controller != null && sourceObject != null && exiledCard != null) { for (Permanent permanent : game.getBattlefield().getActivePermanents( StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, source.getControllerId(), source, game)) { diff --git a/Mage.Sets/src/mage/cards/r/Rethink.java b/Mage.Sets/src/mage/cards/r/Rethink.java index 35192dd77f2..2b0f1efc0ae 100644 --- a/Mage.Sets/src/mage/cards/r/Rethink.java +++ b/Mage.Sets/src/mage/cards/r/Rethink.java @@ -56,7 +56,7 @@ class RethinkEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/cards/r/RevengeStarWars.java b/Mage.Sets/src/mage/cards/r/RevengeStarWars.java index 7d8fc52c91d..b3a4863c196 100644 --- a/Mage.Sets/src/mage/cards/r/RevengeStarWars.java +++ b/Mage.Sets/src/mage/cards/r/RevengeStarWars.java @@ -85,7 +85,7 @@ class RevengeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); if (target != null && target.isCreature(game)) { ContinuousEffect effect = new BoostTargetEffect(4, 0, Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(target.getId(), game)); diff --git a/Mage.Sets/src/mage/cards/r/Rey.java b/Mage.Sets/src/mage/cards/r/Rey.java index a36fd331957..ef4e99e6a04 100644 --- a/Mage.Sets/src/mage/cards/r/Rey.java +++ b/Mage.Sets/src/mage/cards/r/Rey.java @@ -75,7 +75,7 @@ class ReyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if(targetPlayer != null && controller != null) { if(targetPlayer.getLibrary().hasCards()) { // reveal the top card of target player's library. diff --git a/Mage.Sets/src/mage/cards/r/RhysticStudy.java b/Mage.Sets/src/mage/cards/r/RhysticStudy.java index 81e35e7f091..997953129e5 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticStudy.java +++ b/Mage.Sets/src/mage/cards/r/RhysticStudy.java @@ -59,7 +59,7 @@ class RhysticStudyDrawEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = source.getSourceObject(game); if (controller != null && opponent != null && sourceObject != null) { if (controller.chooseUse(Outcome.DrawCard, "Draw a card (" + sourceObject.getLogName() + ')', source, game)) { diff --git a/Mage.Sets/src/mage/cards/r/Riftsweeper.java b/Mage.Sets/src/mage/cards/r/Riftsweeper.java index 61ad612b66a..b832fe05f39 100644 --- a/Mage.Sets/src/mage/cards/r/Riftsweeper.java +++ b/Mage.Sets/src/mage/cards/r/Riftsweeper.java @@ -72,7 +72,7 @@ class RiftsweeperEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { // remove existing suspend counters card.getCounters(game).clear(); diff --git a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java index cacfabadcd9..a86adfc6b7f 100644 --- a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java +++ b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java @@ -73,7 +73,7 @@ class RishadanPawnshopShuffleIntoLibraryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { Player owner = game.getPlayer(permanent.getOwnerId()); if (owner != null) { diff --git a/Mage.Sets/src/mage/cards/r/RiskyMove.java b/Mage.Sets/src/mage/cards/r/RiskyMove.java index 7819b9c4731..4bfcb489fdc 100644 --- a/Mage.Sets/src/mage/cards/r/RiskyMove.java +++ b/Mage.Sets/src/mage/cards/r/RiskyMove.java @@ -1,6 +1,5 @@ package mage.cards.r; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -22,8 +21,9 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author L_J */ public final class RiskyMove extends CardImpl { @@ -199,10 +199,11 @@ class RiskyMoveCreatureGainControlEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(source.getFirstTarget()); - if (targetPointer != null) { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); + if (permanent == null) { + permanent = game.getPermanent(source.getFirstTarget()); } + if (permanent != null) { return permanent.changeControllerId(controller, game, source); } diff --git a/Mage.Sets/src/mage/cards/r/RiteOfTheRagingStorm.java b/Mage.Sets/src/mage/cards/r/RiteOfTheRagingStorm.java index 028b2b40eb7..9f9640400a4 100644 --- a/Mage.Sets/src/mage/cards/r/RiteOfTheRagingStorm.java +++ b/Mage.Sets/src/mage/cards/r/RiteOfTheRagingStorm.java @@ -63,7 +63,7 @@ class RiteOfTheRagingStormEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { return new LightningRagerToken().putOntoBattlefield(1, game, source, player.getId()); } diff --git a/Mage.Sets/src/mage/cards/r/RobberFly.java b/Mage.Sets/src/mage/cards/r/RobberFly.java index 9bea2fc2b8e..e711aa350bd 100644 --- a/Mage.Sets/src/mage/cards/r/RobberFly.java +++ b/Mage.Sets/src/mage/cards/r/RobberFly.java @@ -65,7 +65,7 @@ class DrawCardsDefendingPlayerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player defendingPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player defendingPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller != null && defendingPlayer != null) { int numberOfCardsInHand = defendingPlayer.getHand().size(); diff --git a/Mage.Sets/src/mage/cards/r/RowanScholarOfSparks.java b/Mage.Sets/src/mage/cards/r/RowanScholarOfSparks.java index 44048a03681..34a9aeb7a60 100644 --- a/Mage.Sets/src/mage/cards/r/RowanScholarOfSparks.java +++ b/Mage.Sets/src/mage/cards/r/RowanScholarOfSparks.java @@ -158,7 +158,7 @@ class WillScholarOfFrostEffect extends OneShotEffect { if (player == null) { return false; } - Cards cards = new CardsImpl(targetPointer.getTargets(game, source)); + Cards cards = new CardsImpl(getTargetPointer().getTargets(game, source)); Map playerMap = cards .getCards(game) .stream() diff --git a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java index 9841ba88ec7..43006f460c6 100644 --- a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java +++ b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java @@ -96,12 +96,12 @@ class RumblingAftershocksDealDamageEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Integer damageAmount = (Integer) this.getValue("damageAmount"); if (player != null && damageAmount > 0) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { targetPlayer.damage(damageAmount, source.getSourceId(), source, game); return true; } - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.damage(damageAmount, source.getSourceId(), source, game, false, true); return true; diff --git a/Mage.Sets/src/mage/cards/s/SandsOfTime.java b/Mage.Sets/src/mage/cards/s/SandsOfTime.java index 8bfc61cf168..a27a4bc7bdb 100644 --- a/Mage.Sets/src/mage/cards/s/SandsOfTime.java +++ b/Mage.Sets/src/mage/cards/s/SandsOfTime.java @@ -72,9 +72,9 @@ class SandsOfTimeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { - for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, targetPointer.getFirst(game, source), game)) { + for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, getTargetPointer().getFirst(game, source), game)) { if (permanent.isTapped()) { permanent.untap(game); } else { diff --git a/Mage.Sets/src/mage/cards/s/SarkhanTheMasterless.java b/Mage.Sets/src/mage/cards/s/SarkhanTheMasterless.java index f712d2743be..88ba634a00e 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanTheMasterless.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanTheMasterless.java @@ -73,7 +73,7 @@ class SarkhanTheMasterlessDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (creature == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/Scrounge.java b/Mage.Sets/src/mage/cards/s/Scrounge.java index cd1f55c4517..49cbe913724 100644 --- a/Mage.Sets/src/mage/cards/s/Scrounge.java +++ b/Mage.Sets/src/mage/cards/s/Scrounge.java @@ -58,7 +58,7 @@ class ScroungeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller != null && opponent != null) { FilterArtifactCard filter = new FilterArtifactCard(); filter.add(new OwnerIdPredicate(opponent.getId())); diff --git a/Mage.Sets/src/mage/cards/s/SeasonsBeatings.java b/Mage.Sets/src/mage/cards/s/SeasonsBeatings.java index 36b50d4d36b..9448e5da0ad 100644 --- a/Mage.Sets/src/mage/cards/s/SeasonsBeatings.java +++ b/Mage.Sets/src/mage/cards/s/SeasonsBeatings.java @@ -56,7 +56,7 @@ class SeasonsBeatingsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { Map creatures = new HashMap<>(); int numCreature = 0; diff --git a/Mage.Sets/src/mage/cards/s/SemestersEnd.java b/Mage.Sets/src/mage/cards/s/SemestersEnd.java index 1cd697622a6..17f883bec29 100644 --- a/Mage.Sets/src/mage/cards/s/SemestersEnd.java +++ b/Mage.Sets/src/mage/cards/s/SemestersEnd.java @@ -79,7 +79,7 @@ class SemestersEndEffect extends OneShotEffect { if (player == null) { return false; } - Cards cards = new CardsImpl(targetPointer.getTargets(game, source)); + Cards cards = new CardsImpl(getTargetPointer().getTargets(game, source)); player.moveCards(cards, Zone.EXILED, source, game); cards.retainZone(Zone.EXILED, game); game.addDelayedTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/s/Seraph.java b/Mage.Sets/src/mage/cards/s/Seraph.java index 813c9652959..8b552d90b92 100644 --- a/Mage.Sets/src/mage/cards/s/Seraph.java +++ b/Mage.Sets/src/mage/cards/s/Seraph.java @@ -74,7 +74,7 @@ class SeraphEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Card creatureCard = game.getCard(targetPointer.getFirst(game, source)); + Card creatureCard = game.getCard(getTargetPointer().getFirst(game, source)); if (controller != null && creatureCard != null && game.getState().getZone(creatureCard.getId()) == Zone.GRAVEYARD) { // must be still in the graveyard diff --git a/Mage.Sets/src/mage/cards/s/SereneMaster.java b/Mage.Sets/src/mage/cards/s/SereneMaster.java index a3310a63748..380d30a4f0d 100644 --- a/Mage.Sets/src/mage/cards/s/SereneMaster.java +++ b/Mage.Sets/src/mage/cards/s/SereneMaster.java @@ -77,7 +77,7 @@ class SereneMasterEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent sourceCreature = game.getPermanent(source.getSourceId()); - Permanent attackingCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent attackingCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (sourceCreature != null && attackingCreature != null) { StaticValue newSourcePower = StaticValue.get(attackingCreature.getPower().getValue()); StaticValue newAttackerPower = StaticValue.get(sourceCreature.getPower().getValue()); diff --git a/Mage.Sets/src/mage/cards/s/SerpentsSoulJar.java b/Mage.Sets/src/mage/cards/s/SerpentsSoulJar.java index 0210def2ebb..bead45953c7 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentsSoulJar.java +++ b/Mage.Sets/src/mage/cards/s/SerpentsSoulJar.java @@ -77,7 +77,7 @@ class SerpentsSoulJarExileEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = source.getSourcePermanentIfItStillExists(game); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (player == null || permanent == null || card == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/SeverTheBloodline.java b/Mage.Sets/src/mage/cards/s/SeverTheBloodline.java index dd23f9e0e1c..1bdb1a4c288 100644 --- a/Mage.Sets/src/mage/cards/s/SeverTheBloodline.java +++ b/Mage.Sets/src/mage/cards/s/SeverTheBloodline.java @@ -65,7 +65,7 @@ class SeverTheBloodlineEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Permanent targetPermanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (controller != null && targetPermanent != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); if (CardUtil.haveEmptyName(targetPermanent)) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowPuppeteers.java b/Mage.Sets/src/mage/cards/s/ShadowPuppeteers.java index 61cc82b38cd..436b0f948ca 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowPuppeteers.java +++ b/Mage.Sets/src/mage/cards/s/ShadowPuppeteers.java @@ -97,7 +97,7 @@ class ShadowPuppeteersContinousEffect extends ContinuousEffectImpl { @Override public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java b/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java index 143b9ea9808..c6b7ad43c21 100644 --- a/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java +++ b/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java @@ -93,7 +93,7 @@ class ShellOfTheLastKappaEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null) { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (sourcePermanent == null) { diff --git a/Mage.Sets/src/mage/cards/s/ShelobChildOfUngoliant.java b/Mage.Sets/src/mage/cards/s/ShelobChildOfUngoliant.java index 5ec50d2f6ed..4d32904e1e6 100644 --- a/Mage.Sets/src/mage/cards/s/ShelobChildOfUngoliant.java +++ b/Mage.Sets/src/mage/cards/s/ShelobChildOfUngoliant.java @@ -207,7 +207,7 @@ class ShelobChildOfUngoliantEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Permanent copyFrom = targetPointer.getFirstTargetPermanentOrLKI(game, source); + Permanent copyFrom = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if(controller == null || copyFrom == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/ShelobDreadWeaver.java b/Mage.Sets/src/mage/cards/s/ShelobDreadWeaver.java index 751838486e8..9bed8776f54 100644 --- a/Mage.Sets/src/mage/cards/s/ShelobDreadWeaver.java +++ b/Mage.Sets/src/mage/cards/s/ShelobDreadWeaver.java @@ -103,7 +103,7 @@ class ShelobDreadWeaverExileEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = source.getSourcePermanentIfItStillExists(game); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (player == null || permanent == null || card == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java index 7911fdf3547..7816b5e1222 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java @@ -95,7 +95,7 @@ class ShieldmageAdvocateEffect extends PreventionEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { if (super.applies(event, source, game)) { - if (event.getTargetId().equals(targetPointer.getFirst(game, source)) && event.getSourceId().equals(targetSource.getFirstTarget())) { + if (event.getTargetId().equals(getTargetPointer().getFirst(game, source)) && event.getSourceId().equals(targetSource.getFirstTarget())) { return true; } } diff --git a/Mage.Sets/src/mage/cards/s/Shocker.java b/Mage.Sets/src/mage/cards/s/Shocker.java index 71c7b47ff62..1d3c0335bd9 100644 --- a/Mage.Sets/src/mage/cards/s/Shocker.java +++ b/Mage.Sets/src/mage/cards/s/Shocker.java @@ -57,7 +57,7 @@ class ShockerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/ShroudedLore.java b/Mage.Sets/src/mage/cards/s/ShroudedLore.java index 94f6795f9c2..af26890cb96 100644 --- a/Mage.Sets/src/mage/cards/s/ShroudedLore.java +++ b/Mage.Sets/src/mage/cards/s/ShroudedLore.java @@ -61,7 +61,7 @@ class ShroudedLoreEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player you = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (you != null && opponent != null) { FilterCard filter = new FilterCard(); filter.add(new OwnerIdPredicate(you.getId())); diff --git a/Mage.Sets/src/mage/cards/s/Skred.java b/Mage.Sets/src/mage/cards/s/Skred.java index 732a81b43ef..f96a82b528d 100644 --- a/Mage.Sets/src/mage/cards/s/Skred.java +++ b/Mage.Sets/src/mage/cards/s/Skred.java @@ -62,7 +62,7 @@ class SkredDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int amount = game.getBattlefield().count(filter, source.getControllerId(), source, game); - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if(amount > 0) { if (permanent != null) { permanent.damage(amount, source.getSourceId(), source, game, false, true); diff --git a/Mage.Sets/src/mage/cards/s/Skullscorch.java b/Mage.Sets/src/mage/cards/s/Skullscorch.java index 4b1993ffe33..87759833f85 100644 --- a/Mage.Sets/src/mage/cards/s/Skullscorch.java +++ b/Mage.Sets/src/mage/cards/s/Skullscorch.java @@ -67,7 +67,7 @@ class SkullscorchDiscardEffect extends OneShotEffect { } if (spell != null) { boolean discardCards = true; - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { if (player.chooseUse(Outcome.Detriment, "Have " + spell.getLogName() + " deal 4 damage to you?", source, game)) { discardCards = false; diff --git a/Mage.Sets/src/mage/cards/s/SlaughterGames.java b/Mage.Sets/src/mage/cards/s/SlaughterGames.java index dd56bef94e7..b5b5fe6b326 100644 --- a/Mage.Sets/src/mage/cards/s/SlaughterGames.java +++ b/Mage.Sets/src/mage/cards/s/SlaughterGames.java @@ -55,7 +55,7 @@ class SlaughterGamesEffect extends SearchTargetGraveyardHandLibraryForCardNameAn if (cardName == null) { return false; } - return super.applySearchAndExile(game, source, cardName, targetPointer.getFirst(game, source)); + return super.applySearchAndExile(game, source, cardName, getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage.Sets/src/mage/cards/s/SmotheringTithe.java b/Mage.Sets/src/mage/cards/s/SmotheringTithe.java index 626b9b169a7..a23b5452b25 100644 --- a/Mage.Sets/src/mage/cards/s/SmotheringTithe.java +++ b/Mage.Sets/src/mage/cards/s/SmotheringTithe.java @@ -57,7 +57,7 @@ class SmotheringTitheEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/SnapcasterMage.java b/Mage.Sets/src/mage/cards/s/SnapcasterMage.java index 28e1b91d7d3..ea247bb0b21 100644 --- a/Mage.Sets/src/mage/cards/s/SnapcasterMage.java +++ b/Mage.Sets/src/mage/cards/s/SnapcasterMage.java @@ -75,7 +75,7 @@ class SnapcasterMageEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { FlashbackAbility ability = new FlashbackAbility(card, card.getManaCost()); ability.setSourceId(card.getId()); diff --git a/Mage.Sets/src/mage/cards/s/SootImp.java b/Mage.Sets/src/mage/cards/s/SootImp.java index 9f9ebb1cfe2..f396666be75 100644 --- a/Mage.Sets/src/mage/cards/s/SootImp.java +++ b/Mage.Sets/src/mage/cards/s/SootImp.java @@ -75,7 +75,7 @@ class SootImpEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player caster = game.getPlayer(targetPointer.getFirst(game, source)); + Player caster = game.getPlayer(getTargetPointer().getFirst(game, source)); if (caster != null) { caster.loseLife(1, game, source, false); return true; diff --git a/Mage.Sets/src/mage/cards/s/SorinMarkov.java b/Mage.Sets/src/mage/cards/s/SorinMarkov.java index 5e63fa05759..a9e31aeedea 100644 --- a/Mage.Sets/src/mage/cards/s/SorinMarkov.java +++ b/Mage.Sets/src/mage/cards/s/SorinMarkov.java @@ -73,7 +73,7 @@ class SorinMarkovEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.setLife(10, game, source); return true; diff --git a/Mage.Sets/src/mage/cards/s/SoulEcho.java b/Mage.Sets/src/mage/cards/s/SoulEcho.java index 463eb9772f1..059a283c69c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulEcho.java +++ b/Mage.Sets/src/mage/cards/s/SoulEcho.java @@ -80,7 +80,7 @@ class SoulEchoOpponentsChoiceEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller != null && opponent != null && permanent != null) { if (opponent.chooseUse(outcome, "Have all damage dealt to " + controller.getLogName() + " be decremented from echo counters on " + permanent.getLogName() + " until " + controller.getLogName() + "'s next upkeep instead?", source, game)) { game.informPlayers("Until " + controller.getLogName() + "'s next upkeep, for each 1 damage that would be dealt to " + controller.getLogName() + ", an echo counter from " + permanent.getLogName() + " is removed instead"); diff --git a/Mage.Sets/src/mage/cards/s/SoulRend.java b/Mage.Sets/src/mage/cards/s/SoulRend.java index bbb16613dcc..fc785453b32 100644 --- a/Mage.Sets/src/mage/cards/s/SoulRend.java +++ b/Mage.Sets/src/mage/cards/s/SoulRend.java @@ -55,7 +55,7 @@ class SoulRendEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null && permanent.getColor(game).isWhite()) { permanent.destroy(source, game, true); } diff --git a/Mage.Sets/src/mage/cards/s/SoulSeizer.java b/Mage.Sets/src/mage/cards/s/SoulSeizer.java index 6c471f4b244..43db8c735ff 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSeizer.java +++ b/Mage.Sets/src/mage/cards/s/SoulSeizer.java @@ -113,7 +113,7 @@ class SoulSeizerEffect extends OneShotEffect { if (permanent == null || !permanent.transform(source, game)) { return false; } - Permanent attachTo = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent attachTo = game.getPermanent(getTargetPointer().getFirst(game, source)); return attachTo != null && attachTo.addAttachment(source.getSourceId(), source, game); } diff --git a/Mage.Sets/src/mage/cards/s/SpellRupture.java b/Mage.Sets/src/mage/cards/s/SpellRupture.java index fd99ec6262c..3077c3f0b9e 100644 --- a/Mage.Sets/src/mage/cards/s/SpellRupture.java +++ b/Mage.Sets/src/mage/cards/s/SpellRupture.java @@ -64,7 +64,7 @@ class SpellRuptureCounterUnlessPaysEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); Player controller = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/s/SpellSwindle.java b/Mage.Sets/src/mage/cards/s/SpellSwindle.java index 139ca69419a..6d74e298a4e 100644 --- a/Mage.Sets/src/mage/cards/s/SpellSwindle.java +++ b/Mage.Sets/src/mage/cards/s/SpellSwindle.java @@ -54,7 +54,7 @@ class SpellSwindleEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject stackObject = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (stackObject != null) { game.getStack().counter(source.getFirstTarget(), source, game); return new TreasureToken().putOntoBattlefield(stackObject.getManaValue(), game, source); diff --git a/Mage.Sets/src/mage/cards/s/SpellSyphon.java b/Mage.Sets/src/mage/cards/s/SpellSyphon.java index 1225cbfb1e6..ea87b008337 100644 --- a/Mage.Sets/src/mage/cards/s/SpellSyphon.java +++ b/Mage.Sets/src/mage/cards/s/SpellSyphon.java @@ -70,7 +70,7 @@ class SpellSyphonEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); Player controller = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/s/Spelljack.java b/Mage.Sets/src/mage/cards/s/Spelljack.java index 4f4f4d44bc3..4fb3ec7e652 100644 --- a/Mage.Sets/src/mage/cards/s/Spelljack.java +++ b/Mage.Sets/src/mage/cards/s/Spelljack.java @@ -61,7 +61,7 @@ class SpelljackEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - UUID targetId = targetPointer.getFirst(game, source); + UUID targetId = getTargetPointer().getFirst(game, source); StackObject stackObject = game.getStack().getStackObject(targetId); if (stackObject != null && game.getStack().counter(targetId, source, game, PutCards.EXILED)) { Card card = ((Spell) stackObject).getCard(); diff --git a/Mage.Sets/src/mage/cards/s/Spellshift.java b/Mage.Sets/src/mage/cards/s/Spellshift.java index 0f92197a256..b12b4f15306 100644 --- a/Mage.Sets/src/mage/cards/s/Spellshift.java +++ b/Mage.Sets/src/mage/cards/s/Spellshift.java @@ -65,7 +65,7 @@ class SpellshiftEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player spellController = game.getPlayer(((Spell) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.STACK)).getControllerId()); + Player spellController = game.getPlayer(((Spell) game.getLastKnownInformation(getTargetPointer().getFirst(game, source), Zone.STACK)).getControllerId()); if (spellController != null) { Cards cardsToReveal = new CardsImpl(); Card toCast = null; diff --git a/Mage.Sets/src/mage/cards/s/SphinxAmbassador.java b/Mage.Sets/src/mage/cards/s/SphinxAmbassador.java index 9139d970c0f..cd61086ebd6 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxAmbassador.java +++ b/Mage.Sets/src/mage/cards/s/SphinxAmbassador.java @@ -71,7 +71,7 @@ class SphinxAmbassadorEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (controller != null && targetPlayer != null && sourcePermanent != null) { TargetCardInLibrary target = new TargetCardInLibrary(); diff --git a/Mage.Sets/src/mage/cards/s/SpinalEmbrace.java b/Mage.Sets/src/mage/cards/s/SpinalEmbrace.java index fc056bf55b7..016d3b5a2a4 100644 --- a/Mage.Sets/src/mage/cards/s/SpinalEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/SpinalEmbrace.java @@ -101,7 +101,7 @@ class SpinalEmbraceSacrificeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null) { permanent.sacrifice(source, game); diff --git a/Mage.Sets/src/mage/cards/s/SplitTheParty.java b/Mage.Sets/src/mage/cards/s/SplitTheParty.java index 37c8e3403ae..21ab34362f1 100644 --- a/Mage.Sets/src/mage/cards/s/SplitTheParty.java +++ b/Mage.Sets/src/mage/cards/s/SplitTheParty.java @@ -63,7 +63,7 @@ class SplitThePartyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || targetPlayer == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/SpoilsOfEvil.java b/Mage.Sets/src/mage/cards/s/SpoilsOfEvil.java index 2b218909718..c314775d235 100644 --- a/Mage.Sets/src/mage/cards/s/SpoilsOfEvil.java +++ b/Mage.Sets/src/mage/cards/s/SpoilsOfEvil.java @@ -62,7 +62,7 @@ public final class SpoilsOfEvil extends CardImpl { @Override public boolean apply(Game game, Ability source) { - Player targetOpponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetOpponent = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if(targetOpponent != null && controller != null) { diff --git a/Mage.Sets/src/mage/cards/s/StainTheMind.java b/Mage.Sets/src/mage/cards/s/StainTheMind.java index bfa8de41fcc..2b7ab1aec5d 100644 --- a/Mage.Sets/src/mage/cards/s/StainTheMind.java +++ b/Mage.Sets/src/mage/cards/s/StainTheMind.java @@ -54,7 +54,7 @@ class StainTheMindEffect extends SearchTargetGraveyardHandLibraryForCardNameAndE if (cardName == null) { return false; } - return super.applySearchAndExile(game, source, cardName, targetPointer.getFirst(game, source)); + return super.applySearchAndExile(game, source, cardName, getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage.Sets/src/mage/cards/s/StigmaLasher.java b/Mage.Sets/src/mage/cards/s/StigmaLasher.java index 674fe5c7aea..847b752d5c6 100644 --- a/Mage.Sets/src/mage/cards/s/StigmaLasher.java +++ b/Mage.Sets/src/mage/cards/s/StigmaLasher.java @@ -69,7 +69,7 @@ class StigmaLasherEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(this.targetPointer.getFirst(game, source)); + Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (player != null) { player.setCanGainLife(false); } diff --git a/Mage.Sets/src/mage/cards/s/StolenGoods.java b/Mage.Sets/src/mage/cards/s/StolenGoods.java index 4c6b0590dea..404f858e5db 100644 --- a/Mage.Sets/src/mage/cards/s/StolenGoods.java +++ b/Mage.Sets/src/mage/cards/s/StolenGoods.java @@ -58,7 +58,7 @@ class StolenGoodsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (opponent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java b/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java index e301099cbf9..5d10eab61bb 100644 --- a/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java +++ b/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java @@ -88,7 +88,7 @@ class StonewiseFortifierPreventAllDamageToEffect extends PreventionEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { if (super.applies(event, source, game) && event.getTargetId().equals(source.getSourceId())) { - return event.getSourceId().equals(targetPointer.getFirst(game, source)); + return event.getSourceId().equals(getTargetPointer().getFirst(game, source)); } return false; } diff --git a/Mage.Sets/src/mage/cards/s/StormOfSouls.java b/Mage.Sets/src/mage/cards/s/StormOfSouls.java index 33afb0bda2f..69f61487f80 100644 --- a/Mage.Sets/src/mage/cards/s/StormOfSouls.java +++ b/Mage.Sets/src/mage/cards/s/StormOfSouls.java @@ -100,7 +100,7 @@ class StormOfSoulsChangeCreatureEffect extends ContinuousEffectImpl { } // Each of them is a 1/1 Spirit with flying in addition to its other types - for (UUID cardID : targetPointer.getTargets(game, source)) { + for (UUID cardID : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(cardID); if (permanent == null) { continue; diff --git a/Mage.Sets/src/mage/cards/s/StormWorld.java b/Mage.Sets/src/mage/cards/s/StormWorld.java index 80a9205d92a..0ba6d88084d 100644 --- a/Mage.Sets/src/mage/cards/s/StormWorld.java +++ b/Mage.Sets/src/mage/cards/s/StormWorld.java @@ -54,7 +54,7 @@ class StormWorldEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { int damage = 4 - player.getHand().size(); if (damage > 0) { diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfTheTajuru.java b/Mage.Sets/src/mage/cards/s/StrengthOfTheTajuru.java index d1731451831..8af26b81087 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfTheTajuru.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfTheTajuru.java @@ -70,7 +70,7 @@ class StrengthOfTheTajuruAddCountersTargetEffect extends OneShotEffect { int affectedTargets = 0; int amount = source.getManaCostsToPay().getX(); Counter counter = CounterType.P1P1.createInstance(amount); - for (UUID uuid : targetPointer.getTargets(game, source)) { + for (UUID uuid : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(uuid); if (permanent != null) { permanent.addCounters(counter.copy(), source.getControllerId(), source, game); diff --git a/Mage.Sets/src/mage/cards/s/StrixhavenStadium.java b/Mage.Sets/src/mage/cards/s/StrixhavenStadium.java index 8c36dd0c6aa..d44a036fd08 100644 --- a/Mage.Sets/src/mage/cards/s/StrixhavenStadium.java +++ b/Mage.Sets/src/mage/cards/s/StrixhavenStadium.java @@ -124,7 +124,7 @@ class StrixhavenStadiumEffect extends OneShotEffect { permanent.getCounters(game).getCount(CounterType.POINT) ), source, game); } - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.lost(game); return true; diff --git a/Mage.Sets/src/mage/cards/s/SufferThePast.java b/Mage.Sets/src/mage/cards/s/SufferThePast.java index 028bd98f1ee..4f2d3509d28 100644 --- a/Mage.Sets/src/mage/cards/s/SufferThePast.java +++ b/Mage.Sets/src/mage/cards/s/SufferThePast.java @@ -60,7 +60,7 @@ class SufferThePastEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player you = game.getPlayer(source.getControllerId()); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (you == null || targetPlayer == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/SunkenHope.java b/Mage.Sets/src/mage/cards/s/SunkenHope.java index af14554b953..afff233a8bc 100644 --- a/Mage.Sets/src/mage/cards/s/SunkenHope.java +++ b/Mage.Sets/src/mage/cards/s/SunkenHope.java @@ -60,7 +60,7 @@ class SunkenHopeReturnToHandEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { boolean result = false; - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/SwanSong.java b/Mage.Sets/src/mage/cards/s/SwanSong.java index a0070265362..cd1bfd569d3 100644 --- a/Mage.Sets/src/mage/cards/s/SwanSong.java +++ b/Mage.Sets/src/mage/cards/s/SwanSong.java @@ -67,7 +67,7 @@ class SwanSongEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { boolean countered = false; - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { Spell spell = game.getStack().getSpell(targetId); if (game.getStack().counter(targetId, source, game)) { countered = true; diff --git a/Mage.Sets/src/mage/cards/s/SweepAway.java b/Mage.Sets/src/mage/cards/s/SweepAway.java index 117f61621e2..c799bb00fb0 100644 --- a/Mage.Sets/src/mage/cards/s/SweepAway.java +++ b/Mage.Sets/src/mage/cards/s/SweepAway.java @@ -53,7 +53,7 @@ class SweepAwayEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null && controller != null) { if (permanent.isAttacking()) { if (controller.chooseUse(Outcome.Neutral, "Put " + permanent.getIdName() + " on top of its owner's library (otherwise return to hand)?", source, game)) { diff --git a/Mage.Sets/src/mage/cards/s/SwordOfLightAndShadow.java b/Mage.Sets/src/mage/cards/s/SwordOfLightAndShadow.java index 144f302aa29..38fb707d58d 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfLightAndShadow.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfLightAndShadow.java @@ -81,7 +81,7 @@ class SwordOfLightAndShadowEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); return controller != null && card != null && controller.moveCards(card, Zone.HAND, source, game); } } diff --git a/Mage.Sets/src/mage/cards/t/TadeasJuniperAscendant.java b/Mage.Sets/src/mage/cards/t/TadeasJuniperAscendant.java index c57b511bc90..c0176115730 100644 --- a/Mage.Sets/src/mage/cards/t/TadeasJuniperAscendant.java +++ b/Mage.Sets/src/mage/cards/t/TadeasJuniperAscendant.java @@ -120,7 +120,7 @@ class TadeasJuniperAscendantEvasionEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return this.targetPointer.getTargets(game, source).contains(permanent.getId()); + return this.getTargetPointer().getTargets(game, source).contains(permanent.getId()); } @Override diff --git a/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java b/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java index 4b580575a91..b01e2fbca85 100644 --- a/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java +++ b/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java @@ -74,7 +74,7 @@ class TalentOfTheTelepathEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || opponent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TangleWire.java b/Mage.Sets/src/mage/cards/t/TangleWire.java index a5cdfcd7c09..e5cd4370c41 100644 --- a/Mage.Sets/src/mage/cards/t/TangleWire.java +++ b/Mage.Sets/src/mage/cards/t/TangleWire.java @@ -68,7 +68,7 @@ class TangleWireEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (player == null || permanent == null) { return false; diff --git a/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java b/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java index 178f2090eab..c5a767f1e48 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java +++ b/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java @@ -51,7 +51,7 @@ class TeferisPuzzleBoxEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { int count = player.getHand().size(); player.putCardsOnBottomOfLibrary(player.getHand(), game, source, true); diff --git a/Mage.Sets/src/mage/cards/t/Terastodon.java b/Mage.Sets/src/mage/cards/t/Terastodon.java index e84ee1cf101..e314d78c2f1 100644 --- a/Mage.Sets/src/mage/cards/t/Terastodon.java +++ b/Mage.Sets/src/mage/cards/t/Terastodon.java @@ -77,7 +77,7 @@ class TerastodonEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Map destroyedPermanents = new HashMap<>(); - for (UUID targetID : this.targetPointer.getTargets(game, source)) { + for (UUID targetID : this.getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(targetID); if (permanent != null) { if (permanent.destroy(source, game, false)) { diff --git a/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java b/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java index acc83f05386..6be4b3fb057 100644 --- a/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java +++ b/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java @@ -156,7 +156,7 @@ class TergridGodOfFrightEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { // controller gets to choose the order in which the cards enter the battlefield controller.moveCards(card, Zone.BATTLEFIELD, source, game); diff --git a/Mage.Sets/src/mage/cards/t/TezzeretCruelMachinist.java b/Mage.Sets/src/mage/cards/t/TezzeretCruelMachinist.java index 35bf1fe400c..02d7ba47038 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretCruelMachinist.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretCruelMachinist.java @@ -125,7 +125,7 @@ class TezzeretCruelMachinistCardTypeEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { boolean flag = false; - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { Permanent target = game.getPermanent(targetId); if (target == null || !target.isFaceDown(game)) { continue; diff --git a/Mage.Sets/src/mage/cards/t/TezzeretMasterOfMetal.java b/Mage.Sets/src/mage/cards/t/TezzeretMasterOfMetal.java index 5eb38ddaf69..0f397d961bc 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretMasterOfMetal.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretMasterOfMetal.java @@ -84,7 +84,7 @@ class TezzeretMasterOfMetalEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - List permanents = game.getBattlefield().getAllActivePermanents(filter, targetPointer.getFirst(game, source), game); + List permanents = game.getBattlefield().getAllActivePermanents(filter, getTargetPointer().getFirst(game, source), game); for (Permanent permanent : permanents) { ContinuousEffect effect = new TezzeretMasterOfMetalControlEffect(source.getControllerId()); effect.setTargetPointer(new FixedTarget(permanent, game)); @@ -115,7 +115,7 @@ class TezzeretMasterOfMetalControlEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null && controllerId != null) { return permanent.changeControllerId(controllerId, game, source); } diff --git a/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java b/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java index d25c22ccbdc..5607df7d485 100644 --- a/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java +++ b/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java @@ -64,7 +64,7 @@ class ThadaAdelAcquisitorEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player damagedPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player damagedPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || damagedPlayer == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TheFugitiveDoctor.java b/Mage.Sets/src/mage/cards/t/TheFugitiveDoctor.java index f02f73b1237..775e4279c8e 100644 --- a/Mage.Sets/src/mage/cards/t/TheFugitiveDoctor.java +++ b/Mage.Sets/src/mage/cards/t/TheFugitiveDoctor.java @@ -74,7 +74,7 @@ class TheFugitiveDoctorEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TheMyriadPools.java b/Mage.Sets/src/mage/cards/t/TheMyriadPools.java index 42f35dcc3d1..8561a812d79 100644 --- a/Mage.Sets/src/mage/cards/t/TheMyriadPools.java +++ b/Mage.Sets/src/mage/cards/t/TheMyriadPools.java @@ -168,7 +168,7 @@ class TheMyriadPoolsCopyEffect extends OneShotEffect { if (controller.choose(Outcome.Neutral, target, source, game)) { targetPermanentToCopyTo = game.getPermanent(target.getFirstTarget()); } - Card copyFromCardOnStack = game.getCard(targetPointer.getFirst(game, source)); + Card copyFromCardOnStack = game.getCard(getTargetPointer().getFirst(game, source)); Permanent newBluePrint = null; if (targetPermanentToCopyTo != null) { if (copyFromCardOnStack != null) { diff --git a/Mage.Sets/src/mage/cards/t/TheSeaDevils.java b/Mage.Sets/src/mage/cards/t/TheSeaDevils.java index fda64d433aa..09a21f3471d 100644 --- a/Mage.Sets/src/mage/cards/t/TheSeaDevils.java +++ b/Mage.Sets/src/mage/cards/t/TheSeaDevils.java @@ -132,11 +132,10 @@ class TheSeaDevilsTrigger extends DelayedTriggeredAbility { public String getRule() { // that triggers depends on stack order, so make each trigger unique with extra info String triggeredInfo = ""; - if (this.getEffects().get(0).getTargetPointer() != null) { - if (!this.getEffects().get(0).getTargetPointer().getData("damageAmount").isEmpty()) { - triggeredInfo += "
Damage: " + this.getEffects().get(0).getTargetPointer().getData("damageAmount") + ""; - triggeredInfo += "
Salamander: " + this.getEffects().get(0).getTargetPointer().getData("triggeredName") + ""; - } + String triggeredDamage = this.getEffects().get(0).getTargetPointer().getData("damageAmount"); + if (!triggeredDamage.isEmpty()) { + triggeredInfo += "
Damage: " + this.getEffects().get(0).getTargetPointer().getData("damageAmount") + ""; + triggeredInfo += "
Salamander: " + this.getEffects().get(0).getTargetPointer().getData("triggeredName") + ""; } return "Until end of turn, whenever a Salamander deals combat damage to a player, " + "it deals that much damage to target creature that player controls." + triggeredInfo; diff --git a/Mage.Sets/src/mage/cards/t/TheTombOfAclazotz.java b/Mage.Sets/src/mage/cards/t/TheTombOfAclazotz.java index 0bd5b7b9af3..321297dda72 100644 --- a/Mage.Sets/src/mage/cards/t/TheTombOfAclazotz.java +++ b/Mage.Sets/src/mage/cards/t/TheTombOfAclazotz.java @@ -248,8 +248,8 @@ class AddCardSubTypeEnteringTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getSpell(targetPointer.getFirst(game, source)); - MageObject target = game.getObject(targetPointer.getFirst(game, source)); + Spell spell = game.getSpell(getTargetPointer().getFirst(game, source)); + MageObject target = game.getObject(getTargetPointer().getFirst(game, source)); if (spell != null) { card = spell.getCard(); } diff --git a/Mage.Sets/src/mage/cards/t/ThelonsChant.java b/Mage.Sets/src/mage/cards/t/ThelonsChant.java index f67fd1f79d5..bb9f6ab2e31 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonsChant.java +++ b/Mage.Sets/src/mage/cards/t/ThelonsChant.java @@ -68,7 +68,7 @@ class ThelonsChantEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (player != null && sourcePermanent != null) { boolean paid = false; diff --git a/Mage.Sets/src/mage/cards/t/ThelonsCurse.java b/Mage.Sets/src/mage/cards/t/ThelonsCurse.java index 09a0aae89ed..294f87f41a1 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonsCurse.java +++ b/Mage.Sets/src/mage/cards/t/ThelonsCurse.java @@ -84,7 +84,7 @@ class ThelonsCurseEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (player != null && sourcePermanent != null) { int countBattlefield = game.getBattlefield().getAllActivePermanents(filter, game.getActivePlayerId(), game).size(); diff --git a/Mage.Sets/src/mage/cards/t/ThievingAmalgam.java b/Mage.Sets/src/mage/cards/t/ThievingAmalgam.java index 4c38a68ec5b..2e0ef9921b2 100644 --- a/Mage.Sets/src/mage/cards/t/ThievingAmalgam.java +++ b/Mage.Sets/src/mage/cards/t/ThievingAmalgam.java @@ -131,7 +131,7 @@ class ThievingAmalgamLifeLossEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(game.getOwnerId(targetPointer.getFirst(game, source))); + Player player = game.getPlayer(game.getOwnerId(getTargetPointer().getFirst(game, source))); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtDissector.java b/Mage.Sets/src/mage/cards/t/ThoughtDissector.java index 6f4295a6f6d..f385ae3303f 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtDissector.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtDissector.java @@ -68,7 +68,7 @@ class ThoughtDissectorEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player targetOpponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetOpponent = game.getPlayer(getTargetPointer().getFirst(game, source)); int max = amount.calculate(game, source, this); if (targetOpponent != null && controller != null && max > 0) { int numberOfCard = 0; diff --git a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java index b1fcd5228a9..9cbec348eff 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java @@ -190,7 +190,7 @@ class ThoughtPrisonDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { targetPlayer.damage(2, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/t/ThranTurbine.java b/Mage.Sets/src/mage/cards/t/ThranTurbine.java index 0c1e36b78bf..b0fcdbd7040 100644 --- a/Mage.Sets/src/mage/cards/t/ThranTurbine.java +++ b/Mage.Sets/src/mage/cards/t/ThranTurbine.java @@ -66,7 +66,7 @@ class ThranTurbineEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { new AddConditionalColorlessManaEffect(2, new ThranTurbineManaBuilder()).apply(game, source); diff --git a/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java b/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java index 0d664316eef..39075607b9f 100644 --- a/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java +++ b/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java @@ -71,7 +71,7 @@ class TibaltsTrickeryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null) { String spellName = spell.getName(); Player controller = game.getPlayer(spell.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/t/TimotharBaronOfBats.java b/Mage.Sets/src/mage/cards/t/TimotharBaronOfBats.java index c981650054d..a75e13e19eb 100644 --- a/Mage.Sets/src/mage/cards/t/TimotharBaronOfBats.java +++ b/Mage.Sets/src/mage/cards/t/TimotharBaronOfBats.java @@ -89,7 +89,7 @@ class TimotharBaronOfBatsCreateBatEffect extends OneShotEffect { } // Check vampire card still exists and is still in the graveyard - Card vampireCard = game.getCard(targetPointer.getFirst(game, source)); + Card vampireCard = game.getCard(getTargetPointer().getFirst(game, source)); if (vampireCard == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/Tombfire.java b/Mage.Sets/src/mage/cards/t/Tombfire.java index 0c4d48b26d2..d87866fb56a 100644 --- a/Mage.Sets/src/mage/cards/t/Tombfire.java +++ b/Mage.Sets/src/mage/cards/t/Tombfire.java @@ -61,7 +61,7 @@ class TombfireEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { for (Card card : targetPlayer.getGraveyard().getCards(filter, game)) { card.moveToExile(null, "", source, game); diff --git a/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java b/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java index 4c7e4e26ed8..41621310d63 100644 --- a/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java +++ b/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java @@ -72,7 +72,7 @@ class TormentOfScarabsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player enchantedPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player enchantedPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (enchantedPlayer == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TormentorsHelm.java b/Mage.Sets/src/mage/cards/t/TormentorsHelm.java index a5d37895ecf..8dc290b5255 100644 --- a/Mage.Sets/src/mage/cards/t/TormentorsHelm.java +++ b/Mage.Sets/src/mage/cards/t/TormentorsHelm.java @@ -114,7 +114,7 @@ class TormentorsHelmEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.damage(1, creatureId, source, game); return true; diff --git a/Mage.Sets/src/mage/cards/t/TourachsChant.java b/Mage.Sets/src/mage/cards/t/TourachsChant.java index d1b67f4ec56..9f7fe6f4b25 100644 --- a/Mage.Sets/src/mage/cards/t/TourachsChant.java +++ b/Mage.Sets/src/mage/cards/t/TourachsChant.java @@ -68,7 +68,7 @@ class TourachsChantEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (player != null && sourcePermanent != null) { boolean paid = false; diff --git a/Mage.Sets/src/mage/cards/t/TraitorsRoar.java b/Mage.Sets/src/mage/cards/t/TraitorsRoar.java index dbd922f4115..7b300ac518c 100644 --- a/Mage.Sets/src/mage/cards/t/TraitorsRoar.java +++ b/Mage.Sets/src/mage/cards/t/TraitorsRoar.java @@ -68,7 +68,7 @@ class TraitorsRoarEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { boolean applied = false; - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { applied = targetCreature.tap(source, game); Player controller = game.getPlayer(targetCreature.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/t/TreacherousUrge.java b/Mage.Sets/src/mage/cards/t/TreacherousUrge.java index 9d84a610fb3..dcb297c2e0c 100644 --- a/Mage.Sets/src/mage/cards/t/TreacherousUrge.java +++ b/Mage.Sets/src/mage/cards/t/TreacherousUrge.java @@ -67,7 +67,7 @@ class TreacherousUrgeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); if (opponent != null && sourceObject != null) { opponent.revealCards(sourceObject.getName(), opponent.getHand(), game); diff --git a/Mage.Sets/src/mage/cards/t/TsabosDecree.java b/Mage.Sets/src/mage/cards/t/TsabosDecree.java index a6d630ea7d6..8fccea33b27 100644 --- a/Mage.Sets/src/mage/cards/t/TsabosDecree.java +++ b/Mage.Sets/src/mage/cards/t/TsabosDecree.java @@ -59,7 +59,7 @@ class TsabosDecreeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = game.getObject(source); if (player == null) { return false; diff --git a/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java b/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java index 9e8ff01ba6d..3eb729782f1 100644 --- a/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java +++ b/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java @@ -85,7 +85,7 @@ class UglukOfTheWhiteHandEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent deadCreature = game.getPermanentOrLKIBattlefield(targetPointer.getFirst(game, source)); + Permanent deadCreature = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); boolean wasOrcOrGoblin = false; if (deadCreature != null) { diff --git a/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java b/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java index 12c36f197ee..2fd36db8c4f 100644 --- a/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java +++ b/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java @@ -143,7 +143,7 @@ class UlamogExileLibraryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player defender = game.getPlayer(targetPointer.getFirst(game, source)); + Player defender = game.getPlayer(getTargetPointer().getFirst(game, source)); if (defender != null) { defender.moveCards(defender.getLibrary().getTopCards(game, 20), Zone.EXILED, source, game); return true; diff --git a/Mage.Sets/src/mage/cards/u/Umbilicus.java b/Mage.Sets/src/mage/cards/u/Umbilicus.java index d802eca9fbe..820e5e3e6fc 100644 --- a/Mage.Sets/src/mage/cards/u/Umbilicus.java +++ b/Mage.Sets/src/mage/cards/u/Umbilicus.java @@ -58,7 +58,7 @@ class BloodClockEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/u/UncheckedGrowth.java b/Mage.Sets/src/mage/cards/u/UncheckedGrowth.java index 3ac4c86d41c..1e2fcecddcc 100644 --- a/Mage.Sets/src/mage/cards/u/UncheckedGrowth.java +++ b/Mage.Sets/src/mage/cards/u/UncheckedGrowth.java @@ -60,7 +60,7 @@ public final class UncheckedGrowth extends CardImpl { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null && permanent.hasSubtype(SubType.SPIRIT, game)) { permanent.addAbility(TrampleAbility.getInstance(), source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/u/UnifyingTheory.java b/Mage.Sets/src/mage/cards/u/UnifyingTheory.java index 660e0f050cd..5bb815b8770 100644 --- a/Mage.Sets/src/mage/cards/u/UnifyingTheory.java +++ b/Mage.Sets/src/mage/cards/u/UnifyingTheory.java @@ -60,7 +60,7 @@ class UnifyingTheoryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player caster = game.getPlayer(targetPointer.getFirst(game, source)); + Player caster = game.getPlayer(getTargetPointer().getFirst(game, source)); if (caster != null) { if (caster.chooseUse(Outcome.DrawCard, "Pay {2} to draw a card?", source, game)) { Cost cost = new ManaCostsImpl<>("{2}"); diff --git a/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java b/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java index e8e5fcf7b7f..3656efb6987 100644 --- a/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java +++ b/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java @@ -128,7 +128,7 @@ class UnscytheEffect extends OneShotEffect { if (controller == null) { return false; } - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java b/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java index 05010a45ede..e8702a9aec5 100644 --- a/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java +++ b/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java @@ -60,7 +60,7 @@ class VenarianGlimmerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { FilterCard filter = new FilterNonlandCard(); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); diff --git a/Mage.Sets/src/mage/cards/v/VendilionClique.java b/Mage.Sets/src/mage/cards/v/VendilionClique.java index 105055d2849..1ff9aa4e669 100644 --- a/Mage.Sets/src/mage/cards/v/VendilionClique.java +++ b/Mage.Sets/src/mage/cards/v/VendilionClique.java @@ -72,7 +72,7 @@ class VendilionCliqueEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = source.getSourceObject(game); if (player != null && controller != null && sourceObject != null) { diff --git a/Mage.Sets/src/mage/cards/v/VexingArcanix.java b/Mage.Sets/src/mage/cards/v/VexingArcanix.java index 43d0402826f..a46f38e7a5a 100644 --- a/Mage.Sets/src/mage/cards/v/VexingArcanix.java +++ b/Mage.Sets/src/mage/cards/v/VexingArcanix.java @@ -60,7 +60,7 @@ class VexingArcanixEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { MageObject sourceObject = source.getSourceObject(game); - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (sourceObject == null || player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/v/VexingShusher.java b/Mage.Sets/src/mage/cards/v/VexingShusher.java index 1a7584b34ba..65fedef1e63 100644 --- a/Mage.Sets/src/mage/cards/v/VexingShusher.java +++ b/Mage.Sets/src/mage/cards/v/VexingShusher.java @@ -85,7 +85,7 @@ class VexingShusherCantCounterTargetEffect extends ContinuousRuleModifyingEffect @Override public boolean applies(GameEvent event, Ability source, Game game) { - return event.getTargetId().equals(targetPointer.getFirst(game, source)); + return event.getTargetId().equals(getTargetPointer().getFirst(game, source)); } } diff --git a/Mage.Sets/src/mage/cards/v/VillainousWealth.java b/Mage.Sets/src/mage/cards/v/VillainousWealth.java index b3affaa99ee..415fdb7bb79 100644 --- a/Mage.Sets/src/mage/cards/v/VillainousWealth.java +++ b/Mage.Sets/src/mage/cards/v/VillainousWealth.java @@ -64,7 +64,7 @@ class VillainousWealthEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); int xValue = source.getManaCostsToPay().getX(); if (controller == null || opponent == null || xValue < 1) { return false; diff --git a/Mage.Sets/src/mage/cards/v/Void.java b/Mage.Sets/src/mage/cards/v/Void.java index d0404a666d2..79062b8d7a4 100644 --- a/Mage.Sets/src/mage/cards/v/Void.java +++ b/Mage.Sets/src/mage/cards/v/Void.java @@ -77,7 +77,7 @@ class VoidEffect extends OneShotEffect { filterCard.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, number)); filterCard.add(Predicates.not(CardType.LAND.getPredicate())); - Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer == null) { return true; } diff --git a/Mage.Sets/src/mage/cards/v/VolcanicEruption.java b/Mage.Sets/src/mage/cards/v/VolcanicEruption.java index 4c6fdc685b2..7330d0f7bec 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicEruption.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicEruption.java @@ -75,7 +75,7 @@ class VolcanicEruptionEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int destroyedCount = 0; - for (UUID targetID : this.targetPointer.getTargets(game, source)) { + for (UUID targetID : this.getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(targetID); if (permanent != null) { if (permanent.destroy(source, game, false)) { diff --git a/Mage.Sets/src/mage/cards/v/VolcanicVision.java b/Mage.Sets/src/mage/cards/v/VolcanicVision.java index cb8264efa39..8ba271af233 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicVision.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicVision.java @@ -72,7 +72,7 @@ class VolcanicVisionReturnToHandTargetEffect extends OneShotEffect { if (controller == null) { return false; } - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { switch (game.getState().getZone(targetId)) { case GRAVEYARD: Card card = game.getCard(targetId); diff --git a/Mage.Sets/src/mage/cards/v/VraskaRelicSeeker.java b/Mage.Sets/src/mage/cards/v/VraskaRelicSeeker.java index 833efd7968f..3a35e599954 100644 --- a/Mage.Sets/src/mage/cards/v/VraskaRelicSeeker.java +++ b/Mage.Sets/src/mage/cards/v/VraskaRelicSeeker.java @@ -72,7 +72,7 @@ class VraskaRelicSeekerLifeTotalEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.setLife(1, game, source); return true; diff --git a/Mage.Sets/src/mage/cards/w/WalkerOfSecretWays.java b/Mage.Sets/src/mage/cards/w/WalkerOfSecretWays.java index b946129ec65..8a333832269 100644 --- a/Mage.Sets/src/mage/cards/w/WalkerOfSecretWays.java +++ b/Mage.Sets/src/mage/cards/w/WalkerOfSecretWays.java @@ -80,7 +80,7 @@ class WalkerOfSecretWaysEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null && controller != null) { controller.lookAtCards("Walker of Secret Ways", player.getHand(), game); } diff --git a/Mage.Sets/src/mage/cards/w/WandOfIth.java b/Mage.Sets/src/mage/cards/w/WandOfIth.java index cac9985702f..bba33d38036 100644 --- a/Mage.Sets/src/mage/cards/w/WandOfIth.java +++ b/Mage.Sets/src/mage/cards/w/WandOfIth.java @@ -58,7 +58,7 @@ class WandOfIthEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (player != null && !player.getHand().isEmpty()) { Cards revealed = new CardsImpl(); diff --git a/Mage.Sets/src/mage/cards/w/WanderingArchaic.java b/Mage.Sets/src/mage/cards/w/WanderingArchaic.java index 796030d6346..e31b06ad2f8 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingArchaic.java +++ b/Mage.Sets/src/mage/cards/w/WanderingArchaic.java @@ -80,7 +80,7 @@ class WanderingArchaicEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); Spell spell = (Spell) getValue("spellCast"); if (controller == null || opponent == null || spell == null) { return false; diff --git a/Mage.Sets/src/mage/cards/w/WasitoraNekoruQueen.java b/Mage.Sets/src/mage/cards/w/WasitoraNekoruQueen.java index d764d412bc1..dfa7bd2f0df 100644 --- a/Mage.Sets/src/mage/cards/w/WasitoraNekoruQueen.java +++ b/Mage.Sets/src/mage/cards/w/WasitoraNekoruQueen.java @@ -77,7 +77,7 @@ class WasitoraNekoruQueenEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player damagedPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + Player damagedPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (damagedPlayer != null && controller != null) { TargetSacrifice target = new TargetSacrifice(StaticFilters.FILTER_PERMANENT_CREATURE); diff --git a/Mage.Sets/src/mage/cards/w/WheelOfTorture.java b/Mage.Sets/src/mage/cards/w/WheelOfTorture.java index f328525b68c..112ac871457 100644 --- a/Mage.Sets/src/mage/cards/w/WheelOfTorture.java +++ b/Mage.Sets/src/mage/cards/w/WheelOfTorture.java @@ -49,7 +49,7 @@ class WheelOfTortureEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { int amount = 3 - player.getHand().size(); if (amount > 0) { diff --git a/Mage.Sets/src/mage/cards/w/WhisperingSpecter.java b/Mage.Sets/src/mage/cards/w/WhisperingSpecter.java index 3fe3c8b1e07..6bc9fea537a 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperingSpecter.java +++ b/Mage.Sets/src/mage/cards/w/WhisperingSpecter.java @@ -65,7 +65,7 @@ class WhisperingSpecterEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { int value = player.getCounters().getCount(CounterType.POISON); if (value > 0) { diff --git a/Mage.Sets/src/mage/cards/w/WildEvocation.java b/Mage.Sets/src/mage/cards/w/WildEvocation.java index 45b4a18e931..cafde7f223d 100644 --- a/Mage.Sets/src/mage/cards/w/WildEvocation.java +++ b/Mage.Sets/src/mage/cards/w/WildEvocation.java @@ -61,7 +61,7 @@ class WildEvocationEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); MageObject sourceObject = source.getSourceObject(game); if (player != null && sourceObject != null) { diff --git a/Mage.Sets/src/mage/cards/w/WingedTempleOfOrazca.java b/Mage.Sets/src/mage/cards/w/WingedTempleOfOrazca.java index c245e602697..4632a2078d3 100644 --- a/Mage.Sets/src/mage/cards/w/WingedTempleOfOrazca.java +++ b/Mage.Sets/src/mage/cards/w/WingedTempleOfOrazca.java @@ -73,7 +73,7 @@ class WingedTempleOfOrazcaEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent creature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (creature != null && creature.isCreature(game)) { int pow = creature.getPower().getValue(); ContinuousEffect effect = new BoostTargetEffect(pow, pow, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/w/WinterBlast.java b/Mage.Sets/src/mage/cards/w/WinterBlast.java index 8c0fe80e6cf..03bbb347250 100644 --- a/Mage.Sets/src/mage/cards/w/WinterBlast.java +++ b/Mage.Sets/src/mage/cards/w/WinterBlast.java @@ -68,7 +68,7 @@ class WinterBlastEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null) { permanent.tap(source, game); diff --git a/Mage.Sets/src/mage/cards/w/WordOfCommand.java b/Mage.Sets/src/mage/cards/w/WordOfCommand.java index 5d00c95b116..3aced165f0a 100644 --- a/Mage.Sets/src/mage/cards/w/WordOfCommand.java +++ b/Mage.Sets/src/mage/cards/w/WordOfCommand.java @@ -207,7 +207,7 @@ class WordOfCommandCantActivateEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return !permanent.isLand(game) && permanent.getControllerId().equals(this.targetPointer.getFirst(game, source)); + return !permanent.isLand(game) && permanent.getControllerId().equals(this.getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWar.java b/Mage.Sets/src/mage/cards/w/WordsOfWar.java index f29222e1b04..3b1841f72ec 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWar.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWar.java @@ -63,14 +63,14 @@ class WordsOfWarEffect extends ReplacementEffectImpl { public boolean replaceEvent(GameEvent event, Ability source, Game game) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.damage(2, source.getSourceId(), source, game); this.used = true; discard(); return true; } - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.damage(2, source.getSourceId(), source, game, false, true); this.used = true; diff --git a/Mage.Sets/src/mage/cards/w/WrackWithMadness.java b/Mage.Sets/src/mage/cards/w/WrackWithMadness.java index 6e2c86faf4f..339cd3b15ec 100644 --- a/Mage.Sets/src/mage/cards/w/WrackWithMadness.java +++ b/Mage.Sets/src/mage/cards/w/WrackWithMadness.java @@ -55,7 +55,7 @@ class WrackWithMadnessEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.damage(permanent.getPower().getValue(), permanent.getId(), source, game, false, true); return true; diff --git a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java index 87b520e1b87..9cd5b7d202c 100644 --- a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java +++ b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java @@ -95,7 +95,7 @@ class XenicPoltergeistEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - UUID permanentId = targetPointer.getFirst(game, source); + UUID permanentId = getTargetPointer().getFirst(game, source); Permanent permanent = game.getPermanentOrLKIBattlefield(permanentId); if (permanent != null) { if (!permanent.isArtifact(game)) { @@ -110,7 +110,7 @@ class XenicPoltergeistEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - UUID permanentId = targetPointer.getFirst(game, source); + UUID permanentId = getTargetPointer().getFirst(game, source); Permanent permanent = game.getPermanentOrLKIBattlefield(permanentId); if (permanent != null) { int manaCost = permanent.getManaValue(); diff --git a/Mage.Sets/src/mage/cards/x/XolatoyacTheSmilingFlood.java b/Mage.Sets/src/mage/cards/x/XolatoyacTheSmilingFlood.java index f00163fecd7..9e2747c268f 100644 --- a/Mage.Sets/src/mage/cards/x/XolatoyacTheSmilingFlood.java +++ b/Mage.Sets/src/mage/cards/x/XolatoyacTheSmilingFlood.java @@ -83,7 +83,7 @@ class XolatoyacTheSmilingFloodEffect extends BecomesBasicLandTargetEffect { @Override public boolean apply(Game game, Ability source) { - Permanent land = game.getPermanent(this.targetPointer.getFirst(game, source)); + Permanent land = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (land == null || land.getCounters(game).getCount(CounterType.FLOOD) < 1) { discard(); return false; diff --git a/Mage.Sets/src/mage/cards/y/YedoraGraveGardener.java b/Mage.Sets/src/mage/cards/y/YedoraGraveGardener.java index 97b778d2c9c..3f6f27eeb33 100644 --- a/Mage.Sets/src/mage/cards/y/YedoraGraveGardener.java +++ b/Mage.Sets/src/mage/cards/y/YedoraGraveGardener.java @@ -111,7 +111,7 @@ class YedoraGraveGardenerContinuousEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); if (target == null || !target.isFaceDown(game)) { discard(); return false; diff --git a/Mage.Sets/src/mage/cards/z/ZaraRenegadeRecruiter.java b/Mage.Sets/src/mage/cards/z/ZaraRenegadeRecruiter.java index 424f7df9480..2af062d23a0 100644 --- a/Mage.Sets/src/mage/cards/z/ZaraRenegadeRecruiter.java +++ b/Mage.Sets/src/mage/cards/z/ZaraRenegadeRecruiter.java @@ -78,7 +78,7 @@ class ZaraRenegadeRecruiterEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || player == null || player.getHand().isEmpty()) { return false; } diff --git a/Mage/src/main/java/mage/abilities/Ability.java b/Mage/src/main/java/mage/abilities/Ability.java index d978ad7996e..587d61fc47d 100644 --- a/Mage/src/main/java/mage/abilities/Ability.java +++ b/Mage/src/main/java/mage/abilities/Ability.java @@ -228,6 +228,8 @@ public interface Ability extends Controllable, Serializable { * Retrieves the {@link Target} located at the 0th index in the * {@link Targets}. A call to the method is equivalent to * {@link #getTargets()}.get(0).getFirstTarget(). + *

+ * Warning, if you effect uses target pointers then it must search getTargetPointer too * * @return The {@link java.util.UUID} of the first target within the targets * list. diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java index e5078964d22..ad8da740051 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java @@ -165,7 +165,7 @@ public abstract class ContinuousEffectImpl extends EffectImpl implements Continu @Override public void init(Ability source, Game game, UUID activePlayerId) { - targetPointer.init(game, source); + getTargetPointer().init(game, source); // 20210112 - 611.2c // 611.2c If a continuous effect generated by the resolution of a spell or ability modifies the // characteristics or changes the controller of any objects, the set of objects it affects is diff --git a/Mage/src/main/java/mage/abilities/effects/EffectImpl.java b/Mage/src/main/java/mage/abilities/effects/EffectImpl.java index a594b6535fa..c5a81b5f93c 100644 --- a/Mage/src/main/java/mage/abilities/effects/EffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/EffectImpl.java @@ -22,8 +22,7 @@ public abstract class EffectImpl implements Effect { // read related docs about static and dynamic targets in ContinuousEffectImpl.affectedObjectsSet // warning, do not change it directly, use setTargetPointer instead - // TODO: make it private and replace all usage to getTargetPointer - protected TargetPointer targetPointer = new FirstTargetPointer(); + private TargetPointer targetPointer = new FirstTargetPointer(); protected String staticText = ""; protected Map values; diff --git a/Mage/src/main/java/mage/abilities/effects/OneShotEffect.java b/Mage/src/main/java/mage/abilities/effects/OneShotEffect.java index 8cbe2fd5aff..96e29a2cef4 100644 --- a/Mage/src/main/java/mage/abilities/effects/OneShotEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/OneShotEffect.java @@ -19,7 +19,7 @@ public abstract class OneShotEffect extends EffectImpl { @Override public final void initNewTargetPointer() { // one short effects don't use init logic - this.targetPointer.setInitialized(); + this.getTargetPointer().setInitialized(); } protected OneShotEffect(final OneShotEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/BecomeBlockedTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/BecomeBlockedTargetEffect.java index fd2b8eea935..2da1039caeb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/BecomeBlockedTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/BecomeBlockedTargetEffect.java @@ -35,7 +35,7 @@ public class BecomeBlockedTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Set morSet = new HashSet<>(); - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(targetId); if (permanent == null) { continue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyTargetSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTargetSpellEffect.java index a85c4662277..85e533fdc90 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyTargetSpellEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTargetSpellEffect.java @@ -79,12 +79,12 @@ public class CopyTargetSpellEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Spell spell; if (useLKI) { - spell = game.getSpellOrLKIStack(targetPointer.getFirst(game, source)); + spell = game.getSpellOrLKIStack(getTargetPointer().getFirst(game, source)); } else { - spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); + spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); } if (spell == null) { - spell = (Spell) game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.STACK); + spell = (Spell) game.getLastKnownInformation(getTargetPointer().getFirst(game, source), Zone.STACK); } if (spell != null) { spell.createCopyOnStack(game, source, useController ? spell.getControllerId() : source.getControllerId(), diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyTargetStackAbilityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTargetStackAbilityEffect.java index 737c49e6fd4..8c7f6d4a7f5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyTargetStackAbilityEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTargetStackAbilityEffect.java @@ -22,7 +22,7 @@ public class CopyTargetStackAbilityEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackAbility stackAbility = (StackAbility) game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackAbility stackAbility = (StackAbility) game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (stackAbility == null) { return false; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java index f45ac670e47..59fce1a993d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java @@ -60,7 +60,7 @@ public class CounterUnlessPaysEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + StackObject spell = game.getStack().getStackObject(getTargetPointer().getFirst(game, source)); if (spell == null) { return false; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java index 06a93cdc3a1..a1d2b36e89a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java @@ -63,7 +63,7 @@ public class CreateTokenTargetEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int value = amount.calculate(game, source, this); if (value > 0) { - return token.putOntoBattlefield(value, game, source, targetPointer.getFirst(game, source), tapped, attacking, (UUID) getValue("playerToAttack")); + return token.putOntoBattlefield(value, game, source, getTargetPointer().getFirst(game, source), tapped, attacking, (UUID) getValue("playerToAttack")); } return true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java index cdca2540918..daf9ad352c5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java @@ -47,7 +47,7 @@ public class DamageAllControlledTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayerOrPlaneswalkerController(targetPointer.getFirst(game, source)); + Player player = game.getPlayerOrPlaneswalkerController(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageWithExcessEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageWithExcessEffect.java index 91646477f1f..84721c6224f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageWithExcessEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageWithExcessEffect.java @@ -41,7 +41,7 @@ public class DamageWithExcessEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); MageObject sourceObject = source.getSourceObject(game); if (permanent == null || sourceObject == null) { return false; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java index cbd5b9bc1c8..df1944b5bce 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java @@ -51,7 +51,7 @@ public class DestroyTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null && permanent.isPhasedIn() diff --git a/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java index ee63ca1eaf1..9d4eb2a4151 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java @@ -108,7 +108,7 @@ class DetainRestrictionEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return this.targetPointer.getTargets(game, source).contains(permanent.getId()); + return this.getTargetPointer().getTargets(game, source).contains(permanent.getId()); } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java index e9c369720fa..ae482eb6919 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java @@ -48,7 +48,7 @@ public class DontUntapInControllersUntapStepTargetEffect extends ContinuousRuleM if (game.getTurnStepType() != PhaseStep.UNTAP) { return false; } - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { if (!event.getTargetId().equals(targetId)) { continue; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java index 1375fc13077..a6b0234d495 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java @@ -32,7 +32,7 @@ public class ExileCardYouChooseTargetOpponentEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); + Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (controller == null || opponent == null) { return false; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java index 5aeacfbb538..12d0457f6b0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java @@ -52,7 +52,7 @@ public class ExileFromZoneTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player == null) { return false; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java index 1b6b2c4da78..1b16ffdf372 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java @@ -55,14 +55,14 @@ public class ExileTargetForSourceEffect extends OneShotEffect { } Set objectsToMove = new LinkedHashSet<>(); - if (this.targetPointer instanceof FirstTargetPointer + if (this.getTargetPointer() instanceof FirstTargetPointer && source.getTargets().size() > 1) { for (Target target : source.getTargets()) { objectsToMove.addAll(target.getTargets()); } } else { - if (this.targetPointer != null && !this.targetPointer.getTargets(game, source).isEmpty()) { - objectsToMove.addAll(this.targetPointer.getTargets(game, source)); + if (!this.getTargetPointer().getTargets(game, source).isEmpty()) { + objectsToMove.addAll(this.getTargetPointer().getTargets(game, source)); } else { // issue with Madness keyword #6889 UUID fixedTargetId = null; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileUntilSourceLeavesEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileUntilSourceLeavesEffect.java index 9c2ca0e2ea7..6d8d170ce33 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileUntilSourceLeavesEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileUntilSourceLeavesEffect.java @@ -56,9 +56,7 @@ public class ExileUntilSourceLeavesEffect extends OneShotEffect { } ExileTargetEffect effect = new ExileTargetEffect(CardUtil.getCardExileZoneId(game, source), permanent.getIdName()); - if (this.getTargetPointer() != null) { // Grasping Giant - effect.setTargetPointer(this.getTargetPointer().copy()); - } + effect.setTargetPointer(this.getTargetPointer().copy()); if (effect.apply(game, source)) { game.addDelayedTriggeredAbility(new OnLeaveReturnExiledAbility(returnToZone), source); return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java index 761b0325869..4f1df0c4756 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java @@ -39,7 +39,7 @@ public class GainLifeTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (UUID playerId : targetPointer.getTargets(game, source)) { + for (UUID playerId : getTargetPointer().getTargets(game, source)) { Player player = game.getPlayer(playerId); if (player != null) { player.gainLife(life.calculate(game, source, this), game, source); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java index 3b9ad5cb2d0..c1fcefed258 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java @@ -32,11 +32,11 @@ public class ImprintTargetEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (sourcePermanent != null) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { sourcePermanent.imprint(permanent.getId(), game); } else { - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (card != null) { sourcePermanent.imprint(card.getId(), game); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java index dfcb24b0f95..783bd56dfaa 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java @@ -28,7 +28,7 @@ public class LoseHalfLifeTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { Integer amount = (int) Math.ceil(player.getLife() / 2f); if (amount > 0) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java index eb1b093969b..9f8e9c09e99 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java @@ -42,11 +42,11 @@ public class LoseLifeTargetControllerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - MageObject targetCard = targetPointer.getFirstTargetPermanentOrLKI(game, source); + MageObject targetCard = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); // if target is a countered spell if (targetCard == null) { - targetCard = game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.STACK); + targetCard = game.getLastKnownInformation(getTargetPointer().getFirst(game, source), Zone.STACK); } if (targetCard != null) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java index 1eaecdc0fc0..6f8453449ec 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java @@ -40,7 +40,7 @@ public class LoseLifeTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { boolean applied = false; - for (UUID playerId : targetPointer.getTargets(game, source)) { + for (UUID playerId : getTargetPointer().getTargets(game, source)) { Player player = game.getPlayer(playerId); if (player != null && player.loseLife(amount.calculate(game, source, this), game, source, false) > 0) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java index dc836388364..a463183e5b3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java @@ -23,7 +23,7 @@ public class MayTapOrUntapTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); Player player = game.getPlayer(source.getControllerId()); if (target != null && player != null) { if (target.isTapped()) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/MillCardsTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MillCardsTargetEffect.java index 05b76e42f5f..bd5fa91f6fa 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/MillCardsTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/MillCardsTargetEffect.java @@ -38,7 +38,7 @@ public class MillCardsTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.millCards(numberCards.calculate(game, source, this), source, game); return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java index 998781b62b7..ae5e8c9b468 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java @@ -45,7 +45,7 @@ public class PreventDamageToTargetEffect extends PreventionEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - return !this.used && super.applies(event, source, game) && event.getTargetId().equals(targetPointer.getFirst(game, source)); + return !this.used && super.applies(event, source, game) && event.getTargetId().equals(getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java index f3f876bb433..7b5c872dc7c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java @@ -57,7 +57,7 @@ public class PreventNextDamageFromChosenSourceToTargetEffect extends PreventionE @Override public boolean applies(GameEvent event, Ability source, Game game) { if (!this.used && super.applies(event, source, game)) { - if (event.getTargetId().equals(targetPointer.getFirst(game, source)) && event.getSourceId().equals(targetSource.getFirstTarget())) { + if (event.getTargetId().equals(getTargetPointer().getFirst(game, source)) && event.getSourceId().equals(targetSource.getFirstTarget())) { return true; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java index e35e3813ccf..c980b60f011 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java @@ -54,7 +54,7 @@ public class PutOnLibraryTargetEffect extends OneShotEffect { if (controller != null) { List cards = new ArrayList<>(); List permanents = new ArrayList<>(); - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { switch (game.getState().getZone(targetId)) { case BATTLEFIELD: Permanent permanent = game.getPermanent(targetId); diff --git a/Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceWithReflexiveEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceWithReflexiveEffect.java index 47e66554ccf..a100eb4c23b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceWithReflexiveEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceWithReflexiveEffect.java @@ -39,7 +39,7 @@ public class RegenerateSourceWithReflexiveEffect extends RegenerateSourceEffect if (super.replaceEvent(event, source, game)) { if (this.setReflexiveTarget) { reflexive.getEffects().setTargetPointer( - new FixedTarget(targetPointer.getFirst(game, source), game) + new FixedTarget(getTargetPointer().getFirst(game, source), game) ); } game.fireReflexiveTriggeredAbility(reflexive, source); diff --git a/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java index 5447636ce2f..7a312b95615 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java @@ -26,7 +26,7 @@ public class RegenerateTargetEffect extends ReplacementEffectImpl { @Override public void init(Ability source, Game game) { super.init(source, game); - RegenerateSourceEffect.initRegenerationShieldInfo(game, source, targetPointer.getFirst(game, source)); + RegenerateSourceEffect.initRegenerationShieldInfo(game, source, getTargetPointer().getFirst(game, source)); } @Override @@ -37,7 +37,7 @@ public class RegenerateTargetEffect extends ReplacementEffectImpl { @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { //20110204 - 701.11 - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null && permanent.regenerate(source, game)) { this.used = true; return true; @@ -53,7 +53,7 @@ public class RegenerateTargetEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { //20110204 - 701.11c - event.getAmount() is used to signal if regeneration is allowed - return event.getAmount() == 0 && event.getTargetId().equals(targetPointer.getFirst(game, source)) && !this.used; + return event.getAmount() == 0 && event.getTargetId().equals(getTargetPointer().getFirst(game, source)) && !this.used; } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java index a6cd2c97f41..a62e80c86d4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java @@ -39,7 +39,7 @@ public class ReturnToHandTargetEffect extends OneShotEffect { } List copyIds = new ArrayList<>(); Set cards = new LinkedHashSet<>(); - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { MageObject mageObject = game.getObject(targetId); if (mageObject != null) { if (mageObject instanceof Spell diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java index 8da2ede2e05..2a0367c9edf 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java @@ -51,7 +51,7 @@ public class SacrificeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { boolean applied = false; - for (UUID playerId : targetPointer.getTargets(game, source)) { + for (UUID playerId : getTargetPointer().getTargets(game, source)) { Player player = game.getPlayer(playerId); if (player == null) { continue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java index 27d0fb21cc1..505e00898e7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java @@ -49,7 +49,7 @@ public class SacrificeTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null && (playerIdThatHasToSacrifice == null || playerIdThatHasToSacrifice.equals(permanent.getControllerId()))) { permanent.sacrifice(source, game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeTargetEffect.java index fa7165026a4..4f758ff9eed 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeTargetEffect.java @@ -38,7 +38,7 @@ public class SetPlayerLifeTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.setLife(amount.calculate(game, source, this), game, source); return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java index 8dbd7e6bfb6..e326952f49f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java @@ -29,7 +29,7 @@ public class ShuffleLibraryTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.shuffleLibrary(source, game); return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/SkipCombatStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipCombatStepEffect.java index f27cb50fe3c..cd221d17ff6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SkipCombatStepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SkipCombatStepEffect.java @@ -39,6 +39,6 @@ public class SkipCombatStepEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - return event.getPlayerId().equals(targetPointer.getFirst(game, source)); + return event.getPlayerId().equals(getTargetPointer().getFirst(game, source)); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java index b5c279e4a7c..326708f12b0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java @@ -31,13 +31,11 @@ public class SkipNextPlayerUntapStepEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = null; - if (targetPointer != null) { - if (!this.targetPointer.getTargets(game, source).isEmpty()) { - player = game.getPlayer(targetPointer.getFirst(game, source)); - } else { - player = game.getPlayer(source.getControllerId()); - } + Player player; + if (!this.getTargetPointer().getTargets(game, source).isEmpty()) { + player = game.getPlayer(getTargetPointer().getFirst(game, source)); + } else { + player = game.getPlayer(source.getControllerId()); } if (player != null) { game.getState().getTurnMods().add(new TurnMod(player.getId()).withSkipStep(PhaseStep.UNTAP)); diff --git a/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java index 44baac8ce81..95f8f34908b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java @@ -30,7 +30,7 @@ public class TapAllTargetPlayerControlsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { List permanents = game.getBattlefield().getAllActivePermanents(filter, player.getId(), game); for (Permanent p : permanents) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java index 2d3aab251f6..329ce20cf63 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java @@ -38,7 +38,7 @@ public class TapTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (UUID target : targetPointer.getTargets(game, source)) { + for (UUID target : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(target); if (permanent != null) { permanent.tap(source, game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java index 7487d2b8075..c979835355f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java @@ -36,7 +36,7 @@ public class UntapTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (UUID target : targetPointer.getTargets(game, source)) { + for (UUID target : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(target); if (permanent != null) { permanent.untap(game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java index 9b159d11aa4..79ac4326648 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java @@ -22,7 +22,7 @@ public class CantAttackBlockTargetEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return permanent.getId().equals(targetPointer.getFirst(game, source)); + return permanent.getId().equals(getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackTargetEffect.java index 39e3a0caad5..213d73fce34 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackTargetEffect.java @@ -22,7 +22,7 @@ public class CantAttackTargetEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return permanent.getId().equals(targetPointer.getFirst(game, source)); + return permanent.getId().equals(getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java index 54c6978d55a..35b21acf0ba 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java @@ -60,7 +60,7 @@ public class CantBlockAttachedEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { if (affectedObjectsSet) { - return targetPointer.getFirst(game, source).equals(permanent.getId()); + return getTargetPointer().getFirst(game, source).equals(permanent.getId()); } return permanent.getAttachments().contains(source.getSourceId()); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockTargetEffect.java index 2a7f97ec79c..ef10bac67d9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockTargetEffect.java @@ -22,7 +22,7 @@ public class CantBlockTargetEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return this.targetPointer.getTargets(game, source).contains(permanent.getId()); + return this.getTargetPointer().getTargets(game, source).contains(permanent.getId()); } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java index 67c77a0e3ec..40a69a65e9e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java @@ -28,7 +28,7 @@ public class AddCardSubTypeTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); if (target != null) { target.addSubType(game, addedSubType); } else { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java index d695c1e8974..7cda13f3c0e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java @@ -40,7 +40,7 @@ public class AddCardTypeTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { boolean result = false; - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { Permanent target = game.getPermanent(targetId); if (target != null) { for (CardType cardType : addedCardTypes) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageTargetEffect.java index 4cc9a832b1f..8c69b3025ae 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageTargetEffect.java @@ -50,6 +50,6 @@ public class AssignNoCombatDamageTargetEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - return ((DamageEvent) event).isCombatDamage() && event.getSourceId().equals(targetPointer.getFirst(game, source)); + return ((DamageEvent) event).isCombatDamage() && event.getSourceId().equals(getTargetPointer().getFirst(game, source)); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java index 45bcf6ed829..fde7e556c32 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java @@ -97,7 +97,7 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - for (UUID targetPermanent : targetPointer.getTargets(game, source)) { + for (UUID targetPermanent : getTargetPointer().getTargets(game, source)) { Permanent land = game.getPermanent(targetPermanent); if (land == null) { continue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java index 00461f7d8e8..6f2ae65c00a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java @@ -78,7 +78,7 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl { } if (setColor != null) { boolean objectFound = false; - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { MageObject targetObject = game.getObject(targetId); if (targetObject != null) { if (targetObject instanceof Spell || targetObject instanceof Permanent) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java index c9266a7f3ae..4b4a8e3f362 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java @@ -80,7 +80,7 @@ public class BecomesCreatureTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { boolean result = false; - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent == null) { continue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java index b2fcdff6335..dd1109ebdc2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java @@ -52,7 +52,7 @@ public class BecomesCreatureTypeTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { boolean flag = false; - for (UUID targetPermanent : targetPointer.getTargets(game, source)) { + for (UUID targetPermanent : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(targetPermanent); if (permanent == null) { continue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java index 273bfe0c30c..0d935b91357 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java @@ -69,7 +69,7 @@ public class BoostEnchantedEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { Permanent permanent = null; if (affectedObjectsSet) { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); + permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { discard(); return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java index b4f342fa4d0..2cc3ce3b1bb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java @@ -72,7 +72,7 @@ public class BoostEquippedEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { Permanent creature = null; if (fixedTarget) { - creature = game.getPermanent(targetPointer.getFirst(game, source)); + creature = game.getPermanent(getTargetPointer().getFirst(game, source)); } else { Permanent equipment = game.getPermanent(source.getSourceId()); if (equipment != null && equipment.getAttachedTo() != null) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java index d1c3cb3bda3..dd4df0f0408 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java @@ -68,7 +68,7 @@ public class BoostTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent target = game.getPermanent(permanentId); if (target != null && target.isCreature(game)) { target.addPower(power.calculate(game, source, this)); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java index 7181b5d5b87..03bfa39656c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java @@ -79,10 +79,10 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl { Permanent permanent2 = null; if (withSource) { - permanent1 = game.getPermanent(targetPointer.getFirst(game, source)); + permanent1 = game.getPermanent(getTargetPointer().getFirst(game, source)); permanent2 = game.getPermanent(source.getSourceId()); } else { - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { if (permanent1 == null) { permanent1 = game.getPermanent(permanentId); } else if (permanent2 == null) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java index 88ba35a258b..3c6ea1ea00b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java @@ -90,7 +90,7 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { Permanent permanent; if (affectedObjectsSet) { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); + permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { discard(); return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java index 3e1dd1172eb..224bac2e96a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java @@ -60,7 +60,7 @@ public class GainAbilityTargetEffect extends ContinuousEffectImpl { // must support dynamic targets from static ability and static targets from activated abilities if (this.affectedObjectsSet) { // target permanents (by default) - targetPointer.getTargets(game, source) + getTargetPointer().getTargets(game, source) .stream() .map(game::getPermanent) .filter(Objects::nonNull) @@ -70,7 +70,7 @@ public class GainAbilityTargetEffect extends ContinuousEffectImpl { // target cards with linked permanents if (this.useOnCard) { - targetPointer.getTargets(game, source) + getTargetPointer().getTargets(game, source) .stream() .map(game::getCard) .filter(Objects::nonNull) @@ -147,7 +147,7 @@ public class GainAbilityTargetEffect extends ContinuousEffectImpl { } } else { // DYNAMIC TARGETS - for (UUID objectId : targetPointer.getTargets(game, source)) { + for (UUID objectId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(objectId); if (permanent != null) { permanent.addAbility(ability, source.getSourceId(), game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java index 13b1ea96674..1a9ee587149 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java @@ -73,7 +73,7 @@ public class GainAbilityWithAttachmentEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { Permanent permanent = null; if (affectedObjectsSet) { - permanent = game.getPermanent(targetPointer.getFirst(game, source)); + permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent == null) { discard(); return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAllCreatureTypesTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAllCreatureTypesTargetEffect.java index d458f45e0e9..4ac463b8ec8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAllCreatureTypesTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAllCreatureTypesTargetEffect.java @@ -33,7 +33,7 @@ public class GainAllCreatureTypesTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent target = game.getPermanent(permanentId); if (target != null) { target.setIsAllCreatureTypes(game, true); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java index 0dd21369370..614be0bd431 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java @@ -35,7 +35,7 @@ public class LoseAllAbilitiesTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - for (UUID permanentId : targetPointer.getTargets(game, source)) { + for (UUID permanentId : getTargetPointer().getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null) { permanent.removeAllAbilities(source.getSourceId(), game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java index 08af68fd1f7..da046006396 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java @@ -41,7 +41,7 @@ public class LoseArtifactTypeTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - for (UUID targetId : targetPointer.getTargets(game, source)) { + for (UUID targetId : getTargetPointer().getTargets(game, source)) { if (targetId == null) { continue; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java index 19d85e54f60..d3c8314802e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java @@ -57,7 +57,7 @@ public class AddCountersTargetEffect extends OneShotEffect { MageObject sourceObject = game.getObject(source); if (controller != null && sourceObject != null && counter != null) { int affectedTargets = 0; - for (UUID uuid : targetPointer.getTargets(game, source)) { + for (UUID uuid : getTargetPointer().getTargets(game, source)) { Counter newCounter = counter.copy(); int calculated = amount.calculate(game, source, this); // 0 -- you must use default couner if (calculated < 0) { @@ -72,7 +72,7 @@ public class AddCountersTargetEffect extends OneShotEffect { Permanent permanent = game.getPermanent(uuid); Player player = game.getPlayer(uuid); - Card card = game.getCard(targetPointer.getFirst(game, source)); + Card card = game.getCard(getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.addCounters(newCounter, source.getControllerId(), source, game); affectedTargets++; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java index 9fc8ffd3871..c2f35e9449b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java @@ -38,7 +38,7 @@ public class AddPoisonCounterTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.addCounters(CounterType.POISON.createInstance(amount), source.getControllerId(), source, game); return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/MoveCountersTargetsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/MoveCountersTargetsEffect.java index abb1233f47b..e797f82c7e2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/MoveCountersTargetsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/MoveCountersTargetsEffect.java @@ -37,8 +37,8 @@ public class MoveCountersTargetsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent removeTargetCreature = game.getPermanent(targetPointer.getTargets(game, source).get(0)); - Permanent addTargetCreature = game.getPermanent(targetPointer.getTargets(game, source).get(1)); + Permanent removeTargetCreature = game.getPermanent(getTargetPointer().getTargets(game, source).get(0)); + Permanent addTargetCreature = game.getPermanent(getTargetPointer().getTargets(game, source).get(1)); if (removeTargetCreature != null && addTargetCreature != null && removeTargetCreature.getCounters(game).getCount(counterType) >= amount) { removeTargetCreature.removeCounters(counterType.createInstance(amount), source, game); addTargetCreature.addCounters(counterType.createInstance(amount), source.getControllerId(), source, game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveAllCountersTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveAllCountersTargetEffect.java index f6170abe556..cb135ba07bb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveAllCountersTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveAllCountersTargetEffect.java @@ -29,7 +29,7 @@ public class RemoveAllCountersTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if(permanent != null) { int count = permanent.getCounters(game).getCount(counterType); permanent.removeCounters(counterType.getName(), count, source, game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java index a7fca9f5ea2..8202f9cbfa8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java @@ -89,7 +89,7 @@ public class DiscardCardYouChooseTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); if (player == null || controller == null) { return false; diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java index 9c22850fdf3..c4bdeafe918 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java @@ -58,7 +58,7 @@ public class DiscardTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (UUID targetPlayerId : targetPointer.getTargets(game, source)) { + for (UUID targetPlayerId : getTargetPointer().getTargets(game, source)) { Player player = game.getPlayer(targetPlayerId); if (player != null) { player.discard(amount.calculate(game, source, this), randomDiscard, false, source, game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CombatDamageByToughnessTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CombatDamageByToughnessTargetEffect.java index 36da6ea92d2..125a6e5d02b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CombatDamageByToughnessTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CombatDamageByToughnessTargetEffect.java @@ -33,7 +33,7 @@ public class CombatDamageByToughnessTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - Set set = targetPointer.getTargets(game, source).stream() + Set set = getTargetPointer().getTargets(game, source).stream() .map(game::getPermanent) .filter(Objects::nonNull) .collect(Collectors.toSet()); diff --git a/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java b/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java index ce0ea36581a..3871c49ee02 100644 --- a/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java @@ -142,7 +142,7 @@ class GraftDistributeCounterEffect extends OneShotEffect { if (sourcePermanent != null) { int numberOfCounters = sourcePermanent.getCounters(game).getCount(CounterType.P1P1); if (numberOfCounters > 0) { - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { sourcePermanent.removeCounters(CounterType.P1P1.getName(), 1, source, game); targetCreature.addCounters(CounterType.P1P1.createInstance(1), source.getControllerId(), source, game); diff --git a/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java b/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java index 4bd7f4018bc..fb9124f495a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java @@ -180,7 +180,7 @@ class HauntEffect extends OneShotEffect { if (player == null || card == null) { return false; } - Permanent hauntedCreature = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent hauntedCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); // haunting card will only be moved to exile, if if (hauntedCreature == null) { return false; @@ -193,7 +193,7 @@ class HauntEffect extends OneShotEffect { .append(source.getSourceId().toString()) .append(card.getZoneChangeCounter(game) + hauntedCreature.getZoneChangeCounter(game)).toString(); // in case it is blinked - game.getState().setValue(key, new FixedTarget(targetPointer.getFirst(game, source), game)); + game.getState().setValue(key, new FixedTarget(getTargetPointer().getFirst(game, source), game)); card.addInfo("hauntinfo", new StringBuilder("Haunting ").append(hauntedCreature.getLogName()).toString(), game); hauntedCreature.addInfo("hauntinfo", new StringBuilder("Haunted by ").append(card.getLogName()).toString(), game); game.informPlayers(new StringBuilder(card.getName()).append(" haunting ").append(hauntedCreature.getLogName()).toString()); diff --git a/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java b/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java index 041e0b23be2..7938ccdc3d7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java @@ -79,7 +79,7 @@ class MentorEffect extends AddCountersTargetEffect { return false; } - Permanent mentoredPermanent = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent mentoredPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (mentoredPermanent == null) { return false; } diff --git a/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java b/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java index 64467254580..30d4caf5fdd 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java @@ -150,7 +150,7 @@ class ModularDistributeCounterEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent sourcePermanent = (Permanent) getValue("permanentLeftBattlefield"); - Permanent targetArtifact = game.getPermanent(targetPointer.getFirst(game, source)); + Permanent targetArtifact = game.getPermanent(getTargetPointer().getFirst(game, source)); Player player = game.getPlayer(source.getControllerId()); if (sourcePermanent != null && targetArtifact != null && player != null) { int numberOfCounters = sourcePermanent.getCounters(game).getCount(CounterType.P1P1); diff --git a/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java index 1285e549d80..4d7bd7f0dd6 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java @@ -77,7 +77,7 @@ class ProvokeRequirementEffect extends RequirementEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { - return permanent.getId().equals(targetPointer.getFirst(game, source)); + return permanent.getId().equals(getTargetPointer().getFirst(game, source)); } @Override diff --git a/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java index da9a5446350..9b962fc3ad6 100644 --- a/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java @@ -15,7 +15,9 @@ public interface TargetPointer extends Serializable, Copyable { /** * Init dynamic targets (must save current targets zcc to fizzle it later on outdated targets) * - one shot effects: no needs to init - * - continues effects: must use init logic + * - continues effects: must use init logic (effect init on resolve or game add) + *

+ * Targets list can be accessible before effect's init. */ void init(Game game, Ability source);