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

*Added Torpor Orb.

Browse Source 
*Triggered Abilities no longer trigger AbilityCast.
This commit is contained in:
Hellfish
2011-08-23 20:45:16 +00:00
parent d2f48dfa98
commit 8d29f7b3ce
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/MagicStack.java
View File

@@ -535,7 +535,7 @@ public class MagicStack extends MyObservable {
}
//Run AbilityCast triggers
if (sp.isAbility()) {
if (sp.isAbility() && !sp.isTrigger()) {
AllZone.getTriggerHandler().runTrigger("AbilityCast", runParams);
}

17
src/main/java/forge/card/trigger/TriggerHandler.java
View File

@@ -336,7 +336,22 @@ public class TriggerHandler {
{
return false; //Test failed.
}
//Torpor Orb check
CardList torporOrbs = AllZoneUtil.getCardsInPlay("Torpor Orb");
if(torporOrbs.size() != 0 && mode.equals("ChangesZone") && regtrig.getMapParams().get("ValidCard").contains("Creature"))
{
return false;
}
if(torporOrbs.size() != 0 && regtrig.getMapParams().containsKey("Destination"))
{
if(!regtrig.getMapParams().get("Destination").equals("Battlefield"))
{
return false;
}
}
HashMap<String, String> trigParams = regtrig.getMapParams();
final Player[] decider = new Player[1];