lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removal of disconnection defaultSequence boolean close methods.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-11-04 02:54:18 +00:00
parent 35db563e3c
commit 419edfd7f5
497 changed files with 1106 additions and 1159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java vendored
View File

@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
{ {
player.setAccessLevel(lvl, false, true); player.setAccessLevel(lvl, false, true);
player.sendMessage("Your character has been banned. Bye."); player.sendMessage("Your character has been banned. Bye.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

3
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java vendored
View File

@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler
else else
{ {
BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java vendored
View File

@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
public class AdminKick implements IAdminCommandHandler public class AdminKick implements IAdminCommandHandler
@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler
final PlayerInstance plyr = World.getInstance().getPlayer(player); final PlayerInstance plyr = World.getInstance().getPlayer(player);
if (plyr != null) 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."); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game.");
} }
} }
@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler
if (!player.isGM()) if (!player.isGM())
{ {
counter++; counter++;
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players.");

3
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java vendored
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler
String text; String text;
if (plyr != null) if (plyr != null)
{ {
Disconnection.of(plyr).defaultSequence(false); Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET);
text = "You kicked " + plyr.getName() + " from the game."; text = "You kicked " + plyr.getName() + " from the game.";
} }
else else

5
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java vendored
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* This class handles ban punishment. * This class handles ban punishment.
@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler
} }
else else
{ {
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
break; break;
@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler
*/ */
private void applyToPlayer(PlayerInstance player) private void applyToPlayer(PlayerInstance player)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
@Override @Override

3
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java vendored
View File

@ -19,6 +19,7 @@ package handlers.telnethandlers.player;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand
final PlayerInstance player = World.getInstance().getPlayer(args[0]); final PlayerInstance player = World.getInstance().getPlayer(args[0]);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return "Player has been successfully kicked."; return "Player has been successfully kicked.";
} }
return "Couldn't find player with such name."; return "Couldn't find player with such name.";

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java
View File

@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.EventLoopGroupManager;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; 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.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.network.telnet.TelnetServer;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
@ -509,7 +510,7 @@ public class Shutdown extends Thread
{ {
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
Disconnection.of(player).defaultSequence(true); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
} }
} }

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java
View File

@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class OfflineTraderTable public class OfflineTraderTable
{ {
@ -301,7 +302,7 @@ public class OfflineTraderTable
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java
View File

@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class World public class World
{ {
@ -159,8 +160,8 @@ public class World
final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer);
if (existingPlayer != null) if (existingPlayer != null)
{ {
Disconnection.of(existingPlayer).defaultSequence(false); Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
Disconnection.of(newPlayer).defaultSequence(false); Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")");
} }
else if (Config.FACTION_SYSTEM_ENABLED) else if (Config.FACTION_SYSTEM_ENABLED)

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* Task that handles illegal player actions. * Task that handles illegal player actions.
@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable
} }
case KICK: case KICK:
{ {
Disconnection.of(_actor).defaultSequence(false); Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET);
break; break;
} }
case KICKBAN: case KICKBAN:

15
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Disconnection.java
View File

@ -149,15 +149,6 @@ public class Disconnection
return this; return this;
} }
public Disconnection close(boolean toLoginScreen)
{
if (_client != null)
{
_client.close(toLoginScreen);
}
return this;
}
public Disconnection close(IClientOutgoingPacket packet) public Disconnection close(IClientOutgoingPacket packet)
{ {
if (_client != null) if (_client != null)
@ -167,12 +158,6 @@ public class Disconnection
return this; return this;
} }
public void defaultSequence(boolean toLoginScreen)
{
defaultSequence();
close(toLoginScreen);
}
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
defaultSequence(); defaultSequence();

8
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java
View File

