From 08d37eb6de5d378206d86d7f7934730a2e5bed79 Mon Sep 17 00:00:00 2001
From: ZIT WANG <mymisting@gmail.com>
Date: Sat, 22 Apr 2017 07:21:48 +0800
Subject: [PATCH] Fix duplicate statement

---
 TShockAPI/Localization/EnglishLanguage.cs | 14 +++++++++-----
 TShockAPI/Utils.cs                        |  3 +--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/TShockAPI/Localization/EnglishLanguage.cs b/TShockAPI/Localization/EnglishLanguage.cs
index 29bdd813..11852e36 100644
--- a/TShockAPI/Localization/EnglishLanguage.cs
+++ b/TShockAPI/Localization/EnglishLanguage.cs
@@ -25,8 +25,10 @@ namespace TShockAPI.Localization
 
 			try
 			{
-				if(!skip)
+				if (!skip)
+				{
 					LanguageManager.Instance.SetLanguage(GameCulture.English);
+				}
 
 				for (var i = -48; i < Main.maxItemTypes; i++)
 				{
@@ -46,8 +48,10 @@ namespace TShockAPI.Localization
 			}
 			finally
 			{
-				if(!skip)
+				if (!skip)
+				{
 					LanguageManager.Instance.SetLanguage(culture);
+				}
 			}
 		}
 
@@ -62,7 +66,7 @@ namespace TShockAPI.Localization
 			if (ItemNames.TryGetValue(id, out itemName))
 				return itemName;
 
-			return string.Empty;
+			return null;
 		}
 
 		/// <summary>
@@ -76,7 +80,7 @@ namespace TShockAPI.Localization
 			if (NpcNames.TryGetValue(id, out npcName))
 				return npcName;
 
-			return string.Empty;
+			return null;
 		}
 
 		/// <summary>
@@ -90,7 +94,7 @@ namespace TShockAPI.Localization
 			if (Prefixs.TryGetValue(id, out prefix))
 				return prefix;
 
-			return string.Empty;
+			return null;
 		}
 	}
 }
diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index 60d31293..9edafff7 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -358,11 +358,10 @@ namespace TShockAPI
 				}
 
 				string englishName = EnglishLanguage.GetItemNameById(i).ToLowerInvariant();
-				if (!String.IsNullOrWhiteSpace(englishName))
+				if (!String.IsNullOrEmpty(englishName))
 				{
 					if (englishName == nameLower)
 						return new List<Item> { item };
-						return new List<Item> { item };
 					if (englishName.StartsWith(nameLower))
 						found.Add(item.Clone());
 				}