From 51577468473ed62f2b3d05211f46eb15c31ae85d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 27 Oct 2019 09:55:56 +0000 Subject: [PATCH] Fixed players unable to login after disconnect. Contributed by Sahar. --- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- .../org/l2jmobius/gameserver/network/GameClient.java | 12 +++++++++++- 17 files changed, 187 insertions(+), 17 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } 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 50bfc38404..10991ea979 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 @@ -551,7 +551,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } 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 a827b0d639..64af161bc6 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 @@ -558,7 +558,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } 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 6adac77a9d..eedfeb53e8 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 @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java index 6adac77a9d..eedfeb53e8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } 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 6adac77a9d..eedfeb53e8 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 @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; } 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 6adac77a9d..eedfeb53e8 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 @@ -553,7 +553,17 @@ public class GameClient extends ChannelInboundHandler { LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } - Disconnection.of(player).defaultSequence(false); + + if (player.getClient() != null) + { + Disconnection.of(player).defaultSequence(false); + } + else + { + player.storeMe(); + player.deleteMe(); + } + return null; }