From a9c911e84d1007460c00eb86e64adceb32fea327 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment Date: Thu, 27 Jul 2023 04:01:10 +0300 Subject: [PATCH] NetClient disconnect() should call onDisconnection(). --- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/LoginServerThread.java | 2 +- .../gameserver/network/GameClient.java | 20 +++++++------------ .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/LoginServerThread.java | 2 +- .../gameserver/network/GameClient.java | 20 +++++++------------ .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- .../l2jmobius/commons/network/NetClient.java | 4 +++- .../l2jmobius/commons/network/ReadThread.java | 2 +- .../l2jmobius/commons/network/SendThread.java | 2 +- .../gameserver/network/GameClient.java | 10 ++-------- .../gameserver/network/PacketHandler.java | 2 +- .../network/clientpackets/AuthLogin.java | 2 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/ProtocolVersion.java | 2 +- 250 files changed, 353 insertions(+), 477 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 457fa67be2..ef8ec6ab62 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/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); } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/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; } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 457fa67be2..ef8ec6ab62 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/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; } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/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)) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/NetClient.java +++ b/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(); } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/LoginServerThread.java index 1176da6fb3..73a5a793c1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/LoginServerThread.java +++ b/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; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java index e238caf46d..3c9f2d6116 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java @@ -88,16 +88,6 @@ public class GameClient extends NetClient @Override public void onDisconnection() { - LOGGER_ACCOUNTING.finer("Client disconnected: " + this); - LoginServerThread.getInstance().sendLogout(_accountName); - _connectionState = ConnectionState.DISCONNECTED; - super.onDisconnection(); - } - - public void closeNow() - { - onDisconnection(); - synchronized (this) { if (_cleanupTask != null) @@ -106,13 +96,17 @@ public class GameClient extends NetClient } _cleanupTask = ThreadPool.schedule(new CleanupTask(), 0); // delayed? } + + LOGGER_ACCOUNTING.finer("Client disconnected: " + this); + LoginServerThread.getInstance().sendLogout(_accountName); + _connectionState = ConnectionState.DISCONNECTED; } public void close(ServerPacket packet) { if (packet == null) { - closeNow(); + disconnect(); } else { @@ -120,7 +114,7 @@ public class GameClient extends NetClient sendPacket(packet); // Wait for packet to be sent. - ThreadPool.schedule(this::closeNow, 1000); + ThreadPool.schedule(this::disconnect, 1000); } } @@ -426,7 +420,7 @@ public class GameClient extends NetClient if (player.getClient() != null) { - player.getClient().closeNow(); + player.getClient().disconnect(); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 95dabf61b4..bd5d6a54de 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -56,7 +56,7 @@ public class AuthLogin implements ClientPacket } else { - client.closeNow(); + client.disconnect(); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8952cbf6e8..b550c01b80 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -40,7 +40,7 @@ public class Logout implements ClientPacket final Player player = client.getPlayer(); if (player == null) { - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index ce1ef8ceb8..977147ca93 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/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 ((_version < Config.MIN_PROTOCOL_REVISION) || (_version > Config.MAX_PROTOCOL_REVISION)) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_C6_Interlude/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(); } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java index 5705cedfb9..a114fccbaf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java @@ -421,7 +421,7 @@ public class LoginServerThread extends Thread return true; } - savedClient.closeNow(); + savedClient.disconnect(); _accountsInGameServer.remove(account); return false; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index c93b5c0fdd..3cac181df3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -76,16 +76,6 @@ public class GameClient extends NetClient @Override public void onDisconnection() { - LOGGER_ACCOUNTING.finer("Client disconnected: " + this); - LoginServerThread.getInstance().sendLogout(_accountName); - _connectionState = ConnectionState.DISCONNECTED; - super.onDisconnection(); - } - - public void closeNow() - { - onDisconnection(); - synchronized (this) { if (_cleanupTask != null) @@ -94,13 +84,17 @@ public class GameClient extends NetClient } _cleanupTask = ThreadPool.schedule(new CleanupTask(), 0); // delayed? } + + LOGGER_ACCOUNTING.finer("Client disconnected: " + this); + LoginServerThread.getInstance().sendLogout(_accountName); + _connectionState = ConnectionState.DISCONNECTED; } public void close(ServerPacket packet) { if (packet == null) { - closeNow(); + disconnect(); } else { @@ -108,7 +102,7 @@ public class GameClient extends NetClient sendPacket(packet); // Wait for packet to be sent. - ThreadPool.schedule(this::closeNow, 1000); + ThreadPool.schedule(this::disconnect, 1000); } } @@ -423,7 +417,7 @@ public class GameClient extends NetClient if (player.getClient() != null) { - player.getClient().closeNow(); + player.getClient().disconnect(); } else { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 95dabf61b4..bd5d6a54de 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -56,7 +56,7 @@ public class AuthLogin implements ClientPacket } else { - client.closeNow(); + client.disconnect(); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8952cbf6e8..b550c01b80 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -40,7 +40,7 @@ public class Logout implements ClientPacket final Player player = client.getPlayer(); if (player == null) { - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index ce1ef8ceb8..977147ca93 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_C6_Interlude/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 ((_version < Config.MIN_PROTOCOL_REVISION) || (_version > Config.MAX_PROTOCOL_REVISION)) { diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_CT_0_Interlude/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(); } /** diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index 6607d637a5..9d6994d3e3 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -85,19 +85,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 { @@ -105,7 +99,7 @@ public class GameClient extends NetClient sendPacket(packet); // Wait for packet to be sent. - ThreadPool.schedule(this::closeNow, 1000); + ThreadPool.schedule(this::disconnect, 1000); } } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_CT_0_Interlude/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; } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index a527b4a652..5ffca55191 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -44,7 +44,7 @@ public class Logout implements ClientPacket final Player player = client.getPlayer(); if (player == null) { - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_CT_0_Interlude/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)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_CT_2.4_Epilogue/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(); } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java index 6607d637a5..9d6994d3e3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java @@ -85,19 +85,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 { @@ -105,7 +99,7 @@ public class GameClient extends NetClient sendPacket(packet); // Wait for packet to be sent. - ThreadPool.schedule(this::closeNow, 1000); + ThreadPool.schedule(this::disconnect, 1000); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_CT_2.4_Epilogue/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; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index a527b4a652..5ffca55191 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -44,7 +44,7 @@ public class Logout implements ClientPacket final Player player = client.getPlayer(); if (player == null) { - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_CT_2.4_Epilogue/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)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/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(); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java index 546ac60796..7817771df7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java @@ -88,19 +88,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 { @@ -108,7 +102,7 @@ public class GameClient extends NetClient sendPacket(packet); // Wait for packet to be sent. - ThreadPool.schedule(this::closeNow, 1000); + ThreadPool.schedule(this::disconnect, 1000); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_CT_2.6_HighFive/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; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8d9c627aa3..8123386d19 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -44,7 +44,7 @@ public class Logout implements ClientPacket final Player player = client.getPlayer(); if (player == null) { - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_CT_2.6_HighFive/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)) { diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_1.0/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(); } /** diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_1.0/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); } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_1.0/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; } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_1.0/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; } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_1.0/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)) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/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(); } /** diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/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); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/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; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/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; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/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)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/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(); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/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); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_2.0_Saviors/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; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.0_Saviors/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; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/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)) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_2.5_Zaken/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(); } /** diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.5_Zaken/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); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_2.5_Zaken/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; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.5_Zaken/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; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.5_Zaken/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)) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_2.7_Antharas/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(); } /** diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.7_Antharas/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); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_2.7_Antharas/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; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.7_Antharas/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; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.7_Antharas/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)) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/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(); } /** diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/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); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/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; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/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; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/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)) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/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(); } /** diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/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); } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/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; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/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; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/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)) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/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(); } /** diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/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); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/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; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/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; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/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)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/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(); } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/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); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/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; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/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; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/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)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Classic_Interlude/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(); } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index 283769911e..b615abbccb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_Interlude/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); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_Interlude/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; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_Interlude/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; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_Interlude/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)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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(); } /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/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(); } /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/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); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/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; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 08bb0fabf7..0176af2693 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/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; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/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)) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/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(); } /** diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/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); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/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; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 457fa67be2..ef8ec6ab62 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/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; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/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)) { diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/NetClient.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/NetClient.java index 0b8f7839b0..482d21f531 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/NetClient.java +++ b/L2J_Mobius_Essence_6.3_Crusader/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(); } /** diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/ReadThread.java index 4732d782a3..50494157a0 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/ReadThread.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/ReadThread.java @@ -240,6 +240,6 @@ public class ReadThread implements Runnable private void onDisconnection(E client) { _pool.remove(client); - client.onDisconnection(); + client.disconnect(); } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/SendThread.java index 48cc88b899..01d09df30d 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/SendThread.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/SendThread.java @@ -125,7 +125,7 @@ public class SendThread implements Runnable catch (Exception e) { _pool.remove(_client); - _client.onDisconnection(); + _client.disconnect(); break; } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/GameClient.java index 743f27c173..407437602c 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Essence_6.3_Crusader/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); } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/PacketHandler.java index d117b15806..e4a4274b26 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -43,7 +43,7 @@ public class PacketHandler implements PacketHandlerInterface { LOGGER.warning("PacketHandler: Problem receiving packet id from " + client); LOGGER.warning(CommonUtil.getStackTrace(e)); - client.closeNow(); + client.disconnect(); return; } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 86cc54c280..a83678b4d5 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Essence_6.3_Crusader/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; } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 457fa67be2..ef8ec6ab62 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Essence_6.3_Crusader/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; } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c723992666..8c13ede017 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Essence_6.3_Crusader/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)) {