From 4ab02cad55399f575022bdb699d8912990d92d9b Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 25 Mar 2021 17:24:10 +0000 Subject: [PATCH] Unregister olympiad combatants on logout. Contributed by Iris. --- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 9 ++++++++- .../network/clientpackets/RequestRestart.java | 18 ++++++++++++------ .../network/clientpackets/Logout.java | 9 ++++++++- .../network/clientpackets/RequestRestart.java | 18 ++++++++++++------ .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- .../network/clientpackets/Logout.java | 7 +++++++ .../network/clientpackets/RequestRestart.java | 11 +++++++++-- 42 files changed, 344 insertions(+), 52 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); 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 11392ae11a..2cc621db7c 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 @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,9 +55,15 @@ public class Logout implements IClientIncomingPacket return; } - // Remove player from Boss Zone + // Remove player from boss zone. player.removeFromBossZone(); + // Unregister from olympiad. + if (Olympiad.getInstance().isRegistered(player)) + { + Olympiad.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 3449e5c52c..2d783371d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -23,6 +23,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; @@ -86,9 +87,8 @@ public class RequestRestart implements IClientIncomingPacket return; } - // Prevent player from restarting if they are a festival participant - // and it is in progress, otherwise notify party members that the player - // is not longer a participant. + // Prevent player from restarting if they are a festival participant and it is in progress, + // otherwise notify party members that the player is no longer a participant. if (player.isFestivalParticipant()) { if (SevenSignsFestival.getInstance().isFestivalInitialized()) @@ -120,21 +120,27 @@ public class RequestRestart implements IClientIncomingPacket return; } - // Remove player from Boss Zone + // Remove player from boss zone. player.removeFromBossZone(); + // Unregister from olympiad. + if (Olympiad.getInstance().isRegistered(player)) + { + Olympiad.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.valueOf(true)); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); 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 11392ae11a..d0a30ef47b 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 @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,9 +55,15 @@ public class Logout implements IClientIncomingPacket return; } - // Remove player from Boss Zone + // Remove player from boss zone. player.removeFromBossZone(); + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 3449e5c52c..a3adf69405 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -23,6 +23,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; @@ -86,9 +87,8 @@ public class RequestRestart implements IClientIncomingPacket return; } - // Prevent player from restarting if they are a festival participant - // and it is in progress, otherwise notify party members that the player - // is not longer a participant. + // Prevent player from restarting if they are a festival participant and it is in progress, + // otherwise notify party members that the player is no longer a participant. if (player.isFestivalParticipant()) { if (SevenSignsFestival.getInstance().isFestivalInitialized()) @@ -120,21 +120,27 @@ public class RequestRestart implements IClientIncomingPacket return; } - // Remove player from Boss Zone + // Remove player from boss zone. player.removeFromBossZone(); + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.valueOf(true)); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); 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 c72a397784..a9d085331b 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 @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); 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 c72a397784..a9d085331b 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 @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); 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 c72a397784..a9d085331b 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 @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo()); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index c72a397784..a9d085331b 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -54,6 +55,12 @@ public class Logout implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index d3444d4c28..2696e9eb27 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; @@ -57,18 +58,24 @@ public class RequestRestart implements IClientIncomingPacket return; } + // Unregister from olympiad. + if (OlympiadManager.getInstance().isRegistered(player)) + { + OlympiadManager.getInstance().unRegisterNoble(player); + } + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { Disconnection.of(client, player).storeMe().deleteMe(); } - // return the client to the authed status + // Return the client to the authenticated status. client.setConnectionState(ConnectionState.AUTHENTICATED); client.sendPacket(RestartResponse.TRUE); - // send char list + // Send character list. final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.sendPacket(cl); client.setCharSelection(cl.getCharInfo());