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

Fix dumping and restoring game state with morphed creatures.

Browse Source
This commit is contained in:
Myrd
2015-02-08 17:43:09 +00:00
parent 019a241184
commit ff18cb74c8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/GameState.java
View File

@@ -98,7 +98,7 @@ public abstract class GameState {
if (c.isToken()) { if (c.isToken()) {
newText.append("t:" + new CardFactory.TokenInfo(c).toString()); newText.append("t:" + new CardFactory.TokenInfo(c).toString());
} else { } else {
newText.append(c.getName()); newText.append(c.getPaperCard().getName());
} }
if (zoneType == ZoneType.Battlefield) { if (zoneType == ZoneType.Battlefield) {
if (c.isTapped()) { if (c.isTapped()) {
@@ -258,6 +258,7 @@ public abstract class GameState {
// by doubling season, etc). // by doubling season, etc).
c = CardFactory.makeToken(CardFactory.TokenInfo.fromString(tokenStr), player).get(0); c = CardFactory.makeToken(CardFactory.TokenInfo.fromString(tokenStr), player).get(0);
} else { } else {
System.out.println(cardinfo[0]);
c = Card.fromPaperCard(getPaperCard(cardinfo[0]), player); c = Card.fromPaperCard(getPaperCard(cardinfo[0]), player);
} }
c.setSickness(false); c.setSickness(false);

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

@@ -5662,7 +5662,7 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
public final String getMostRecentSet() { public final String getMostRecentSet() {
return StaticData.instance().getCommonCards().getCard(getName()).getEdition(); return StaticData.instance().getCommonCards().getCard(getPaperCard().getName()).getEdition();
} }
public final String getImageKey() { public final String getImageKey() {