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

Fix Utils.GetByName add duplicate candidate for same target i18n

Browse source
This commit is contained in:
SGKoishi 2022-11-27 22:30:40 -08:00
parent 106f735559
commit b57d02094f
No known key found for this signature in database
GPG key ID: 8FFC399070653828
1 changed files with 56 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

64
TShockAPI/Utils.cs
View file

@ -290,9 +290,15 @@ namespace TShockAPI
if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase))
return new List<Item> { GetItemById(i) }; return new List<Item> { GetItemById(i) };
if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase))
{
startswith.Add(i); startswith.Add(i);
else if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase)) continue;
}
if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase))
{
contains.Add(i); contains.Add(i);
continue;
}
} }
currentName = EnglishLanguage.GetItemNameById(i); currentName = EnglishLanguage.GetItemNameById(i);
if (!string.IsNullOrEmpty(currentName)) if (!string.IsNullOrEmpty(currentName))
@ -300,9 +306,15 @@ namespace TShockAPI
if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase))
return new List<Item> { GetItemById(i) }; return new List<Item> { GetItemById(i) };
if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase))
{
startswith.Add(i); startswith.Add(i);
else if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase)) continue;
}
if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase))
{
contains.Add(i); contains.Add(i);
continue;
}
} }
} }
@ -377,9 +389,15 @@ namespace TShockAPI
if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase))
return new List<NPC> { GetNPCById(i) }; return new List<NPC> { GetNPCById(i) };
if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase))
{
startswith.Add(i); startswith.Add(i);
else if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase)) continue;
}
if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase))
{
contains.Add(i); contains.Add(i);
continue;
}
} }
currentName = EnglishLanguage.GetNpcNameById(i); currentName = EnglishLanguage.GetNpcNameById(i);
if (!string.IsNullOrEmpty(currentName)) if (!string.IsNullOrEmpty(currentName))
@ -387,9 +405,15 @@ namespace TShockAPI
if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase))
return new List<NPC> { GetNPCById(i) }; return new List<NPC> { GetNPCById(i) };
if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase))
{
startswith.Add(i); startswith.Add(i);
else if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase)) continue;
}
if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase))
{
contains.Add(i); contains.Add(i);
continue;
}
} }
} }
@ -435,9 +459,15 @@ namespace TShockAPI
if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase))
return new List<int> { i }; return new List<int> { i };
if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase))
{
startswith.Add(i); startswith.Add(i);
else if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase)) continue;
}
if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase))
{
contains.Add(i); contains.Add(i);
continue;
}
} }
currentName = EnglishLanguage.GetBuffNameById(i); currentName = EnglishLanguage.GetBuffNameById(i);
if (!string.IsNullOrWhiteSpace(currentName)) if (!string.IsNullOrWhiteSpace(currentName))
@ -445,9 +475,15 @@ namespace TShockAPI
if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase))
return new List<int> { i }; return new List<int> { i };
if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase))
{
startswith.Add(i); startswith.Add(i);
else if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase)) continue;
}
if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase))
{
contains.Add(i); contains.Add(i);
continue;
}
} }
} }
@ -483,9 +519,15 @@ namespace TShockAPI
if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase))
return new List<int> { i }; return new List<int> { i };
if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase))
{
startswith.Add(i); startswith.Add(i);
else if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase)) continue;
}
if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase))
{
contains.Add(i); contains.Add(i);
continue;
}
} }
currentName = EnglishLanguage.GetPrefixById(i); currentName = EnglishLanguage.GetPrefixById(i);
if (!string.IsNullOrWhiteSpace(currentName)) if (!string.IsNullOrWhiteSpace(currentName))
@ -493,9 +535,15 @@ namespace TShockAPI
if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.Equals(name, StringComparison.InvariantCultureIgnoreCase))
return new List<int> { i }; return new List<int> { i };
if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase)) if (currentName.StartsWith(name, StringComparison.InvariantCultureIgnoreCase))
{
startswith.Add(i); startswith.Add(i);
else if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase)) continue;
}
if (currentName.Contains(name, StringComparison.InvariantCultureIgnoreCase))
{
contains.Add(i); contains.Add(i);
continue;
}
} }
} }