From b4d261eb2034b9bcdfddec2e0253d70853d215f0 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 25 Feb 2019 17:36:19 +0000 Subject: [PATCH] EnterWorld exploit fix. Author: Tryskell Source: https://acis.i-live.eu/index.php?topic=10070 --- .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/L2GameClient.java | 1 + .../network/L2GamePacketHandler.java | 22 ++++++++++++++----- .../clientpackets/CharacterSelected.java | 2 +- .../network/clientpackets/EnterWorld.java | 4 +++- .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ .../gameserver/network/ConnectionState.java | 1 + .../gameserver/network/IncomingPackets.java | 2 +- .../clientpackets/CharacterSelect.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +++ 48 files changed, 88 insertions(+), 29 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index d4ea8a8a42..df32bd1291 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -57,6 +57,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -143,6 +144,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 7f467f6323..6da5ff2266 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -58,6 +58,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -148,6 +149,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 7f467f6323..6da5ff2266 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -58,6 +58,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -148,6 +149,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9658908858..fafda636b7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -58,6 +58,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -148,6 +149,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 3dc650d07c..6728014c64 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -58,6 +58,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -146,6 +147,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 3a97e58e3a..dff3336b1b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -58,6 +58,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -146,6 +147,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GameClient.java index 34639b0bc2..80a93f430b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -75,6 +75,7 @@ public final class L2GameClient extends MMOClient> i { CONNECTED, AUTHED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java index 4c0d9b3cba..531ad1a119 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java @@ -138,6 +138,23 @@ public final class L2GamePacketHandler implements IPacketHandler, } break; } + case ENTERING: + { + switch (opcode) + { + case 0x03: + { + msg = new EnterWorld(); + break; + } + default: + { + printDebug(opcode, buf, state, client); + break; + } + } + break; + } case IN_GAME: { switch (opcode) @@ -150,11 +167,6 @@ public final class L2GamePacketHandler implements IPacketHandler, // case 0x02: // Say ... not used any more ?? // break; - case 0x03: - { - msg = new EnterWorld(); - break; - } case 0x04: { msg = new Action(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java index fe377b130f..c3edb546a8 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java @@ -84,7 +84,7 @@ public class CharacterSelected extends L2GameClientPacket cha.setClient(getClient()); getClient().setActiveChar(cha); nProtect.getInstance().sendRequest(getClient()); - getClient().setState(GameClientState.IN_GAME); + getClient().setState(GameClientState.ENTERING); sendPacket(new CharSelected(cha, getClient().getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 19a0a0924b..928c83ed92 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -71,6 +71,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.network.Disconnection; +import com.l2jmobius.gameserver.network.L2GameClient.GameClientState; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ClientSetTime; import com.l2jmobius.gameserver.network.serverpackets.CreatureSay; @@ -125,7 +126,6 @@ public class EnterWorld extends L2GameClientPacket protected void runImpl() { final L2PcInstance activeChar = getClient().getActiveChar(); - if (activeChar == null) { LOGGER.warning("EnterWorld failed! activeChar is null..."); @@ -133,6 +133,8 @@ public class EnterWorld extends L2GameClientPacket return; } + getClient().setState(GameClientState.IN_GAME); + // Set lock at login activeChar.setLocked(true); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/ConnectionState.java index cb8e140ecd..ea81478af8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/IncomingPackets.java index c98f4bc848..85024b3427 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -45,7 +45,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 2d55acc40e..03699a6cc8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -169,7 +169,7 @@ public class CharacterSelect implements IClientIncomingPacket client.sendPacket(new SSQInfo()); - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0000ac94f9..6dce88e0ed 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -60,6 +60,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.skills.CommonSkill; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -135,6 +136,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index ad62bdb7cf..c9bcd43b70 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -58,6 +58,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -147,6 +148,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 2ce97d8c14..1e17aa4796 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -58,6 +58,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -147,6 +148,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index ab403a0e59..8131a36435 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -58,6 +58,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -147,6 +148,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/ConnectionState.java index 60246917c2..59fc8a5c3c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/ConnectionState.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/ConnectionState.java @@ -27,5 +27,6 @@ public enum ConnectionState implements IConnectionState DISCONNECTED, CLOSING, AUTHENTICATED, + ENTERING, IN_GAME } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/IncomingPackets.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/IncomingPackets.java index 85b3fad9fd..c9b082059d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/IncomingPackets.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/IncomingPackets.java @@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets CHARACTER_DELETE(0x0D, CharacterDelete::new, ConnectionState.AUTHENTICATED), PROTOCOL_VERSION(0x0E, ProtocolVersion::new, ConnectionState.CONNECTED), MOVE_BACKWARD_TO_LOCATION(0x0F, MoveBackwardToLocation::new, ConnectionState.IN_GAME), - ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.IN_GAME), + ENTER_WORLD(0x11, EnterWorld::new, ConnectionState.ENTERING), CHARACTER_SELECT(0x12, CharacterSelect::new, ConnectionState.AUTHENTICATED), NEW_CHARACTER(0x13, NewCharacter::new, ConnectionState.AUTHENTICATED), REQUEST_ITEM_LIST(0x14, RequestItemList::new, ConnectionState.IN_GAME), diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 10ff1731d2..e1057dd6eb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -166,7 +166,7 @@ public class CharacterSelect implements IClientIncomingPacket return; } - client.setConnectionState(ConnectionState.IN_GAME); + client.setConnectionState(ConnectionState.ENTERING); client.sendPacket(new CharSelected(cha, client.getSessionId().playOkID1)); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index ab403a0e59..8131a36435 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -58,6 +58,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; +import com.l2jmobius.gameserver.network.ConnectionState; import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -147,6 +148,8 @@ public class EnterWorld implements IClientIncomingPacket return; } + client.setConnectionState(ConnectionState.IN_GAME); + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) {