Fixed concurrency issues with shortcuts.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
@@ -39,7 +39,7 @@ public class ShortCuts
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	
 	private final PlayerInstance _owner;
-	private final Map<Integer, ShortCut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, ShortCut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
@@ -39,7 +39,7 @@ public class ShortCuts
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	
 	private final PlayerInstance _owner;
-	private final Map<Integer, ShortCut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, ShortCut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/ShortCuts.java

@@ -21,7 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,7 +40,7 @@ public class ShortCuts implements IRestorable
 	private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
 	private static final int MAX_SHORTCUTS_PER_BAR = 12;
 	private final PlayerInstance _owner;
-	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	private final Map<Integer, Shortcut> _shortCuts = new ConcurrentHashMap<>();
 	
 	public ShortCuts(PlayerInstance owner)
 	{