From 8366ce3b8d5bf18ef08712a5020c735d3cb0c9d8 Mon Sep 17 00:00:00 2001
From: LoneFox <lonefox@kapsi.fi>
Date: Thu, 25 Jun 2015 10:44:48 +0300
Subject: [PATCH] Use BeginningOfUpkeepTriggeredAbility instead of
 OnEventTriggeredAbility for Harbinger of Night and Ivory Tower

---
 Mage.Sets/src/mage/sets/antiquities/IvoryTower.java  | 7 +++----
 Mage.Sets/src/mage/sets/mirage/HarbingerOfNight.java | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/antiquities/IvoryTower.java b/Mage.Sets/src/mage/sets/antiquities/IvoryTower.java
index 6f4d25c427f..4fb67af9f23 100644
--- a/Mage.Sets/src/mage/sets/antiquities/IvoryTower.java
+++ b/Mage.Sets/src/mage/sets/antiquities/IvoryTower.java
@@ -29,14 +29,14 @@ package mage.sets.antiquities;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.OnEventTriggeredAbility;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
+import mage.constants.TargetController;
 import mage.game.Game;
-import mage.game.events.GameEvent.EventType;
 import mage.players.Player;
 
 /**
@@ -50,8 +50,7 @@ public class IvoryTower extends CardImpl {
         super(ownerId, 18, "Ivory Tower", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}");
         this.expansionSetCode = "ATQ";
 
-        this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep",
-            new IvoryTowerEffect(), false));
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new IvoryTowerEffect(), TargetController.YOU, false));
     }
 
     public IvoryTower(final IvoryTower card) {
diff --git a/Mage.Sets/src/mage/sets/mirage/HarbingerOfNight.java b/Mage.Sets/src/mage/sets/mirage/HarbingerOfNight.java
index fc31ace1c0c..6c6a717650c 100644
--- a/Mage.Sets/src/mage/sets/mirage/HarbingerOfNight.java
+++ b/Mage.Sets/src/mage/sets/mirage/HarbingerOfNight.java
@@ -29,14 +29,14 @@ package mage.sets.mirage;
 
 import java.util.UUID;
 import mage.MageInt;
-import mage.abilities.common.OnEventTriggeredAbility;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.common.counter.AddCountersAllEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
+import mage.constants.TargetController;
 import mage.counters.CounterType;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.game.events.GameEvent.EventType;
 
 /**
  *
@@ -53,8 +53,8 @@ public class HarbingerOfNight extends CardImpl {
         this.toughness = new MageInt(3);
 
         // At the beginning of your upkeep, put a -1/-1 counter on each creature.
-        this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep",
-            new AddCountersAllEffect(CounterType.M1M1.createInstance(), new FilterCreaturePermanent()), false));
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAllEffect(CounterType.M1M1.createInstance(), new FilterCreaturePermanent()),
+            TargetController.YOU, false));
     }
 
     public HarbingerOfNight(final HarbingerOfNight card) {