From 0ea96bb8298d8b4b4aa0cbd5048e56fb4641346a Mon Sep 17 00:00:00 2001
From: Plopman <Plopman@hotmail.ch>
Date: Wed, 5 Jun 2013 20:04:39 +0200
Subject: [PATCH] Fixed Goblin Piledriver, Goblin Sharpshooter, Stingscourger
 and Goblin Warchief (cards used in Legacy goblin deck)

---
 Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java   | 2 +-
 Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java | 2 +-
 Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java    | 4 +++-
 Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java       | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java b/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java
index a1db5805ae9..2a6fb54fe5e 100644
--- a/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java
+++ b/Mage.Sets/src/mage/sets/onslaught/GoblinPiledriver.java
@@ -74,7 +74,7 @@ public class GoblinPiledriver extends CardImpl<GoblinPiledriver> {
         this.addAbility(new ProtectionAbility(filter1));
         // Whenever Goblin Piledriver attacks, it gets +2/+0 until end of turn for each other attacking Goblin.
         PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter2, 2);
-        this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(value, new StaticValue(0), Duration.EndOfTurn), false));
+        this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(value, new StaticValue(0), Duration.EndOfTurn, true), false));
     }
 
     public GoblinPiledriver(final GoblinPiledriver card) {
diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java b/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java
index 02183db0e12..4661c467f9e 100644
--- a/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java
+++ b/Mage.Sets/src/mage/sets/onslaught/GoblinSharpshooter.java
@@ -61,7 +61,7 @@ public class GoblinSharpshooter extends CardImpl<GoblinSharpshooter> {
         // Goblin Sharpshooter doesn't untap during your untap step.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapSourceEffect()));
         // Whenever a creature dies, untap Goblin Sharpshooter.
-        this.addAbility(new DiesCreatureTriggeredAbility(new UntapSourceEffect(), true));
+        this.addAbility(new DiesCreatureTriggeredAbility(new UntapSourceEffect(), false));
         // {tap}: Goblin Sharpshooter deals 1 damage to target creature or player.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost());
         ability.addTarget(new TargetCreatureOrPlayer());
diff --git a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java
index 879cf4bf5d9..99e7dc60ee7 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java
@@ -67,7 +67,9 @@ public class Stingscourger extends CardImpl<Stingscourger> {
         this.addAbility(new EchoAbility("{3}{R}"));
         // When Stingscourger enters the battlefield, return target creature an opponent controls to its owner's hand.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        target.setRequired(true);
+        ability.addTarget(target);
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java b/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java
index 8463a959a25..e2ccfe733f7 100644
--- a/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java
+++ b/Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java
@@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
 public class GoblinWarchief extends CardImpl<GoblinWarchief> {
 
     private static final FilterCard filterSpells = new FilterCard("Goblin spells");
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creatures");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblins");
 
     static {
         filter.add(new SubtypePredicate("Goblin"));
@@ -68,7 +68,7 @@ public class GoblinWarchief extends CardImpl<GoblinWarchief> {
         // Goblin spells you cast cost {1} less to cast.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionEffect(filterSpells, 1)));
         // Goblin creatures you control have haste.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, true)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false)));
     }
 
     public GoblinWarchief(final GoblinWarchief card) {