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

Kill checks if player is found before killing.

Browse source
This commit is contained in:
ricky 2011-06-08 08:11:26 +10:00
parent 0fdfe8a09f
commit 88477eaccf
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
TShockAPI/Commands.cs
View file

@ -786,11 +786,17 @@ namespace TShockAPI
var msgargs = Regex.Split(args.Message, "(?<=^[^\"]*(?:\"[^\"]*\"[^\"]*)*) (?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)"); var msgargs = Regex.Split(args.Message, "(?<=^[^\"]*(?:\"[^\"]*\"[^\"]*)*) (?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)");
if (msgargs.Length == 2) if (msgargs.Length == 2)
{ {
int player = -1; int player = Tools.FindPlayer((msgargs[1].TrimEnd('"')).TrimStart('"'));
player = Tools.FindPlayer((msgargs[1].TrimEnd('"')).TrimStart('"')); if (player == -1)
Tools.SendMessage(args.PlayerID, "You just killed " + Tools.FindPlayer(player) + "!"); Tools.SendMessage(args.PlayerID, "Invalid player!", new[] { 255f, 0f, 0f });
Tools.SendMessage(player, Tools.FindPlayer(args.PlayerID) + " just killed you!"); else if (player == -2)
TShock.KillMe(player); Tools.SendMessage(args.PlayerID, "More than one player matched!", new[] { 255f, 0f, 0f });
else
{
Tools.SendMessage(args.PlayerID, "You just killed " + Tools.FindPlayer(player) + "!");
Tools.SendMessage(player, Tools.FindPlayer(args.PlayerID) + " just killed you!");
TShock.KillMe(player);
}
} }
} }
@ -807,6 +813,8 @@ namespace TShockAPI
int player = Tools.FindPlayer(msgargs[1]); int player = Tools.FindPlayer(msgargs[1]);
if (player == -1) if (player == -1)
Tools.SendMessage(args.PlayerID, "Invalid player!", new[] { 255f, 0f, 0f }); Tools.SendMessage(args.PlayerID, "Invalid player!", new[] { 255f, 0f, 0f });
else if (player == -2)
Tools.SendMessage(args.PlayerID, "More than one player matched!", new[] { 255f, 0f, 0f });
else else
{ {
NetMessage.SendData(26, -1, -1, "", player, ((new Random()).Next(1, 20)), 5, (float)0); NetMessage.SendData(26, -1, -1, "", player, ((new Random()).Next(1, 20)), 5, (float)0);
@ -821,6 +829,8 @@ namespace TShockAPI
int.TryParse(msgargs[2], out damage); int.TryParse(msgargs[2], out damage);
if (player == -1) if (player == -1)
Tools.SendMessage(args.PlayerID, "Invalid player!", new[] { 255f, 0f, 0f }); Tools.SendMessage(args.PlayerID, "Invalid player!", new[] { 255f, 0f, 0f });
else if (player == -2)
Tools.SendMessage(args.PlayerID, "More than one player matched!", new[] { 255f, 0f, 0f });
else else
{ {
NetMessage.SendData(26, -1, -1, "", player, ((new Random()).Next(-1, 1)), damage, (float)0); NetMessage.SendData(26, -1, -1, "", player, ((new Random()).Next(-1, 1)), damage, (float)0);