diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index cd02ebc7..df98776e 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -2544,7 +2544,7 @@ namespace TShockAPI break; } if (npc.FullName.ToLowerInvariant().StartsWith(npcStr.ToLowerInvariant()) || - englishName.StartsWith(npcStr, StringComparison.InvariantCultureIgnoreCase)) + englishName?.StartsWith(npcStr, StringComparison.InvariantCultureIgnoreCase) == true) matches.Add(npc); } diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index 9edafff7..1ae0c3b5 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -437,7 +437,7 @@ namespace TShockAPI || nameLower == englishName) return new List { npc }; if (npc.FullName.ToLowerInvariant().StartsWith(nameLower) || npc.TypeName.ToLowerInvariant().StartsWith(nameLower) - || englishName.StartsWith(nameLower)) + || englishName?.StartsWith(nameLower) == true) found.Add((NPC)npc.Clone()); } return found; @@ -516,7 +516,7 @@ namespace TShockAPI string englishName = EnglishLanguage.GetPrefixById(i).ToLowerInvariant(); if (prefixName == lowerName || englishName == lowerName) return new List() { 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); } return found;