@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.NpcSay; 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.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth;
import org.l2jmobius.gameserver.util.FloodProtectors; import org.l2jmobius.gameserver.util.FloodProtectors;
@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
closeNow(); closeNow();
} }
public void close(boolean toLoginScreen)
{
close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET);
}
public Channel getChannel() public Channel getChannel()
{ {
return _channel; return _channel;
@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler<GameClient>
if (player.getClient() != null) if (player.getClient() != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
else else
{ {

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
View File

@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.CharSelected; 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.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose; 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); final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class);
if ((terminate != null) && terminate.terminate()) if ((terminate != null) && terminate.terminate())
{ {
Disconnection.of(cha).defaultSequence(false); Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -94,6 +94,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt;
import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
import org.l2jmobius.gameserver.network.serverpackets.ItemList; 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.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
@ -148,7 +149,7 @@ public class EnterWorld implements IClientIncomingPacket
if (player == null) if (player == null)
{ {
LOGGER.warning("EnterWorld failed! player returned 'null'."); LOGGER.warning("EnterWorld failed! player returned 'null'.");
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@ -674,14 +675,14 @@ public class EnterWorld implements IClientIncomingPacket
// Banned? // Banned?
if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) 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; return;
} }
// Check max players. // Check max players.
if (Config.KICK_MISSING_HWID && (hwInfo == null)) 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) else if (Config.MAX_PLAYERS_PER_HWID > 0)
{ {
@ -699,7 +700,7 @@ public class EnterWorld implements IClientIncomingPacket
} }
if (count >= Config.MAX_PLAYERS_PER_HWID) if (count >= Config.MAX_PLAYERS_PER_HWID)
{ {
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
}, 5000); }, 5000);

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.OfflineTradeUtil; import org.l2jmobius.gameserver.util.OfflineTradeUtil;
/** /**
@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket
if (!OfflineTradeUtil.enteredOfflineMode(player)) if (!OfflineTradeUtil.enteredOfflineMode(player))
{ {
Disconnection.of(client, player).defaultSequence(false); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
View File

@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; 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.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
if (_command.isEmpty()) if (_command.isEmpty())
{ {
LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); LOGGER.warning("Player " + player.getName() + " sent empty bypass!");
Disconnection.of(client, player).defaultSequence(false); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

5
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util; 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); LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket
{ {
LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java
View File

@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; 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.network.serverpackets.alchemy.ExTryMixCube;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket
{ {
final PlayerInstance player = client.getPlayer(); final PlayerInstance player = client.getPlayer();
LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); 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; return false;
} }
} }

5
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
/** /**
@ -105,7 +106,7 @@ public class SecondaryPasswordAuth
if (passwordExist()) if (passwordExist())
{ {
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword");
Disconnection.of(_activeClient).defaultSequence(false); Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false; return false;
} }
@ -157,7 +158,7 @@ public class SecondaryPasswordAuth
if (!passwordExist()) if (!passwordExist())
{ {
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword");
Disconnection.of(_activeClient).defaultSequence(false); Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false; return false;
} }

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
View File

@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/** /**
@ -139,7 +140,7 @@ public class FloodProtectorAction
*/ */
private void kickPlayer() private void kickPlayer()
{ {
Disconnection.of(_client).defaultSequence(false); Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET);
if (LOGGER.isLoggable(Level.WARNING)) if (LOGGER.isLoggable(Level.WARNING))
{ {

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
/** /**
* @author lord_rex * @author lord_rex
@ -105,7 +106,7 @@ public class OfflineTradeUtil
World.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(ServerClose.STATIC_PACKET);
if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS)
{ {
AntiFeedManager.getInstance().onDisconnect(client); AntiFeedManager.getInstance().onDisconnect(client);

3
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java vendored
View File

@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
{ {
player.setAccessLevel(lvl, false, true); player.setAccessLevel(lvl, false, true);
player.sendMessage("Your character has been banned. Bye."); player.sendMessage("Your character has been banned. Bye.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

3
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java vendored
View File

@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler
else else
{ {
BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java vendored
View File

@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
public class AdminKick implements IAdminCommandHandler public class AdminKick implements IAdminCommandHandler
@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler
final PlayerInstance plyr = World.getInstance().getPlayer(player); final PlayerInstance plyr = World.getInstance().getPlayer(player);
if (plyr != null) 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."); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game.");
} }
} }
@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler
if (!player.isGM()) if (!player.isGM())
{ {
counter++; counter++;
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players.");

3
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java vendored
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler
String text; String text;
if (plyr != null) if (plyr != null)
{ {
Disconnection.of(plyr).defaultSequence(false); Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET);
text = "You kicked " + plyr.getName() + " from the game."; text = "You kicked " + plyr.getName() + " from the game.";
} }
else else

5
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java vendored
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* This class handles ban punishment. * This class handles ban punishment.
@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler
} }
else else
{ {
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
break; break;
@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler
*/ */
private void applyToPlayer(PlayerInstance player) private void applyToPlayer(PlayerInstance player)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
@Override @Override

3
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java vendored
View File

@ -19,6 +19,7 @@ package handlers.telnethandlers.player;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand
final PlayerInstance player = World.getInstance().getPlayer(args[0]); final PlayerInstance player = World.getInstance().getPlayer(args[0]);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return "Player has been successfully kicked."; return "Player has been successfully kicked.";
} }
return "Couldn't find player with such name."; return "Couldn't find player with such name.";

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java
View File

@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.EventLoopGroupManager;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; 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.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.network.telnet.TelnetServer;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
@ -509,7 +510,7 @@ public class Shutdown extends Thread
{ {
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
Disconnection.of(player).defaultSequence(true); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
} }
} }

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java
View File

