ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing card importer not handling card lines without a "1x" or "x1" on them, which was most site and the RB/Ring

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2023-01-02 10:12:43 -06:00
parent 48668918ce
commit 5842fd34a5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/ImportCards.java
View File

@@ -2,6 +2,7 @@ package com.gempukku.lotro.game;
import com.gempukku.lotro.common.*; import com.gempukku.lotro.common.*;
import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.GameUtils;
import com.google.common.base.Strings;
import java.util.*; import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -86,10 +87,10 @@ public class ImportCards {
var matches = cardLinePattern.matcher(line); var matches = cardLinePattern.matcher(line);
if(matches.matches()) { if(matches.matches()) {
if(!matches.group(1).isBlank()) { if(!Strings.isNullOrEmpty(matches.group(1))) {
quantity = Integer.parseInt(matches.group(1).replaceAll("\\D+", "")); quantity = Integer.parseInt(matches.group(1).replaceAll("\\D+", ""));
} }
else if(!matches.group(3).isBlank()) { else if(!Strings.isNullOrEmpty(matches.group(3))) {
quantity = Integer.parseInt(matches.group(3).replaceAll("\\D+", "")); quantity = Integer.parseInt(matches.group(3).replaceAll("\\D+", ""));
} }
else { else {
@@ -100,7 +101,7 @@ public class ImportCards {
result.add(new CardCount(SortAndFilterCards.replaceSpecialCharacters(cardLine).trim(), quantity)); result.add(new CardCount(SortAndFilterCards.replaceSpecialCharacters(cardLine).trim(), quantity));
} }
} catch (Exception exp) { } catch (Exception exp) {
// Ignore the card System.out.println("blah");
} }
} }
return result; return result;