From ee1e3c1d1dd20c851140506fa6cc6a5bb444e0d6 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 13 Apr 2021 09:38:05 +0000 Subject: [PATCH] No need for unified entering and ingame enum. --- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 6 ------ .../org/l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- 44 files changed, 21 insertions(+), 159 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index f3308b24da..87d801ae76 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -128,7 +128,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 181d23d2d2..de5eb9c4a8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -136,7 +136,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index ddae6cb290..51be7d53d7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -137,7 +137,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index bdcd9e8fb1..9e2b54eba3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -144,7 +144,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 60797f0105..880dc9b5aa 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -150,7 +150,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index e72bf00c54..3fe44f3903 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -150,7 +150,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index e79108f017..e6b175747b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -151,7 +151,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 874166eb0f..7a0fcfe988 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -161,7 +161,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 315304e4a4..b509169071 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -175,7 +175,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 978d79668f..9e0e9f55a2 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -175,7 +175,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/ConnectionState.java index b01874908a..399cabd177 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/ConnectionState.java index b01874908a..399cabd177 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 1e5c17c3a0..8f55d62f33 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -64,7 +64,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 530e8b6d92..46f5f02d64 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -67,7 +67,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 381e1bc2a7..838672e8ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -128,7 +128,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index e3aba46636..a45ee6476d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -131,7 +131,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index aa62cbfda3..8863d43c90 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -131,7 +131,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index aba8e56f53..c5db652387 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -141,7 +141,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 067082de80..8aab1ab8c9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -142,7 +142,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 00eafc690c..81c42ceeb3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -152,7 +152,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index f4815f9476..de1ae46d20 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -127,7 +127,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index fbf4839cd6..235ff081da 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -167,7 +167,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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), diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/ConnectionState.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/ConnectionState.java index b48498b7b9..03ffad13cc 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/ConnectionState.java +++ b/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 - }; } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java index 6121e4b903..8956e37844 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -167,7 +167,7 @@ public enum ExIncomingPackets implements IIncomingPackets 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),