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

Notify user if command failed

Browse source 
Fixed /heal not working from server console (cant heal self from console now)
/playing from console now outputs the same as the overridden playing
Using args.Player or args.TPlayer in commands instead of Index
This commit is contained in:
ricky 2011-06-16 12:09:50 +10:00
parent efc5ed5fcf
commit 15924c543e
3 changed files with 57 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

54
TShockAPI/Commands.cs
View file

@ -44,11 +44,6 @@ namespace TShockAPI
get { return Player.TPlayer; } get { return Player.TPlayer; }
} }
public int PlayerID
{
get { return Player.Index; }
}
public CommandArgs(string message, TSPlayer ply, List<string> args) public CommandArgs(string message, TSPlayer ply, List<string> args)
{ {
Message = message; Message = message;
@ -80,6 +75,7 @@ namespace TShockAPI
} }
catch (Exception e) catch (Exception e)
{ {
ply.SendMessage("Command failed, check logs for more details.");
Log.Error(e.ToString()); Log.Error(e.ToString());
} }
@ -544,17 +540,15 @@ namespace TShockAPI
private static void Home(CommandArgs args) private static void Home(CommandArgs args)
{ {
int ply = args.PlayerID; TShock.Teleport(args.Player.Index, args.TPlayer.SpawnX * 16 + 8 - args.TPlayer.width / 2,
TShock.Teleport(ply, Main.player[args.PlayerID].SpawnX * 16 + 8 - Main.player[ply].width / 2, args.TPlayer.SpawnY * 16 - args.TPlayer.height);
Main.player[args.PlayerID].SpawnY * 16 - Main.player[ply].height);
args.Player.SendMessage("Teleported to your spawnpoint."); args.Player.SendMessage("Teleported to your spawnpoint.");
} }
private static void Spawn(CommandArgs args) private static void Spawn(CommandArgs args)
{ {
int ply = args.PlayerID; TShock.Teleport(args.Player.Index, Main.spawnTileX * 16 + 8 - args.TPlayer.width / 2,
TShock.Teleport(ply, Main.spawnTileX * 16 + 8 - Main.player[ply].width / 2, Main.spawnTileY * 16 - args.TPlayer.height);
Main.spawnTileY * 16 - Main.player[ply].height);
args.Player.SendMessage("Teleported to the map's spawnpoint."); args.Player.SendMessage("Teleported to the map's spawnpoint.");
} }
@ -577,8 +571,6 @@ namespace TShockAPI
private static void TP(CommandArgs args) private static void TP(CommandArgs args)
{ {
int adminplr = args.PlayerID;
if (args.Parameters.Count < 1) if (args.Parameters.Count < 1)
{ {
args.Player.SendMessage("Invalid syntax! Proper syntax: /tp <player> ", Color.Red); args.Player.SendMessage("Invalid syntax! Proper syntax: /tp <player> ", Color.Red);
@ -594,7 +586,7 @@ namespace TShockAPI
else else
{ {
var plr = player[0]; var plr = player[0];
TShock.Teleport(adminplr, plr.TPlayer.position.X, plr.TPlayer.position.Y); TShock.Teleport(args.Player.Index, plr.X, plr.Y);
args.Player.SendMessage(string.Format("Teleported to {0}", plr.Name)); args.Player.SendMessage(string.Format("Teleported to {0}", plr.Name));
} }
} }
@ -620,7 +612,7 @@ namespace TShockAPI
else else
{ {
var plr = player[0]; var plr = player[0];
TShock.Teleport(plr.Index, args.TPlayer.position.X, args.TPlayer.position.Y); TShock.Teleport(plr.Index, args.Player.X, args.Player.Y);
plr.SendMessage(string.Format("You were teleported to {0}.", plr.Name)); plr.SendMessage(string.Format("You were teleported to {0}.", plr.Name));
args.Player.SendMessage(string.Format("You brought {0} here.", plr.Name)); args.Player.SendMessage(string.Format("You brought {0} here.", plr.Name));
} }
@ -749,20 +741,13 @@ namespace TShockAPI
{ {
if (!plr.TPlayer.inventory[i].active) if (!plr.TPlayer.inventory[i].active)
{ {
//Main.player[player].inventory[i].SetDefaults(type);
//Main.player[player].inventory[i].stack = Main.player[player].inventory[i].maxStack;
int id = Terraria.Item.NewItem(0, 0, 0, 0, type, 1, true); int id = Terraria.Item.NewItem(0, 0, 0, 0, type, 1, true);
Main.item[id].position.X = plr.TPlayer.position.X; Main.item[id].position.X = plr.X;
Main.item[id].position.Y = plr.TPlayer.position.Y; Main.item[id].position.Y = plr.Y;
Main.item[id].stack = Main.item[id].maxStack; Main.item[id].stack = Main.item[id].maxStack;
//TShock.SendDataAll(21, -1, "", id);
NetMessage.SendData(21, -1, -1, "", id, 0f, 0f, 0f); NetMessage.SendData(21, -1, -1, "", id, 0f, 0f, 0f);
args.Player.SendMessage( args.Player.SendMessage(string.Format("Gave {0} some {1}.", plr.Name, Main.item[id].name));
string.Format("Gave {0} some {1}.", plr.Name, Main.item[id].name)); plr.SendMessage(string.Format("{0} gave you some {1}.", args.Player.Name, Main.item[id].name));
plr.SendMessage(
string.Format("{0} gave you some {1}.", args.Player.Name,
Main.item[id].name));
//TShock.UpdateInventories();
flag = true; flag = true;
break; break;
} }
@ -789,10 +774,21 @@ namespace TShockAPI
else else
{ {
var plr = player[0]; var plr = player[0];
DropHearts(plr.TPlayer.position.X, plr.TPlayer.position.Y, 20); DropHearts(plr.X, plr.Y, 20);
args.Player.SendMessage(string.Format("You just healed {0}", plr.Name)); if (plr == args.Player)
plr.SendMessage(string.Format("{0} just healed you!", plr.Name)); {
args.Player.SendMessage("You just got healed!");
} }
else
{
args.Player.SendMessage(string.Format("You just healed {0}", plr.Name));
plr.SendMessage(string.Format("{0} just healed you!", args.Player.Name));
}
}
}
else if (args.Player.Index < 0)
{
args.Player.SendMessage("You cant heal yourself!");
} }
else else
{ {

53
TShockAPI/TShock.cs
View file

@ -215,7 +215,35 @@ namespace TShockAPI
/// <param name="e"></param> /// <param name="e"></param>
private void ServerHooks_OnCommand(string text, HandledEventArgs e) private void ServerHooks_OnCommand(string text, HandledEventArgs e)
{ {
if (text.StartsWith("/")) // Damn you ThreadStatic and Redigit
if (Main.rand == null)
{
Main.rand = new Random();
}
if (text.StartsWith("exit"))
{
Tools.ForceKickAll("Server shutting down!");
}
else if (text.StartsWith("playing") || text.StartsWith("/playing"))
{
int count = 0;
foreach (TSPlayer player in Players)
{
if (player != null && player.Active)
{
count++;
TSPlayer.Server.SendMessage(string.Format("{0} ({1}) [{2}]", player.Name, player.IP, player.Group.Name));
}
}
TSPlayer.Server.SendMessage(string.Format("{0} players connected.", count));
e.Handled = true;
}
else if (text.StartsWith("say "))
{
Log.Info(string.Format("Server said: {0}", text.Remove(0, 4)));
}
else if (text.StartsWith("/"))
{ {
string cmdStr = text.Remove(0, 1); string cmdStr = text.Remove(0, 1);
var args = Commands.ParseParameters(cmdStr); var args = Commands.ParseParameters(cmdStr);
@ -236,7 +264,7 @@ namespace TShockAPI
if (cmd == null) if (cmd == null)
{ {
TSPlayer.Server.SendMessage("That command does not exist, try /help", Color.Red); TSPlayer.Server.SendMessage("That command does not exist, try /help");
} }
else else
{ {
@ -245,26 +273,7 @@ namespace TShockAPI
} }
e.Handled = true; e.Handled = true;
} }
else if (text.StartsWith("exit"))
{
Tools.ForceKickAll("Server shutting down!");
}
else if (text.StartsWith("playing"))
{
int count = 0;
foreach (TSPlayer player in Players)
{
if (player != null && player.Active)
{
count++;
Console.WriteLine(string.Format("{0} ({1}) [{2}]", player.Name, player.IP, player.Group.Name));
}
}
Console.WriteLine(string.Format("{0} players connected.", count));
e.Handled = true;
}
else if (text.StartsWith("say "))
Log.Info(string.Format("Server said: {0}", text.Remove(0, 4)));
} }
private void NpcHooks_OnStrikeNpc(NpcStrikeEventArgs e) private void NpcHooks_OnStrikeNpc(NpcStrikeEventArgs e)

1
TShockAPI/Tools.cs
View file

@ -101,6 +101,7 @@ namespace TShockAPI
Log.Info(string.Format("Broadcast: {0}", msg)); Log.Info(string.Format("Broadcast: {0}", msg));
} }
public static void Broadcast(string msg, Color color) public static void Broadcast(string msg, Color color)
{ {
Broadcast(msg, color.R, color.G, color.B); Broadcast(msg, color.R, color.G, color.B);