From f609f8e88729156064e5ee14d40c0af0059ba19f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 8 Jun 2021 21:44:12 +0000 Subject: [PATCH] Auto use should check for item conditions. --- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++ .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++ .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++ .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++ .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++ .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index db7a05caca..2f132f5f52 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -93,6 +93,11 @@ public class AutoUseTaskManager final Item it = item.getItem(); if (it != null) { + if (!it.checkCondition(player, player, false)) + { + continue ITEMS; + } + final List skills = it.getAllSkills(); if (skills != null) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index db7a05caca..2f132f5f52 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -93,6 +93,11 @@ public class AutoUseTaskManager final Item it = item.getItem(); if (it != null) { + if (!it.checkCondition(player, player, false)) + { + continue ITEMS; + } + final List skills = it.getAllSkills(); if (skills != null) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index db7a05caca..2f132f5f52 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -93,6 +93,11 @@ public class AutoUseTaskManager final Item it = item.getItem(); if (it != null) { + if (!it.checkCondition(player, player, false)) + { + continue ITEMS; + } + final List skills = it.getAllSkills(); if (skills != null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index db7a05caca..2f132f5f52 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -93,6 +93,11 @@ public class AutoUseTaskManager final Item it = item.getItem(); if (it != null) { + if (!it.checkCondition(player, player, false)) + { + continue ITEMS; + } + final List skills = it.getAllSkills(); if (skills != null) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index db7a05caca..2f132f5f52 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -93,6 +93,11 @@ public class AutoUseTaskManager final Item it = item.getItem(); if (it != null) { + if (!it.checkCondition(player, player, false)) + { + continue ITEMS; + } + final List skills = it.getAllSkills(); if (skills != null) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index db7a05caca..2f132f5f52 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -93,6 +93,11 @@ public class AutoUseTaskManager final Item it = item.getItem(); if (it != null) { + if (!it.checkCondition(player, player, false)) + { + continue ITEMS; + } + final List skills = it.getAllSkills(); if (skills != null) {