From c6d3a8247d27e8d71fc369ff218a3adeae0a7862 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 15 Feb 2015 23:14:32 +0100 Subject: [PATCH 1/2] * Holiday Cube 2014 - Removed additinal blank in name of Hero of Oxid Ridge that prevented the use of the card in the cube. --- .../src/mage/tournament/cubes/HolidayCube2014.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2014.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2014.java index 334710ec56..62ae1f9a79 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2014.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2014.java @@ -239,7 +239,7 @@ public class HolidayCube2014 extends DraftCube { cubeCards.add(new CardIdentity("Heartbeat of Spring", "")); cubeCards.add(new CardIdentity("Hellrider", "")); cubeCards.add(new CardIdentity("Hero of Bladehold", "")); - cubeCards.add(new CardIdentity("Hero of Oxid Ridge ", "")); + cubeCards.add(new CardIdentity("Hero of Oxid Ridge", "")); cubeCards.add(new CardIdentity("Hero's Downfall", "")); cubeCards.add(new CardIdentity("Hinterland Harbor", "")); cubeCards.add(new CardIdentity("Honor of the Pure", "")); From dfd46bd94e6a6aefb78f50a81c905375344eae2b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 15 Feb 2015 23:32:54 +0100 Subject: [PATCH 2/2] * Sphinx Sovereign - Fixed that the life loss was also applied to the controller (fixes #722). --- .../sets/shardsofalara/SphinxSovereign.java | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SphinxSovereign.java b/Mage.Sets/src/mage/sets/shardsofalara/SphinxSovereign.java index 53447a326b..1e0ef0846b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SphinxSovereign.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SphinxSovereign.java @@ -28,16 +28,15 @@ package mage.sets.shardsofalara; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -53,9 +52,6 @@ public class SphinxSovereign extends CardImpl { this.expansionSetCode = "ALA"; this.subtype.add("Sphinx"); - this.color.setBlue(true); - this.color.setBlack(true); - this.color.setWhite(true); this.power = new MageInt(6); this.toughness = new MageInt(6); @@ -93,20 +89,18 @@ class SphinxSovereignEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(source.getControllerId()); - Permanent permanent = game.getPermanent(source.getSourceId()); - if (permanent == null) { - permanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); - } - - if (player != null && permanent != null) { + Player controller = game.getPlayer(source.getControllerId()); + Permanent permanent = (Permanent) source.getSourceObject(game); + if (controller != null && permanent != null) { if (!permanent.isTapped()) { - player.gainLife(3, game); + controller.gainLife(3, game); } else { - for (UUID opponentId : player.getInRange()) { + for (UUID opponentId : controller.getInRange()) { + if (controller.hasOpponent(opponentId, game)) { Player opponent = game.getPlayer(opponentId); - if (opponent != null) { - opponent.loseLife(3, game); + if (opponent != null) { + opponent.loseLife(3, game); + } } } }