From 8404832faa51a7cc77c5a75e1f95e655af62ffb9 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 25 Mar 2022 22:24:23 +0000 Subject: [PATCH] Exclude items included in DailyTaskManager from extractable consumption. --- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 16 +++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 ++++++++++-------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 ++++++++++-------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 ++++++++++-------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- .../itemhandlers/ExtractableItems.java | 3 ++- .../instancemanager/DailyTaskManager.java | 18 +++++++++++------- 42 files changed, 268 insertions(+), 171 deletions(-) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 4933104fec..60b641d7ea 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ce88b59257..6d17d8858c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -56,15 +58,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + } protected DailyTaskManager() { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 4933104fec..60b641d7ea 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ce88b59257..6d17d8858c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -56,15 +58,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + } protected DailyTaskManager() { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 4933104fec..60b641d7ea 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ad712b7b29..8248c1c897 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -54,15 +56,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + } protected DailyTaskManager() { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 4933104fec..60b641d7ea 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ad712b7b29..8248c1c897 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -54,15 +56,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + } protected DailyTaskManager() { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 4933104fec..60b641d7ea 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ad712b7b29..8248c1c897 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -54,15 +56,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + } protected DailyTaskManager() { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index aa2afe1bf0..80a107b2a7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 680089efa8..3583c73bf3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -56,15 +58,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + } protected DailyTaskManager() { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index b453181103..50460aa8cd 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 54c219673f..4c63a7615b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -58,15 +58,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + } protected DailyTaskManager() { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index b453181103..50460aa8cd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index bec8c8bc6d..b9baffa157 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -58,16 +58,18 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - 60011, // Festival Fairy's Good Luck Bag - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + RESET_ITEMS.add(60011); // Festival Fairy's Good Luck Bag + } protected DailyTaskManager() { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 327211b537..ff4c6b79b3 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index aef3c0f775..6220aef86f 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -60,16 +60,18 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - 60011, // Festival Fairy's Good Luck Bag - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + RESET_ITEMS.add(60011); // Festival Fairy's Good Luck Bag + } protected DailyTaskManager() { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 327211b537..ff4c6b79b3 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index aef3c0f775..6220aef86f 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -60,16 +60,18 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 47387, // Balthus Knights Supply Items - 60011, // Festival Fairy's Good Luck Bag - }; + RESET_ITEMS.add(47387); // Balthus Knights Supply Items + RESET_ITEMS.add(60011); // Festival Fairy's Good Luck Bag + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 4834906e87..7ee89616ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 103197b676..aa27cbc5e1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -57,15 +59,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6e081397bb..7a85451f18 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 103197b676..aa27cbc5e1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -57,15 +59,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6e081397bb..7a85451f18 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 0fe0e1348a..1ec27ca276 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -57,15 +59,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6e081397bb..7a85451f18 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 0fe0e1348a..1ec27ca276 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -57,15 +59,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6e081397bb..7a85451f18 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 0fe0e1348a..1ec27ca276 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -57,15 +59,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6e081397bb..7a85451f18 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 86e4718cc3..8b54fe78ae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -59,15 +61,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 098310aa95..d03388a491 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -67,7 +68,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ebefab5b51..8bcefce345 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -56,15 +58,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 4b09612cc4..700da6541b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 4e9c81d7b4..f9b16049ea 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -61,15 +63,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index faad2b0bd2..8b96275152 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 3c9c8fdf92..27a2972865 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -61,15 +63,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index faad2b0bd2..8b96275152 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index f8445585c5..ba237be662 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -61,15 +63,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index faad2b0bd2..8b96275152 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -26,6 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; +import org.l2jmobius.gameserver.instancemanager.DailyTaskManager; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +67,7 @@ public class ExtractableItems implements IItemHandler } // destroy item - if (!player.destroyItem("Extract", item.getObjectId(), 1, player, true)) + if (!DailyTaskManager.RESET_ITEMS.contains(item.getId()) && !player.destroyItem("Extract", item.getObjectId(), 1, player, true)) { return false; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index f8445585c5..ba237be662 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -61,15 +63,17 @@ public class DailyTaskManager private static final Logger LOGGER = Logger.getLogger(DailyTaskManager.class.getName()); private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM HH:mm"); - private static final int[] RESET_SKILLS = + private static final Set RESET_SKILLS = new HashSet<>(); + static { - 2510, // Wondrous Cubic - 22180, // Wondrous Cubic - 1 time use - }; - private static final int[] RESET_ITEMS = + RESET_SKILLS.add(2510); // Wondrous Cubic + RESET_SKILLS.add(22180); // Wondrous Cubic - 1 time use + } + public static final Set RESET_ITEMS = new HashSet<>(); + static { - 49782, // Balthus Knights' Supply Box - }; + RESET_ITEMS.add(49782); // Balthus Knights' Supply Box + } protected DailyTaskManager() {