From 4b4714207a000be66601c99af9d1aa072317810c Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sun, 7 Aug 2011 00:30:45 +0000
Subject: [PATCH] *Added an extra check to IsTriggeredX.

---
 src/forge/Card.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/forge/Card.java b/src/forge/Card.java
index e9e52f79ab1..83255a06907 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -279,6 +279,11 @@ public class Card extends MyObservable {
         return triggeringObjects.get(type);
     }
 
+    public boolean hasTriggeringObject(String type)
+    {
+        return triggeringObjects.containsKey(type);
+    }
+
     public void setAllTriggeringObjects(HashMap<String, Object> map)
     {
         triggeringObjects = map;
@@ -2923,6 +2928,9 @@ public class Card extends MyObservable {
              }
              else if(Property.startsWith("IsTriggered"))
              {
+                 if(!source.hasTriggeringObject(Property.substring(11)))
+                     return false;
+
                  Object TriggeredObject = source.getTriggeringObject(Property.substring(11));
                  if(!(TriggeredObject instanceof Card))
                      return false;