diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index e31bd86b..0f19cb7d 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -1379,7 +1379,7 @@ namespace TShockAPI
/// e - The SendDataEventArgs object.
private void NetHooks_SendData(SendDataEventArgs e)
{
- if (e.MsgId == PacketTypes.Disconnect)
+ /*if (e.MsgId == PacketTypes.Disconnect)
{
Action disconnect = (client, str) =>
{
@@ -1411,7 +1411,7 @@ namespace TShockAPI
e.Handled = true;
return;
}
- else if (e.MsgId == PacketTypes.WorldInfo)
+ else */if (e.MsgId == PacketTypes.WorldInfo)
{
using (var ms = new MemoryStream())
{
diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index 6bab466f..8cf79f9b 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -580,18 +580,18 @@ namespace TShockAPI
{
string playerName = player.Name;
player.SilentKickInProgress = silent;
- if (player.IsLoggedIn && saveSSI)
- player.SaveServerCharacter();
+ if (player.IsLoggedIn && saveSSI)
+ player.SaveServerCharacter();
player.Disconnect(string.Format("Kicked: {0}", reason));
TShock.Log.ConsoleInfo(string.Format("Kicked {0} for : '{1}'", playerName, reason));
string verb = force ? "force " : "";
- if (!silent)
- {
- if (string.IsNullOrWhiteSpace(adminUserName))
- Broadcast(string.Format("{0} was {1}kicked for '{2}'", playerName, verb, reason.ToLower()), Color.Green);
- else
+ if (!silent)
+ {
+ if (string.IsNullOrWhiteSpace(adminUserName))
+ Broadcast(string.Format("{0} was {1}kicked for '{2}'", playerName, verb, reason.ToLower()), Color.Green);
+ else
Broadcast(string.Format("{0} {1}kicked {2} for '{3}'", adminUserName, verb, playerName, reason.ToLower()), Color.Green);
- }
+ }
return true;
}
return false;