diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Shortcut.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Shortcut.java
index af9c1bab7f..4b48c0f950 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Shortcut.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Shortcut.java
@@ -136,18 +136,18 @@ public class Shortcut
 	}
 	
 	/**
-	* Gets is shortcut is auto use enabled.
-	* @return if shortcut is auto use enabled.
-	*/
+	 * Gets is shortcut is auto use enabled.
+	 * @return if shortcut is auto use enabled.
+	 */
 	public boolean isAutoUse()
 	{
 		return _autoUse;
 	}
 	
 	/**
-	* Sets the auto use status.
-	* @param value of shortcut auto use status.
-	*/
+	 * Sets the auto use status.
+	 * @param value of shortcut auto use status.
+	 */
 	public void setAutoUse(boolean value)
 	{
 		_autoUse = value;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
index f3fd78b99a..b427c0a6c2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14280,10 +14280,13 @@ public class Player extends Playable
 				continue;
 			}
 			
-			final Skill knownSkill = getKnownSkill(shortcut.getId());
-			if (knownSkill != null)
+			if (shortcut.getType() == ShortcutType.SKILL)
 			{
-				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				final Skill knownSkill = getKnownSkill(shortcut.getId());
+				if (knownSkill != null)
+				{
+					sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				}
 			}
 			else
 			{
@@ -14359,7 +14362,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(true);
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
@@ -14393,7 +14396,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(false);
 					sendPacket(new ExActivateAutoShortcut(shortcut, false));
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 1a68e64b4a..364602469d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -93,7 +93,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
 		// Activate if any other similar shortcut is activated.
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
-			if (!shortcut.isAutoUse())
+			if (!shortcut.isAutoUse() || (shortcut.getType() != _type))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
index 386f59db55..ae4c857fdf 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.autoplay;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.ActionData;
+import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
@@ -74,12 +75,16 @@ public class ExRequestActivateAutoShortcut implements IClientIncomingPacket
 			player.removeAutoShortcut(_slot, _page);
 		}
 		
-		final Item item = player.getInventory().getItemByObjectId(shortcut.getId());
+		Item item = null;
 		Skill skill = null;
-		if (item == null)
+		if (shortcut.getType() == ShortcutType.SKILL)
 		{
 			skill = player.getKnownSkill(shortcut.getId());
 		}
+		else
+		{
+			item = player.getInventory().getItemByObjectId(shortcut.getId());
+		}
 		
 		// stop
 		if (!_active)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Shortcut.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Shortcut.java
index af9c1bab7f..4b48c0f950 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Shortcut.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Shortcut.java
@@ -136,18 +136,18 @@ public class Shortcut
 	}
 	
 	/**
-	* Gets is shortcut is auto use enabled.
-	* @return if shortcut is auto use enabled.
-	*/
+	 * Gets is shortcut is auto use enabled.
+	 * @return if shortcut is auto use enabled.
+	 */
 	public boolean isAutoUse()
 	{
 		return _autoUse;
 	}
 	
 	/**
-	* Sets the auto use status.
-	* @param value of shortcut auto use status.
-	*/
+	 * Sets the auto use status.
+	 * @param value of shortcut auto use status.
+	 */
 	public void setAutoUse(boolean value)
 	{
 		_autoUse = value;
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
index dfe79e023e..190d95dcfb 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14349,10 +14349,13 @@ public class Player extends Playable
 				continue;
 			}
 			
-			final Skill knownSkill = getKnownSkill(shortcut.getId());
-			if (knownSkill != null)
+			if (shortcut.getType() == ShortcutType.SKILL)
 			{
-				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				final Skill knownSkill = getKnownSkill(shortcut.getId());
+				if (knownSkill != null)
+				{
+					sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				}
 			}
 			else
 			{
@@ -14428,7 +14431,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(true);
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
@@ -14462,7 +14465,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(false);
 					sendPacket(new ExActivateAutoShortcut(shortcut, false));
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 1a68e64b4a..364602469d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -93,7 +93,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
 		// Activate if any other similar shortcut is activated.
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
-			if (!shortcut.isAutoUse())
+			if (!shortcut.isAutoUse() || (shortcut.getType() != _type))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
index 386f59db55..ae4c857fdf 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.autoplay;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.ActionData;
+import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
@@ -74,12 +75,16 @@ public class ExRequestActivateAutoShortcut implements IClientIncomingPacket
 			player.removeAutoShortcut(_slot, _page);
 		}
 		
