Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fix Maarika, Brutal Gladiator trigger to use LKI. (#12507)

Browse source 
* 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.
This commit is contained in:
Grath 2024-06-22 17:55:03 -04:00 • committed by GitHub
parent aa216dc742
commit f96343eec8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/b/BreatheYourLast.java
View file

@ -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;

2
Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java
View file

@ -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);
}
}

2
Mage.Sets/src/mage/cards/m/MaarikaBrutalGladiator.java
View file

@ -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;
}

2
Mage.Sets/src/mage/cards/o/ObscuraConfluence.java
View file

@ -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);
}
}

2
Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java
View file

@ -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;
}

2
Mage.Sets/src/mage/cards/r/RakdosTheMuscle.java
View file

@ -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;
}

2
Mage.Sets/src/mage/cards/s/Sporogenesis.java
View file

@ -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);
}

2
Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java
View file

@ -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;
}

2
Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java
View file

@ -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) {

2
Mage/src/main/java/mage/abilities/effects/common/DoUnlessTargetPlayerOrTargetsControllerPaysEffect.java
View file

@ -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());
}

2
Mage/src/main/java/mage/abilities/effects/common/ExileAndGainLifeEqualPowerTargetEffect.java
View file

@ -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;
}