mmo-ref/stendhal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backport fix for: greater potions request gets substituted with potions - ID: 3285554

Browse source
This commit is contained in:
Katie Russell 2011-04-13 19:17:35 +00:00
parent a1dc3b80bc
commit d6a5afb5e5
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/games/stendhal/server/entity/npc/parser/NameSearch.java
View file

@ -49,18 +49,31 @@ public final class NameSearch {
boolean found = false;
final String itemName = item.getNormalized();
for(Map.Entry<String, Sentence> e : parsedNames.entrySet()) {
Sentence parsed = e.getValue();
if (itemName.endsWith(parsed.getOriginalText()) ||
itemName.endsWith(parsed.getNormalized()) ||
parsed.matchesNormalized(itemName)) {
if (parsed.matchesNormalized(itemName)) {
name = e.getKey();
found = true;
break;
}
}
if (!found) {
// see if instead the end matches, this is deliberately done afterwards because of bug #3285554
for(Map.Entry<String, Sentence> e : parsedNames.entrySet()) {
Sentence parsed = e.getValue();
if (itemName.endsWith(parsed.getOriginalText()) ||
itemName.endsWith(parsed.getNormalized())) {
name = e.getKey();
found = true;
break;
}
}
}
if (!found) {
// see if instead the plural matches
final String pluralName = Grammar.plural(itemName);