-		final Item item = player.getInventory().getItemByObjectId(shortcut.getId());
+		Item item = null;
 		Skill skill = null;
-		if (item == null)
+		if (shortcut.getType() == ShortcutType.SKILL)
 		{
 			skill = player.getKnownSkill(shortcut.getId());
 		}
+		else
+		{
+			item = player.getInventory().getItemByObjectId(shortcut.getId());
+		}
 		
 		// stop
 		if (!_active)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Shortcut.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Shortcut.java
index af9c1bab7f..4b48c0f950 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Shortcut.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Shortcut.java
@@ -136,18 +136,18 @@ public class Shortcut
 	}
 	
 	/**
-	* Gets is shortcut is auto use enabled.
-	* @return if shortcut is auto use enabled.
-	*/
+	 * Gets is shortcut is auto use enabled.
+	 * @return if shortcut is auto use enabled.
+	 */
 	public boolean isAutoUse()
 	{
 		return _autoUse;
 	}
 	
 	/**
-	* Sets the auto use status.
-	* @param value of shortcut auto use status.
-	*/
+	 * Sets the auto use status.
+	 * @param value of shortcut auto use status.
+	 */
 	public void setAutoUse(boolean value)
 	{
 		_autoUse = value;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
index 74c0fe1085..5d8e27dd3c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14386,10 +14386,13 @@ public class Player extends Playable
 				continue;
 			}
 			
-			final Skill knownSkill = getKnownSkill(shortcut.getId());
-			if (knownSkill != null)
+			if (shortcut.getType() == ShortcutType.SKILL)
 			{
-				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				final Skill knownSkill = getKnownSkill(shortcut.getId());
+				if (knownSkill != null)
+				{
+					sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				}
 			}
 			else
 			{
@@ -14465,7 +14468,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(true);
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
@@ -14499,7 +14502,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(false);
 					sendPacket(new ExActivateAutoShortcut(shortcut, false));
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 1a68e64b4a..364602469d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -93,7 +93,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
 		// Activate if any other similar shortcut is activated.
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
-			if (!shortcut.isAutoUse())
+			if (!shortcut.isAutoUse() || (shortcut.getType() != _type))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
index 386f59db55..ae4c857fdf 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.autoplay;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.ActionData;
+import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
@@ -74,12 +75,16 @@ public class ExRequestActivateAutoShortcut implements IClientIncomingPacket
 			player.removeAutoShortcut(_slot, _page);
 		}
 		
-		final Item item = player.getInventory().getItemByObjectId(shortcut.getId());
+		Item item = null;
 		Skill skill = null;
-		if (item == null)
+		if (shortcut.getType() == ShortcutType.SKILL)
 		{
 			skill = player.getKnownSkill(shortcut.getId());
 		}
+		else
+		{
+			item = player.getInventory().getItemByObjectId(shortcut.getId());
+		}
 		
 		// stop
 		if (!_active)
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Shortcut.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Shortcut.java
index af9c1bab7f..4b48c0f950 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Shortcut.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Shortcut.java
@@ -136,18 +136,18 @@ public class Shortcut
 	}
 	
 	/**
-	* Gets is shortcut is auto use enabled.
-	* @return if shortcut is auto use enabled.
-	*/
+	 * Gets is shortcut is auto use enabled.
+	 * @return if shortcut is auto use enabled.
+	 */
 	public boolean isAutoUse()
 	{
 		return _autoUse;
 	}
 	
 	/**
-	* Sets the auto use status.
-	* @param value of shortcut auto use status.
-	*/
+	 * Sets the auto use status.
+	 * @param value of shortcut auto use status.
+	 */
 	public void setAutoUse(boolean value)
 	{
 		_autoUse = value;
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index 5a1daf89c2..ad25eabc17 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14436,10 +14436,13 @@ public class Player extends Playable
 				continue;
 			}
 			
