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

53
TShockAPI/TShock.cs
View file

@ -215,7 +215,35 @@ namespace TShockAPI
/// <param name="e"></param>
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);
var args = Commands.ParseParameters(cmdStr);
@ -236,7 +264,7 @@ namespace TShockAPI
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
{
@ -245,26 +273,7 @@ namespace TShockAPI
}
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)