diff --git a/Mage.Sets/src/mage/sets/magic2015/BurningAnger.java b/Mage.Sets/src/mage/sets/magic2015/BurningAnger.java index 0e0d5e24d2..7fe4c19407 100644 --- a/Mage.Sets/src/mage/sets/magic2015/BurningAnger.java +++ b/Mage.Sets/src/mage/sets/magic2015/BurningAnger.java @@ -33,6 +33,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; @@ -69,7 +70,9 @@ public class BurningAnger extends CardImpl { this.addAbility(ability); // Enchanted creature has "{T}: This creature deals damage equal to its power to target creature or player." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new TapSourceCost()); + Effect effect = new DamageTargetEffect(new SourcePermanentPowerCount()); + effect.setText("{this} deals damage equal to its power to target creature or player"); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); gainedAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals damage equal to its power to target creature or player.\""))); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java index 9dd1e477ed..850479af39 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java @@ -62,6 +62,7 @@ public class LeoninArbiter extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); + // Players can't search libraries. Any player may pay {2} for that player to ignore this effect until end of turn. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeoninArbiterReplacementEffect())); } @@ -78,7 +79,7 @@ public class LeoninArbiter extends CardImpl { class LeoninArbiterReplacementEffect extends ReplacementEffectImpl { private static final String effectText = "Players can't search libraries. Any player may pay {2} for that player to ignore this effect until end of turn"; - private List<UUID> paidPlayers = new ArrayList<UUID>(); + private final List<UUID> paidPlayers = new ArrayList<>(); LeoninArbiterReplacementEffect ( ) { super(Duration.WhileOnBattlefield, Outcome.Neutral); @@ -87,7 +88,7 @@ class LeoninArbiterReplacementEffect extends ReplacementEffectImpl { LeoninArbiterReplacementEffect ( LeoninArbiterReplacementEffect effect ) { super(effect); - this.paidPlayers = effect.paidPlayers; + this.paidPlayers.addAll(effect.paidPlayers); } @Override @@ -105,7 +106,7 @@ class LeoninArbiterReplacementEffect extends ReplacementEffectImpl { if ( arbiterTax.canPay(source.getSourceId(), event.getPlayerId(), game) && player.chooseUse(Outcome.Neutral, "Pay {2} to search your library?", game) ) { - if (arbiterTax.payOrRollback(source, game, this.getId(), event.getPlayerId()) ) { + if (arbiterTax.payOrRollback(source, game, source.getSourceId(), event.getPlayerId()) ) { paidPlayers.add(event.getPlayerId()); return false; } @@ -121,7 +122,7 @@ class LeoninArbiterReplacementEffect extends ReplacementEffectImpl { if ( event.getType() == EventType.SEARCH_LIBRARY ) { return true; } - if ( event.getType() == EventType.END_TURN_STEP_POST ) { + if ( event.getType() == EventType.END_PHASE_POST) { this.paidPlayers.clear(); } return false;