From 925709a804bd974314bfd4a8c50697a5adcad582 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 16 Sep 2021 21:44:14 +0000
Subject: [PATCH] Fixed AutoLootHerbs configuration not triggering herb skills.

---
 .../model/actor/instance/PlayerInstance.java         | 12 ++++--------
 .../model/actor/instance/PlayerInstance.java         | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index bf7b050a3c..cefa3626b7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -3367,17 +3367,13 @@ public class PlayerInstance extends Playable
 			}
 			
 			// Auto-use herbs.
-			if (item.hasExImmediateEffect())
+			if (item.hasExImmediateEffect() && item.isEtcItem())
 			{
-				final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof EtcItem ? (EtcItem) item : null);
-				if (handler == null)
+				for (SkillHolder skillHolder : item.getSkills())
 				{
-					LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!");
-				}
-				else
-				{
-					handler.useItem(this, new ItemInstance(itemId), false);
+					doSimultaneousCast(skillHolder.getSkill());
 				}
+				broadcastInfo();
 			}
 			else
 			{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index a00d5dfca7..8e8d3d8190 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -3278,17 +3278,13 @@ public class PlayerInstance extends Playable
 			}
 			
 			// Auto-use herbs.
-			if (item.hasExImmediateEffect())
+			if (item.hasExImmediateEffect() && item.isEtcItem())
 			{
-				final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof EtcItem ? (EtcItem) item : null);
-				if (handler == null)
+				for (SkillHolder skillHolder : item.getSkills())
 				{
-					LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!");
-				}
-				else
-				{
-					handler.useItem(this, new ItemInstance(itemId), false);
+					doSimultaneousCast(skillHolder.getSkill());
 				}
+				broadcastInfo();
 			}
 			else
 			{