From 8ecabb7f2ecd3c2bc40644241a4aa4c34994e89c Mon Sep 17 00:00:00 2001
From: Lucas Nicodemus <shank@shanked.me>
Date: Sat, 26 May 2012 09:50:15 -0600
Subject: [PATCH] All TShock methods calling the obsolete ForceKick function
 now use the new one

Subnote: fixes an issue where players would be reported as kicked to the
ingame console.
---
 TShockAPI/GetDataHandlers.cs  |  2 +-
 TShockAPI/Rest/RestManager.cs |  4 ++--
 TShockAPI/TShock.cs           | 10 +++++-----
 TShockAPI/Utils.cs            |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index c696bfcb..eb0b0c05 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -2271,7 +2271,7 @@ namespace TShockAPI
 						}
 						else
 						{
-							TShock.Utils.ForceKick(args.Player, TShock.Config.MediumcoreKickReason);
+							TShock.Utils.ForceKick(args.Player, TShock.Config.MediumcoreKickReason, true, false);
 						}
 						return true;
 					}
diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs
index 98543d6d..d3ea639f 100644
--- a/TShockAPI/Rest/RestManager.cs
+++ b/TShockAPI/Rest/RestManager.cs
@@ -522,7 +522,7 @@ namespace TShockAPI
 				return ret;
 
 			TSPlayer player = (TSPlayer)ret;
-			TShock.Utils.ForceKick(player, null == parameters["reason"] ? "Kicked via web" : parameters["reason"]);
+			TShock.Utils.ForceKick(player, null == parameters["reason"] ? "Kicked via web" : parameters["reason"], false, true);
 			return RestResponse("Player " + player.Name + " was kicked");
 		}
 
@@ -535,7 +535,7 @@ namespace TShockAPI
 			TSPlayer player = (TSPlayer)ret;
 			var reason = null == parameters["reason"] ? "Banned via web" : parameters["reason"];
 			TShock.Bans.AddBan(player.IP, player.Name, reason);
-			TShock.Utils.ForceKick(player, reason);
+			TShock.Utils.ForceKick(player, reason, false, true);
 			return RestResponse("Player " + player.Name + " was banned");
 		}
 
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index c2ca92d5..623f7135 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -672,7 +672,7 @@ namespace TShockAPI
 
 			if (Utils.ActivePlayers() + 1 > Config.MaxSlots + 20)
 			{
-				Utils.ForceKick(player, Config.ServerFullNoReservedReason);
+				Utils.ForceKick(player, Config.ServerFullNoReservedReason, true, false);
 				handler.Handled = true;
 				return;
 			}
@@ -684,14 +684,14 @@ namespace TShockAPI
 
 			if (ban != null)
 			{
-				Utils.ForceKick(player, string.Format("You are banned: {0}", ban.Reason));
+				Utils.ForceKick(player, string.Format("You are banned: {0}", ban.Reason), true, false);
 				handler.Handled = true;
 				return;
 			}
 
 			if (!FileTools.OnWhitelist(player.IP))
 			{
-				Utils.ForceKick(player, Config.WhitelistKickReason);
+				Utils.ForceKick(player, Config.WhitelistKickReason, true, false);
 				handler.Handled = true;
 				return;
 			}
@@ -704,7 +704,7 @@ namespace TShockAPI
 				{
 					if (Config.KickProxyUsers)
 					{
-						Utils.ForceKick(player, "Proxies are not allowed");
+						Utils.ForceKick(player, "Proxies are not allowed.", true, false);
 						handler.Handled = true;
 						return;
 					}
@@ -737,7 +737,7 @@ namespace TShockAPI
 
 			if (ban != null)
 			{
-				Utils.ForceKick(player, string.Format("You are banned: {0}", ban.Reason));
+				Utils.ForceKick(player, string.Format("You are banned: {0}", ban.Reason), true, false);
 				handler.Handled = true;
 				return;
 			}
diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index 9e686624..4a817afd 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -516,7 +516,7 @@ namespace TShockAPI
 			{
 				if (player != null && player.Active)
 				{
-					ForceKick(player, reason);
+					ForceKick(player, reason, false, true);
 				}
 			}
 		}