Fixed item shortcuts removed during player login.

Contributed by flanagak.

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -6773,6 +6773,9 @@ public final class L2PcInstance extends L2Playable
 			
 			player.restoreItemReuse();
 			
+			// Restore player shortcuts
+			player.restoreShortCuts();
+			
 			// Initialize status update cache
 			player.initStatusUpdateCache();
 			
@@ -6924,7 +6927,6 @@ public final class L2PcInstance extends L2Playable
 	 * <ul>
 	 * <li>Skills</li>
 	 * <li>Macros</li>
-	 * <li>Short-cuts</li>
 	 * <li>Henna</li>
 	 * <li>Teleport Bookmark</li>
 	 * <li>Recipe Book</li>
@@ -6941,9 +6943,6 @@ public final class L2PcInstance extends L2Playable
 		// Retrieve from the database all macroses of this L2PcInstance and add them to _macros.
 		_macros.restoreMe();
 		
-		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
-		_shortCuts.restoreMe();
-		
 		// Retrieve from the database all henna of this L2PcInstance and add them to _henna.
 		restoreHenna();
 		
@@ -6966,6 +6965,18 @@ public final class L2PcInstance extends L2Playable
 		restorePetInventoryItems();
 	}
 	
+	/**
+	 * Restores:
+	 * <ul>
+	 * <li>Short-cuts</li>
+	 * </ul>
+	 */
+	private void restoreShortCuts()
+	{
+		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
+		_shortCuts.restoreMe();
+	}
+	
 	/**
 	 * Restore recipe book data for this L2PcInstance.
 	 * @param loadCommon

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -6774,6 +6774,9 @@ public final class L2PcInstance extends L2Playable
 			
 			player.restoreItemReuse();
 			
+			// Restore player shortcuts
+			player.restoreShortCuts();
+			
 			// Initialize status update cache
 			player.initStatusUpdateCache();
 			
@@ -6925,7 +6928,6 @@ public final class L2PcInstance extends L2Playable
 	 * <ul>
 	 * <li>Skills</li>
 	 * <li>Macros</li>
-	 * <li>Short-cuts</li>
 	 * <li>Henna</li>
 	 * <li>Teleport Bookmark</li>
 	 * <li>Recipe Book</li>
@@ -6942,9 +6944,6 @@ public final class L2PcInstance extends L2Playable
 		// Retrieve from the database all macroses of this L2PcInstance and add them to _macros.
 		_macros.restoreMe();
 		
-		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
-		_shortCuts.restoreMe();
-		
 		// Retrieve from the database all henna of this L2PcInstance and add them to _henna.
 		restoreHenna();
 		
@@ -6967,6 +6966,18 @@ public final class L2PcInstance extends L2Playable
 		restorePetInventoryItems();
 	}
 	
+	/**
+	 * Restores:
+	 * <ul>
+	 * <li>Short-cuts</li>
+	 * </ul>
+	 */
+	private void restoreShortCuts()
+	{
+		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
+		_shortCuts.restoreMe();
+	}
+	
 	/**
 	 * Restore recipe book data for this L2PcInstance.
 	 * @param loadCommon

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -6776,6 +6776,9 @@ public final class L2PcInstance extends L2Playable
 			
 			player.restoreItemReuse();
 			
+			// Restore player shortcuts
+			player.restoreShortCuts();
+			
 			// Initialize status update cache
 			player.initStatusUpdateCache();
 			
@@ -6927,7 +6930,6 @@ public final class L2PcInstance extends L2Playable
 	 * <ul>
 	 * <li>Skills</li>
 	 * <li>Macros</li>
-	 * <li>Short-cuts</li>
 	 * <li>Henna</li>
 	 * <li>Teleport Bookmark</li>
 	 * <li>Recipe Book</li>
@@ -6944,9 +6946,6 @@ public final class L2PcInstance extends L2Playable
 		// Retrieve from the database all macroses of this L2PcInstance and add them to _macros.
 		_macros.restoreMe();
 		
-		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
-		_shortCuts.restoreMe();
-		
 		// Retrieve from the database all henna of this L2PcInstance and add them to _henna.
 		restoreHenna();
 		
@@ -6969,6 +6968,18 @@ public final class L2PcInstance extends L2Playable
 		restorePetInventoryItems();
 	}
 	
+	/**
+	 * Restores:
+	 * <ul>
+	 * <li>Short-cuts</li>
+	 * </ul>
+	 */
+	private void restoreShortCuts()
+	{
+		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
+		_shortCuts.restoreMe();
+	}
+	
 	/**
 	 * Restore recipe book data for this L2PcInstance.
 	 * @param loadCommon

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -6773,6 +6773,9 @@ public final class L2PcInstance extends L2Playable
 			
 			player.restoreItemReuse();
 			
+			// Restore player shortcuts
+			player.restoreShortCuts();
+			
 			// Initialize status update cache
 			player.initStatusUpdateCache();
 			
@@ -6924,7 +6927,6 @@ public final class L2PcInstance extends L2Playable
 	 * <ul>
 	 * <li>Skills</li>
 	 * <li>Macros</li>
-	 * <li>Short-cuts</li>
 	 * <li>Henna</li>
 	 * <li>Teleport Bookmark</li>
 	 * <li>Recipe Book</li>
@@ -6941,9 +6943,6 @@ public final class L2PcInstance extends L2Playable
 		// Retrieve from the database all macroses of this L2PcInstance and add them to _macros.
 		_macros.restoreMe();
 		
-		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
-		_shortCuts.restoreMe();
-		
 		// Retrieve from the database all henna of this L2PcInstance and add them to _henna.
 		restoreHenna();
 		
@@ -6966,6 +6965,18 @@ public final class L2PcInstance extends L2Playable
 		restorePetInventoryItems();
 	}
 	
+	/**
+	 * Restores:
+	 * <ul>
+	 * <li>Short-cuts</li>
+	 * </ul>
+	 */
+	private void restoreShortCuts()
+	{
+		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
+		_shortCuts.restoreMe();
+	}
+	
 	/**
 	 * Restore recipe book data for this L2PcInstance.
 	 * @param loadCommon

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -6744,6 +6744,9 @@ public final class L2PcInstance extends L2Playable
 			
 			player.restoreItemReuse();
 			
+			// Restore player shortcuts
+			player.restoreShortCuts();
+			
 			// Initialize status update cache
 			player.initStatusUpdateCache();
 			
@@ -6895,7 +6898,6 @@ public final class L2PcInstance extends L2Playable
 	 * <ul>
 	 * <li>Skills</li>
 	 * <li>Macros</li>
-	 * <li>Short-cuts</li>
 	 * <li>Henna</li>
 	 * <li>Teleport Bookmark</li>
 	 * <li>Recipe Book</li>
@@ -6912,9 +6914,6 @@ public final class L2PcInstance extends L2Playable
 		// Retrieve from the database all macroses of this L2PcInstance and add them to _macros.
 		_macros.restoreMe();
 		
-		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
-		_shortCuts.restoreMe();
-		
 		// Retrieve from the database all henna of this L2PcInstance and add them to _henna.
 		restoreHenna();
 		
@@ -6937,6 +6936,18 @@ public final class L2PcInstance extends L2Playable
 		restorePetInventoryItems();
 	}
 	
+	/**
+	 * Restores:
+	 * <ul>
+	 * <li>Short-cuts</li>
+	 * </ul>
+	 */
+	private void restoreShortCuts()
+	{
+		// Retrieve from the database all shortCuts of this L2PcInstance and add them to _shortCuts.
+		_shortCuts.restoreMe();
+	}
+	
 	/**
 	 * Restore recipe book data for this L2PcInstance.
 	 * @param loadCommon