From f991e94e9bdd1acb850e1185eae38d316dba1572 Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Mon, 5 Sep 2022 21:57:57 -0400 Subject: [PATCH] Fix #9476 --- Mage.Sets/src/mage/cards/s/SoulScarMage.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/s/SoulScarMage.java b/Mage.Sets/src/mage/cards/s/SoulScarMage.java index 48a236ad182..017118eb144 100644 --- a/Mage.Sets/src/mage/cards/s/SoulScarMage.java +++ b/Mage.Sets/src/mage/cards/s/SoulScarMage.java @@ -84,10 +84,19 @@ class SoulScarMageDamageReplacementEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { + // If a source you control... + if (!source.isControlledBy(game.getControllerId(event.getSourceId()))) { + return false; + } + // ...would deal noncombat damage... + if (((DamageEvent) event).isCombatDamage()) { + return false; + } Permanent permanent = game.getPermanent(event.getTargetId()); return permanent != null + // ...to a creature... && permanent.isCreature(game) - && !((DamageEvent) event).isCombatDamage() + // ...an opponent controls && game.getOpponents(permanent.getControllerId()).contains(source.getControllerId()); } }