From 7b6cedacfa04b1fd11d952b2c52091b64a5e76e0 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sat, 4 Feb 2012 00:36:17 +0400
Subject: [PATCH] Fixed DiesTriggeredAbility not working.

---
 Mage/src/mage/abilities/TriggeredAbilities.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mage/src/mage/abilities/TriggeredAbilities.java b/Mage/src/mage/abilities/TriggeredAbilities.java
index 8ed7ae47dc1..067e9b5282c 100644
--- a/Mage/src/mage/abilities/TriggeredAbilities.java
+++ b/Mage/src/mage/abilities/TriggeredAbilities.java
@@ -49,9 +49,9 @@ public class TriggeredAbilities extends AbilitiesImpl<TriggeredAbility> {
 
     public void checkTriggers(GameEvent event, Game game) {
         for (TriggeredAbility ability: this) {
-            if (ability.isInUseableZone(game)) {
+            if (event.getType() == GameEvent.EventType.ZONE_CHANGE || ability.isInUseableZone(game)) {
                 MageObject object = game.getObject(ability.getSourceId());
-                if (object.getAbilities().contains(ability)) {
+                if (object != null && object.getAbilities().contains(ability)) {
                     if (ability.checkTrigger(event, game)) {
                         ability.trigger(game, ability.getControllerId());
                     }