No need for unified entering and ingame enum.

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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

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

@@ -150,7 +150,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

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

@@ -150,7 +150,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -161,7 +161,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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_8.0_Homunculus/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -175,7 +175,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -175,7 +175,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -64,7 +64,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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

@@ -141,7 +141,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final 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

@@ -142,7 +142,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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_3.0_TheKamael/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -152,7 +152,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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_Interlude/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -127,7 +127,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -167,7 +167,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/ConnectionState.java

@@ -29,10 +29,4 @@ public enum ConnectionState implements IConnectionState
 	AUTHENTICATED,
 	ENTERING,
 	IN_GAME;
-	
-	public static final ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
-	{
-		ConnectionState.ENTERING,
-		ConnectionState.IN_GAME
-	};
 }

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java

@@ -167,7 +167,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.ENTERING_AND_IN_GAME),
+	REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING, ConnectionState.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),