From f96343eec82ba72983b9dc5f219db83fa8b38790 Mon Sep 17 00:00:00 2001 From: Grath <1895280+Grath@users.noreply.github.com> Date: Sat, 22 Jun 2024 17:55:03 -0400 Subject: [PATCH] Fix Maarika, Brutal Gladiator trigger to use LKI. (#12507) * Fix Maarika, Brutal Gladiator trigger to use LKI. Fixes #8775 * Fix more instances of getting permanent or LKI from first target. * Two more instances of getting permanent or LKI from first target. --- Mage.Sets/src/mage/cards/b/BreatheYourLast.java | 2 +- Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java | 2 +- Mage.Sets/src/mage/cards/m/MaarikaBrutalGladiator.java | 2 +- Mage.Sets/src/mage/cards/o/ObscuraConfluence.java | 2 +- Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java | 2 +- Mage.Sets/src/mage/cards/r/RakdosTheMuscle.java | 2 +- Mage.Sets/src/mage/cards/s/Sporogenesis.java | 2 +- Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java | 2 +- Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java | 2 +- .../DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java | 2 +- .../effects/common/ExileAndGainLifeEqualPowerTargetEffect.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BreatheYourLast.java b/Mage.Sets/src/mage/cards/b/BreatheYourLast.java index a3e8830c40a..c46161d1549 100644 --- a/Mage.Sets/src/mage/cards/b/BreatheYourLast.java +++ b/Mage.Sets/src/mage/cards/b/BreatheYourLast.java @@ -56,7 +56,7 @@ class BreatheYourLastEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); + Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); Player controller = game.getPlayer(source.getControllerId()); if (permanent == null || controller == null) { return false; diff --git a/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java b/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java index 4e8ae17b404..592a648f543 100644 --- a/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java +++ b/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java @@ -73,7 +73,7 @@ class KamizConniveEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); + Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); return ConniveSourceEffect.connive(permanent, 1, source, game); } } diff --git a/Mage.Sets/src/mage/cards/m/MaarikaBrutalGladiator.java b/Mage.Sets/src/mage/cards/m/MaarikaBrutalGladiator.java index 05670bc42a3..b585d85efc3 100644 --- a/Mage.Sets/src/mage/cards/m/MaarikaBrutalGladiator.java +++ b/Mage.Sets/src/mage/cards/m/MaarikaBrutalGladiator.java @@ -100,7 +100,7 @@ class MaarikaBrutalGladiatorEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); + Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (permanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/o/ObscuraConfluence.java b/Mage.Sets/src/mage/cards/o/ObscuraConfluence.java index eb639ca5f18..663747f9a98 100644 --- a/Mage.Sets/src/mage/cards/o/ObscuraConfluence.java +++ b/Mage.Sets/src/mage/cards/o/ObscuraConfluence.java @@ -79,7 +79,7 @@ class ObscuraConfluenceConniveEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); + Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); return ConniveSourceEffect.connive(permanent, 1, source, game); } } diff --git a/Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java b/Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java index 9014aa1e51b..128723fc18c 100644 --- a/Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java +++ b/Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java @@ -85,7 +85,7 @@ class RaffineSchemingSeerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); + Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (permanent == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/r/RakdosTheMuscle.java b/Mage.Sets/src/mage/cards/r/RakdosTheMuscle.java index fb951e61958..18383cc0f95 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosTheMuscle.java +++ b/Mage.Sets/src/mage/cards/r/RakdosTheMuscle.java @@ -95,7 +95,7 @@ class RakdosTheMuscleEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getFirstTarget()); - Permanent sacrificed = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); + Permanent sacrificed = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (player == null || controller == null || sacrificed == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/Sporogenesis.java b/Mage.Sets/src/mage/cards/s/Sporogenesis.java index 4318c616498..4d51b62e6e3 100644 --- a/Mage.Sets/src/mage/cards/s/Sporogenesis.java +++ b/Mage.Sets/src/mage/cards/s/Sporogenesis.java @@ -111,7 +111,7 @@ class SporogenesisCount implements DynamicValue { @Override public int calculate(Game game, Ability sourceAbility, Effect effect) { - Permanent permanent = game.getPermanentOrLKIBattlefield(effect.getTargetPointer().getFirst(game, sourceAbility)); + Permanent permanent = effect.getTargetPointer().getFirstTargetPermanentOrLKI(game, sourceAbility); if (permanent != null) { return permanent.getCounters(game).getCount(CounterType.FUNGUS); } diff --git a/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java b/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java index 2eea2315440..6b4ef88976d 100644 --- a/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java +++ b/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java @@ -98,7 +98,7 @@ class TaboraxHopesDemiseEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); + Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (permanent == null || !permanent.hasSubtype(SubType.CLERIC, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java b/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java index 3eb729782f1..8baa25d6ecc 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(getTargetPointer().getFirst(game, source)); + Permanent deadCreature = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); boolean wasOrcOrGoblin = false; if (deadCreature != null) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java index f2aa6a26fa3..dafae40b45b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java @@ -69,7 +69,7 @@ public class DoUnlessTargetPlayerOrTargetsControllerPaysEffect extends OneShotEf @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); - Permanent targetPermanent = game.getPermanentOrLKIBattlefield(this.getTargetPointer().getFirst(game, source)); + Permanent targetPermanent = this.getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (targetPermanent != null) { player = game.getPlayer(targetPermanent.getControllerId()); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileAndGainLifeEqualPowerTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAndGainLifeEqualPowerTargetEffect.java index 26ef9df800b..9f526d99ef6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileAndGainLifeEqualPowerTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAndGainLifeEqualPowerTargetEffect.java @@ -30,7 +30,7 @@ public class ExileAndGainLifeEqualPowerTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); + Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (permanent == null) { return false; }