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

Fixed filtering based on names with removing special characters

Browse Source
This commit is contained in:
marcin.sciesinski
2019-10-02 17:19:42 -07:00
parent 6b2ad74437
commit fcdd464008
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
View File

@@ -211,7 +211,7 @@ public class SortAndFilterCards {
List<String> result = new LinkedList<String>();
for (String filterParam : filterParams) {
if (filterParam.startsWith("name:"))
result.add(filterParam.substring("name:".length()));
result.add(replaceSpecialCharacters(filterParam.substring("name:".length()).toLowerCase()));
}
return result;
}
@@ -242,12 +242,19 @@ public class SortAndFilterCards {
private boolean containsAllWords(LotroCardBlueprint blueprint, List<String> words) {
for (String word : words) {
if (blueprint == null || !GameUtils.getFullName(blueprint).toLowerCase().contains(word.toLowerCase()))
if (blueprint == null || !replaceSpecialCharacters(GameUtils.getFullName(blueprint).toLowerCase()).contains(word))
return false;
}
return true;
}
private String replaceSpecialCharacters(String text) {
return text
.replace('é', 'e')
.replace('ú', 'u')
.replace('ë', 'e');
}
private <T extends Enum> Set<T> getEnumFilter(T[] enumValues, Class<T> enumType, String prefix, Set<T> defaultResult, String[] filterParams) {
for (String filterParam : filterParams) {
if (filterParam.startsWith(prefix + ":")) {