@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class OfflineTraderTable public class OfflineTraderTable
{ {
@ -301,7 +302,7 @@ public class OfflineTraderTable
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/World.java
View File

@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class World public class World
{ {
@ -159,8 +160,8 @@ public class World
final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer);
if (existingPlayer != null) if (existingPlayer != null)
{ {
Disconnection.of(existingPlayer).defaultSequence(false); Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
Disconnection.of(newPlayer).defaultSequence(false); Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")");
} }
else if (Config.FACTION_SYSTEM_ENABLED) else if (Config.FACTION_SYSTEM_ENABLED)

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* Task that handles illegal player actions. * Task that handles illegal player actions.
@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable
} }
case KICK: case KICK:
{ {
Disconnection.of(_actor).defaultSequence(false); Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET);
break; break;
} }
case KICKBAN: case KICKBAN:

15
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Disconnection.java
View File

@ -149,15 +149,6 @@ public class Disconnection
return this; return this;
} }
public Disconnection close(boolean toLoginScreen)
{
if (_client != null)
{
_client.close(toLoginScreen);
}
return this;
}
public Disconnection close(IClientOutgoingPacket packet) public Disconnection close(IClientOutgoingPacket packet)
{ {
if (_client != null) if (_client != null)
@ -167,12 +158,6 @@ public class Disconnection
return this; return this;
} }
public void defaultSequence(boolean toLoginScreen)
{
defaultSequence();
close(toLoginScreen);
}
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
defaultSequence(); defaultSequence();

8
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java
View File

