From e23f807e636232b8855f8568f1e23ef228705d6a Mon Sep 17 00:00:00 2001 From: Agetian Date: Sat, 17 Mar 2018 17:15:25 +0300 Subject: [PATCH] - Clean up some code ugliness and fix a meaningless "unknown key: turn" error message in GameState. --- forge-ai/src/main/java/forge/ai/GameState.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java index 050193da109..9a3712a5f51 100644 --- a/forge-ai/src/main/java/forge/ai/GameState.java +++ b/forge-ai/src/main/java/forge/ai/GameState.java @@ -82,7 +82,7 @@ public abstract class GameState { private String precastHuman = null; private String precastAI = null; - private int turn; + private int turn = 1; // Targeting for precast spells in a game state (mostly used by Puzzle Mode game states) private final int TARGET_NONE = -1; // untargeted spell (e.g. Joraga Invocation) @@ -398,10 +398,9 @@ public abstract class GameState { if (categoryName.equals("turn")) { turn = Integer.parseInt(categoryValue); - } else { - turn = 1; } - if (categoryName.endsWith("life")) { + + else if (categoryName.endsWith("life")) { if (isHuman) humanLife = Integer.parseInt(categoryValue); else