mirror of
https://github.com/correl/mage.git
synced 2024-12-24 11:50:45 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
11136412f4
2 changed files with 13 additions and 19 deletions
|
@ -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", ""));
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue