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

Fix MultiwordType parsing

Browse Source
This commit is contained in:
tool4EvEr
2023-10-06 23:23:27 +02:00
parent f66e08cd5b
commit 01f7c4aa5e
6 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
forge-core/src/main/java/forge/card/CardType.java
View File

@@ -753,20 +753,18 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
final CardType result = new CardType(incomplete);
int iTypeStart = 0;
int iSpace = typeText.indexOf(space);
boolean hasMoreTypes = typeText.length() > 0;
int max = typeText.length();
boolean hasMoreTypes = max > 0;
while (hasMoreTypes) {
final String type = typeText.substring(iTypeStart, iSpace == -1 ? typeText.length() : iSpace);
hasMoreTypes = iSpace != -1;
final String rest = typeText.substring(iTypeStart);
if (isMultiwordType(rest)) {
result.add(rest);
break;
String type = getMultiwordType(rest);
if (type == null) {
int iSpace = typeText.indexOf(space, iTypeStart);
type = typeText.substring(iTypeStart, iSpace == -1 ? max : iSpace);
}
iTypeStart = iSpace + 1;
result.add(type);
iSpace = typeText.indexOf(space, iSpace + 1);
iTypeStart += type.length() + 1;
hasMoreTypes = iTypeStart < max;
}
return result;
}
@@ -782,8 +780,13 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
return result;
}
private static boolean isMultiwordType(final String type) {
return Constant.MultiwordTypes.contains(type);
private static String getMultiwordType(final String type) {
for (String multi : Constant.MultiwordTypes) {
if (type.startsWith(multi)) {
return multi;
}
}
return null;
}
public static class Constant {