-			final Skill knownSkill = getKnownSkill(shortcut.getId());
-			if (knownSkill != null)
+			if (shortcut.getType() == ShortcutType.SKILL)
 			{
-				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				final Skill knownSkill = getKnownSkill(shortcut.getId());
+				if (knownSkill != null)
+				{
+					sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				}
 			}
 			else
 			{
@@ -14515,7 +14518,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(true);
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
@@ -14549,7 +14552,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(false);
 					sendPacket(new ExActivateAutoShortcut(shortcut, false));
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 1a68e64b4a..364602469d 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -93,7 +93,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
 		// Activate if any other similar shortcut is activated.
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
-			if (!shortcut.isAutoUse())
+			if (!shortcut.isAutoUse() || (shortcut.getType() != _type))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
index 386f59db55..ae4c857fdf 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.autoplay;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.ActionData;
+import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
@@ -74,12 +75,16 @@ public class ExRequestActivateAutoShortcut implements IClientIncomingPacket
 			player.removeAutoShortcut(_slot, _page);
 		}
 		
-		final Item item = player.getInventory().getItemByObjectId(shortcut.getId());
+		Item item = null;
 		Skill skill = null;
-		if (item == null)
+		if (shortcut.getType() == ShortcutType.SKILL)
 		{
 			skill = player.getKnownSkill(shortcut.getId());
 		}
+		else
+		{
+			item = player.getInventory().getItemByObjectId(shortcut.getId());
+		}
 		
 		// stop
 		if (!_active)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Shortcut.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Shortcut.java
index af9c1bab7f..4b48c0f950 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Shortcut.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Shortcut.java
@@ -136,18 +136,18 @@ public class Shortcut
 	}
 	
 	/**
-	* Gets is shortcut is auto use enabled.
-	* @return if shortcut is auto use enabled.
-	*/
+	 * Gets is shortcut is auto use enabled.
+	 * @return if shortcut is auto use enabled.
+	 */
 	public boolean isAutoUse()
 	{
 		return _autoUse;
 	}
 	
 	/**
-	* Sets the auto use status.
-	* @param value of shortcut auto use status.
-	*/
+	 * Sets the auto use status.
+	 * @param value of shortcut auto use status.
+	 */
 	public void setAutoUse(boolean value)
 	{
 		_autoUse = value;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1be47d9822..4a34213557 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14227,10 +14227,13 @@ public class Player extends Playable
 				continue;
 			}
 			
-			final Skill knownSkill = getKnownSkill(shortcut.getId());
-			if (knownSkill != null)
+			if (shortcut.getType() == ShortcutType.SKILL)
 			{
-				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				final Skill knownSkill = getKnownSkill(shortcut.getId());
+				if (knownSkill != null)
+				{
+					sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				}
 			}
 			else
 			{
@@ -14306,7 +14309,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(true);
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
@@ -14340,7 +14343,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(false);
 					sendPacket(new ExActivateAutoShortcut(shortcut, false));
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 1a68e64b4a..364602469d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -93,7 +93,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
 		// Activate if any other similar shortcut is activated.
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
-			if (!shortcut.isAutoUse())
+			if (!shortcut.isAutoUse() || (shortcut.getType() != _type))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
index 386f59db55..ae4c857fdf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.autoplay;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.ActionData;
+import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
@@ -74,12 +75,16 @@ public class ExRequestActivateAutoShortcut implements IClientIncomingPacket
 			player.removeAutoShortcut(_slot, _page);
 		}
 		
-		final Item item = player.getInventory().getItemByObjectId(shortcut.getId());
+		Item item = null;
 		Skill skill = null;