@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.NpcSay; 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.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth;
import org.l2jmobius.gameserver.util.FloodProtectors; import org.l2jmobius.gameserver.util.FloodProtectors;
@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
closeNow(); closeNow();
} }
public void close(boolean toLoginScreen)
{
close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET);
}
public Channel getChannel() public Channel getChannel()
{ {
return _channel; return _channel;
@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler<GameClient>
if (player.getClient() != null) if (player.getClient() != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
else else
{ {

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
View File

@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.CharSelected; 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.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose; 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); final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class);
if ((terminate != null) && terminate.terminate()) if ((terminate != null) && terminate.terminate())
{ {
Disconnection.of(cha).defaultSequence(false); Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

9
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -96,6 +96,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt;
import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
import org.l2jmobius.gameserver.network.serverpackets.ItemList; 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.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket
if (player == null) if (player == null)
{ {
LOGGER.warning("EnterWorld failed! player returned 'null'."); LOGGER.warning("EnterWorld failed! player returned 'null'.");
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@ -712,14 +713,14 @@ public class EnterWorld implements IClientIncomingPacket
// Banned? // Banned?
if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) 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; return;
} }
// Check max players. // Check max players.
if (Config.KICK_MISSING_HWID && (hwInfo == null)) 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) else if (Config.MAX_PLAYERS_PER_HWID > 0)
{ {
@ -737,7 +738,7 @@ public class EnterWorld implements IClientIncomingPacket
} }
if (count >= Config.MAX_PLAYERS_PER_HWID) if (count >= Config.MAX_PLAYERS_PER_HWID)
{ {
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
}, 5000); }, 5000);

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.OfflineTradeUtil; import org.l2jmobius.gameserver.util.OfflineTradeUtil;
/** /**
@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket
if (!OfflineTradeUtil.enteredOfflineMode(player)) if (!OfflineTradeUtil.enteredOfflineMode(player))
{ {
Disconnection.of(client, player).defaultSequence(false); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
View File

@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; 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.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
if (_command.isEmpty()) if (_command.isEmpty())
{ {
LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); LOGGER.warning("Player " + player.getName() + " sent empty bypass!");
Disconnection.of(client, player).defaultSequence(false); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

5
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util; 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); LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket
{ {
LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java
View File

@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; 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.network.serverpackets.alchemy.ExTryMixCube;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket
{ {
final PlayerInstance player = client.getPlayer(); final PlayerInstance player = client.getPlayer();
LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); 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; return false;
} }
} }

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
/** /**
@ -61,7 +62,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
if (player.hasRequest(RewardRequest.class)) if (player.hasRequest(RewardRequest.class))
{ {
LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName());
Disconnection.of(player).defaultSequence(true); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
return; return;
} }
player.addRequest(new RewardRequest(player)); player.addRequest(new RewardRequest(player));

5
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
/** /**
@ -105,7 +106,7 @@ public class SecondaryPasswordAuth
if (passwordExist()) if (passwordExist())
{ {
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword");
Disconnection.of(_activeClient).defaultSequence(false); Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false; return false;
} }
@ -157,7 +158,7 @@ public class SecondaryPasswordAuth
if (!passwordExist()) if (!passwordExist())
{ {
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword");
Disconnection.of(_activeClient).defaultSequence(false); Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false; return false;
} }

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
View File

@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/** /**
@ -139,7 +140,7 @@ public class FloodProtectorAction
*/ */
private void kickPlayer() private void kickPlayer()
{ {
Disconnection.of(_client).defaultSequence(false); Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET);
if (LOGGER.isLoggable(Level.WARNING)) if (LOGGER.isLoggable(Level.WARNING))
{ {

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
/** /**
* @author lord_rex * @author lord_rex
@ -105,7 +106,7 @@ public class OfflineTradeUtil
World.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(ServerClose.STATIC_PACKET);
if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS)
{ {
AntiFeedManager.getInstance().onDisconnect(client); AntiFeedManager.getInstance().onDisconnect(client);

3
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java vendored
View File

@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
{ {
player.setAccessLevel(lvl, false, true); player.setAccessLevel(lvl, false, true);
player.sendMessage("Your character has been banned. Bye."); player.sendMessage("Your character has been banned. Bye.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

3
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java vendored
View File

@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler
else else
{ {
BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java vendored
View File

@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
public class AdminKick implements IAdminCommandHandler public class AdminKick implements IAdminCommandHandler
@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler
final PlayerInstance plyr = World.getInstance().getPlayer(player); final PlayerInstance plyr = World.getInstance().getPlayer(player);
if (plyr != null) 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."); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game.");
} }
} }
@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler
if (!player.isGM()) if (!player.isGM())
{ {
counter++; counter++;
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players.");

3
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java vendored
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler
String text; String text;
if (plyr != null) if (plyr != null)
{ {
Disconnection.of(plyr).defaultSequence(false); Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET);
text = "You kicked " + plyr.getName() + " from the game."; text = "You kicked " + plyr.getName() + " from the game.";
} }
else else

5
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java vendored
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* This class handles ban punishment. * This class handles ban punishment.
@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler
} }
else else
{ {
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
break; break;
@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler
*/ */
private void applyToPlayer(PlayerInstance player) private void applyToPlayer(PlayerInstance player)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
@Override @Override

3
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java vendored
View File

@ -19,6 +19,7 @@ package handlers.telnethandlers.player;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand
final PlayerInstance player = World.getInstance().getPlayer(args[0]); final PlayerInstance player = World.getInstance().getPlayer(args[0]);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return "Player has been successfully kicked."; return "Player has been successfully kicked.";
} }
return "Couldn't find player with such name."; return "Couldn't find player with such name.";

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java
View File

@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.EventLoopGroupManager;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; 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.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.network.telnet.TelnetServer;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
@ -509,7 +510,7 @@ public class Shutdown extends Thread
{ {
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
Disconnection.of(player).defaultSequence(true); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
} }
} }

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java
View File

@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class OfflineTraderTable public class OfflineTraderTable
{ {
@ -301,7 +302,7 @@ public class OfflineTraderTable
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/World.java
View File

@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class World public class World
{ {
@ -159,8 +160,8 @@ public class World
final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer);
if (existingPlayer != null) if (existingPlayer != null)
{ {
Disconnection.of(existingPlayer).defaultSequence(false); Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
Disconnection.of(newPlayer).defaultSequence(false); Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")");
} }
else if (Config.FACTION_SYSTEM_ENABLED) else if (Config.FACTION_SYSTEM_ENABLED)

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* Task that handles illegal player actions. * Task that handles illegal player actions.
@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable
} }
case KICK: case KICK:
{ {
Disconnection.of(_actor).defaultSequence(false); Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET);
break; break;
} }
case KICKBAN: case KICKBAN:

15
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Disconnection.java
View File

@ -149,15 +149,6 @@ public class Disconnection
return this; return this;
} }
public Disconnection close(boolean toLoginScreen)
{
if (_client != null)
{
_client.close(toLoginScreen);
}
return this;
}
public Disconnection close(IClientOutgoingPacket packet) public Disconnection close(IClientOutgoingPacket packet)
{ {
if (_client != null) if (_client != null)
@ -167,12 +158,6 @@ public class Disconnection
return this; return this;
} }
public void defaultSequence(boolean toLoginScreen)
{
defaultSequence();
close(toLoginScreen);
}
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
defaultSequence(); defaultSequence();

