From 098841e7e9dd99ca0373c30b2ff07fb7316179c7 Mon Sep 17 00:00:00 2001 From: Deathmax Date: Thu, 2 Jun 2011 22:55:15 +0800 Subject: [PATCH] Fixed an issue with /item --- TShockAPI/Commands.cs | 10 ++++++---- TShockAPI/TShock.cs | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 49adfb98..58899a22 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -51,6 +51,7 @@ namespace TShockAPI TShock.admincommandList.Add("time", new CommandDelegate(Time)); TShock.admincommandList.Add("kill", new CommandDelegate(Kill)); TShock.admincommandList.Add("help", new CommandDelegate(Help)); + TShock.admincommandList.Add("slap", new CommandDelegate(Slap)); TShock.commandList.Add("help", new CommandDelegate(Help)); TShock.commandList.Add("kill", new CommandDelegate(Kill)); } @@ -266,9 +267,9 @@ namespace TShockAPI flag = true; break; } - if (!flag) - Tools.SendMessage(args.PlayerID, "You don't have free slots!", new float[] { 255f, 0f, 0f }); } + if (!flag) + Tools.SendMessage(args.PlayerID, "You don't have free slots!", new float[] { 255f, 0f, 0f }); } else Tools.SendMessage(args.PlayerID, "Invalid item type!", new float[] { 255f, 0f, 0f }); @@ -452,18 +453,19 @@ namespace TShockAPI { int player = -1; player = Tools.FindPlayer((msgargs[1].TrimEnd('"')).TrimStart('"')); - //Main.player[player].KillMe(99999, 1); Tools.SendMessage(args.PlayerID, "You just killed " + Tools.FindPlayer(player) + "!"); Tools.SendMessage(player, Tools.FindPlayer(args.PlayerID) + " just killed you!"); TShock.KillMe(player); } else { - //Main.player[args.PlayerID].KillMe(99999, 1); Tools.SendMessage(args.PlayerID, "You just suicided."); TShock.KillMe(args.PlayerID); } } + public static void Slap(CommandArgs args) + { + } #endregion } } diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 8a42fe90..6b31559b 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -210,8 +210,6 @@ namespace TShockAPI int x = (int)Main.player[ply].position.X; int y = (int)Main.player[ply].position.Y; - //if (Tools.IsAdmin(ply)) - //{ if (msg.StartsWith("/")) { Commands.CommandArgs args = new Commands.CommandArgs(msg, x, y, ply);