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

- Added the option temporarilySuppressed to the trigger class (suppressed can now be used without it being reset all the time).

Browse Source
This commit is contained in:
Sloth
2011-09-08 10:28:55 +00:00
parent ab8ec0d4d2
commit 48d045cd51
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java
View File

@@ -246,7 +246,7 @@ public class StaticAbility_Continuous {
if (params.containsKey("RemoveTriggers") || params.containsKey("RemoveAllAbilities")) { if (params.containsKey("RemoveTriggers") || params.containsKey("RemoveAllAbilities")) {
ArrayList<Trigger> triggers = affectedCard.getTriggers(); ArrayList<Trigger> triggers = affectedCard.getTriggers();
for (Trigger trigger : triggers) { for (Trigger trigger : triggers) {
trigger.setSuppressed(true); trigger.setTemporarilySuppressed(true);
} }
} }
//affectedCard.updateObservers(); //affectedCard.updateObservers();

9
src/main/java/forge/card/trigger/Trigger.java
View File

@@ -525,12 +525,17 @@ public abstract class Trigger {
} }
protected boolean suppressed = false; protected boolean suppressed = false;
protected boolean temporarilySuppressed = false;
public void setSuppressed(boolean supp) { /*public void setSuppressed(boolean supp) {
suppressed = supp; suppressed = supp;
}*/
public void setTemporarilySuppressed(boolean supp) {
temporarilySuppressed = supp;
} }
public boolean isSuppressed() { public boolean isSuppressed() {
return suppressed; return (suppressed || temporarilySuppressed);
} }
} }

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

@@ -261,7 +261,7 @@ public class TriggerHandler {
} }
} }
for (int i = 0; i < registeredTriggers.size(); i++) { for (int i = 0; i < registeredTriggers.size(); i++) {
registeredTriggers.get(i).setSuppressed(false); registeredTriggers.get(i).setTemporarilySuppressed(false);
} }
} }