8
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java
View File

@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.NpcSay; 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.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth;
import org.l2jmobius.gameserver.util.FloodProtectors; import org.l2jmobius.gameserver.util.FloodProtectors;
@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
closeNow(); closeNow();
} }
public void close(boolean toLoginScreen)
{
close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET);
}
public Channel getChannel() public Channel getChannel()
{ {
return _channel; return _channel;
@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler<GameClient>
if (player.getClient() != null) if (player.getClient() != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
else else
{ {

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
View File

@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.CharSelected; 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.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose; 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); final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class);
if ((terminate != null) && terminate.terminate()) if ((terminate != null) && terminate.terminate())
{ {
Disconnection.of(cha).defaultSequence(false); Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

9
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -96,6 +96,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt;
import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
import org.l2jmobius.gameserver.network.serverpackets.ItemList; 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.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket
if (player == null) if (player == null)
{ {
LOGGER.warning("EnterWorld failed! player returned 'null'."); LOGGER.warning("EnterWorld failed! player returned 'null'.");
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@ -712,14 +713,14 @@ public class EnterWorld implements IClientIncomingPacket
// Banned? // Banned?
if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) 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; return;
} }
// Check max players. // Check max players.
if (Config.KICK_MISSING_HWID && (hwInfo == null)) 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) else if (Config.MAX_PLAYERS_PER_HWID > 0)
{ {
@ -737,7 +738,7 @@ public class EnterWorld implements IClientIncomingPacket
} }
if (count >= Config.MAX_PLAYERS_PER_HWID) if (count >= Config.MAX_PLAYERS_PER_HWID)
{ {
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
}, 5000); }, 5000);

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.OfflineTradeUtil; import org.l2jmobius.gameserver.util.OfflineTradeUtil;
/** /**
@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket
if (!OfflineTradeUtil.enteredOfflineMode(player)) if (!OfflineTradeUtil.enteredOfflineMode(player))
{ {
Disconnection.of(client, player).defaultSequence(false); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
View File

@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; 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.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
if (_command.isEmpty()) if (_command.isEmpty())
{ {
LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); LOGGER.warning("Player " + player.getName() + " sent empty bypass!");
Disconnection.of(client, player).defaultSequence(false); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

5
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util; 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); LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket
{ {
LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java
View File

@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; 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.network.serverpackets.alchemy.ExTryMixCube;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket
{ {
final PlayerInstance player = client.getPlayer(); final PlayerInstance player = client.getPlayer();
LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); 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; return false;
} }
} }

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
/** /**
@ -61,7 +62,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
if (player.hasRequest(RewardRequest.class)) if (player.hasRequest(RewardRequest.class))
{ {
LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName());
Disconnection.of(player).defaultSequence(true); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
return; return;
} }
player.addRequest(new RewardRequest(player)); player.addRequest(new RewardRequest(player));

5
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
/** /**
@ -105,7 +106,7 @@ public class SecondaryPasswordAuth
if (passwordExist()) if (passwordExist())
{ {
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword");
Disconnection.of(_activeClient).defaultSequence(false); Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false; return false;
} }
@ -157,7 +158,7 @@ public class SecondaryPasswordAuth
if (!passwordExist()) if (!passwordExist())
{ {
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword");
Disconnection.of(_activeClient).defaultSequence(false); Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false; return false;
} }

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
View File

@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/** /**
@ -139,7 +140,7 @@ public class FloodProtectorAction
*/ */
private void kickPlayer() private void kickPlayer()
{ {
Disconnection.of(_client).defaultSequence(false); Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET);
if (LOGGER.isLoggable(Level.WARNING)) if (LOGGER.isLoggable(Level.WARNING))
{ {

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
/** /**
* @author lord_rex * @author lord_rex
@ -105,7 +106,7 @@ public class OfflineTradeUtil
World.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(ServerClose.STATIC_PACKET);
if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS)
{ {
AntiFeedManager.getInstance().onDisconnect(client); AntiFeedManager.getInstance().onDisconnect(client);

3
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java vendored
View File

@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
{ {
player.setAccessLevel(lvl, false, true); player.setAccessLevel(lvl, false, true);
player.sendMessage("Your character has been banned. Bye."); player.sendMessage("Your character has been banned. Bye.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

3
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java vendored
View File

@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler
else else
{ {
BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java vendored
View File

@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
public class AdminKick implements IAdminCommandHandler public class AdminKick implements IAdminCommandHandler
@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler
final PlayerInstance plyr = World.getInstance().getPlayer(player); final PlayerInstance plyr = World.getInstance().getPlayer(player);
if (plyr != null) 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."); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game.");
} }
} }
@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler
if (!player.isGM()) if (!player.isGM())
{ {
counter++; counter++;
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players.");

3
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java vendored
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler
String text; String text;
if (plyr != null) if (plyr != null)
{ {
Disconnection.of(plyr).defaultSequence(false); Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET);
text = "You kicked " + plyr.getName() + " from the game."; text = "You kicked " + plyr.getName() + " from the game.";
} }
else else

5
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java vendored
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* This class handles ban punishment. * This class handles ban punishment.
@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler
} }
else else
{ {
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
break; break;
@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler
*/ */
private void applyToPlayer(PlayerInstance player) private void applyToPlayer(PlayerInstance player)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
@Override @Override

3
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java vendored
View File

@ -19,6 +19,7 @@ package handlers.telnethandlers.player;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand
final PlayerInstance player = World.getInstance().getPlayer(args[0]); final PlayerInstance player = World.getInstance().getPlayer(args[0]);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return "Player has been successfully kicked."; return "Player has been successfully kicked.";
} }
return "Couldn't find player with such name."; return "Couldn't find player with such name.";

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java
View File

@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.EventLoopGroupManager;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; 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.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.network.telnet.TelnetServer;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
@ -509,7 +510,7 @@ public class Shutdown extends Thread
{ {
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
Disconnection.of(player).defaultSequence(true); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
} }
} }

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java
View File

