From a1bfe071c80109394bb1f2bb9d042aca17a35e75 Mon Sep 17 00:00:00 2001
From: Noah Gleason <noah.gleason1@gmail.com>
Date: Sat, 23 Jun 2018 14:41:14 -0400
Subject: [PATCH] Switch from Watcher to getDealtDamageByThisTurn()

---
 .../src/mage/cards/g/GiantAlbatross.java      | 33 +++++++++----------
 Mage.Sets/src/mage/sets/Homelands.java        |  4 +--
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/g/GiantAlbatross.java b/Mage.Sets/src/mage/cards/g/GiantAlbatross.java
index 93abfbfc03..b9ec60ce36 100644
--- a/Mage.Sets/src/mage/cards/g/GiantAlbatross.java
+++ b/Mage.Sets/src/mage/cards/g/GiantAlbatross.java
@@ -44,9 +44,6 @@ public final class GiantAlbatross extends CardImpl {
 
         // When Giant Albatross dies, you may pay {1}{U}. If you do, for each creature that dealt damage to Giant Albatross this turn, destroy that creature unless its controller pays 2 life. A creature destroyed this way can't be regenerated.
         Ability ability = new DiesTriggeredAbility(new DoIfCostPaid(new GiantAlbatrossEffect(), new ManaCostsImpl("{1}{U}")));
-        DealtDamageToWatcher watcher = new DealtDamageToWatcher();
-        watcher.setSourceId(this.objectId);
-        ability.addWatcher(watcher);
         this.addAbility(ability);
     }
 
@@ -79,21 +76,23 @@ class GiantAlbatrossEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
-        DealtDamageToWatcher watcher = (DealtDamageToWatcher) game.getState().getWatchers().get(DealtDamageToWatcher.class.getSimpleName(), source.getSourceId());
-        for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
-            Player player = game.getPlayer(playerId);
-            if (player != null) {
-                List<Permanent> creatures = game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, playerId, game);
+        Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
+        if (sourcePermanent != null) {
+            for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
+                Player player = game.getPlayer(playerId);
+                if (player != null) {
+                    List<Permanent> creatures = game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, playerId, game);
 
-                Cost cost = new PayLifeCost(2);
-                for (Permanent creature : creatures) {
-                    if (watcher.didDamage(creature, game)) {
-                        final StringBuilder sb = new StringBuilder("Pay 2 life? (Otherwise ").append(creature.getName()).append(" will be destroyed)");
-                        if (cost.canPay(source, creature.getControllerId(), creature.getControllerId(), game) && player.chooseUse(Outcome.Benefit, sb.toString(), source, game)) {
-                            cost.pay(source, game, creature.getControllerId(), creature.getControllerId(), true, null);
-                        }
-                        if (!cost.isPaid()) {
-                            creature.destroy(source.getSourceId(), game, true);
+                    Cost cost = new PayLifeCost(2);
+                    for (Permanent creature : creatures) {
+                        if (sourcePermanent.getDealtDamageByThisTurn().contains(new MageObjectReference(creature.getId(), game))) {
+                            final StringBuilder sb = new StringBuilder("Pay 2 life? (Otherwise ").append(creature.getName()).append(" will be destroyed)");
+                            if (cost.canPay(source, creature.getControllerId(), creature.getControllerId(), game) && player.chooseUse(Outcome.Benefit, sb.toString(), source, game)) {
+                                cost.pay(source, game, creature.getControllerId(), creature.getControllerId(), true, null);
+                            }
+                            if (!cost.isPaid()) {
+                                creature.destroy(source.getSourceId(), game, true);
+                            }
                         }
                     }
                 }
diff --git a/Mage.Sets/src/mage/sets/Homelands.java b/Mage.Sets/src/mage/sets/Homelands.java
index f867f332d3..2b22d743b6 100644
--- a/Mage.Sets/src/mage/sets/Homelands.java
+++ b/Mage.Sets/src/mage/sets/Homelands.java
@@ -103,8 +103,8 @@ public final class Homelands extends ExpansionSet {
         cards.add(new SetCardInfo("Forget", 26, Rarity.RARE, mage.cards.f.Forget.class));
         cards.add(new SetCardInfo("Funeral March", 48, Rarity.UNCOMMON, mage.cards.f.FuneralMarch.class));
         cards.add(new SetCardInfo("Ghost Hounds", 49, Rarity.UNCOMMON, mage.cards.g.GhostHounds.class));
-        cards.add(new SetCardInfo("Giant Albatross", "34a", Rarity.COMMON, mage.cards.g.GiantAlbatross.class, NON_FULL_USE_VARIOUS));
-        cards.add(new SetCardInfo("Giant Albatross", "34b", Rarity.COMMON, mage.cards.g.GiantAlbatross.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Giant Albatross", "27a", Rarity.COMMON, mage.cards.g.GiantAlbatross.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Giant Albatross", "27b", Rarity.COMMON, mage.cards.g.GiantAlbatross.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Grandmother Sengir", 50, Rarity.RARE, mage.cards.g.GrandmotherSengir.class));
         cards.add(new SetCardInfo("Greater Werewolf", 51, Rarity.UNCOMMON, mage.cards.g.GreaterWerewolf.class));
         cards.add(new SetCardInfo("Hazduhr the Abbot", 8, Rarity.RARE, mage.cards.h.HazduhrTheAbbot.class));