From 56d79f36dc2d4db0481c7d8bac112c65c70d1cac Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 30 Jul 2017 11:14:32 +0000 Subject: [PATCH] - Fixed a crash when loading a game state with a misspelled card name (will now report the card name in the console instead of hard-crashing). --- forge-ai/src/main/java/forge/ai/GameState.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java index 674499e864d..626fb62eec6 100644 --- a/forge-ai/src/main/java/forge/ai/GameState.java +++ b/forge-ai/src/main/java/forge/ai/GameState.java @@ -510,6 +510,11 @@ public abstract class GameState { c = CardFactory.makeOneToken(CardFactory.TokenInfo.fromString(tokenStr), player); } else { PaperCard pc = StaticData.instance().getCommonCards().getCard(cardinfo[0], setCode); + if (pc == null) { + System.err.println("ERROR: Tried to create a non-existent card named " + cardinfo[0] + " (set: " + (setCode == null ? "any" : setCode) + ") when loading game state!"); + continue; + } + c = Card.fromPaperCard(pc, player); if (setCode != null) { hasSetCurSet = true;