lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude items included in DailyTaskManager from extractable consumption.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-03-25 22:24:23 +00:00
parent 1970695d10
commit 8404832faa
42 changed files with 268 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
47387, // Balthus Knights Supply Items
};
RESET_ITEMS.add(47387); // Balthus Knights Supply Items
}
protected DailyTaskManager()
{

3
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
47387, // Balthus Knights Supply Items
};
RESET_ITEMS.add(47387); // Balthus Knights Supply Items
}
protected DailyTaskManager()
{

3
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
47387, // Balthus Knights Supply Items
};
RESET_ITEMS.add(47387); // Balthus Knights Supply Items
}
protected DailyTaskManager()
{

3
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
47387, // Balthus Knights Supply Items
};
RESET_ITEMS.add(47387); // Balthus Knights Supply Items
}
protected DailyTaskManager()
{

3
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
47387, // Balthus Knights Supply Items
};
RESET_ITEMS.add(47387); // Balthus Knights Supply Items
}
protected DailyTaskManager()
{

3
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
47387, // Balthus Knights Supply Items
};
RESET_ITEMS.add(47387); // Balthus Knights Supply Items
}
protected DailyTaskManager()
{

3
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

16
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
47387, // Balthus Knights Supply Items
};
RESET_ITEMS.add(47387); // Balthus Knights Supply Items
}
protected DailyTaskManager()
{

3
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> 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()
{

3
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> 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()
{

3
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> 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()
{

3
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{

3
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -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;
}

18
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@ -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<Integer> 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<Integer> RESET_ITEMS = new HashSet<>();
static
{
49782, // Balthus Knights' Supply Box
};
RESET_ITEMS.add(49782); // Balthus Knights' Supply Box
}
protected DailyTaskManager()
{