From 19a4d7dc7a8f91d260993ef8db4f030e05a8d38e Mon Sep 17 00:00:00 2001 From: Kenny Wottrich Date: Sun, 24 Apr 2016 17:45:30 -0500 Subject: [PATCH 1/2] fixed land sacrifice effect to damage player if sacrificed land is an island --- .../src/mage/sets/masterseditioniv/SerendibDjinn.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SerendibDjinn.java b/Mage.Sets/src/mage/sets/masterseditioniv/SerendibDjinn.java index c41c64ff138..9fef12804b1 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/SerendibDjinn.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/SerendibDjinn.java @@ -122,12 +122,11 @@ class SerendibDjinnEffect extends OneShotEffect { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { permanent.sacrifice(source.getSourceId(), game); + if (permanent.hasSubtype("Island")) { + player.damage(3, source.getSourceId(), game, false, true); + } return true; } - if (permanent.hasSubtype("Island")){ - player.damage(3, source.getSourceId(), game, false, true); - return true; - } } return false; } From 9b2ad2a88abf2382e3cb30a9e4be57c84181032a Mon Sep 17 00:00:00 2001 From: Kenny Wottrich Date: Sun, 24 Apr 2016 19:08:38 -0500 Subject: [PATCH 2/2] put Island check before land is sacrificed --- Mage.Sets/src/mage/sets/masterseditioniv/SerendibDjinn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SerendibDjinn.java b/Mage.Sets/src/mage/sets/masterseditioniv/SerendibDjinn.java index 9fef12804b1..b07bd31ed5f 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/SerendibDjinn.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/SerendibDjinn.java @@ -121,10 +121,10 @@ class SerendibDjinnEffect extends OneShotEffect { player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { - permanent.sacrifice(source.getSourceId(), game); if (permanent.hasSubtype("Island")) { player.damage(3, source.getSourceId(), game, false, true); } + permanent.sacrifice(source.getSourceId(), game); return true; } }