github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-17 01:06:26 -09:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed #5393

Browse source
This commit is contained in:
Jeff 2018-11-19 15:09:36 -06:00
parent d1c1abb967
commit 0eedca5283
3 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java
View file

@ -56,7 +56,7 @@ public class AminatouTheFateShifter extends CardImpl {
// -1: Exile another target permanent you own, then return it to the battlefield under your control. // -1: Exile another target permanent you own, then return it to the battlefield under your control.
ability = new LoyaltyAbility(new ExileTargetForSourceEffect(), -1); ability = new LoyaltyAbility(new ExileTargetForSourceEffect(), -1);
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect()); ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true));
ability.addTarget(new TargetPermanent(filter)); ability.addTarget(new TargetPermanent(filter));
this.addAbility(ability); this.addAbility(ability);
@ -68,6 +68,7 @@ public class AminatouTheFateShifter extends CardImpl {
// Aminatou, the Fateshifter can be your commander. // Aminatou, the Fateshifter can be your commander.
this.addAbility(CanBeYourCommanderAbility.getInstance()); this.addAbility(CanBeYourCommanderAbility.getInstance());
} }
public AminatouTheFateShifter(final AminatouTheFateShifter card) { public AminatouTheFateShifter(final AminatouTheFateShifter card) {
super(card); super(card);
} }
@ -79,6 +80,7 @@ public class AminatouTheFateShifter extends CardImpl {
} }
class AminatouPlusEffect extends OneShotEffect { class AminatouPlusEffect extends OneShotEffect {
public AminatouPlusEffect() { public AminatouPlusEffect() {
super(Outcome.DrawCard); super(Outcome.DrawCard);
staticText = "draw a card, then put a card from your hand on top of your library"; staticText = "draw a card, then put a card from your hand on top of your library";
@ -118,10 +120,11 @@ class AminatouPlusEffect extends OneShotEffect {
} }
class AminatouUltimateEffect extends OneShotEffect { class AminatouUltimateEffect extends OneShotEffect {
public AminatouUltimateEffect() { public AminatouUltimateEffect() {
super(Outcome.Benefit); super(Outcome.Benefit);
staticText = "Choose left or right. Each player gains control of all nonland permanents other than Aminatou," + staticText = "Choose left or right. Each player gains control of all nonland permanents other than Aminatou,"
" the Fateshifter controlled by the next player in the chosen direction."; + " the Fateshifter controlled by the next player in the chosen direction.";
} }
public AminatouUltimateEffect(final AminatouUltimateEffect effect) { public AminatouUltimateEffect(final AminatouUltimateEffect effect) {
@ -129,7 +132,9 @@ class AminatouUltimateEffect extends OneShotEffect {
} }
@Override @Override
public AminatouUltimateEffect copy(){return new AminatouUltimateEffect(this);} public AminatouUltimateEffect copy() {
return new AminatouUltimateEffect(this);
}
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
@ -188,4 +193,3 @@ class AminatouUltimateEffect extends OneShotEffect {
return nextPlayerId; return nextPlayerId;
} }
} }

3
Mage.Sets/src/mage/cards/t/TheEldestReborn.java
View file

@ -1,4 +1,3 @@
package mage.cards.t; package mage.cards.t;
import java.util.UUID; import java.util.UUID;
@ -13,7 +12,6 @@ import mage.constants.SagaChapter;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.filter.StaticFilters;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.CardTypePredicate;
@ -35,6 +33,7 @@ public final class TheEldestReborn extends CardImpl {
} }
private static final FilterControlledPermanent filterSacrifice = new FilterControlledPermanent("creature or planeswalker"); private static final FilterControlledPermanent filterSacrifice = new FilterControlledPermanent("creature or planeswalker");
static { static {
filterSacrifice.add(Predicates.or( filterSacrifice.add(Predicates.or(
new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.CREATURE),

4
Mage/src/main/java/mage/abilities/common/SagaAbility.java
View file

@ -1,4 +1,3 @@
package mage.abilities.common; package mage.abilities.common;
import mage.abilities.Ability; import mage.abilities.Ability;
@ -138,7 +137,8 @@ class ChapterTriggeredAbility extends TriggeredAbilityImpl {
if (event.getTargetId().equals(getSourceId()) && event.getData().equals(CounterType.LORE.getName())) { if (event.getTargetId().equals(getSourceId()) && event.getData().equals(CounterType.LORE.getName())) {
int amountAdded = event.getAmount(); int amountAdded = event.getAmount();
int loreCounters = amountAdded; int loreCounters = amountAdded;
Permanent sourceSaga = game.getPermanentOrLKIBattlefield(getSourceId()); //Permanent sourceSaga = game.getPermanentOrLKIBattlefield(getSourceId()); BUG #5393
Permanent sourceSaga = game.getPermanent(getSourceId());
if (sourceSaga == null) { if (sourceSaga == null) {
sourceSaga = game.getPermanentEntering(getSourceId()); sourceSaga = game.getPermanentEntering(getSourceId());
} }