external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

*Added an extra check to IsTriggeredX.

Browse Source
This commit is contained in:
jendave
2011-08-07 00:30:45 +00:00
parent ca454d52cd
commit 4b4714207a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/forge/Card.java
View File

@@ -279,6 +279,11 @@ public class Card extends MyObservable {
return triggeringObjects.get(type); return triggeringObjects.get(type);
} }
public boolean hasTriggeringObject(String type)
{
return triggeringObjects.containsKey(type);
}
public void setAllTriggeringObjects(HashMap<String, Object> map) public void setAllTriggeringObjects(HashMap<String, Object> map)
{ {
triggeringObjects = map; triggeringObjects = map;
@@ -2923,6 +2928,9 @@ public class Card extends MyObservable {
} }
else if(Property.startsWith("IsTriggered")) else if(Property.startsWith("IsTriggered"))
{ {
if(!source.hasTriggeringObject(Property.substring(11)))
return false;
Object TriggeredObject = source.getTriggeringObject(Property.substring(11)); Object TriggeredObject = source.getTriggeringObject(Property.substring(11));
if(!(TriggeredObject instanceof Card)) if(!(TriggeredObject instanceof Card))
return false; return false;