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

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

Browse source
This commit is contained in:
darkunderdog 2011-12-30 20:35:11 -06:00
commit f6ba0bde4b
2 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/GetDataHandlers.cs
View file

@ -53,13 +53,13 @@ namespace TShockAPI
#region Events #region Events
public class TileEditEventArgs : HandledEventArgs public class TileEditEventArgs : HandledEventArgs
{ {
public float X { get; set; } public int X { get; set; }
public float Y { get; set; } public int Y { get; set; }
public float Type { get; set; } public int Type { get; set; }
public float EditType { get; set; } public byte EditType { get; set; }
} }
public static HandlerList<TileEditEventArgs> TileEdit = new HandlerList<TileEditEventArgs>(); public static HandlerList<TileEditEventArgs> TileEdit = new HandlerList<TileEditEventArgs>();
public static bool OnTileEdit(float x, float y, float type, float editType) public static bool OnTileEdit(int x, int y, int type, byte editType)
{ {
var args = new TileEditEventArgs var args = new TileEditEventArgs
{ {

28
TShockAPI/Rest/RestManager.cs
View file

@ -25,13 +25,13 @@ namespace TShockAPI
Rest.Register(new RestCommand("/users/read/{user}/info", UserInfo) {RequiresToken = true}); Rest.Register(new RestCommand("/users/read/{user}/info", UserInfo) {RequiresToken = true});
Rest.Register(new RestCommand("/users/destroy/{user}", UserDestroy) {RequiresToken = true}); Rest.Register(new RestCommand("/users/destroy/{user}", UserDestroy) {RequiresToken = true});
Rest.Register(new RestCommand("/users/update/{user}", UserUpdate) {RequiresToken = true}); Rest.Register(new RestCommand("/users/update/{user}", UserUpdate) {RequiresToken = true});
Rest.Register(new RestCommand("/users/activelist", UserList) {RequiresToken = true});
Rest.Register(new RestCommand("/bans/create", BanCreate) {RequiresToken = true}); Rest.Register(new RestCommand("/bans/create", BanCreate) {RequiresToken = true});
Rest.Register(new RestCommand("/bans/read/{user}/info", BanInfo) {RequiresToken = true}); Rest.Register(new RestCommand("/bans/read/{user}/info", BanInfo) {RequiresToken = true});
Rest.Register(new RestCommand("/bans/destroy/{user}", BanDestroy) {RequiresToken = true}); Rest.Register(new RestCommand("/bans/destroy/{user}", BanDestroy) {RequiresToken = true});
Rest.Register(new RestCommand("/lists/players", UserList) {RequiresToken = true}); Rest.Register(new RestCommand("/lists/players", PlayerList) {RequiresToken = true});
Rest.Register(new RestCommand("/world/read", WorldRead) {RequiresToken = true}); Rest.Register(new RestCommand("/world/read", WorldRead) {RequiresToken = true});
Rest.Register(new RestCommand("/world/meteor", WorldMeteor) {RequiresToken = true}); Rest.Register(new RestCommand("/world/meteor", WorldMeteor) {RequiresToken = true});
@ -74,10 +74,19 @@ namespace TShockAPI
private object UserList(RestVerbs verbs, IParameterCollection parameters) private object UserList(RestVerbs verbs, IParameterCollection parameters)
{ {
var activeplayers = Main.player.Where(p => p != null && p.active).ToList();
string currentPlayers = string.Join(", ", activeplayers.Select(p => p.name));
var ret = new RestObject("200"); var ret = new RestObject("200");
ret["players"] = currentPlayers; string playerlist = "";
foreach (var TSPlayer in TShock.Players)
{
if (playerlist == "")
{
playerlist += TSPlayer.UserAccountName;
} else
{
playerlist += ", " + TSPlayer.UserAccountName;
}
}
ret["activeuesrs"] = playerlist;
return ret; return ret;
} }
@ -329,6 +338,15 @@ namespace TShockAPI
#region RestPlayerMethods #region RestPlayerMethods
private object PlayerList(RestVerbs verbs, IParameterCollection parameters)
{
var activeplayers = Main.player.Where(p => p != null && p.active).ToList();
string currentPlayers = string.Join(", ", activeplayers.Select(p => p.name));
var ret = new RestObject("200");
ret["players"] = currentPlayers;
return ret;
}
private object PlayerRead(RestVerbs verbs, IParameterCollection parameters) private object PlayerRead(RestVerbs verbs, IParameterCollection parameters)
{ {
var returnBlock = new Dictionary<string, object>(); var returnBlock = new Dictionary<string, object>();