-		if (item == null)
+		if (shortcut.getType() == ShortcutType.SKILL)
 		{
 			skill = player.getKnownSkill(shortcut.getId());
 		}
+		else
+		{
+			item = player.getInventory().getItemByObjectId(shortcut.getId());
+		}
 		
 		// stop
 		if (!_active)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Shortcut.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Shortcut.java
index af9c1bab7f..4b48c0f950 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Shortcut.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Shortcut.java
@@ -136,18 +136,18 @@ public class Shortcut
 	}
 	
 	/**
-	* Gets is shortcut is auto use enabled.
-	* @return if shortcut is auto use enabled.
-	*/
+	 * Gets is shortcut is auto use enabled.
+	 * @return if shortcut is auto use enabled.
+	 */
 	public boolean isAutoUse()
 	{
 		return _autoUse;
 	}
 	
 	/**
-	* Sets the auto use status.
-	* @param value of shortcut auto use status.
-	*/
+	 * Sets the auto use status.
+	 * @param value of shortcut auto use status.
+	 */
 	public void setAutoUse(boolean value)
 	{
 		_autoUse = value;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
index 46a3777a85..0ea7972dfb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14499,10 +14499,13 @@ public class Player extends Playable
 				continue;
 			}
 			
-			final Skill knownSkill = getKnownSkill(shortcut.getId());
-			if (knownSkill != null)
+			if (shortcut.getType() == ShortcutType.SKILL)
 			{
-				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				final Skill knownSkill = getKnownSkill(shortcut.getId());
+				if (knownSkill != null)
+				{
+					sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				}
 			}
 			else
 			{
@@ -14578,7 +14581,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(true);
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
@@ -14612,7 +14615,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(false);
 					sendPacket(new ExActivateAutoShortcut(shortcut, false));
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 1a68e64b4a..364602469d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -93,7 +93,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
 		// Activate if any other similar shortcut is activated.
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
-			if (!shortcut.isAutoUse())
+			if (!shortcut.isAutoUse() || (shortcut.getType() != _type))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
index 0e97ab41b4..aa92562385 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.autoplay;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.ShortCuts;
 import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -70,12 +71,16 @@ public class ExRequestActivateAutoShortcut implements IClientIncomingPacket
 			player.removeAutoShortcut(_slot, _page);
 		}
 		
-		final Item item = player.getInventory().getItemByObjectId(shortcut.getId());
+		Item item = null;
 		Skill skill = null;
-		if (item == null)
+		if (shortcut.getType() == ShortcutType.SKILL)
 		{
 			skill = player.getKnownSkill(shortcut.getId());
 		}
+		else
+		{
+			item = player.getInventory().getItemByObjectId(shortcut.getId());
+		}
 		
 		// stop
 		if (!_active)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Shortcut.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Shortcut.java
index af9c1bab7f..4b48c0f950 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Shortcut.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Shortcut.java
@@ -136,18 +136,18 @@ public class Shortcut
 	}
 	
 	/**
-	* Gets is shortcut is auto use enabled.
-	* @return if shortcut is auto use enabled.
-	*/
+	 * Gets is shortcut is auto use enabled.
+	 * @return if shortcut is auto use enabled.
+	 */
 	public boolean isAutoUse()
 	{
 		return _autoUse;
 	}
 	
 	/**
-	* Sets the auto use status.
-	* @param value of shortcut auto use status.
-	*/
+	 * Sets the auto use status.
+	 * @param value of shortcut auto use status.
+	 */
 	public void setAutoUse(boolean value)
 	{
 		_autoUse = value;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
index e72633bff5..ab4e629867 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14576,10 +14576,13 @@ public class Player extends Playable
 				continue;
 			}
 			
