From 77f19c157a0f482fd9ed675ff6cbd10612f8a3a1 Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Fri, 14 Oct 2011 11:34:51 -0400
Subject: [PATCH] refactoring and cleanup

---
 .../sets/mirrodinbesieged/GlissaTheTraitor.java   | 11 ++++-------
 .../mage/sets/mirrodinbesieged/MassacreWurm.java  | 15 ++++++---------
 .../mage/sets/mirrodinbesieged/Sangromancer.java  | 11 ++++-------
 .../mage/sets/scarsofmirrodin/ViridianRevel.java  | 13 +++++--------
 Mage.Sets/src/mage/sets/zendikar/NissaRevane.java |  1 -
 .../common/CreatureDiesTriggeredAbility.java      | 13 +++++--------
 ...iesAndDealtDamageThisTurnTriggeredAbility.java | 13 +++++--------
 ...AnotherCreatureYouControlTriggeredAbility.java |  3 +--
 .../common/DiesAttachedTriggeredAbility.java      | 11 ++++-------
 .../continious/GainAbilityTargetEffect.java       |  3 ++-
 Mage/src/mage/watchers/common/MorbidWatcher.java  | 11 ++++-------
 11 files changed, 40 insertions(+), 65 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java
index 1951886cd3..890d12082f 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java
@@ -102,13 +102,10 @@ class GlissaTheTraitorTriggeredAbility extends TriggeredAbilityImpl<GlissaTheTra
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
-            ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-            if (zEvent.getFromZone() == Constants.Zone.BATTLEFIELD && zEvent.getToZone() == Constants.Zone.GRAVEYARD) {
-                Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
-                if (p != null && p.getCardType().contains(CardType.CREATURE) && game.getOpponents(this.getControllerId()).contains(p.getControllerId())) {
-                    return true;
-                }
+        if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
+            Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
+            if (p != null && p.getCardType().contains(CardType.CREATURE) && game.getOpponents(this.getControllerId()).contains(p.getControllerId())) {
+                return true;
             }
         }
         return false;
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java
index 2f1abb491b..8b0f7377a6 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java
@@ -90,16 +90,13 @@ class MassacreWurmTriggeredAbility extends TriggeredAbilityImpl<MassacreWurmTrig
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
-            ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-            if (zEvent.getFromZone() == Constants.Zone.BATTLEFIELD && zEvent.getToZone() == Constants.Zone.GRAVEYARD) {
-                Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
-                if (p != null && p.getCardType().contains(CardType.CREATURE) && game.getOpponents(this.getControllerId()).contains(p.getControllerId())) {
-                    for (Effect effect : this.getEffects()) {
-                        effect.setTargetPointer(new FixedTarget(p.getControllerId()));
-                    }
-                    return true;
+        if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
+            Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
+            if (p != null && p.getCardType().contains(CardType.CREATURE) && game.getOpponents(this.getControllerId()).contains(p.getControllerId())) {
+                for (Effect effect : this.getEffects()) {
+                    effect.setTargetPointer(new FixedTarget(p.getControllerId()));
                 }
+                return true;
             }
         }
         return false;
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java
index 839ae3ff7f..ce9d67b012 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java
@@ -88,13 +88,10 @@ class SangromancerFirstTriggeredAbility extends TriggeredAbilityImpl<Sangromance
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
-            ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-            if (zEvent.getFromZone() == Constants.Zone.BATTLEFIELD && zEvent.getToZone() == Constants.Zone.GRAVEYARD) {
-                Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
-                if (p != null && p.getCardType().contains(CardType.CREATURE) && game.getOpponents(this.getControllerId()).contains(p.getControllerId())) {
-                    return true;
-                }
+        if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
+            Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
+            if (p != null && p.getCardType().contains(CardType.CREATURE) && game.getOpponents(this.getControllerId()).contains(p.getControllerId())) {
+                return true;
             }
         }
         return false;
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java
index fb610733c6..8a788a81ce 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java
@@ -81,14 +81,11 @@ class ViridianRevelTriggeredAbility extends TriggeredAbilityImpl<ViridianRevelTr
 
 	@Override
 	public boolean checkTrigger(GameEvent event, Game game) {
-		if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
-			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-			if (zEvent.getFromZone() == Constants.Zone.BATTLEFIELD && zEvent.getToZone() == Constants.Zone.GRAVEYARD && game.getOpponents(this.getControllerId()).contains(zEvent.getPlayerId())) {
-                Card card = game.getCard(event.getTargetId());
-                if (card != null && card.getCardType().contains(CardType.ARTIFACT)) {
-    				return true;
-                }
-			}
+		if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
+            Card card = game.getCard(event.getTargetId());
+            if (card != null && card.getCardType().contains(CardType.ARTIFACT)) {
+                return true;
+            }
 		}
 		return false;
 	}
