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

added prefix to rest manager

Browse source 
added region method again
This commit is contained in:
Zack Piispanen 2012-06-23 14:40:06 -04:00
parent bdf56225b7
commit a259a02306
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
TShockAPI/DB/RegionManager.cs
View file

@ -283,6 +283,21 @@ namespace TShockAPI.DB
return regions; return regions;
} }
public List<Region> InAreaRegion(int x, int y)
{
List<Region> regions = new List<Region>() { };
foreach (Region region in Regions)
{
if (x >= region.Area.Left && x <= region.Area.Right &&
y >= region.Area.Top && y <= region.Area.Bottom &&
region.DisableBuild)
{
regions.Add(region);
}
}
return regions;
}
public static List<string> ListIDs(string MergedIDs) public static List<string> ListIDs(string MergedIDs)
{ {
return MergedIDs.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).ToList(); return MergedIDs.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).ToList();

2
TShockAPI/Rest/RestManager.cs
View file

@ -510,7 +510,7 @@ namespace TShockAPI
{"ip", player.IP}, {"ip", player.IP},
{"group", player.Group.Name}, {"group", player.Group.Name},
{"position", player.TileX + "," + player.TileY}, {"position", player.TileX + "," + player.TileY},
{"inventory", string.Join(", ", activeItems.Select(p => (p.name + ":" + p.stack)))}, {"inventory", string.Join(", ", activeItems.Select(p => (String.Format( "({0}){1}:{2}", p.prefix, p.name, p.stack))))},
{"buffs", string.Join(", ", player.TPlayer.buffType)} {"buffs", string.Join(", ", player.TPlayer.buffType)}
}; };
} }