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

Merge branch 'facedown-reveal-fix' into 'master'

Browse Source 
Fixed the reveal for face-down cards leaving battlefield/stack not working anymore.

See merge request core-developers/forge!1253
This commit is contained in:
Michael Kamensky
2018-12-30 10:43:37 +00:00
parent 0eed2c67d1 1ced8bba7d
commit 215808b011
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,7 @@ public class GameAction {
boolean toBattlefield = zoneTo.is(ZoneType.Battlefield); boolean toBattlefield = zoneTo.is(ZoneType.Battlefield);
boolean fromBattlefield = zoneFrom != null && zoneFrom.is(ZoneType.Battlefield); boolean fromBattlefield = zoneFrom != null && zoneFrom.is(ZoneType.Battlefield);
boolean toHand = zoneTo.is(ZoneType.Hand); boolean toHand = zoneTo.is(ZoneType.Hand);
boolean wasFacedown = c.isFaceDown();
//Rule 110.5g: A token that has left the battlefield can't move to another zone //Rule 110.5g: A token that has left the battlefield can't move to another zone
if (c.isToken() && zoneFrom != null && !fromBattlefield && !zoneFrom.is(ZoneType.Command)) { if (c.isToken() && zoneFrom != null && !fromBattlefield && !zoneFrom.is(ZoneType.Command)) {
@@ -150,7 +151,7 @@ public class GameAction {
// Cards returned from exile face-down must be reset to their original state, otherwise // Cards returned from exile face-down must be reset to their original state, otherwise
// all sort of funky shenanigans may happen later (e.g. their ETB replacement effects are set // all sort of funky shenanigans may happen later (e.g. their ETB replacement effects are set
// up on the wrong card state etc.). // up on the wrong card state etc.).
if (c.isFaceDown() && (fromBattlefield || (toHand && zoneFrom.is(ZoneType.Exile)))) { if (wasFacedown && (fromBattlefield || (toHand && zoneFrom.is(ZoneType.Exile)))) {
c.setState(CardStateName.Original, true); c.setState(CardStateName.Original, true);
c.runFaceupCommands(); c.runFaceupCommands();
} }
@@ -435,10 +436,14 @@ public class GameAction {
} }
// rule 504.6: reveal a face-down card leaving the stack // rule 504.6: reveal a face-down card leaving the stack
if (zoneFrom != null && zoneTo != null && zoneFrom.is(ZoneType.Stack) && !zoneTo.is(ZoneType.Battlefield) && c.isFaceDown()) { if (zoneFrom != null && zoneTo != null && zoneFrom.is(ZoneType.Stack) && !zoneTo.is(ZoneType.Battlefield) && wasFacedown) {
// FIXME: tracker freeze-unfreeze is needed here to avoid a bug with the card staying face down in the View for the reveal
boolean trackerFrozen = game.getTracker().isFrozen();
game.getTracker().unfreeze();
c.setState(CardStateName.Original, true); c.setState(CardStateName.Original, true);
reveal(new CardCollection(c), c.getOwner(), true, "Face-down card moves from the stack: "); reveal(new CardCollection(c), c.getOwner(), true, "Face-down card moves from the stack: ");
c.setState(CardStateName.FaceDown, true); c.setState(CardStateName.FaceDown, true);
if (trackerFrozen) { game.getTracker().freeze(); }
} }
if (fromBattlefield) { if (fromBattlefield) {
@@ -466,10 +471,14 @@ public class GameAction {
changeZone(null, zoneTo, unmeld, position, cause, params); changeZone(null, zoneTo, unmeld, position, cause, params);
} }
// Reveal if face-down // Reveal if face-down
if (c.isFaceDown()) { if (wasFacedown) {
// FIXME: tracker freeze-unfreeze is needed here to avoid a bug with the card staying face down in the View for the reveal
boolean trackerFrozen = game.getTracker().isFrozen();
game.getTracker().unfreeze();
c.setState(CardStateName.Original, true); c.setState(CardStateName.Original, true);
reveal(new CardCollection(c), c.getOwner(), true, "Face-down card leaves the battlefield: "); reveal(new CardCollection(c), c.getOwner(), true, "Face-down card leaves the battlefield: ");
c.setState(CardStateName.FaceDown, true); c.setState(CardStateName.FaceDown, true);
if (trackerFrozen) { game.getTracker().freeze(); }
copied.setState(CardStateName.Original, true); copied.setState(CardStateName.Original, true);
} }
unattachCardLeavingBattlefield(copied); unattachCardLeavingBattlefield(copied);