From 901e0d3fc1651cad0335dd1fa341bb2660833ae7 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 10 Sep 2020 15:05:54 +0000
Subject: [PATCH] Fixed item auto use based on item skill availability.

---
 .../model/actor/instance/PlayerInstance.java    | 17 ++++++++++++++---
 .../model/actor/instance/PlayerInstance.java    | 17 ++++++++++++++---
 2 files changed, 28 insertions(+), 6 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 1fef5c1d87..4586dedd3e 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
@@ -222,6 +222,7 @@ import org.l2jmobius.gameserver.model.fishing.Fishing;
 import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder;
 import org.l2jmobius.gameserver.model.holders.DamageTakenHolder;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import org.l2jmobius.gameserver.model.holders.MonsterBookCardHolder;
 import org.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
 import org.l2jmobius.gameserver.model.holders.MovieHolder;
@@ -14269,14 +14270,14 @@ public class PlayerInstance extends Playable
 		
 		_autoUseTask = ThreadPool.scheduleAtFixedRate(() ->
 		{
-			if (hasBlockActions() || isControlBlocked() || isAlikeDead())
+			if (hasBlockActions() || isControlBlocked() || isAlikeDead() || isInsideZone(ZoneId.PEACE))
 			{
 				return;
 			}
 			
 			if (Config.ENABLE_AUTO_ITEM)
 			{
-				for (int itemId : _autoSupplyItems)
+				ITEMS: for (int itemId : _autoSupplyItems)
 				{
 					final ItemInstance item = _inventory.getItemByItemId(itemId);
 					if (item == null)
@@ -14284,6 +14285,16 @@ public class PlayerInstance extends Playable
 						removeAutoSupplyItem(itemId);
 						continue;
 					}
+					
+					for (ItemSkillHolder itemSkillHolder : item.getItem().getAllSkills())
+					{
+						final Skill skill = itemSkillHolder.getSkill();
+						if (isAffectedBySkill(skill.getId()) || hasSkillReuse(skill.getReuseHashCode()) || !skill.checkCondition(this, this, false))
+						{
+							continue ITEMS;
+						}
+					}
+					
 					final int reuseDelay = item.getReuseDelay();
 					if ((reuseDelay <= 0) || (getItemRemainingReuseTime(item.getObjectId()) <= 0))
 					{
@@ -14330,7 +14341,7 @@ public class PlayerInstance extends Playable
 						removeAutoSkill(skillId);
 						continue;
 					}
-					if (!isAffectedBySkill(skillId) && !isInsideZone(ZoneId.PEACE) && !hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(this, this, false))
+					if (!isAffectedBySkill(skillId) && !hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(this, this, false))
 					{
 						// Summon check.
 						if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
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 08cea9635c..b1ace408e4 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
@@ -226,6 +226,7 @@ import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder;
 import org.l2jmobius.gameserver.model.holders.DamageTakenHolder;
 import org.l2jmobius.gameserver.model.holders.ElementalSpiritDataHolder;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import org.l2jmobius.gameserver.model.holders.MovieHolder;
 import org.l2jmobius.gameserver.model.holders.PlayerEventHolder;
 import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
@@ -14216,14 +14217,14 @@ public class PlayerInstance extends Playable
 		
 		_autoUseTask = ThreadPool.scheduleAtFixedRate(() ->
 		{
-			if (hasBlockActions() || isControlBlocked() || isAlikeDead())
+			if (hasBlockActions() || isControlBlocked() || isAlikeDead() || isInsideZone(ZoneId.PEACE))
 			{
 				return;
 			}
 			
 			if (Config.ENABLE_AUTO_ITEM)
 			{
-				for (int itemId : _autoSupplyItems)
+				ITEMS: for (int itemId : _autoSupplyItems)
 				{
 					final ItemInstance item = _inventory.getItemByItemId(itemId);
 					if (item == null)
@@ -14231,6 +14232,16 @@ public class PlayerInstance extends Playable
 						removeAutoSupplyItem(itemId);
 						continue;
 					}
+					
+					for (ItemSkillHolder itemSkillHolder : item.getItem().getAllSkills())
+					{
+						final Skill skill = itemSkillHolder.getSkill();
+						if (isAffectedBySkill(skill.getId()) || hasSkillReuse(skill.getReuseHashCode()) || !skill.checkCondition(this, this, false))
+						{
+							continue ITEMS;
+						}
+					}
+					
 					final int reuseDelay = item.getReuseDelay();
 					if ((reuseDelay <= 0) || (getItemRemainingReuseTime(item.getObjectId()) <= 0))
 					{
@@ -14277,7 +14288,7 @@ public class PlayerInstance extends Playable
 						removeAutoSkill(skillId);
 						continue;
 					}
-					if (!isAffectedBySkill(skillId) && !isInsideZone(ZoneId.PEACE) && !hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(this, this, false))
+					if (!isAffectedBySkill(skillId) && !hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(this, this, false))
 					{
 						// Summon check.
 						if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)