From 388e9fc7a1b9d3b4c1a073ff63748213c3ac9302 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 14 Oct 2021 21:51:00 +0000
Subject: [PATCH] Fixed auto icons disabled when learning skills.

---
 .../gameserver/model/actor/instance/PlayerInstance.java      | 5 +++--
 .../gameserver/model/actor/instance/PlayerInstance.java      | 5 +++--
 .../gameserver/model/actor/instance/PlayerInstance.java      | 5 +++--
 .../gameserver/model/actor/instance/PlayerInstance.java      | 5 +++--
 .../gameserver/model/actor/instance/PlayerInstance.java      | 5 +++--
 .../gameserver/model/actor/instance/PlayerInstance.java      | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index d21a587386..c7a2a7e939 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14378,9 +14378,10 @@ public class PlayerInstance extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
-			else if (_autoUseSettings.getAutoSupplyItems().contains(shortcut.getId()))
+			else
 			{
-				if (getInventory().getItemByObjectId(shortcut.getId()) != null)
+				final ItemInstance item = getInventory().getItemByObjectId(shortcut.getId());
+				if ((item != null) && _autoUseSettings.getAutoSupplyItems().contains(item.getId()))
 				{
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 9956bea1e0..c53ca3b8d8 100644
--- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14448,9 +14448,10 @@ public class PlayerInstance extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
-			else if (_autoUseSettings.getAutoSupplyItems().contains(shortcut.getId()))
+			else
 			{
-				if (getInventory().getItemByObjectId(shortcut.getId()) != null)
+				final ItemInstance item = getInventory().getItemByObjectId(shortcut.getId());
+				if ((item != null) && _autoUseSettings.getAutoSupplyItems().contains(item.getId()))
 				{
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 7288788608..753f0a62d4 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14485,9 +14485,10 @@ public class PlayerInstance extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
-			else if (_autoUseSettings.getAutoSupplyItems().contains(shortcut.getId()))
+			else
 			{
-				if (getInventory().getItemByObjectId(shortcut.getId()) != null)
+				final ItemInstance item = getInventory().getItemByObjectId(shortcut.getId());
+				if ((item != null) && _autoUseSettings.getAutoSupplyItems().contains(item.getId()))
 				{
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index bb65de0da3..a244cce95a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14375,9 +14375,10 @@ public class PlayerInstance extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
-			else if (_autoUseSettings.getAutoSupplyItems().contains(shortcut.getId()))
+			else
 			{
-				if (getInventory().getItemByObjectId(shortcut.getId()) != null)
+				final ItemInstance item = getInventory().getItemByObjectId(shortcut.getId());
+				if ((item != null) && _autoUseSettings.getAutoSupplyItems().contains(item.getId()))
 				{
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 754f159cd3..5ad6aa2c09 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14635,9 +14635,10 @@ public class PlayerInstance extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
-			else if (_autoUseSettings.getAutoSupplyItems().contains(shortcut.getId()))
+			else
 			{
-				if (getInventory().getItemByObjectId(shortcut.getId()) != null)
+				final ItemInstance item = getInventory().getItemByObjectId(shortcut.getId());
+				if ((item != null) && _autoUseSettings.getAutoSupplyItems().contains(item.getId()))
 				{
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 4df33f08fc..f604dccba0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14712,9 +14712,10 @@ public class PlayerInstance extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
-			else if (_autoUseSettings.getAutoSupplyItems().contains(shortcut.getId()))
+			else
 			{
-				if (getInventory().getItemByObjectId(shortcut.getId()) != null)
+				final ItemInstance item = getInventory().getItemByObjectId(shortcut.getId());
+				if ((item != null) && _autoUseSettings.getAutoSupplyItems().contains(item.getId()))
 				{
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}