diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 33b52c3f78..0b63ef9cdb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -94,6 +94,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -148,7 +149,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -674,14 +675,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -699,7 +700,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c2cb56b495..32ad547b6f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 140a701076..30786a1645 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -96,6 +96,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -712,14 +713,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -737,7 +738,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c2cb56b495..32ad547b6f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 06de8cefc1..c632e26175 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; /** @@ -61,7 +62,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 140a701076..30786a1645 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -96,6 +96,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -712,14 +713,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -737,7 +738,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 4b61f82ce4..d70d8d438b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 06de8cefc1..c632e26175 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; /** @@ -61,7 +62,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index c3ab796fbf..1c35371695 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -305,7 +306,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 3b54f871d0..a73bbfe99c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -96,6 +96,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -712,14 +713,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -737,7 +738,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 4b61f82ce4..d70d8d438b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java index 58c33cb501..bbe3d0221d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index c3ab796fbf..1c35371695 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -305,7 +306,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index e45c072e44..0d5561de34 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -97,6 +97,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -718,14 +719,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -743,7 +744,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 2baaad0914..dfc02e365f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index bd37cea9b9..9bd53e399e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index c3ab796fbf..1c35371695 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -305,7 +306,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 5b936c92f8..169d0e9e99 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -97,6 +97,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -718,14 +719,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -743,7 +744,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 4b61f82ce4..d70d8d438b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index bd37cea9b9..9bd53e399e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index c3ab796fbf..1c35371695 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -305,7 +306,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 5b936c92f8..169d0e9e99 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -97,6 +97,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -718,14 +719,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -743,7 +744,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 4b61f82ce4..d70d8d438b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index bd37cea9b9..9bd53e399e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index c3ab796fbf..1c35371695 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -305,7 +306,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index ff310286a5..fe8c94b824 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -98,6 +98,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -728,14 +729,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -753,7 +754,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 4b61f82ce4..d70d8d438b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index bd37cea9b9..9bd53e399e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index c3ab796fbf..1c35371695 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -305,7 +306,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/World.java index c80be0ecc8..1f72bea5a9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/World.java @@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -164,8 +165,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 28f71290df..9ce82cf165 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -100,6 +100,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -158,7 +159,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -745,14 +746,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -770,7 +771,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 586cf4c238..651ea26f5e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -113,7 +114,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -121,7 +122,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index bd37cea9b9..9bd53e399e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index c3ab796fbf..1c35371695 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -305,7 +306,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/World.java index c80be0ecc8..1f72bea5a9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/World.java @@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -164,8 +165,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index da813f3ee0..0063e5b664 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -101,6 +101,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -160,7 +161,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -755,14 +756,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -780,7 +781,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 586cf4c238..651ea26f5e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -113,7 +114,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -121,7 +122,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index bd37cea9b9..9bd53e399e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java index 02419a263c..51e7adadd4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -509,7 +510,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index c3ab796fbf..1c35371695 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -305,7 +306,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/World.java index c80be0ecc8..1f72bea5a9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/World.java @@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -164,8 +165,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java index bad557158a..42eb5af9ec 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index da813f3ee0..0063e5b664 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -101,6 +101,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -160,7 +161,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -755,14 +756,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -780,7 +781,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7eeeae73ce..029583519c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 586cf4c238..651ea26f5e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -113,7 +114,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -121,7 +122,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 331afdbb3c..58bd62544c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket { final PlayerInstance player = client.getPlayer(); LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index bd37cea9b9..9bd53e399e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/LoginServerThread.java index 3a59e69760..41eeb23e13 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/LoginServerThread.java @@ -59,6 +59,7 @@ import org.l2jmobius.gameserver.network.loginserverpackets.login.LoginServerFail import org.l2jmobius.gameserver.network.loginserverpackets.login.PlayerAuthResponse; import org.l2jmobius.gameserver.network.serverpackets.AuthLoginFail; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; public class LoginServerThread extends Thread { @@ -465,7 +466,7 @@ public class LoginServerThread extends Thread final GameClient client = _accountsInGameServer.get(account); if (client != null) { - client.close(true); + client.close(ServerClose.STATIC_PACKET); getInstance().sendLogout(account); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java index 991a906a5a..4aed9ea676 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.network.ClientNetworkManager; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -544,7 +545,7 @@ public class Shutdown extends Thread if (player.getClient() != null) { player.getClient().sendPacket(ServerClose.STATIC_PACKET); - player.getClient().close(false); + player.getClient().close(LeaveWorld.STATIC_PACKET); player.getClient().setPlayer(null); player.setClient(null); } 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 78b6359a45..cb027001a9 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 @@ -49,8 +49,6 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; -import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -165,11 +163,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -357,12 +350,11 @@ public class GameClient extends ChannelInboundHandler return; } - try (Connection con = DatabaseFactory.getConnection()) + try (Connection con = DatabaseFactory.getConnection(); + PreparedStatement statement = con.prepareStatement("UPDATE characters SET deletetime=0 WHERE charId=?")) { - final PreparedStatement statement = con.prepareStatement("UPDATE characters SET deletetime=0 WHERE charId=?"); statement.setInt(1, objectId); statement.execute(); - statement.close(); } catch (Exception e) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java index e25a3ba5e1..b274fcf69f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java @@ -59,6 +59,7 @@ import org.l2jmobius.gameserver.network.loginserverpackets.login.LoginServerFail import org.l2jmobius.gameserver.network.loginserverpackets.login.PlayerAuthResponse; import org.l2jmobius.gameserver.network.serverpackets.AuthLoginFail; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; public class LoginServerThread extends Thread { @@ -466,7 +467,7 @@ public class LoginServerThread extends Thread final GameClient client = _accountsInGameServer.get(account); if (client != null) { - client.close(true); + client.close(ServerClose.STATIC_PACKET); getInstance().sendLogout(account); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java index 6ef4776a18..c3bc47fa32 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.network.ClientNetworkManager; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -553,7 +554,7 @@ public class Shutdown extends Thread if (player.getClient() != null) { player.getClient().sendPacket(ServerClose.STATIC_PACKET); - player.getClient().close(false); + player.getClient().close(LeaveWorld.STATIC_PACKET); player.getClient().setPlayer(null); player.setClient(null); } 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 06a837afcd..5f9fe8fdfa 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 @@ -49,8 +49,6 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; -import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -153,11 +151,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -346,12 +339,11 @@ public class GameClient extends ChannelInboundHandler return; } - try (Connection con = DatabaseFactory.getConnection()) + try (Connection con = DatabaseFactory.getConnection(); + PreparedStatement statement = con.prepareStatement("UPDATE characters SET deletetime=0 WHERE charId=?")) { - final PreparedStatement statement = con.prepareStatement("UPDATE characters SET deletetime=0 WHERE charId=?"); statement.setInt(1, objectId); statement.execute(); - statement.close(); } catch (Exception e) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c8084a6ac9..335eb276cd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index ae98d7d463..8a63a7f82d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -174,7 +175,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java index fb5f3d070a..660b9c86ea 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -539,7 +540,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 6455c53795..0225783388 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -117,8 +117,6 @@ public abstract class AbstractAI implements Ctrl return _intention; } - - /** * Set the Intention of this AbstractAI.
* Caution: This method is USED by AI classes
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java index 0cbde39237..e2f7ba7625 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -155,8 +156,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 6c37d640c1..32b1311748 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 b4eeb81178..9f35603279 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 @@ -47,7 +47,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -135,11 +134,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -542,7 +536,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 4fd186a4db..a50e597c8c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SSQInfo; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -157,7 +158,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a66a81ccba..5fc51b5997 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -87,6 +87,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExStorageMaxCount; import org.l2jmobius.gameserver.network.serverpackets.FriendList; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -141,7 +142,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -673,14 +674,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -698,7 +699,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); 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 f46ca24eee..dc1e53b088 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 @@ -29,6 +29,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -100,7 +101,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 48668523dc..da9743a041 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -40,6 +40,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 294eb3bcba..5d43f01724 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -110,7 +111,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -118,7 +119,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 91909d6272..c259c8c6a2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c8084a6ac9..335eb276cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index ae98d7d463..8a63a7f82d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -174,7 +175,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java index fb5f3d070a..660b9c86ea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -539,7 +540,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java index 0cbde39237..e2f7ba7625 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -155,8 +156,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 6c37d640c1..32b1311748 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 e9d3f0ff2d..0c63359f4a 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 @@ -48,7 +48,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -138,11 +137,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -548,7 +542,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 90c6559e39..adc84d480b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SSQInfo; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -164,7 +165,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 507b30d978..a0eb75c7f2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -88,6 +88,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.FriendList; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -142,7 +143,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -672,14 +673,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -697,7 +698,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); 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 dee7b12152..ebe9ee98b3 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 @@ -29,6 +29,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -100,7 +101,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7c3150b79f..12862f8865 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -83,7 +84,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 294eb3bcba..5d43f01724 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -110,7 +111,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -118,7 +119,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 70cdcbdfb1..44ad3f2c11 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 730c69beb6..9d510455fc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0ba3ca4aa9..2e6e98c3ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -95,6 +95,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -151,7 +152,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -699,14 +700,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -724,7 +725,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); 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 8640fdfd39..263a728599 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 @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c2cb56b495..32ad547b6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 06de8cefc1..c632e26175 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; /** @@ -61,7 +62,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 8527c87423..faef4bd4e9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -95,6 +95,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -151,7 +152,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -699,14 +700,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -724,7 +725,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); 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 8640fdfd39..263a728599 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 @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c2cb56b495..32ad547b6f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9fa4e130d4..85be5e813a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -96,6 +96,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -709,14 +710,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -734,7 +735,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); 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 8640fdfd39..263a728599 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 @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c2cb56b495..32ad547b6f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9fa4e130d4..85be5e813a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -96,6 +96,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -709,14 +710,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -734,7 +735,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); 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 8640fdfd39..263a728599 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 @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c2cb56b495..32ad547b6f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9fa4e130d4..85be5e813a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -96,6 +96,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -709,14 +710,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -734,7 +735,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); 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 8640fdfd39..263a728599 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 @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c2cb56b495..32ad547b6f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 53bbd8a34b..6d2afd04e5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -97,6 +97,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -717,14 +718,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -742,7 +743,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); 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 8640fdfd39..263a728599 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 @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c2cb56b495..32ad547b6f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 a2824332c8..657e77e9e4 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -538,7 +532,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6ea8202605..6551f26471 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -93,6 +93,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVitalityEffectInfo; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -149,7 +150,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -695,14 +696,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -720,7 +721,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); 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 8640fdfd39..263a728599 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 @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c2cb56b495..32ad547b6f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 1cfd4f7e0f..03bf28223b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -99,6 +99,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -158,7 +159,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -751,14 +752,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -776,7 +777,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 30bde486bc..f0172ea99c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -113,7 +114,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -121,7 +122,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); 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 bad557158a..42eb5af9ec 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 @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index b789a72516..fcd9939ca3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -100,6 +100,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -162,7 +163,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -765,14 +766,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -790,7 +791,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 30bde486bc..f0172ea99c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -113,7 +114,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -121,7 +122,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index c325fd8bea..f0dcd81ae6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler { player.setAccessLevel(lvl, false, true); player.sendMessage("Your character has been banned. Bye."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index 5f3ee2d7e3..249bff9e3c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler else { BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index c6ece7044b..43b696a146 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; public class AdminKick implements IAdminCommandHandler @@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler final PlayerInstance plyr = World.getInstance().getPlayer(player); if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game."); } } @@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler if (!player.isGM()) { counter++; - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index e85793d923..b3f0e87283 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler String text; if (plyr != null) { - Disconnection.of(plyr).defaultSequence(false); + Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET); text = "You kicked " + plyr.getName() + " from the game."; } else diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 5964ef175a..c34c22c4df 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * This class handles ban punishment. @@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler } else { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } break; @@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler */ private void applyToPlayer(PlayerInstance player) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } @Override diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java index aa9dba4ce3..7f77540031 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java @@ -19,6 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import io.netty.channel.ChannelHandlerContext; @@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand final PlayerInstance player = World.getInstance().getPlayer(args[0]); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return "Player has been successfully kicked."; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/Shutdown.java index f222a68ba7..e2df844d24 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/Shutdown.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -514,7 +515,7 @@ public class Shutdown extends Thread { for (PlayerInstance player : World.getInstance().getPlayers()) { - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 3d8844ae9f..363e20e154 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class OfflineTraderTable { @@ -301,7 +302,7 @@ public class OfflineTraderTable LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); if (player != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/World.java index 5090a4ed3f..36e07c5d12 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/World.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class World { @@ -159,8 +160,8 @@ public class World final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); if (existingPlayer != null) { - Disconnection.of(existingPlayer).defaultSequence(false); - Disconnection.of(newPlayer).defaultSequence(false); + Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); + Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); } else if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 290e49a99f..a66c148e51 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.Disconnection; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; /** * Task that handles illegal player actions. @@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable } case KICK: { - Disconnection.of(_actor).defaultSequence(false); + Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET); break; } case KICKBAN: diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/Disconnection.java index 686b8a40c2..f70efff5c3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -149,15 +149,6 @@ public class Disconnection return this; } - public Disconnection close(boolean toLoginScreen) - { - if (_client != null) - { - _client.close(toLoginScreen); - } - return this; - } - public Disconnection close(IClientOutgoingPacket packet) { if (_client != null) @@ -167,12 +158,6 @@ public class Disconnection return this; } - public void defaultSequence(boolean toLoginScreen) - { - defaultSequence(); - close(toLoginScreen); - } - public void defaultSequence(IClientOutgoingPacket packet) { defaultSequence(); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/GameClient.java index bad557158a..42eb5af9ec 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/GameClient.java @@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; -import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.util.FloodProtectors; @@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler closeNow(); } - public void close(boolean toLoginScreen) - { - close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET); - } - public Channel getChannel() { return _channel; @@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler if (player.getClient() != null) { - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); } else { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5b25bd24c9..d778525410 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; @@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class); if ((terminate != null) && terminate.terminate()) { - Disconnection.of(cha).defaultSequence(false); + Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index b789a72516..fcd9939ca3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -100,6 +100,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.ItemList; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; @@ -162,7 +163,7 @@ public class EnterWorld implements IClientIncomingPacket if (player == null) { LOGGER.warning("EnterWorld failed! player returned 'null'."); - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -765,14 +766,14 @@ public class EnterWorld implements IClientIncomingPacket // Banned? if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } // Check max players. if (Config.KICK_MISSING_HWID && (hwInfo == null)) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } else if (Config.MAX_PLAYERS_PER_HWID > 0) { @@ -790,7 +791,7 @@ public class EnterWorld implements IClientIncomingPacket } if (count >= Config.MAX_PLAYERS_PER_HWID) { - Disconnection.of(client).defaultSequence(false); + Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } } }, 5000); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 8640fdfd39..263a728599 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -28,6 +28,7 @@ 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; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.OfflineTradeUtil; /** @@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket if (!OfflineTradeUtil.enteredOfflineMode(player)) { - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 1e87455cc7..8e66c12f40 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -88,7 +89,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); - Disconnection.of(client, player).defaultSequence(false); + Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 30bde486bc..f0172ea99c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -113,7 +114,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -121,7 +122,7 @@ public class Say2 implements IClientIncomingPacket { LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); - Disconnection.of(player).defaultSequence(false); + Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index fb80443656..f4760adf68 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); - Disconnection.of(player).defaultSequence(true); + Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } player.addRequest(new RewardRequest(player)); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 7974b2f8d7..a8509ef11d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.util.Util; /** @@ -105,7 +106,7 @@ public class SecondaryPasswordAuth if (passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } @@ -157,7 +158,7 @@ public class SecondaryPasswordAuth if (!passwordExist()) { LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); - Disconnection.of(_activeClient).defaultSequence(false); + Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index 2c2f5e3b58..993a5ede11 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -139,7 +140,7 @@ public class FloodProtectorAction */ private void kickPlayer() { - Disconnection.of(_client).defaultSequence(false); + Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET); if (LOGGER.isLoggable(Level.WARNING)) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 68100c5557..0ad2e5a314 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.serverpackets.ServerClose; /** * @author lord_rex @@ -105,7 +106,7 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - client.close(true); + client.close(ServerClose.STATIC_PACKET); if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { AntiFeedManager.getInstance().onDisconnect(client);