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

Merge branch 'general-devel' of https://github.com/NyxStudios/TShock into general-devel

Browse source
This commit is contained in:
Patrikk 2015-07-06 19:15:32 +01:00
commit 159acf5016
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/Utils.cs
View file

@ -422,15 +422,18 @@ namespace TShockAPI
public List<int> GetBuffByName(string name) public List<int> GetBuffByName(string name)
{ {
string nameLower = name.ToLower(); string nameLower = name.ToLower();
string buffname;
for (int i = 1; i < Main.maxBuffTypes; i++) for (int i = 1; i < Main.maxBuffTypes; i++)
{ {
if (Main.buffName[i].ToLower() == nameLower) buffname = Main.buffName[i];
if (!String.IsNullOrWhiteSpace(buffname) && buffname.ToLower() == nameLower)
return new List<int> {i}; return new List<int> {i};
} }
var found = new List<int>(); var found = new List<int>();
for (int i = 1; i < Main.maxBuffTypes; i++) for (int i = 1; i < Main.maxBuffTypes; i++)
{ {
if (Main.buffName[i].ToLower().StartsWith(nameLower)) buffname = Main.buffName[i];
if (!String.IsNullOrWhiteSpace(buffname) && buffname.ToLower().StartsWith(nameLower))
found.Add(i); found.Add(i);
} }
return found; return found;

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit d0bd38b5b12a6c0cb4cc54706550e94153856ce4 Subproject commit 88e0fd4a73e944e8e0cdc3f05eb2dfc616bc8149