* Goblin Gaveleer - Added missing Trample ability.

Mage.Sets/src/mage/sets/scarsofmirrodin/GoblinGaveleer.java

@@ -28,16 +28,17 @@
 package mage.sets.scarsofmirrodin;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.dynamicvalue.common.EquipmentAttachedCount;
 import mage.abilities.dynamicvalue.common.StaticValue;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 
 /**
  *
@@ -54,6 +55,9 @@ public class GoblinGaveleer extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+        // Goblin Gaveleer gets +2/+0 for each Equipment attached to it.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new EquipmentAttachedCount(2),
                 new StaticValue(0), Duration.WhileOnBattlefield)));
     }

Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java

@@ -217,6 +217,45 @@ public class TamiyoTest extends CardTestPlayerBase {
         assertHandCount(playerA, 3); // 2 cards drawn from Advocate + 1 card during T3 draw step.
     }
 
+    /*
+     *  I activated his +1 ability once. then, the next turn, i activated it one more time, and then
+     *  i get to draw 3 cards of three creatures. So i think the first activation wasn't away.
+     */
+    @Test
+    public void testDrawEffectGetsRemoved() {
+
+        /*
+        // Tamiyo, Field Researcher {1}{G}{W}{U} - 4 loyalty
+            +1: Choose up to two target creatures. Until your next turn, whenever either of those creatures deals combat damage, you draw a card.
+            −2: Tap up to two target nonland permanents. They don't untap during their controller's next untap step.
+            −7: Draw three cards. You get an emblem with "You may cast nonland cards from your hand without paying their mana costs."
+         */
+        addCard(Zone.HAND, playerA, "Tamiyo, Field Researcher", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Sylvan Advocate", 1); // 2/3
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1); // 2/2
+        addCard(Zone.BATTLEFIELD, playerA, "Pillarfield Ox", 1); // 2/4
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tamiyo, Field Researcher");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Choose up to two", "Sylvan Advocate");
+
+        attack(1, playerA, "Sylvan Advocate");
+
+        activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Choose up to two", "Pillarfield Ox^Silvercoat Lion");
+
+        attack(3, playerA, "Pillarfield Ox");
+        attack(3, playerA, "Silvercoat Lion");
+
+        setStopAt(3, PhaseStep.END_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "Tamiyo, Field Researcher", 1);
+        assertLife(playerB, 14);
+        assertHandCount(playerA, 4); // 3 cards drawn from attackers + 1 card during T3 draw step.
+    }
+
     @Test
     public void testFieldResearcherFirstAbilityTargetOpponentCreature() {
         /*