From 043ae8f94e451b06bde18f36c6881b1fdf27119e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 29 Mar 2021 21:20:38 +0000
Subject: [PATCH] Disable auto use on shortcut removal.

---
 .../network/clientpackets/RequestShortCutDel.java      | 10 ++++++++--
 .../network/clientpackets/RequestShortCutDel.java      | 10 ++++++++--
 .../network/clientpackets/RequestShortCutDel.java      | 10 ++++++++--
 .../network/clientpackets/RequestShortCutDel.java      | 10 ++++++++--
 .../network/clientpackets/RequestShortCutDel.java      | 10 ++++++++--
 .../network/clientpackets/RequestShortCutDel.java      | 10 ++++++++--
 6 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
index a31c55b419..3647c7679a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
@@ -53,16 +54,21 @@ public class RequestShortCutDel implements IClientIncomingPacket
 			return;
 		}
 		
+		// Store shortcut reference id.
+		final Shortcut shortcut = player.getShortCut(_slot, _page);
+		final int id = shortcut == null ? -1 : shortcut.getId();
+		
+		// Delete the shortcut.
 		player.deleteShortCut(_slot, _page);
 		
 		// Remove auto used ids.
 		if (_slot > 263)
 		{
-			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
 		}
 		else
 		{
-			AutoUseTaskManager.getInstance().removeAutoSkill(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
 		}
 	}
 }
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
index a31c55b419..3647c7679a 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
@@ -53,16 +54,21 @@ public class RequestShortCutDel implements IClientIncomingPacket
 			return;
 		}
 		
+		// Store shortcut reference id.
+		final Shortcut shortcut = player.getShortCut(_slot, _page);
+		final int id = shortcut == null ? -1 : shortcut.getId();
+		
+		// Delete the shortcut.
 		player.deleteShortCut(_slot, _page);
 		
 		// Remove auto used ids.
 		if (_slot > 263)
 		{
-			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
 		}
 		else
 		{
-			AutoUseTaskManager.getInstance().removeAutoSkill(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
 		}
 	}
 }
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
index a31c55b419..3647c7679a 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
@@ -53,16 +54,21 @@ public class RequestShortCutDel implements IClientIncomingPacket
 			return;
 		}
 		
+		// Store shortcut reference id.
+		final Shortcut shortcut = player.getShortCut(_slot, _page);
+		final int id = shortcut == null ? -1 : shortcut.getId();
+		
+		// Delete the shortcut.
 		player.deleteShortCut(_slot, _page);
 		
 		// Remove auto used ids.
 		if (_slot > 263)
 		{
-			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
 		}
 		else
 		{
-			AutoUseTaskManager.getInstance().removeAutoSkill(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
index a31c55b419..3647c7679a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
@@ -53,16 +54,21 @@ public class RequestShortCutDel implements IClientIncomingPacket
 			return;
 		}
 		
+		// Store shortcut reference id.
+		final Shortcut shortcut = player.getShortCut(_slot, _page);
+		final int id = shortcut == null ? -1 : shortcut.getId();
+		
+		// Delete the shortcut.
 		player.deleteShortCut(_slot, _page);
 		
 		// Remove auto used ids.
 		if (_slot > 263)
 		{
-			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
 		}
 		else
 		{
-			AutoUseTaskManager.getInstance().removeAutoSkill(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
 		}
 	}
 }
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
index a31c55b419..3647c7679a 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
@@ -53,16 +54,21 @@ public class RequestShortCutDel implements IClientIncomingPacket
 			return;
 		}
 		
+		// Store shortcut reference id.
+		final Shortcut shortcut = player.getShortCut(_slot, _page);
+		final int id = shortcut == null ? -1 : shortcut.getId();
+		
+		// Delete the shortcut.
 		player.deleteShortCut(_slot, _page);
 		
 		// Remove auto used ids.
 		if (_slot > 263)
 		{
-			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
 		}
 		else
 		{
-			AutoUseTaskManager.getInstance().removeAutoSkill(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
 		}
 	}
 }
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
index a31c55b419..3647c7679a 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
@@ -53,16 +54,21 @@ public class RequestShortCutDel implements IClientIncomingPacket
 			return;
 		}
 		
+		// Store shortcut reference id.
+		final Shortcut shortcut = player.getShortCut(_slot, _page);
+		final int id = shortcut == null ? -1 : shortcut.getId();
+		
+		// Delete the shortcut.
 		player.deleteShortCut(_slot, _page);
 		
 		// Remove auto used ids.
 		if (_slot > 263)
 		{
-			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
 		}
 		else
 		{
-			AutoUseTaskManager.getInstance().removeAutoSkill(player, _id);
+			AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
 		}
 	}
 }