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

.

Browse source
This commit is contained in:
Deathmax 2011-06-05 13:49:10 +08:00
parent 5b655f00de
commit 2a2fbe62d5
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
TShockAPI/Commands.cs
View file

@ -100,12 +100,13 @@ namespace TShockAPI
{ {
string plStr = args.Message.Remove(0, 5).Trim(); string plStr = args.Message.Remove(0, 5).Trim();
int ply = args.PlayerID; int ply = args.PlayerID;
if (!(Tools.FindPlayer(plStr) == -1 || Tools.FindPlayer(plStr) == -2 || plStr == "")) int player = Tools.FindPlayer(plStr);
if (!(player == -1 || player == -2 || plStr == ""))
{ {
if (!TShock.players[Tools.FindPlayer(plStr)].IsAdmin()) if (!TShock.players[player].IsAdmin())
{ {
Tools.Kick(Tools.FindPlayer(plStr), "You were kicked."); Tools.Kick(player, "You were kicked.");
Tools.Broadcast(Tools.FindPlayer(Tools.FindPlayer(plStr)) + " was kicked by " + Tools.FindPlayer(ply)); Tools.Broadcast(Tools.FindPlayer(player) + " was kicked by " + Tools.FindPlayer(ply));
} }
else else
Tools.SendMessage(ply, "You can't kick another admin!", new float[] { 255f, 0f, 0f }); Tools.SendMessage(ply, "You can't kick another admin!", new float[] { 255f, 0f, 0f });
@ -120,13 +121,14 @@ namespace TShockAPI
{ {
string plStr = args.Message.Remove(0, 4).Trim(); string plStr = args.Message.Remove(0, 4).Trim();
int ply = args.PlayerID; int ply = args.PlayerID;
if (!(Tools.FindPlayer(plStr) == -1 || Tools.FindPlayer(plStr) == -2 || plStr == "")) int player = Tools.FindPlayer(plStr);
if (!(player == -1 || player == -2 || plStr == ""))
{ {
if (!TShock.players[Tools.FindPlayer(plStr)].IsAdmin()) if (!TShock.players[player].IsAdmin())
{ {
FileTools.WriteBan(Tools.FindPlayer(plStr)); FileTools.WriteBan(player);
Tools.Kick(Tools.FindPlayer(plStr), "You were banned."); Tools.Kick(player, "You were banned.");
Tools.Broadcast(Tools.FindPlayer(ply) + " banned " + Tools.FindPlayer(Tools.FindPlayer(plStr)) + "!"); Tools.Broadcast(Tools.FindPlayer(ply) + " banned " + Tools.FindPlayer(player) + "!");
} }
else else
Tools.SendMessage(ply, "You can't ban another admin!", new float[] { 255f, 0f, 0f }); Tools.SendMessage(ply, "You can't ban another admin!", new float[] { 255f, 0f, 0f });