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

CardView: updateStateForView on GameAction changeZone

Browse Source
This commit is contained in:
Hanmac
2019-08-03 10:39:15 +02:00
parent 773f2b280f
commit e5b9c313b4
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -376,6 +376,9 @@ public class GameAction {
copied.clearEtbCounters(); copied.clearEtbCounters();
} }
// update state for view
copied.updateStateForView();
if (fromBattlefield) { if (fromBattlefield) {
c.setDamage(0); //clear damage after a card leaves the battlefield c.setDamage(0); //clear damage after a card leaves the battlefield
c.setHasBeenDealtDeathtouchDamage(false); c.setHasBeenDealtDeathtouchDamage(false);

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

@@ -539,8 +539,7 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
public final void updatePowerToughnessForView() { public final void updatePowerToughnessForView() {
currentState.getView().updatePower(this); view.updateCounters(this);
currentState.getView().updateToughness(this);
} }
public final void updateTypesForView() { public final void updateTypesForView() {

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

@@ -659,6 +659,8 @@ public class CardView extends GameEntityView {
if (c.getGame() != null) { if (c.getGame() != null) {
currentStateView.updateColors(currentState); currentStateView.updateColors(currentState);
} }
} else {
currentStateView.updateLoyalty(currentState);
} }
currentState.getView().updateKeywords(c, currentState); //update keywords even if state doesn't change currentState.getView().updateKeywords(c, currentState); //update keywords even if state doesn't change
@@ -685,6 +687,8 @@ public class CardView extends GameEntityView {
if (c.getGame() != null) { if (c.getGame() != null) {
alternateStateView.updateColors(alternateState); alternateStateView.updateColors(alternateState);
} }
} else {
alternateStateView.updateLoyalty(alternateState);
} }
alternateState.getView().updateKeywords(c, alternateState); alternateState.getView().updateKeywords(c, alternateState);
} }