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

- Fix the triggered abilities still visually appearing when suppressed (e.g. with Humility).

Browse Source
This commit is contained in:
Agetian
2015-02-14 11:21:04 +00:00
parent 25da751464
commit c256b29ce6
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
View File

@@ -610,6 +610,8 @@ public final class StaticAbilityContinuous {
if (controllerMayPlay) { if (controllerMayPlay) {
affectedCard.setMayPlay(controller, mayPlayWithoutManaCost, mayPlayIgnoreColor); affectedCard.setMayPlay(controller, mayPlayWithoutManaCost, mayPlayIgnoreColor);
} }
affectedCard.updateStateForView();
} }
return affectedCards; return affectedCards;

14
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -60,20 +60,32 @@ public class TriggerHandler {
game.forEachCardInGame(new Visitor<Card>() { game.forEachCardInGame(new Visitor<Card>() {
@Override @Override
public void visit(Card c) { public void visit(Card c) {
boolean changed = false;
for (int i = 0; i < c.getTriggers().size(); i++) { for (int i = 0; i < c.getTriggers().size(); i++) {
Trigger trigger = c.getTriggers().get(i); Trigger trigger = c.getTriggers().get(i);
if (trigger.isTemporary()) { if (trigger.isTemporary()) {
c.removeTrigger(trigger); c.removeTrigger(trigger);
changed = true;
i--; i--;
} }
} }
if (changed) {
c.updateStateForView();
}
} }
}); });
game.forEachCardInGame(new Visitor<Card>() { game.forEachCardInGame(new Visitor<Card>() {
@Override @Override
public void visit(Card c) { public void visit(Card c) {
boolean changed = false;
for (int i = 0; i < c.getTriggers().size(); i++) { for (int i = 0; i < c.getTriggers().size(); i++) {
c.getTriggers().get(i).setTemporarilySuppressed(false); if (c.getTriggers().get(i).isSuppressed()) {
c.getTriggers().get(i).setTemporarilySuppressed(false);
changed = true;
}
}
if (changed) {
c.updateStateForView();
} }
} }
}); });