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

Moved fireevent on changekeywords

Browse Source
This commit is contained in:
Anthony Calosa
2019-09-27 20:00:24 +08:00
parent 3ae7887cb8
commit 77d6bde4e5
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
View File

@@ -7,7 +7,6 @@ import forge.game.Game;
import forge.game.ability.SpellAbilityEffect; import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.card.CardUtil; import forge.game.card.CardUtil;
import forge.game.event.GameEventTokenStateUpdate;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.spellability.TargetRestrictions; import forge.game.spellability.TargetRestrictions;
@@ -152,8 +151,6 @@ public class ProtectEffect extends SpellAbilityEffect {
} }
tgtC.addChangedCardKeywords(gainsKWList, null, false, false, timestamp, true); tgtC.addChangedCardKeywords(gainsKWList, null, false, false, timestamp, true);
if (tgtC.isToken()) // update protection -> cast blessed breath on any token belonging to a stack
game.fireEvent(new GameEventTokenStateUpdate(tgtC));
if (!sa.hasParam("Permanent")) { if (!sa.hasParam("Permanent")) {
// If not Permanent, remove protection at EOT // If not Permanent, remove protection at EOT
@@ -164,8 +161,6 @@ public class ProtectEffect extends SpellAbilityEffect {
public void run() { public void run() {
if (tgtC.isInPlay()) { if (tgtC.isInPlay()) {
tgtC.removeChangedCardKeywords(timestamp, true); tgtC.removeChangedCardKeywords(timestamp, true);
if (tgtC.isToken()) // update remove protection
game.fireEvent(new GameEventTokenStateUpdate(tgtC));
} }
} }
}; };
@@ -194,8 +189,6 @@ public class ProtectEffect extends SpellAbilityEffect {
public void run() { public void run() {
if (unTgtC.isInPlay()) { if (unTgtC.isInPlay()) {
unTgtC.removeChangedCardKeywords(timestamp, true); unTgtC.removeChangedCardKeywords(timestamp, true);
if (unTgtC.isToken()) // update removed protection
game.fireEvent(new GameEventTokenStateUpdate(unTgtC));
} }
} }
}; };

4
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -3659,6 +3659,8 @@ public class Card extends GameEntity implements Comparable<Card> {
if (updateView) { if (updateView) {
updateKeywords(); updateKeywords();
if (isToken())
game.fireEvent(new GameEventTokenStateUpdate(this));
} }
} }
@@ -3713,6 +3715,8 @@ public class Card extends GameEntity implements Comparable<Card> {
KeywordsChange change = changedCardKeywords.remove(timestamp); KeywordsChange change = changedCardKeywords.remove(timestamp);
if (change != null && updateView) { if (change != null && updateView) {
updateKeywords(); updateKeywords();
if (isToken())
game.fireEvent(new GameEventTokenStateUpdate(this));
} }
return change; return change;
} }