From f47c6505ab8cc956c89be83915818e40ad3b6115 Mon Sep 17 00:00:00 2001
From: ZIT WANG <mymisting@gmail.com>
Date: Sat, 22 Apr 2017 07:34:59 +0800
Subject: [PATCH] Add null check for English name

---
 TShockAPI/Commands.cs | 2 +-
 TShockAPI/Utils.cs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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> { 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<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);
 			}
 			return found;