From 2b69f1a311cac9bb3fd0cb40b6835fe0a8fdcf96 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 6 May 2018 09:43:47 +0200 Subject: [PATCH] * Soul Ransom - Fixed handling of some rare cases (e.g. Vedalken Orrery in play using Boomerang and playing Soul Ransom again). --- Mage.Sets/src/mage/cards/s/SoulRansom.java | 10 +++++++--- .../main/java/mage/abilities/ActivatedAbilityImpl.java | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/SoulRansom.java b/Mage.Sets/src/mage/cards/s/SoulRansom.java index 6b060fdf5b8..73fa2162245 100644 --- a/Mage.Sets/src/mage/cards/s/SoulRansom.java +++ b/Mage.Sets/src/mage/cards/s/SoulRansom.java @@ -93,7 +93,7 @@ class SoulRansomEffect extends OneShotEffect { SoulRansomEffect() { super(Outcome.Benefit); - this.staticText = "{this} controller sacrifices it, then draws two cards. Only any opponent may activate this ability"; + this.staticText = "{this}'s controller sacrifices it, then draws two cards. Only any opponent may activate this ability"; } SoulRansomEffect(final SoulRansomEffect effect) { @@ -107,7 +107,12 @@ class SoulRansomEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); + Permanent permanent = source.getSourcePermanentIfItStillExists(game); + if (permanent != null) { + permanent.sacrifice(source.getSourceId(), game); + } else { + permanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); + } if (permanent == null) { return false; } @@ -116,7 +121,6 @@ class SoulRansomEffect extends OneShotEffect { return false; } controller.drawCards(2, game); - permanent.sacrifice(source.getSourceId(), game); return true; } } diff --git a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java index 5ef80ab0f1e..073a4596885 100644 --- a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java @@ -250,6 +250,7 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa return false; } + @Override public void setMayActivate(TargetController mayActivate) { this.mayActivate = mayActivate; }