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

Fix crash with Battalion

Browse Source
This commit is contained in:
drdev
2014-10-10 16:23:24 +00:00
parent ea5e4857af
commit f74f438765
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-game/src/main/java/forge/game/keyword/Keyword.java
View File

@@ -110,7 +110,13 @@ public enum Keyword {
for (Keyword kw : Keyword.values()) { for (Keyword kw : Keyword.values()) {
if (enumName.startsWith(kw.name())) { if (enumName.startsWith(kw.name())) {
keyword = kw; keyword = kw;
details = k.substring(kw.name().length() + 1); int idx = kw.name().length() + 1;
if (idx < k.length()) {
details = k.substring(idx);
}
else {
details = "";
}
break; break;
} }
} }
@@ -120,7 +126,14 @@ public enum Keyword {
String firstWord = idx == -1 ? enumName : enumName.substring(0, idx); String firstWord = idx == -1 ? enumName : enumName.substring(0, idx);
if (firstWord.endsWith("CYCLING")) { if (firstWord.endsWith("CYCLING")) {
//handle special case of Typecycling //handle special case of Typecycling
return new Cycling(firstWord.substring(0, firstWord.length() - 7), k.substring(firstWord.length() + 1)); idx = firstWord.length() + 1;
if (idx < k.length()) {
details = k.substring(idx);
}
else {
details = "";
}
return new Cycling(firstWord.substring(0, firstWord.length() - 7), details);
} }
else if (firstWord.endsWith("WALK")) { else if (firstWord.endsWith("WALK")) {
keyword = Keyword.LANDWALK; keyword = Keyword.LANDWALK;