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

Fixed an issue with /item

Browse source
This commit is contained in:
Deathmax 2011-06-02 22:55:15 +08:00
parent 00ce4ff2c4
commit 098841e7e9
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/Commands.cs
View file

@ -51,6 +51,7 @@ namespace TShockAPI
TShock.admincommandList.Add("time", new CommandDelegate(Time)); TShock.admincommandList.Add("time", new CommandDelegate(Time));
TShock.admincommandList.Add("kill", new CommandDelegate(Kill)); TShock.admincommandList.Add("kill", new CommandDelegate(Kill));
TShock.admincommandList.Add("help", new CommandDelegate(Help)); TShock.admincommandList.Add("help", new CommandDelegate(Help));
TShock.admincommandList.Add("slap", new CommandDelegate(Slap));
TShock.commandList.Add("help", new CommandDelegate(Help)); TShock.commandList.Add("help", new CommandDelegate(Help));
TShock.commandList.Add("kill", new CommandDelegate(Kill)); TShock.commandList.Add("kill", new CommandDelegate(Kill));
} }
@ -266,9 +267,9 @@ namespace TShockAPI
flag = true; flag = true;
break; 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 else
Tools.SendMessage(args.PlayerID, "Invalid item type!", new float[] { 255f, 0f, 0f }); Tools.SendMessage(args.PlayerID, "Invalid item type!", new float[] { 255f, 0f, 0f });
@ -452,18 +453,19 @@ namespace TShockAPI
{ {
int player = -1; int player = -1;
player = Tools.FindPlayer((msgargs[1].TrimEnd('"')).TrimStart('"')); 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(args.PlayerID, "You just killed " + Tools.FindPlayer(player) + "!");
Tools.SendMessage(player, Tools.FindPlayer(args.PlayerID) + " just killed you!"); Tools.SendMessage(player, Tools.FindPlayer(args.PlayerID) + " just killed you!");
TShock.KillMe(player); TShock.KillMe(player);
} }
else else
{ {
//Main.player[args.PlayerID].KillMe(99999, 1);
Tools.SendMessage(args.PlayerID, "You just suicided."); Tools.SendMessage(args.PlayerID, "You just suicided.");
TShock.KillMe(args.PlayerID); TShock.KillMe(args.PlayerID);
} }
} }
public static void Slap(CommandArgs args)
{
}
#endregion #endregion
} }
} }

2
TShockAPI/TShock.cs
View file

@ -210,8 +210,6 @@ namespace TShockAPI
int x = (int)Main.player[ply].position.X; int x = (int)Main.player[ply].position.X;
int y = (int)Main.player[ply].position.Y; int y = (int)Main.player[ply].position.Y;
//if (Tools.IsAdmin(ply))
//{
if (msg.StartsWith("/")) if (msg.StartsWith("/"))
{ {
Commands.CommandArgs args = new Commands.CommandArgs(msg, x, y, ply); Commands.CommandArgs args = new Commands.CommandArgs(msg, x, y, ply);