diff --git a/Mage.Sets/src/mage/cards/i/Invigorate.java b/Mage.Sets/src/mage/cards/i/Invigorate.java index ad4e2d3ab99..dddb5418107 100644 --- a/Mage.Sets/src/mage/cards/i/Invigorate.java +++ b/Mage.Sets/src/mage/cards/i/Invigorate.java @@ -1,4 +1,3 @@ - package mage.cards.i; import java.util.UUID; @@ -9,7 +8,7 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Duration; +import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.target.common.TargetCreaturePermanent; @@ -29,9 +28,9 @@ public final class Invigorate extends CardImpl { public Invigorate(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}"); - // If you control a Forest, rather than pay Invigorate's mana cost, you may have an opponent gain 3 life. this.addAbility(new AlternativeCostSourceAbility(new GainLifeOpponentCost(3), new PermanentsOnTheBattlefieldCondition(filter))); + // Target creature gets +4/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(4,4,Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java index 805c78ff469..8045bc39bb4 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java @@ -28,7 +28,8 @@ public class EmergeAbility extends SpellAbility { public EmergeAbility(Card card, ManaCosts emergeCost) { super(card.getSpellAbility()); - this.newId(); + this.emergeCost = emergeCost.copy(); + this.newId(); // Why is this neccessary? will create new id anyway or not? this.setCardName(card.getName() + " with emerge"); zone = Zone.HAND; spellAbilityType = SpellAbilityType.BASE_ALTERNATE; @@ -37,8 +38,7 @@ public class EmergeAbility extends SpellAbility { this.getManaCostsToPay().clear(); this.addManaCost(emergeCost.copy()); - this.setRuleAtTheTop(true); - this.emergeCost = emergeCost.copy(); + this.setRuleAtTheTop(true); } public EmergeAbility(final EmergeAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java b/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java index 9cb4a763a74..3dbcbc2a678 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java @@ -20,7 +20,7 @@ public class SpectacleAbility extends SpellAbility { public static final String SPECTACLE_ACTIVATION_VALUE_KEY = "spectacleActivation"; - private String rule; + private final String rule; public SpectacleAbility(Card card, ManaCost spectacleCosts) { super(card.getSpellAbility()); diff --git a/Mage/src/main/java/mage/game/GameState.java b/Mage/src/main/java/mage/game/GameState.java index 04f1e5d2a21..13b084f3f17 100644 --- a/Mage/src/main/java/mage/game/GameState.java +++ b/Mage/src/main/java/mage/game/GameState.java @@ -867,7 +867,7 @@ public class GameState implements Serializable, Copyable { } /** - * Abilities that are applied to other objects or applie for a certain time + * Abilities that are applied to other objects or applied for a certain time * span * * @param ability