EnterWorld exploit fix.

Author: Tryskell
Source: https://acis.i-live.eu/index.php?topic=10070

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
 }

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

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
 }

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

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
 }

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

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
 }

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

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
 }

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

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
 }

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GameClient.java

@@ -75,6 +75,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 	{
 		CONNECTED,
 		AUTHED,
+		ENTERING,
 		IN_GAME
 	}
 	

L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java

@@ -138,6 +138,23 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 				}
 				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<L2GameClient>,
 					// case 0x02:
 					// Say ... not used any more ??
 					// break;
-					case 0x03:
-					{
-						msg = new EnterWorld();
-						break;
-					}
 					case 0x04:
 					{
 						msg = new Action();

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));
 				}
 			}

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);
 		

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
 }

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -45,7 +45,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

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
 }

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

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
 }

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

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
 }

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{

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
 }

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/IncomingPackets.java

@@ -50,7 +50,7 @@ public enum IncomingPackets implements IIncomingPackets<L2GameClient>
 	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),

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));
 				}
 			}

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++)
 		{