From a2a57e0f14689bf8b3640883cefda48680d5d439 Mon Sep 17 00:00:00 2001 From: sprangg Date: Sat, 7 Jan 2023 19:01:33 +0200 Subject: [PATCH] Fix: Pyre-Sledge Arsonist, Public Enemy, Reckoner Shakedown, Kami's Flare (#9875) --- Mage.Sets/src/mage/cards/k/KamisFlare.java | 1 + Mage.Sets/src/mage/cards/p/PublicEnemy.java | 8 ++++++++ Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java | 2 +- Mage.Sets/src/mage/cards/r/ReckonerShakedown.java | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/k/KamisFlare.java b/Mage.Sets/src/mage/cards/k/KamisFlare.java index 1de874a78a..27b6d3fba8 100644 --- a/Mage.Sets/src/mage/cards/k/KamisFlare.java +++ b/Mage.Sets/src/mage/cards/k/KamisFlare.java @@ -48,6 +48,7 @@ class KamisFlareEffect extends OneShotEffect { static { filter.add(ModifiedPredicate.instance); + filter.add(CardType.CREATURE.getPredicate()); } private static final Hint hint = new ConditionHint( diff --git a/Mage.Sets/src/mage/cards/p/PublicEnemy.java b/Mage.Sets/src/mage/cards/p/PublicEnemy.java index 217cce56b6..72c0f002f0 100644 --- a/Mage.Sets/src/mage/cards/p/PublicEnemy.java +++ b/Mage.Sets/src/mage/cards/p/PublicEnemy.java @@ -75,6 +75,14 @@ class PublicEnemyEffect extends RequirementEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { + Permanent enchantment = game.getPermanent(source.getSourceId()); + Permanent enchantedCreature = game.getPermanent(enchantment.getAttachedTo()); + if (enchantment == null || enchantedCreature == null) { + return false; + } + if (permanent.isControlledBy(enchantedCreature.getControllerId())) { + return false; + } return true; } diff --git a/Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java b/Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java index 9e3f844e32..2c7ab603e1 100644 --- a/Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java +++ b/Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java @@ -48,7 +48,7 @@ public final class PyreSledgeArsonist extends CardImpl { ); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); - this.addAbility(ability.addHint(hint)); + this.addAbility(ability.addHint(hint), new PyreSledgeArsonistWatcher()); } private PyreSledgeArsonist(final PyreSledgeArsonist card) { diff --git a/Mage.Sets/src/mage/cards/r/ReckonerShakedown.java b/Mage.Sets/src/mage/cards/r/ReckonerShakedown.java index fb198136f6..9a27ca0a01 100644 --- a/Mage.Sets/src/mage/cards/r/ReckonerShakedown.java +++ b/Mage.Sets/src/mage/cards/r/ReckonerShakedown.java @@ -93,7 +93,7 @@ class ReckonerShakedownEffect extends OneShotEffect { } TargetPermanent targetPermanent = new TargetPermanent(filter); targetPermanent.setNotTarget(true); - player.choose(Outcome.BoostCreature, targetPermanent, source, game); + controller.choose(Outcome.BoostCreature, targetPermanent, source, game); Permanent permanent = game.getPermanent(targetPermanent.getFirstTarget()); if (permanent != null) { permanent.addCounters(CounterType.P1P1.createInstance(2), source, game);