From c264817f4e986586ed4a2ec6ffe8e2e01c11cd7b Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 21 Sep 2017 14:49:57 -0400 Subject: [PATCH] fixed Admiral Beckett Brass not triggering correctly when cloned --- .../src/mage/cards/a/AdmiralBeckettBrass.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java index 84b6dcd8c19..6e97c7ab134 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java @@ -65,12 +65,13 @@ import mage.watchers.Watcher; */ public class AdmiralBeckettBrass extends CardImpl { - private final UUID originalId; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other Pirates you control"); + private static final FilterNonlandPermanent filter2 = new FilterNonlandPermanent("nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn"); static { filter.add(new SubtypePredicate(SubType.PIRATE)); filter.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(new ControllerDealtDamageByPiratesPredicate()); } public AdmiralBeckettBrass(UUID ownerId, CardSetInfo setInfo) { @@ -87,25 +88,12 @@ public class AdmiralBeckettBrass extends CardImpl { // At the beginning of your end step, gain control of target nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn. Ability ability = new BeginningOfEndStepTriggeredAbility(new GainControlTargetEffect(Duration.Custom), TargetController.YOU, false); - ability.addTarget(new TargetNonlandPermanent(new FilterNonlandPermanent("nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn"))); - originalId = ability.getOriginalId(); + ability.addTarget(new TargetNonlandPermanent(filter2)); this.addAbility(ability, new DamagedByPiratesWatcher()); } public AdmiralBeckettBrass(final AdmiralBeckettBrass card) { super(card); - this.originalId = card.originalId; - } - - @Override - public void adjustTargets(Ability ability, Game game) { - if (ability.getOriginalId().equals(originalId)) { - ability.getTargets().clear(); - FilterNonlandPermanent playerFilter = new FilterNonlandPermanent("nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn"); - playerFilter.add(new ControllerDealtDamageByPiratesPredicate()); - TargetNonlandPermanent target = new TargetNonlandPermanent(1, 1, playerFilter, true); - ability.addTarget(target); - } } @Override