themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Add null check for English name

Browse source
This commit is contained in:
ZIT WANG 2017-04-22 07:34:59 +08:00
parent 08d37eb6de
commit f47c6505ab
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Commands.cs
View file

@ -2544,7 +2544,7 @@ namespace TShockAPI
break; break;
} }
if (npc.FullName.ToLowerInvariant().StartsWith(npcStr.ToLowerInvariant()) || if (npc.FullName.ToLowerInvariant().StartsWith(npcStr.ToLowerInvariant()) ||
englishName.StartsWith(npcStr, StringComparison.InvariantCultureIgnoreCase)) englishName?.StartsWith(npcStr, StringComparison.InvariantCultureIgnoreCase) == true)
matches.Add(npc); matches.Add(npc);
} }

4
TShockAPI/Utils.cs
View file

@ -437,7 +437,7 @@ namespace TShockAPI
|| nameLower == englishName) || nameLower == englishName)
return new List<NPC> { npc }; return new List<NPC> { npc };
if (npc.FullName.ToLowerInvariant().StartsWith(nameLower) || npc.TypeName.ToLowerInvariant().StartsWith(nameLower) if (npc.FullName.ToLowerInvariant().StartsWith(nameLower) || npc.TypeName.ToLowerInvariant().StartsWith(nameLower)
|| englishName.StartsWith(nameLower)) || englishName?.StartsWith(nameLower) == true)
found.Add((NPC)npc.Clone()); found.Add((NPC)npc.Clone());
} }
return found; return found;
@ -516,7 +516,7 @@ namespace TShockAPI
string englishName = EnglishLanguage.GetPrefixById(i).ToLowerInvariant(); string englishName = EnglishLanguage.GetPrefixById(i).ToLowerInvariant();
if (prefixName == lowerName || englishName == lowerName) if (prefixName == lowerName || englishName == lowerName)
return new List<int>() { i }; return new List<int>() { i };
else if (prefixName.StartsWith(lowerName) || englishName.StartsWith(lowerName)) // Partial match else if (prefixName.StartsWith(lowerName) || englishName?.StartsWith(lowerName) == true) // Partial match
found.Add(i); found.Add(i);
} }
return found; return found;