github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
daagar 2015-02-15 16:53:48 -06:00
commit 11136412f4
2 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2014.java
View file

@ -239,7 +239,7 @@ public class HolidayCube2014 extends DraftCube {
cubeCards.add(new CardIdentity("Heartbeat of Spring", "")); cubeCards.add(new CardIdentity("Heartbeat of Spring", ""));
cubeCards.add(new CardIdentity("Hellrider", "")); cubeCards.add(new CardIdentity("Hellrider", ""));
cubeCards.add(new CardIdentity("Hero of Bladehold", "")); 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("Hero's Downfall", ""));
cubeCards.add(new CardIdentity("Hinterland Harbor", "")); cubeCards.add(new CardIdentity("Hinterland Harbor", ""));
cubeCards.add(new CardIdentity("Honor of the Pure", "")); cubeCards.add(new CardIdentity("Honor of the Pure", ""));

30
Mage.Sets/src/mage/sets/shardsofalara/SphinxSovereign.java
View file

@ -28,16 +28,15 @@
package mage.sets.shardsofalara; package mage.sets.shardsofalara;
import java.util.UUID; 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.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
@ -53,9 +52,6 @@ public class SphinxSovereign extends CardImpl {
this.expansionSetCode = "ALA"; this.expansionSetCode = "ALA";
this.subtype.add("Sphinx"); this.subtype.add("Sphinx");
this.color.setBlue(true);
this.color.setBlack(true);
this.color.setWhite(true);
this.power = new MageInt(6); this.power = new MageInt(6);
this.toughness = new MageInt(6); this.toughness = new MageInt(6);
@ -93,20 +89,18 @@ class SphinxSovereignEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId()); Permanent permanent = (Permanent) source.getSourceObject(game);
if (permanent == null) { if (controller != null && permanent != null) {
permanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD);
}
if (player != null && permanent != null) {
if (!permanent.isTapped()) { if (!permanent.isTapped()) {
player.gainLife(3, game); controller.gainLife(3, game);
} else { } else {
for (UUID opponentId : player.getInRange()) { for (UUID opponentId : controller.getInRange()) {
if (controller.hasOpponent(opponentId, game)) {
Player opponent = game.getPlayer(opponentId); Player opponent = game.getPlayer(opponentId);
if (opponent != null) { if (opponent != null) {
opponent.loseLife(3, game); opponent.loseLife(3, game);
}
} }
} }
} }