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
Download Patch File Download Diff File Expand all files Collapse all files

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

3
L2J_Mobius_10.0_MasterClass/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.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
public class OfflineTraderTable
{
@@ -305,7 +306,7 @@ public class OfflineTraderTable
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading trader: " + player, e);
if (player != null)
{
Disconnection.of(player).defaultSequence(false);
Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
}
}
}

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/World.java
View File

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

3
L2J_Mobius_10.0_MasterClass/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.PunishmentType;
import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
/**
* Task that handles illegal player actions.
@@ -88,7 +89,7 @@ public class IllegalPlayerActionTask implements Runnable
}
case KICK:
{
Disconnection.of(_actor).defaultSequence(false);
Disconnection.of(_actor).defaultSequence(LeaveWorld.STATIC_PACKET);
break;
}
case KICKBAN:

15
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/Disconnection.java
View File

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

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

3
L2J_Mobius_10.0_MasterClass/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.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.CharSelected;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
@@ -163,7 +164,7 @@ public class CharacterSelect implements IClientIncomingPacket
final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new OnPlayerSelect(cha, cha.getObjectId(), cha.getName(), client), Containers.Players(), TerminateReturn.class);
if ((terminate != null) && terminate.terminate())
{
Disconnection.of(cha).defaultSequence(false);
Disconnection.of(cha).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
}

9
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -101,6 +101,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExWorldChatCnt;
import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
@@ -160,7 +161,7 @@ public class EnterWorld implements IClientIncomingPacket
if (player == null)
{
LOGGER.warning("EnterWorld failed! player returned 'null'.");
Disconnection.of(client).defaultSequence(false);
Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
}
@@ -755,14 +756,14 @@ public class EnterWorld implements IClientIncomingPacket
// Banned?
if ((hwInfo != null) && PunishmentManager.getInstance().hasPunishment(hwInfo.getMacAddress(), PunishmentAffect.HWID, PunishmentType.BAN))
{
Disconnection.of(client).defaultSequence(false);
Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
}
// Check max players.
if (Config.KICK_MISSING_HWID && (hwInfo == null))
{
Disconnection.of(client).defaultSequence(false);
Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
}
else if (Config.MAX_PLAYERS_PER_HWID > 0)
{
@@ -780,7 +781,7 @@ public class EnterWorld implements IClientIncomingPacket
}
if (count >= Config.MAX_PLAYERS_PER_HWID)
{
Disconnection.of(client).defaultSequence(false);
Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
}
}
}, 5000);

3
L2J_Mobius_10.0_MasterClass/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.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.OfflineTradeUtil;
/**
@@ -92,7 +93,7 @@ public class Logout implements IClientIncomingPacket
if (!OfflineTradeUtil.enteredOfflineMode(player))
{
Disconnection.of(client, player).defaultSequence(false);
Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
}
}
}

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

5
L2J_Mobius_10.0_MasterClass/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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util;
/**
@@ -113,7 +114,7 @@ public class Say2 implements IClientIncomingPacket
{
LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text);
player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false);
Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
}
@@ -121,7 +122,7 @@ public class Say2 implements IClientIncomingPacket
{
LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!");
player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(false);
Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
}

3
L2J_Mobius_10.0_MasterClass/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.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
import org.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket
{
final PlayerInstance player = client.getPlayer();
LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName());
Disconnection.of(player).defaultSequence(true);
Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
return false;
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.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.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
@@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket
if (player.hasRequest(RewardRequest.class))
{
LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName());
Disconnection.of(player).defaultSequence(true);
Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
return;
}

5
L2J_Mobius_10.0_MasterClass/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.Ex2ndPasswordCheck;
import org.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.util.Util;
/**
@@ -105,7 +106,7 @@ public class SecondaryPasswordAuth
if (passwordExist())
{
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword");
Disconnection.of(_activeClient).defaultSequence(false);
Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false;
}
@@ -157,7 +158,7 @@ public class SecondaryPasswordAuth
if (!passwordExist())
{
LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword");
Disconnection.of(_activeClient).defaultSequence(false);
Disconnection.of(_activeClient).defaultSequence(LeaveWorld.STATIC_PACKET);
return false;
}

3
L2J_Mobius_10.0_MasterClass/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.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/**
@@ -139,7 +140,7 @@ public class FloodProtectorAction
*/
private void kickPlayer()
{
Disconnection.of(_client).defaultSequence(false);
Disconnection.of(_client).defaultSequence(LeaveWorld.STATIC_PACKET);
if (LOGGER.isLoggable(Level.WARNING))
{

3
L2J_Mobius_10.0_MasterClass/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.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
/**
* @author lord_rex
@@ -105,7 +106,7 @@ public class OfflineTradeUtil
World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient();
client.close(true);
client.close(ServerClose.STATIC_PACKET);
if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS)
{
AntiFeedManager.getInstance().onDisconnect(client);