NetClient disconnect() should call onDisconnection().

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -43,7 +43,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -42,7 +42,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java

@@ -97,19 +97,13 @@ public class GameClient extends NetClient
 			Disconnection.of(this).onDisconnection();
 		}
 		_connectionState = ConnectionState.DISCONNECTED;
-		super.onDisconnection();
-	}
-	
-	public void closeNow()
-	{
-		onDisconnection();
 	}
 	
 	public void close(ServerPacket packet)
 	{
 		if (packet == null)
 		{
-			closeNow();
+			disconnect();
 		}
 		else
 		{
@@ -117,7 +111,7 @@ public class GameClient extends NetClient
 			sendPacket(packet);
 			
 			// Wait for packet to be sent.
-			ThreadPool.schedule(this::closeNow, 1000);
+			ThreadPool.schedule(this::disconnect, 1000);
 		}
 	}
 	

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java

@@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface<GameClient>
 		{
 			LOGGER.warning("PacketHandler: Problem receiving packet id from " + client);
 			LOGGER.warning(CommonUtil.getStackTrace(e));
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java

@@ -48,7 +48,7 @@ public class AuthLogin implements ClientPacket
 	{
 		if (_loginName.isEmpty() || !client.isProtocolOk())
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java

@@ -42,7 +42,7 @@ public class Logout implements ClientPacket
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
-			client.closeNow();
+			client.disconnect();
 			return;
 		}
 		

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java

@@ -45,7 +45,7 @@ public class ProtocolVersion implements ClientPacket
 		if (_version == -2)
 		{
 			// This is just a ping attempt from the new C2 client.
-			client.closeNow();
+			client.disconnect();
 		}
 		else if (!Config.PROTOCOL_LIST.contains(_version))
 		{

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/NetClient.java

@@ -66,7 +66,6 @@ public class NetClient
 	 */
 	public void onDisconnection()
 	{
-		disconnect();
 	}
 	
 	/**
@@ -117,6 +116,9 @@ public class NetClient
 		{
 			_pendingData = null;
 		}
+		
+		// Client is disconnected.
+		onDisconnection();
 	}
 	
 	/**

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/ReadThread.java

@@ -240,6 +240,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 	private void onDisconnection(E client)
 	{
 		_pool.remove(client);
-		client.onDisconnection();
+		client.disconnect();
 	}
 }

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/SendThread.java

@@ -125,7 +125,7 @@ public class SendThread<E extends NetClient> implements Runnable
 				catch (Exception e)
 				{
 					_pool.remove(_client);
-					_client.onDisconnection();
+					_client.disconnect();
 					break;
 				}
 			}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/LoginServerThread.java

@@ -420,7 +420,7 @@ public class LoginServerThread extends Thread
 				return true;
 			}
 			
-			savedClient.closeNow();
+			savedClient.disconnect();
 			_accountsInGameServer.remove(account);
 			return false;
 		}