From cfd4de2f32b22a001f19e712569742cf361e1673 Mon Sep 17 00:00:00 2001
From: ricky <rjhazelwood@gmail.com>
Date: Tue, 7 Jun 2011 20:34:15 +1000
Subject: [PATCH] Fixed errors from failed merge

---
 TShockAPI/Commands.cs | 2 --
 TShockAPI/Tools.cs    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 045e1d1a..38cc0ee4 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -246,8 +246,6 @@ namespace TShockAPI
                         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
                 Tools.SendMessage(ply, "Invalid syntax! Proper syntax: /ban <player> [reason]",
diff --git a/TShockAPI/Tools.cs b/TShockAPI/Tools.cs
index 9502ebda..8d04c9f1 100755
--- a/TShockAPI/Tools.cs
+++ b/TShockAPI/Tools.cs
@@ -227,7 +227,7 @@ namespace TShockAPI
         public static bool Kick(int ply, string reason, string adminUserName = "")
         {
             if (!Main.player[ply].active)
-                return;
+                return false;
             if (!TShock.players[ply].group.HasPermission("immunetokick"))
             {
                 string playerName = Main.player[ply].name;