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

Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

Browse Source
This commit is contained in:
Agetian
2018-10-19 07:19:07 +03:00
parent c2290d5002 02beb9fd3d
commit dc1cb92eb6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui/src/main/java/forge/deck/DeckImportController.java
View File

@@ -78,6 +78,9 @@ public class DeckImportController {
final DeckRecognizer.TokenType type = t.getType(); final DeckRecognizer.TokenType type = t.getType();
if (type == DeckRecognizer.TokenType.SectionName) { if (type == DeckRecognizer.TokenType.SectionName) {
section = t.getText().toLowerCase(); section = t.getText().toLowerCase();
if (section.startsWith("//")) {
continue;
}
// can't use wildcards in switch/case, so if/else it is // can't use wildcards in switch/case, so if/else it is
if (section.startsWith("main")) { if (section.startsWith("main")) {
deckSection = DeckSection.Main; deckSection = DeckSection.Main;
@@ -101,7 +104,7 @@ public class DeckImportController {
deckSection = DeckSection.Conspiracy; deckSection = DeckSection.Conspiracy;
} }
else { else {
throw new NotImplementedException("Unexpected section: %s", t.getText()); throw new NotImplementedException("Unexpected section: " + t.getText());
} }
} }
if (type != DeckRecognizer.TokenType.KnownCard) { if (type != DeckRecognizer.TokenType.KnownCard) {