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

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

Browse source 
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
high 2011-09-03 14:55:21 -04:00
commit 78fa7ab42f
13 changed files with 585 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/DB/RegionManager.cs
View file

@ -262,7 +262,7 @@ namespace TShockAPI.DB
public bool AddRegion(int tx, int ty, int width, int height, string regionname, string worldid)
{
if (TShock.Regions.GetRegionByName(regionname) != null)
if (GetRegionByName(regionname) != null)
{
return false;
}
@ -452,6 +452,16 @@ namespace TShockAPI.DB
{
return Regions.FirstOrDefault(r => r.Name.Equals(name) && r.WorldID == Main.worldID.ToString());
}
public Region ZacksGetRegionByName(String name)
{
foreach (Region r in Regions)
{
if (r.Name.Equals(name))
return r;
}
return null;
}
}
public class Region