From c449a89a83b934e8d95576fcf87622e7f5ab1ce0 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment Date: Thu, 27 Jul 2023 03:58:32 +0300 Subject: [PATCH] Avoid directly utilizing the disconnect method for GameClient. --- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../org/l2jmobius/gameserver/network/clientpackets/Logout.java | 1 + .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../org/l2jmobius/gameserver/network/clientpackets/Logout.java | 1 + .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- .../java/org/l2jmobius/gameserver/network/GameClient.java | 3 ++- .../java/org/l2jmobius/gameserver/network/PacketHandler.java | 2 +- 64 files changed, 95 insertions(+), 62 deletions(-) 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 5faa8fc0a2..e238caf46d 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 @@ -91,11 +91,12 @@ public class GameClient extends NetClient LOGGER_ACCOUNTING.finer("Client disconnected: " + this); LoginServerThread.getInstance().sendLogout(_accountName); _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); synchronized (this) { 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 4b6c5da212..8952cbf6e8 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,6 +40,7 @@ public class Logout implements ClientPacket final Player player = client.getPlayer(); if (player == null) { + client.closeNow(); return; } 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 3be998688a..c93b5c0fdd 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 @@ -79,11 +79,12 @@ public class GameClient extends NetClient LOGGER_ACCOUNTING.finer("Client disconnected: " + this); LoginServerThread.getInstance().sendLogout(_accountName); _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); synchronized (this) { 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 4b6c5da212..8952cbf6e8 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,6 +40,7 @@ public class Logout implements ClientPacket final Player player = client.getPlayer(); if (player == null) { + client.closeNow(); return; } 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 b1bb1438e9..6607d637a5 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,11 +85,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 b1bb1438e9..6607d637a5 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,11 +85,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 55ece611dc..546ac60796 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,11 +88,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 9025d22081..283769911e 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; } 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 90d1a1ac11..743f27c173 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,11 +97,12 @@ public class GameClient extends NetClient Disconnection.of(this).onDisconnection(); } _connectionState = ConnectionState.DISCONNECTED; + super.onDisconnection(); } public void closeNow() { - disconnect(); + onDisconnection(); } public void close(ServerPacket packet) 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 e4a4274b26..d117b15806 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.disconnect(); + client.closeNow(); return; }