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

Fixed errors from failed merge

Browse source
This commit is contained in:
ricky 2011-06-07 20:34:15 +10:00
parent c368518caa
commit cfd4de2f32
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Commands.cs
View file

@ -246,8 +246,6 @@ namespace TShockAPI
Tools.SendMessage(ply, "You can't ban another admin!", new[] { 255f, 0f, 0f }); Tools.SendMessage(ply, "You can't ban another admin!", new[] { 255f, 0f, 0f });
} }
} }
else
Tools.SendMessage(adminplr, "You can't ban another admin!", new[] { 255f, 0f, 0f });
} }
else else
Tools.SendMessage(ply, "Invalid syntax! Proper syntax: /ban <player> [reason]", Tools.SendMessage(ply, "Invalid syntax! Proper syntax: /ban <player> [reason]",

2
TShockAPI/Tools.cs
View file

@ -227,7 +227,7 @@ namespace TShockAPI
public static bool Kick(int ply, string reason, string adminUserName = "") public static bool Kick(int ply, string reason, string adminUserName = "")
{ {
if (!Main.player[ply].active) if (!Main.player[ply].active)
return; return false;
if (!TShock.players[ply].group.HasPermission("immunetokick")) if (!TShock.players[ply].group.HasPermission("immunetokick"))
{ {
string playerName = Main.player[ply].name; string playerName = Main.player[ply].name;