From 841cd22ae461e084e466dac8fb6d719b7b6320bd Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Tue, 11 Sep 2018 20:41:06 -0600 Subject: [PATCH 1/2] default importing DeckSection to Main Closes: core-developers/forge#705 Signed-off-by: Jamin W. Collins --- forge-gui/src/main/java/forge/deck/DeckImportController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java index 3f162073386..217115efe5a 100644 --- a/forge-gui/src/main/java/forge/deck/DeckImportController.java +++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java @@ -72,7 +72,7 @@ public class DeckImportController { } final Deck result = new Deck(); - DeckSection deckSection = null; + DeckSection deckSection = DeckSection.Main; String section = ""; for (final DeckRecognizer.Token t : tokens) { final DeckRecognizer.TokenType type = t.getType(); From 5c723d8883e3872832b8e922f604e615d547681e Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Wed, 12 Sep 2018 07:29:03 -0600 Subject: [PATCH 2/2] log malformed card rather than throw an exception Signed-off-by: Jamin W. Collins --- .../src/main/java/forge/game/card/CardFactoryUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 685ad9f367d..28d3d15a7c8 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -3763,8 +3763,12 @@ public class CardFactoryUtil { final SpellAbility origSA = card.getFirstSpellAbility(); // append to original SA - origSA.appendSubAbility(newSA); + origSA.appendSubAbility(newSA); } else if (keyword.startsWith("Equip")) { + if (!keyword.contains(":")) { + System.err.println("Malformed Equip entry! - Card: " + card.toString()); + return; + } String[] k = keyword.split(":"); // Get cost string String equipCost = k[1];