@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class OfflineTraderTable public class OfflineTraderTable
{ {
@ -305,7 +306,7 @@ public class OfflineTraderTable
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java
View File

@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class World public class World
{ {
@ -159,8 +160,8 @@ public class World
final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer);
if (existingPlayer != null) if (existingPlayer != null)
{ {
Disconnection.of(existingPlayer).defaultSequence(false); Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
Disconnection.of(newPlayer).defaultSequence(false); Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")");
} }
else if (Config.FACTION_SYSTEM_ENABLED) else if (Config.FACTION_SYSTEM_ENABLED)

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* Task that handles illegal player actions. * Task that handles illegal player actions.
@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable
} }
case KICK: case KICK:
{ {
Disconnection.of(_actor).defaultSequence(false); Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET);
break; break;
} }
case KICKBAN: case KICKBAN:

15
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Disconnection.java
View File

@ -149,15 +149,6 @@ public class Disconnection
return this; return this;
} }
public Disconnection close(boolean toLoginScreen)
{
if (_client != null)
{
_client.close(toLoginScreen);
}
return this;
}
public Disconnection close(IClientOutgoingPacket packet) public Disconnection close(IClientOutgoingPacket packet)
{ {
if (_client != null) if (_client != null)
@ -167,12 +158,6 @@ public class Disconnection
return this; return this;
} }
public void defaultSequence(boolean toLoginScreen)
{
defaultSequence();
close(toLoginScreen);
}
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
defaultSequence(); defaultSequence();

8
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java
View File

