Skip to content

Keep melded permanents intact across a snapshot #11421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Agetian merged 1 commit into from
Jul 29, 2026
Merged

Keep melded permanents intact across a snapshot #11421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions forge-game/src/main/java/forge/game/GameSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,10 @@ public void copyGameState(Game fromGame, Game toGame) {
newAttachedTo.addAttachedCard(newCard);
}
}
// Melded or not, the front half has to point at what the snapshot had — the two
// halves are one permanent, and a stale link outlives the meld otherwise.
newCard.setMeldedWith(fromCard.getMeldedWith() == null ? null
: toGame.findById(fromCard.getMeldedWith().getId()));
if (fromCard.getCloneOrigin() != null) {
newCard.setCloneOrigin(toGame.findById(fromCard.getCloneOrigin().getId()));
}
Expand Down Expand Up @@ -377,7 +381,20 @@ private void setCardInCopiedGame(Game toGame, Player toPlayer, Card fromCard, Ca
if (fromType.equals(ZoneType.Stack)) {
toGame.getStackZone().add(newCard);
newCard.setZone(toGame.getStackZone());
} else if (isMelded(fromCard)) {
// The back half of a meld lives in the battlefield zone but in its own
// collection rather than the card list. Putting it in the list instead would
// leave it on the battlefield as a permanent of its own.
PlayerZoneBattlefield battlefield = (PlayerZoneBattlefield) toPlayer.getZone(ZoneType.Battlefield);
if (newCard.getZone() == null) {
newCard.setZone(battlefield);
}
battlefield.addToMelded(newCard);
} else {
// It may have been melded in the state we are leaving behind.
if (toPlayer.getZone(ZoneType.Battlefield) instanceof PlayerZoneBattlefield battlefield) {
battlefield.removeFromMelded(newCard);
}
toPlayer.getZone(fromType).add(newCard);
newCard.setZone(toPlayer.getZone(fromType));
}
Expand All @@ -391,9 +408,16 @@ private void setCardInCopiedGame(Game toGame, Player toPlayer, Card fromCard, Ca
newCard.setSickness(fromCard.hasSickness());
//newCard.setForetold(fromCard.isForetold());
//newCard.setForetoldCostByEffect(fromCard.isForetoldCostByEffect());
newCard.setBackSide(fromCard.isBackSide());
newCard.setState(fromCard.getCurrentStateName(), false);
}

/** The back half of a meld: on the battlefield, but held apart from its card list. */
private static boolean isMelded(Card c) {
return c.getZone() instanceof PlayerZoneBattlefield battlefield
&& battlefield.getMeldedCards().contains(c);
}

private static SpellAbility findSAInCard(SpellAbility sa, Card c) {
String saDesc = sa.getDescription();
for (SpellAbility cardSa : c.getAllSpellAbilities()) {
Expand Down
Loading