mirror of
https://github.com/correl/mage.git
synced 2024-12-25 19:25:41 +00:00
* Sphinx Sovereign - Fixed that the life loss was also applied to the controller (fixes #722).
This commit is contained in:
parent
c6d3a8247d
commit
dfd46bd94e
1 changed files with 12 additions and 18 deletions
|
@ -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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue