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

Merge branch 'gameActionCloneFix' into 'master'

Browse Source 
GameAction: fix Clone working again

See merge request core-developers/forge!2506
This commit is contained in:
Michael Kamensky
2020-02-08 17:33:00 +00:00
parent 5d1a0421fd 0f435b58a1
commit 23ab256f7d
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,11 +208,7 @@ public class GameAction {
}
if (!c.isToken()) {
boolean updateState = false;
updateState |= c.removeCloneStates();
updateState |= c.removeTextChangeStates();
if (updateState) {
if (c.removeChangedState()) {
c.updateStateForView();
}
@@ -284,7 +280,7 @@ public class GameAction {
}
// was replaced with another Zone Change
if (toBattlefield && c.isInZone(ZoneType.Battlefield)) {
if (toBattlefield && !c.isInZone(ZoneType.Battlefield)) {
if (c.removeChangedState()) {
c.updateStateForView();
}