From e66c57450a955fa1c4d997cf6442314e2343839f Mon Sep 17 00:00:00 2001
From: high <pooop828@hotmail.com>
Date: Wed, 8 Jun 2011 06:44:53 -0400
Subject: [PATCH] Fixed Ban not checking socket status correctly. Fixed
 unban/unbanip for real this time

---
 TShockAPI/Commands.cs | 4 ++--
 TShockAPI/Tools.cs    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 5e863cd2..26d4519c 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -279,7 +279,7 @@ namespace TShockAPI
 
         public static void UnBan(CommandArgs args)
         {
-            string plStr = args.Message.Remove(0, 6);
+            string plStr = args.Message.Remove(0, 7);
             int adminplr = args.PlayerID;
             var ban = TShock.Bans.GetBanByName(plStr);
             if (ban != null)
@@ -295,7 +295,7 @@ namespace TShockAPI
 
         public static void UnBanIP(CommandArgs args)
         {
-            string plStr = args.Message.Remove(0, 8);
+            string plStr = args.Message.Remove(0, 9);
             int adminplr = args.PlayerID;
             var ban = TShock.Bans.GetBanByIp(plStr);
             if (ban != null)
diff --git a/TShockAPI/Tools.cs b/TShockAPI/Tools.cs
index d8ae36b3..93bee215 100755
--- a/TShockAPI/Tools.cs
+++ b/TShockAPI/Tools.cs
@@ -249,13 +249,14 @@ namespace TShockAPI
         /// <param name="reason">string reason</param>
         public static bool Ban(int plr, string reason, string adminUserName = "")
         {
+            if (!Netplay.serverSock[plr].active || Netplay.serverSock[plr].kill)
+                return true;
             if (!TShock.players[plr].group.HasPermission("immunetoban"))
             {
                 string ip = GetPlayerIP(plr);
                 string playerName = Main.player[plr].name;
                 TShock.Bans.AddBan(ip, playerName, reason);
-                if (Main.player[plr].active || !Netplay.serverSock[plr].kill)
-                    NetMessage.SendData(0x2, plr, -1, "Banned: " + reason, 0x0, 0f, 0f, 0f);
+                NetMessage.SendData(0x2, plr, -1, "Banned: " + reason, 0x0, 0f, 0f, 0f);
                 Log.Info("Banned " + playerName + " for : " + reason);
                 if (adminUserName.Length == 0)
                     Broadcast(playerName + " was banned for " + reason.ToLower());