-			final Skill knownSkill = getKnownSkill(shortcut.getId());
-			if (knownSkill != null)
+			if (shortcut.getType() == ShortcutType.SKILL)
 			{
-				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				final Skill knownSkill = getKnownSkill(shortcut.getId());
+				if (knownSkill != null)
+				{
+					sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				}
 			}
 			else
 			{
@@ -14655,7 +14658,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(true);
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
@@ -14689,7 +14692,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(false);
 					sendPacket(new ExActivateAutoShortcut(shortcut, false));
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 1a68e64b4a..364602469d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -93,7 +93,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
 		// Activate if any other similar shortcut is activated.
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
-			if (!shortcut.isAutoUse())
+			if (!shortcut.isAutoUse() || (shortcut.getType() != _type))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
index 0e97ab41b4..aa92562385 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.autoplay;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.ShortCuts;
 import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -70,12 +71,16 @@ public class ExRequestActivateAutoShortcut implements IClientIncomingPacket
 			player.removeAutoShortcut(_slot, _page);
 		}
 		
-		final Item item = player.getInventory().getItemByObjectId(shortcut.getId());
+		Item item = null;
 		Skill skill = null;
-		if (item == null)
+		if (shortcut.getType() == ShortcutType.SKILL)
 		{
 			skill = player.getKnownSkill(shortcut.getId());
 		}
+		else
+		{
+			item = player.getInventory().getItemByObjectId(shortcut.getId());
+		}
 		
 		// stop
 		if (!_active)
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Shortcut.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Shortcut.java
index af9c1bab7f..4b48c0f950 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Shortcut.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Shortcut.java
@@ -136,18 +136,18 @@ public class Shortcut
 	}
 	
 	/**
-	* Gets is shortcut is auto use enabled.
-	* @return if shortcut is auto use enabled.
-	*/
+	 * Gets is shortcut is auto use enabled.
+	 * @return if shortcut is auto use enabled.
+	 */
 	public boolean isAutoUse()
 	{
 		return _autoUse;
 	}
 	
 	/**
-	* Sets the auto use status.
-	* @param value of shortcut auto use status.
-	*/
+	 * Sets the auto use status.
+	 * @param value of shortcut auto use status.
+	 */
 	public void setAutoUse(boolean value)
 	{
 		_autoUse = value;
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
index e72633bff5..ab4e629867 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14576,10 +14576,13 @@ public class Player extends Playable
 				continue;
 			}
 			
-			final Skill knownSkill = getKnownSkill(shortcut.getId());
-			if (knownSkill != null)
+			if (shortcut.getType() == ShortcutType.SKILL)
 			{
-				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				final Skill knownSkill = getKnownSkill(shortcut.getId());
+				if (knownSkill != null)
+				{
+					sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				}
 			}
 			else
 			{
@@ -14655,7 +14658,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(true);
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
@@ -14689,7 +14692,7 @@ public class Player extends Playable
 		{
 			for (Shortcut shortcut : getAllShortCuts())
 			{
-				if (usedShortcut.getId() == shortcut.getId())
+				if ((usedShortcut.getId() == shortcut.getId()) && (usedShortcut.getType() == shortcut.getType()))
 				{
 					shortcut.setAutoUse(false);
 					sendPacket(new ExActivateAutoShortcut(shortcut, false));
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 1a68e64b4a..364602469d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -93,7 +93,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
 		// Activate if any other similar shortcut is activated.
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
-			if (!shortcut.isAutoUse())
+			if (!shortcut.isAutoUse() || (shortcut.getType() != _type))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
index 0e97ab41b4..aa92562385 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.autoplay;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.ShortCuts;
 import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -70,12 +71,16 @@ public class ExRequestActivateAutoShortcut implements IClientIncomingPacket
 			player.removeAutoShortcut(_slot, _page);
 		}
 		
-		final Item item = player.getInventory().getItemByObjectId(shortcut.getId());
+		Item item = null;
 		Skill skill = null;
-		if (item == null)
+		if (shortcut.getType() == ShortcutType.SKILL)
 		{
 			skill = player.getKnownSkill(shortcut.getId());
 		}
+		else
+		{
+			item = player.getInventory().getItemByObjectId(shortcut.getId());
+		}
 		
 		// stop
 		if (!_active)