From 389ebb47aff95cb9c90f0735c2d88830d95bbf28 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 3 May 2013 14:56:09 +0200
Subject: [PATCH] Goblin War Drum's and Terror of Kruin Pass effect are no
 longer abilities given to the concerned creatures. Terror of Krion Pass
 effect concerns now only controlled werewolves.

---
 .../sets/fallenempires/GoblinWarDrums1.java   | 19 ++++++++++---------
 .../sets/innistrad/TerrorOfKruinPass.java     | 11 +++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java
index 2bc017b0fe1..68053f6a8d1 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinWarDrums1.java
@@ -31,13 +31,12 @@ import java.util.UUID;
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
+import mage.Constants.Zone;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect;
-import mage.abilities.effects.common.continious.GainAbilityAllEffect;
+import mage.abilities.effects.common.continious.CantBeBlockedByOneAllEffect;
 import mage.cards.CardImpl;
-import mage.filter.common.FilterControlledCreaturePermanent;
-
-
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
 
 /**
  *
@@ -45,6 +44,11 @@ import mage.filter.common.FilterControlledCreaturePermanent;
  */
  public class GoblinWarDrums1 extends CardImpl<GoblinWarDrums1> {
 
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control");
+    static {
+        filter.add(new ControllerPredicate(Constants.TargetController.YOU));
+    }
+
     public GoblinWarDrums1(UUID ownerId) {
         super(ownerId, 118, "Goblin War Drums", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}");
         this.expansionSetCode = "FEM";
@@ -52,10 +56,7 @@ import mage.filter.common.FilterControlledCreaturePermanent;
         this.color.setRed(true);
 
         // Each creature you control can't be blocked except by two or more creatures.
-        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(
-                new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)),
-                Constants.Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent(),
-                "Each creature you control can't be blocked except by two or more creatures")));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneAllEffect(2, filter)));
     }
 
     public GoblinWarDrums1(final GoblinWarDrums1 card) {
diff --git a/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java b/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java
index 0a2049c9ed6..300fe63ec81 100644
--- a/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java
+++ b/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java
@@ -29,7 +29,6 @@ package mage.sets.innistrad;
 
 import java.util.UUID;
 import mage.Constants.CardType;
-import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.Constants.TargetController;
 import mage.Constants.Zone;
@@ -40,13 +39,13 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.TwoOrMoreSpellsWereCastLastTurnCondition;
 import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.common.TransformSourceEffect;
-import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect;
-import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
+import mage.abilities.effects.common.continious.CantBeBlockedByOneAllEffect;
 import mage.abilities.keyword.DoubleStrikeAbility;
 import mage.abilities.keyword.TransformAbility;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
 
 /**
  *
@@ -54,9 +53,10 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
  */
 public class TerrorOfKruinPass extends CardImpl<TerrorOfKruinPass> {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf you control");
 
     static {
+        filter.add(new ControllerPredicate(TargetController.YOU));
         filter.add(new SubtypePredicate("Werewolf"));
     }
 
@@ -75,8 +75,7 @@ public class TerrorOfKruinPass extends CardImpl<TerrorOfKruinPass> {
 
         this.addAbility(DoubleStrikeAbility.getInstance());
         // Each Werewolf you control can't be blocked except by two or more creatures.
-        SimpleStaticAbility gainedAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2));
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(gainedAbility, Duration.WhileOnBattlefield, filter)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneAllEffect(2, filter)));
         // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Terror of Kruin Pass.
         TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false);
         this.addAbility(new ConditionalTriggeredAbility(ability, TwoOrMoreSpellsWereCastLastTurnCondition.getInstance(), TransformAbility.TWO_OR_MORE_SPELLS_TRANSFORM_RULE));