@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.NpcSay; 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.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth;
import org.l2jmobius.gameserver.util.FloodProtectors; import org.l2jmobius.gameserver.util.FloodProtectors;
@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
closeNow(); closeNow();
} }
public void close(boolean toLoginScreen)
{
close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET);
}
public Channel getChannel() public Channel getChannel()
{ {
return _channel; return _channel;
@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler<GameClient>
if (player.getClient() != null) if (player.getClient() != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
else else
{ {

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
View File

@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.CharSelected; 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.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose; 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); final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class);
if ((terminate != null) && terminate.terminate()) if ((terminate != null) && terminate.terminate())
{ {
Disconnection.of(cha).defaultSequence(false); Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

9
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -96,6 +96,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt; import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt;
import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
import org.l2jmobius.gameserver.network.serverpackets.ItemList; 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.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket
if (player == null) if (player == null)
{ {
LOGGER.warning("EnterWorld failed! player returned 'null'."); LOGGER.warning("EnterWorld failed! player returned 'null'.");
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@ -712,14 +713,14 @@ public class EnterWorld implements IClientIncomingPacket
// Banned? // Banned?
if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN)) 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; return;
} }
// Check max players. // Check max players.
if (Config.KICK_MISSING_HWID && (hwInfo == null)) 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) else if (Config.MAX_PLAYERS_PER_HWID > 0)
{ {
@ -737,7 +738,7 @@ public class EnterWorld implements IClientIncomingPacket
} }
if (count >= Config.MAX_PLAYERS_PER_HWID) if (count >= Config.MAX_PLAYERS_PER_HWID)
{ {
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
}, 5000); }, 5000);

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.OfflineTradeUtil; import org.l2jmobius.gameserver.util.OfflineTradeUtil;
/** /**
@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket
if (!OfflineTradeUtil.enteredOfflineMode(player)) if (!OfflineTradeUtil.enteredOfflineMode(player))
{ {
Disconnection.of(client, player).defaultSequence(false); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
View File

@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; 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.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
@ -90,7 +91,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
if (_command.isEmpty()) if (_command.isEmpty())
{ {
LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); LOGGER.warning("Player " + player.getName() + " sent empty bypass!");
Disconnection.of(client, player).defaultSequence(false); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

5
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util; 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); LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket
{ {
LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java
View File

@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; 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.network.serverpackets.alchemy.ExTryMixCube;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket
{ {
final PlayerInstance player = client.getPlayer(); final PlayerInstance player = client.getPlayer();
LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); 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; return false;
} }
} }

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.RewardRequest;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; 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.ExConnectedTimeAndGettableReward;
import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
if (player.hasRequest(RewardRequest.class)) if (player.hasRequest(RewardRequest.class))
{ {
LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName());
Disconnection.of(player).defaultSequence(true); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
return; return;
} }
player.addRequest(new RewardRequest(player)); player.addRequest(new RewardRequest(player));

5
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify; import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
/** /**
@ -105,7 +106,7 @@ public class SecondaryPasswordAuth
if (passwordExist()) if (passwordExist())
{ {
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword");
Disconnection.of(_activeClient).defaultSequence(false); Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false; return false;
} }
@ -157,7 +158,7 @@ public class SecondaryPasswordAuth
if (!passwordExist()) if (!passwordExist())
{ {
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword");
Disconnection.of(_activeClient).defaultSequence(false); Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false; return false;
} }

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
View File

@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/** /**
@ -139,7 +140,7 @@ public class FloodProtectorAction
*/ */
private void kickPlayer() private void kickPlayer()
{ {
Disconnection.of(_client).defaultSequence(false); Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET);
if (LOGGER.isLoggable(Level.WARNING)) if (LOGGER.isLoggable(Level.WARNING))
{ {

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
/** /**
* @author lord_rex * @author lord_rex
@ -105,7 +106,7 @@ public class OfflineTradeUtil
World.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(ServerClose.STATIC_PACKET);
if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS)
{ {
AntiFeedManager.getInstance().onDisconnect(client); AntiFeedManager.getInstance().onDisconnect(client);

3
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java vendored
View File

@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -133,7 +134,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
{ {
player.setAccessLevel(lvl, false, true); player.setAccessLevel(lvl, false, true);
player.sendMessage("Your character has been banned. Bye."); player.sendMessage("Your character has been banned. Bye.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

3
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java vendored
View File

@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -69,7 +70,7 @@ public class AdminDisconnect implements IAdminCommandHandler
else else
{ {
BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server."); BuilderUtil.sendSysMessage(activeChar, "Character " + player.getName() + " disconnected from server.");
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java vendored
View File

@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
public class AdminKick implements IAdminCommandHandler public class AdminKick implements IAdminCommandHandler
@ -45,7 +46,7 @@ public class AdminKick implements IAdminCommandHandler
final PlayerInstance plyr = World.getInstance().getPlayer(player); final PlayerInstance plyr = World.getInstance().getPlayer(player);
if (plyr != null) 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."); BuilderUtil.sendSysMessage(activeChar, "You kicked " + plyr.getName() + " from the game.");
} }
} }
@ -58,7 +59,7 @@ public class AdminKick implements IAdminCommandHandler
if (!player.isGM()) if (!player.isGM())
{ {
counter++; counter++;
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players."); BuilderUtil.sendSysMessage(activeChar, "Kicked " + counter + " players.");

3
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java vendored
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
/** /**
@ -172,7 +173,7 @@ public class AdminMenu implements IAdminCommandHandler
String text; String text;
if (plyr != null) if (plyr != null)
{ {
Disconnection.of(plyr).defaultSequence(false); Disconnection.of(plyr).defaultSequence(LeaveWorld.STATIC_PACKET);
text = "You kicked " + plyr.getName() + " from the game."; text = "You kicked " + plyr.getName() + " from the game.";
} }
else else

5
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java vendored
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* This class handles ban punishment. * This class handles ban punishment.
@ -59,7 +60,7 @@ public class BanHandler implements IPunishmentHandler
} }
else else
{ {
Disconnection.of(client).defaultSequence(false); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
break; break;
@ -104,7 +105,7 @@ public class BanHandler implements IPunishmentHandler
*/ */
private void applyToPlayer(PlayerInstance player) private void applyToPlayer(PlayerInstance player)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
@Override @Override

3
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Kick.java vendored
View File

@ -19,6 +19,7 @@ package handlers.telnethandlers.player;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
@ -50,7 +51,7 @@ public class Kick implements ITelnetCommand
final PlayerInstance player = World.getInstance().getPlayer(args[0]); final PlayerInstance player = World.getInstance().getPlayer(args[0]);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return "Player has been successfully kicked."; return "Player has been successfully kicked.";
} }
return "Couldn't find player with such name."; return "Couldn't find player with such name.";

3
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java
View File

@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.EventLoopGroupManager; import org.l2jmobius.gameserver.network.EventLoopGroupManager;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus; 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.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.network.telnet.TelnetServer;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
@ -509,7 +510,7 @@ public class Shutdown extends Thread
{ {
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
Disconnection.of(player).defaultSequence(true); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
} }
} }

