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

Removed Disconnect handling in NetHooks_SendData

Browse source
This commit is contained in:
White 2015-07-05 12:12:31 +09:30
parent 0009d77d18
commit 63bf31ded5
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/TShock.cs
View file

@ -1379,7 +1379,7 @@ namespace TShockAPI
/// <param name="e">e - The SendDataEventArgs object.</param> /// <param name="e">e - The SendDataEventArgs object.</param>
private void NetHooks_SendData(SendDataEventArgs e) private void NetHooks_SendData(SendDataEventArgs e)
{ {
if (e.MsgId == PacketTypes.Disconnect) /*if (e.MsgId == PacketTypes.Disconnect)
{ {
Action<RemoteClient, string> disconnect = (client, str) => Action<RemoteClient, string> disconnect = (client, str) =>
{ {
@ -1411,7 +1411,7 @@ namespace TShockAPI
e.Handled = true; e.Handled = true;
return; return;
} }
else if (e.MsgId == PacketTypes.WorldInfo) else */if (e.MsgId == PacketTypes.WorldInfo)
{ {
using (var ms = new MemoryStream()) using (var ms = new MemoryStream())
{ {

16
TShockAPI/Utils.cs
View file

@ -580,18 +580,18 @@ namespace TShockAPI
{ {
string playerName = player.Name; string playerName = player.Name;
player.SilentKickInProgress = silent; player.SilentKickInProgress = silent;
if (player.IsLoggedIn && saveSSI) if (player.IsLoggedIn && saveSSI)
player.SaveServerCharacter(); player.SaveServerCharacter();
player.Disconnect(string.Format("Kicked: {0}", reason)); player.Disconnect(string.Format("Kicked: {0}", reason));
TShock.Log.ConsoleInfo(string.Format("Kicked {0} for : '{1}'", playerName, reason)); TShock.Log.ConsoleInfo(string.Format("Kicked {0} for : '{1}'", playerName, reason));
string verb = force ? "force " : ""; string verb = force ? "force " : "";
if (!silent) if (!silent)
{ {
if (string.IsNullOrWhiteSpace(adminUserName)) if (string.IsNullOrWhiteSpace(adminUserName))
Broadcast(string.Format("{0} was {1}kicked for '{2}'", playerName, verb, reason.ToLower()), Color.Green); Broadcast(string.Format("{0} was {1}kicked for '{2}'", playerName, verb, reason.ToLower()), Color.Green);
else else
Broadcast(string.Format("{0} {1}kicked {2} for '{3}'", adminUserName, verb, playerName, reason.ToLower()), Color.Green); Broadcast(string.Format("{0} {1}kicked {2} for '{3}'", adminUserName, verb, playerName, reason.ToLower()), Color.Green);
} }
return true; return true;
} }
return false; return false;