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

Fix duplicate statement

Browse source
This commit is contained in:
ZIT WANG 2017-04-22 07:21:48 +08:00
parent 930607a142
commit 08d37eb6de
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TShockAPI/Localization/EnglishLanguage.cs
View file

@ -25,8 +25,10 @@ namespace TShockAPI.Localization
try try
{ {
if(!skip) if (!skip)
{
LanguageManager.Instance.SetLanguage(GameCulture.English); LanguageManager.Instance.SetLanguage(GameCulture.English);
}
for (var i = -48; i < Main.maxItemTypes; i++) for (var i = -48; i < Main.maxItemTypes; i++)
{ {
@ -46,8 +48,10 @@ namespace TShockAPI.Localization
} }
finally finally
{ {
if(!skip) if (!skip)
{
LanguageManager.Instance.SetLanguage(culture); LanguageManager.Instance.SetLanguage(culture);
}
} }
} }
@ -62,7 +66,7 @@ namespace TShockAPI.Localization
if (ItemNames.TryGetValue(id, out itemName)) if (ItemNames.TryGetValue(id, out itemName))
return itemName; return itemName;
return string.Empty; return null;
} }
/// <summary> /// <summary>
@ -76,7 +80,7 @@ namespace TShockAPI.Localization
if (NpcNames.TryGetValue(id, out npcName)) if (NpcNames.TryGetValue(id, out npcName))
return npcName; return npcName;
return string.Empty; return null;
} }
/// <summary> /// <summary>
@ -90,7 +94,7 @@ namespace TShockAPI.Localization
if (Prefixs.TryGetValue(id, out prefix)) if (Prefixs.TryGetValue(id, out prefix))
return prefix; return prefix;
return string.Empty; return null;
} }
} }
} }

3
TShockAPI/Utils.cs
View file

@ -358,11 +358,10 @@ namespace TShockAPI
} }
string englishName = EnglishLanguage.GetItemNameById(i).ToLowerInvariant(); string englishName = EnglishLanguage.GetItemNameById(i).ToLowerInvariant();
if (!String.IsNullOrWhiteSpace(englishName)) if (!String.IsNullOrEmpty(englishName))
{ {
if (englishName == nameLower) if (englishName == nameLower)
return new List<Item> { item }; return new List<Item> { item };
return new List<Item> { item };
if (englishName.StartsWith(nameLower)) if (englishName.StartsWith(nameLower))
found.Add(item.Clone()); found.Add(item.Clone());
} }