From dfa3426f8769fcd8e77e9e85fdc751a494cac0aa Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 17 May 2018 21:32:35 -0400 Subject: [PATCH] fixed Goblin Bushwacker giving haste to noncreature permanents --- .../src/mage/cards/g/GoblinBushwhacker.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/cards/g/GoblinBushwhacker.java b/Mage.Sets/src/mage/cards/g/GoblinBushwhacker.java index f98ac39ade9..7e454732d60 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBushwhacker.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBushwhacker.java @@ -41,6 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; +import mage.filter.StaticFilters; /** * @@ -49,7 +50,7 @@ import mage.constants.Duration; public class GoblinBushwhacker extends CardImpl { public GoblinBushwhacker(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}"); this.subtype.add(SubType.GOBLIN); this.subtype.add(SubType.WARRIOR); @@ -61,8 +62,18 @@ public class GoblinBushwhacker extends CardImpl { // When Goblin Bushwhacker enters the battlefield, if it was kicked, creatures you control get +1/+0 and gain haste until end of turn. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new BoostControlledEffect(1, 0, Duration.EndOfTurn), false); - ability.addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.instance, "When {this} enters the battlefield, if it was kicked, creatures you control get +1/+0 and gain haste until end of turn.")); + ability.addEffect(new GainAbilityControlledEffect( + HasteAbility.getInstance(), + Duration.EndOfTurn, + StaticFilters.FILTER_CONTROLLED_CREATURES + )); + this.addAbility(new ConditionalTriggeredAbility( + ability, + KickedCondition.instance, + "When {this} enters the battlefield, " + + "if it was kicked, " + + "creatures you control get +1/+0 and gain haste until end of turn." + )); } public GoblinBushwhacker(final GoblinBushwhacker card) {