diff --git a/Mage.Sets/src/mage/sets/zendikar/NissaRevane.java b/Mage.Sets/src/mage/sets/zendikar/NissaRevane.java
index c668c37193..a2a379cc99 100644
--- a/Mage.Sets/src/mage/sets/zendikar/NissaRevane.java
+++ b/Mage.Sets/src/mage/sets/zendikar/NissaRevane.java
@@ -31,7 +31,6 @@ import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.EntersBattlefieldAbility;
diff --git a/Mage/src/mage/abilities/common/CreatureDiesTriggeredAbility.java b/Mage/src/mage/abilities/common/CreatureDiesTriggeredAbility.java
index c0e6600dd9..f1a6b9a270 100644
--- a/Mage/src/mage/abilities/common/CreatureDiesTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/CreatureDiesTriggeredAbility.java
@@ -65,14 +65,11 @@ public class CreatureDiesTriggeredAbility extends TriggeredAbilityImpl<CreatureD
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
-            ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
-            if (zEvent.getFromZone() == Zone.BATTLEFIELD && zEvent.getToZone() == Zone.GRAVEYARD) {
-                Permanent permanent = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
-                if (permanent != null && permanent.getCardType().contains(CardType.CREATURE)
-                        && (!another || !permanent.getId().equals(this.getSourceId()))) {
-                    return true;
-                }
+        if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
+            Permanent permanent = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
+            if (permanent != null && permanent.getCardType().contains(CardType.CREATURE)
+                    && (!another || !permanent.getId().equals(this.getSourceId()))) {
+                return true;
             }
         }
         return false;
diff --git a/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java
index f5ea8b60c0..ebe91530c0 100644
--- a/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java
@@ -30,14 +30,11 @@ public class DiesAndDealtDamageThisTurnTriggeredAbility extends TriggeredAbility
 
 	@Override
 	public boolean checkTrigger(GameEvent event, Game game) {
-		if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
-			ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
-			if (zEvent.getFromZone() == Constants.Zone.BATTLEFIELD && zEvent.getToZone() == Constants.Zone.GRAVEYARD) {
-				Card card = game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
-				if (card instanceof Permanent && ((Permanent)card).getDealtDamageByThisTurn().contains(this.sourceId)) {
-					return true;
-				}
-			}
+		if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
+            Card card = game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
+            if (card instanceof Permanent && ((Permanent)card).getDealtDamageByThisTurn().contains(this.sourceId)) {
+                return true;
+            }
 		}
 		return false;
 	}
diff --git a/Mage/src/mage/abilities/common/DiesAnotherCreatureYouControlTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAnotherCreatureYouControlTriggeredAbility.java
index bd5c408d37..25fd1f2498 100644
--- a/Mage/src/mage/abilities/common/DiesAnotherCreatureYouControlTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesAnotherCreatureYouControlTriggeredAbility.java
@@ -40,8 +40,7 @@ public class DiesAnotherCreatureYouControlTriggeredAbility extends TriggeredAbil
             Permanent permanent = zEvent.getTarget();
 
             if (permanent != null && permanent.getCardType().contains(Constants.CardType.CREATURE) &&
-                    zEvent.getToZone() == Constants.Zone.GRAVEYARD &&
-                    zEvent.getFromZone() == Constants.Zone.BATTLEFIELD &&
+                    zEvent.isDiesEvent() &&
                     permanent.getControllerId().equals(this.getControllerId())) {
                 return true;
             }
diff --git a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
index 8d205579b2..2dfb90f21b 100644
--- a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
@@ -32,13 +32,10 @@ public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl<DiesAttac
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
-			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-			if (zEvent.getFromZone() == Constants.Zone.BATTLEFIELD && zEvent.getToZone() == Constants.Zone.GRAVEYARD) {
-                Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
-                if (p.getAttachments().contains(this.getSourceId()))
-				    return true;
-			}
+        if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
+            Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
+            if (p.getAttachments().contains(this.getSourceId()))
+                return true;
 		}
 		return false;
     }
diff --git a/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java
index 410ae680c3..0984818137 100644
--- a/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java
@@ -50,7 +50,8 @@ public class GainAbilityTargetEffect extends ContinuousEffectImpl<GainAbilityTar
 	protected Ability ability;
 
 	public GainAbilityTargetEffect(Ability ability, Duration duration) {
-		super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
+		super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, 
+                ability.getEffects().size() > 0 ? ability.getEffects().get(0).getOutcome() : Outcome.AddAbility);
 		this.ability = ability;
 	}
 
diff --git a/Mage/src/mage/watchers/common/MorbidWatcher.java b/Mage/src/mage/watchers/common/MorbidWatcher.java
index fc53c6d84f..dfb2449abd 100644
--- a/Mage/src/mage/watchers/common/MorbidWatcher.java
+++ b/Mage/src/mage/watchers/common/MorbidWatcher.java
@@ -55,13 +55,10 @@ public class MorbidWatcher extends WatcherImpl<MorbidWatcher> {
     public void watch(GameEvent event, Game game) {
         if (condition == true) //no need to check - condition has already occured
             return;
-        if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
-			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-            if (zEvent.getFromZone() == Constants.Zone.BATTLEFIELD && zEvent.getToZone() == Constants.Zone.GRAVEYARD) {
-                Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
-                if (p != null && p.getCardType().contains(CardType.CREATURE)) {
-                    condition = true;
-                }
+        if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
+            Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Constants.Zone.BATTLEFIELD);
+            if (p != null && p.getCardType().contains(CardType.CREATURE)) {
+                condition = true;
             }
         }
     }