3
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java
View File

@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class OfflineTraderTable public class OfflineTraderTable
{ {
@ -305,7 +306,7 @@ public class OfflineTraderTable
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e); LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e);
if (player != null) if (player != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
} }
} }

5
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/World.java
View File

@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class World public class World
{ {
@ -159,8 +160,8 @@ public class World
final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer); final PlayerInstance existingPlayer = _allPlayers.putIfAbsent(object.getObjectId(), newPlayer);
if (existingPlayer != null) if (existingPlayer != null)
{ {
Disconnection.of(existingPlayer).defaultSequence(false); Disconnection.of(existingPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
Disconnection.of(newPlayer).defaultSequence(false); Disconnection.of(newPlayer).defaultSequence(LeaveWorld.STATIC_PACKET);
LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")"); LOGGER.warning(getClass().getSimpleName() + ": Duplicate character!? Disconnected both characters (" + newPlayer.getName() + ")");
} }
else if (Config.FACTION_SYSTEM_ENABLED) else if (Config.FACTION_SYSTEM_ENABLED)

3
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/** /**
* Task that handles illegal player actions. * Task that handles illegal player actions.
@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable
} }
case KICK: case KICK:
{ {
Disconnection.of(_actor).defaultSequence(false); Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET);
break; break;
} }
case KICKBAN: case KICKBAN:

15
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Disconnection.java
View File

@ -149,15 +149,6 @@ public class Disconnection
return this; return this;
} }
public Disconnection close(boolean toLoginScreen)
{
if (_client != null)
{
_client.close(toLoginScreen);
}
return this;
}
public Disconnection close(IClientOutgoingPacket packet) public Disconnection close(IClientOutgoingPacket packet)
{ {
if (_client != null) if (_client != null)
@ -167,12 +158,6 @@ public class Disconnection
return this; return this;
} }
public void defaultSequence(boolean toLoginScreen)
{
defaultSequence();
close(toLoginScreen);
}
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
defaultSequence(); defaultSequence();

8
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java
View File

@ -52,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.NpcSay; 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.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.security.SecondaryPasswordAuth; import org.l2jmobius.gameserver.security.SecondaryPasswordAuth;
import org.l2jmobius.gameserver.util.FloodProtectors; import org.l2jmobius.gameserver.util.FloodProtectors;
@ -142,11 +141,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
closeNow(); closeNow();
} }
public void close(boolean toLoginScreen)
{
close(toLoginScreen ? ServerClose.STATIC_PACKET : LeaveWorld.STATIC_PACKET);
}
public Channel getChannel() public Channel getChannel()
{ {
return _channel; return _channel;
@ -544,7 +538,7 @@ public class GameClient extends ChannelInboundHandler<GameClient>
if (player.getClient() != null) if (player.getClient() != null)
{ {
Disconnection.of(player).defaultSequence(false); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
} }
else else
{ {

3
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
View File

@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.CharSelected; 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.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose; 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); final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class);
if ((terminate != null) && terminate.terminate()) if ((terminate != null) && terminate.terminate())
{ {
Disconnection.of(cha).defaultSequence(false); Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }

Some files were not shown because too many files have changed in this diff Show More