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

Reapplied my region changes that were lost from a bad conflict merge

Browse source
This commit is contained in:
high 2011-07-24 11:27:00 -04:00
parent 57a2d082ef
commit d39d9e5127
3 changed files with 127 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Commands.cs
View file

@ -1465,10 +1465,10 @@ namespace TShockAPI
{
foreach (Region r in TShock.Regions.Regions)
{
args.Player.SendMessage(r.RegionName + ": P: " + r.DisableBuild + " X: " + r.RegionArea.X + " Y: " + r.RegionArea.Y + " W: " + r.RegionArea.Width + " H: " + r.RegionArea.Height);
foreach (int s in r.RegionAllowedIDs)
args.Player.SendMessage(r.Name + ": P: " + r.DisableBuild + " X: " + r.Area.X + " Y: " + r.Area.Y + " W: " + r.Area.Width + " H: " + r.Area.Height);
foreach (int s in r.AllowedIDs)
{
args.Player.SendMessage(r.RegionName + ": " + s);
args.Player.SendMessage(r.Name + ": " + s);
}
}
}
@ -1666,7 +1666,7 @@ namespace TShockAPI
var nameslist = new List<string>();
for (int i = 0; i < pagelimit && i + (page * pagelimit) < regions.Count; i++)
{
nameslist.Add(regions[i].RegionName);
nameslist.Add(regions[i].Name);
}
//convert the list to an array for joining