Send UI requests on both entering and ingame states.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -128,7 +128,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -136,7 +136,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -137,7 +137,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -144,7 +144,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -151,7 +151,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -151,7 +151,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -151,7 +151,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -67,7 +67,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -128,7 +128,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -131,7 +131,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -131,7 +131,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -132,7 +132,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
 	CLOSING,
 	AUTHENTICATED,
 	ENTERING,
-	IN_GAME
+	IN_GAME;
+	
+	public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
+	{
+		ConnectionState.ENTERING,
+		ConnectionState.IN_GAME
+	};
 }

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -132,7 +132,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
 	REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
 	CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
 	MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
-	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
 	REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
 	REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
 	REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),