From 350bae2d95380a6e36e51a67ab35fe9d0b903177 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Tue, 22 Oct 2013 14:36:31 +0200
Subject: [PATCH] Fixed Helix Pinnacle and Merrow Bonegnawer.

---
 .../src/mage/sets/eventide/HelixPinnacle.java      | 14 +++++---------
 .../src/mage/sets/eventide/MerrowBonegnawer.java   |  2 +-
 .../decorator/ConditionalTriggeredAbility.java     |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/eventide/HelixPinnacle.java b/Mage.Sets/src/mage/sets/eventide/HelixPinnacle.java
index a7da5c5d57d..f52f4874796 100644
--- a/Mage.Sets/src/mage/sets/eventide/HelixPinnacle.java
+++ b/Mage.Sets/src/mage/sets/eventide/HelixPinnacle.java
@@ -28,27 +28,21 @@
 package mage.sets.eventide;
 
 import java.util.UUID;
-import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.HasCounterCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalOneShotEffect;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.dynamicvalue.common.ManacostVariableValue;
-import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.WinGameEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.ShroudAbility;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
-import mage.constants.Outcome;
 import mage.constants.Rarity;
 import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
 
 /**
  *
@@ -73,8 +67,10 @@ public class HelixPinnacle extends CardImpl<HelixPinnacle> {
                 new ManaCostsImpl("{X}")));
         
         // At the beginning of your upkeep, if there are 100 or more tower counters on Helix Pinnacle, you win the game.
-        Condition condition = new HasCounterCondition(CounterType.TOWER, 100);
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ConditionalOneShotEffect(new WinGameEffect(), condition, rule), TargetController.YOU, false));
+        this.addAbility(new ConditionalTriggeredAbility(
+                new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new WinGameEffect(), TargetController.YOU, false),
+                new HasCounterCondition(CounterType.TOWER, 100),
+                rule, false ));
 
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java b/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java
index beb5b78ad08..4fcd19e0b81 100644
--- a/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java
+++ b/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java
@@ -70,7 +70,7 @@ public class MerrowBonegnawer extends CardImpl<MerrowBonegnawer> {
         this.toughness = new MageInt(1);
 
         // {tap}: Target player exiles a card from his or her graveyard.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileFromZoneTargetEffect(Zone.GRAVEYARD, exileId, "Merrow Bonegnawer", new FilterCard("a card from your graveyard")), new TapSourceCost());
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileFromZoneTargetEffect(Zone.GRAVEYARD, exileId, "Merrow Bonegnawer", new FilterCard("a card")), new TapSourceCost());
         ability.addTarget(new TargetPlayer(true));
         this.addAbility(ability);
         
diff --git a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
index 81fc32573bc..23062564818 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
@@ -21,7 +21,7 @@ public class ConditionalTriggeredAbility extends TriggeredAbilityImpl<Conditiona
         this(ability, condition, text, false);
     }
 
-    public ConditionalTriggeredAbility(TriggeredAbility ability, Condition condition, String text, Boolean optional) {
+    public ConditionalTriggeredAbility(TriggeredAbility ability, Condition condition, String text, boolean optional) {
         super(ability.getZone(), null);
         this.ability = ability;
         this.modes = ability.getModes();