From 1677a641d1468f39e4fcd081a23f40badd4d072b Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 15 May 2019 17:31:16 +0000 Subject: [PATCH] Send UI requests on both entering and ingame states. --- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- .../org/l2jmobius/gameserver/network/ConnectionState.java | 8 +++++++- .../l2jmobius/gameserver/network/ExIncomingPackets.java | 2 +- 26 files changed, 104 insertions(+), 26 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 7f3e6913c5..b839404cbf 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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 736d7854c1..50160c1830 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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 53934354be..5fdbe34301 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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 660f6a9534..16f2af777c 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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 2c75f28a7e..0d56d0e092 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 @@ -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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 2e4fe29e0c..580d6e8321 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 @@ -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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 2e4fe29e0c..580d6e8321 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.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), 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 af92ed69fa..3e5d23b8ac 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 @@ -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 + }; } 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 f720a033f7..530e8b6d92 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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 f56feafa54..24758fe7cc 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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 c7c49ac950..56dec7cb5d 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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 8d8eafc99a..c60496a84b 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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 43784dd3e6..f2e8906daa 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 @@ -132,7 +132,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.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), 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 f6a86a4fa2..cb307d9b97 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 @@ -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 + }; } 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 43784dd3e6..f2e8906daa 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 @@ -132,7 +132,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.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),