From 0b582d92d6444e2b2da8d26b775fd56219151560 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 3 Apr 2022 21:30:31 +0000 Subject: [PATCH] Removed ItemDeletionInfo date recalculation. --- .../events/ItemDeletionInfoManager.java | 11 +++++------ .../gameserver/model/quest/LongTimeEvent.java | 5 +++-- .../network/serverpackets/ItemDeletionInfo.java | 11 +++++------ .../events/ItemDeletionInfoManager.java | 11 +++++------ .../gameserver/model/quest/LongTimeEvent.java | 5 +++-- .../network/serverpackets/ItemDeletionInfo.java | 11 +++++------ .../events/ItemDeletionInfoManager.java | 11 +++++------ .../gameserver/model/quest/LongTimeEvent.java | 5 +++-- .../network/serverpackets/ItemDeletionInfo.java | 11 +++++------ .../events/ItemDeletionInfoManager.java | 11 +++++------ .../gameserver/model/quest/LongTimeEvent.java | 5 +++-- .../network/serverpackets/ItemDeletionInfo.java | 11 +++++------ .../events/ItemDeletionInfoManager.java | 11 +++++------ .../gameserver/model/quest/LongTimeEvent.java | 5 +++-- .../network/serverpackets/ItemDeletionInfo.java | 11 +++++------ .../events/ItemDeletionInfoManager.java | 11 +++++------ .../gameserver/model/quest/LongTimeEvent.java | 5 +++-- .../network/serverpackets/ItemDeletionInfo.java | 11 +++++------ .../events/ItemDeletionInfoManager.java | 11 +++++------ .../gameserver/model/quest/LongTimeEvent.java | 5 +++-- .../network/serverpackets/ItemDeletionInfo.java | 11 +++++------ .../events/ItemDeletionInfoManager.java | 11 +++++------ .../gameserver/model/quest/LongTimeEvent.java | 5 +++-- .../network/serverpackets/ItemDeletionInfo.java | 11 +++++------ 24 files changed, 104 insertions(+), 112 deletions(-) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java index 76bb843ac2..4bff1bba31 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.instancemanager.events; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; @@ -28,20 +27,20 @@ public class ItemDeletionInfoManager { protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); - private final Map _items = new HashMap<>(); + private final Map _itemDates = new HashMap<>(); protected ItemDeletionInfoManager() { } - public void addItemInfo(int itemId, Date date) + public void addItemDate(int itemId, int date) { - _items.put(itemId, date); + _itemDates.put(itemId, date); } - public Map getInfo() + public Map getItemDates() { - return _items; + return _itemDates; } public static ItemDeletionInfoManager getInstance() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 04683bf934..ebd92135e8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest { if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) { + final long endtime = _eventPeriod.getEndDate().getTime(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equalsIgnoreCase("item")) @@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (_eventPeriod.getEndDate().getTime() > Chronos.currentTimeMillis()) + if (endtime > Chronos.currentTimeMillis()) { - ItemDeletionInfoManager.getInstance().addItemInfo(itemId, _eventPeriod.getEndDate()); + ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } } catch (NumberFormatException nfe) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java index b3d49fc1b7..6ed675188b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Date; import java.util.Map; import java.util.Map.Entry; @@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); // Items. - final Map itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); - packet.writeD(itemInfos.size()); - for (Entry info : itemInfos.entrySet()) + final Map itemDates = ItemDeletionInfoManager.getInstance().getItemDates(); + packet.writeD(itemDates.size()); + for (Entry info : itemDates.entrySet()) { - packet.writeD(info.getKey()); // item id - packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME + packet.writeD(info.getKey()); // item + packet.writeD(info.getValue()); // date } // Skills. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java index 76bb843ac2..4bff1bba31 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.instancemanager.events; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; @@ -28,20 +27,20 @@ public class ItemDeletionInfoManager { protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); - private final Map _items = new HashMap<>(); + private final Map _itemDates = new HashMap<>(); protected ItemDeletionInfoManager() { } - public void addItemInfo(int itemId, Date date) + public void addItemDate(int itemId, int date) { - _items.put(itemId, date); + _itemDates.put(itemId, date); } - public Map getInfo() + public Map getItemDates() { - return _items; + return _itemDates; } public static ItemDeletionInfoManager getInstance() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 04683bf934..ebd92135e8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest { if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) { + final long endtime = _eventPeriod.getEndDate().getTime(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equalsIgnoreCase("item")) @@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (_eventPeriod.getEndDate().getTime() > Chronos.currentTimeMillis()) + if (endtime > Chronos.currentTimeMillis()) { - ItemDeletionInfoManager.getInstance().addItemInfo(itemId, _eventPeriod.getEndDate()); + ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } } catch (NumberFormatException nfe) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java index b3d49fc1b7..6ed675188b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Date; import java.util.Map; import java.util.Map.Entry; @@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); // Items. - final Map itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); - packet.writeD(itemInfos.size()); - for (Entry info : itemInfos.entrySet()) + final Map itemDates = ItemDeletionInfoManager.getInstance().getItemDates(); + packet.writeD(itemDates.size()); + for (Entry info : itemDates.entrySet()) { - packet.writeD(info.getKey()); // item id - packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME + packet.writeD(info.getKey()); // item + packet.writeD(info.getValue()); // date } // Skills. diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java index 76bb843ac2..4bff1bba31 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.instancemanager.events; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; @@ -28,20 +27,20 @@ public class ItemDeletionInfoManager { protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); - private final Map _items = new HashMap<>(); + private final Map _itemDates = new HashMap<>(); protected ItemDeletionInfoManager() { } - public void addItemInfo(int itemId, Date date) + public void addItemDate(int itemId, int date) { - _items.put(itemId, date); + _itemDates.put(itemId, date); } - public Map getInfo() + public Map getItemDates() { - return _items; + return _itemDates; } public static ItemDeletionInfoManager getInstance() diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 04683bf934..ebd92135e8 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest { if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) { + final long endtime = _eventPeriod.getEndDate().getTime(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equalsIgnoreCase("item")) @@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (_eventPeriod.getEndDate().getTime() > Chronos.currentTimeMillis()) + if (endtime > Chronos.currentTimeMillis()) { - ItemDeletionInfoManager.getInstance().addItemInfo(itemId, _eventPeriod.getEndDate()); + ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } } catch (NumberFormatException nfe) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java index b3d49fc1b7..6ed675188b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Date; import java.util.Map; import java.util.Map.Entry; @@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); // Items. - final Map itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); - packet.writeD(itemInfos.size()); - for (Entry info : itemInfos.entrySet()) + final Map itemDates = ItemDeletionInfoManager.getInstance().getItemDates(); + packet.writeD(itemDates.size()); + for (Entry info : itemDates.entrySet()) { - packet.writeD(info.getKey()); // item id - packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME + packet.writeD(info.getKey()); // item + packet.writeD(info.getValue()); // date } // Skills. diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java index 76bb843ac2..4bff1bba31 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.instancemanager.events; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; @@ -28,20 +27,20 @@ public class ItemDeletionInfoManager { protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); - private final Map _items = new HashMap<>(); + private final Map _itemDates = new HashMap<>(); protected ItemDeletionInfoManager() { } - public void addItemInfo(int itemId, Date date) + public void addItemDate(int itemId, int date) { - _items.put(itemId, date); + _itemDates.put(itemId, date); } - public Map getInfo() + public Map getItemDates() { - return _items; + return _itemDates; } public static ItemDeletionInfoManager getInstance() diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 04683bf934..ebd92135e8 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest { if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) { + final long endtime = _eventPeriod.getEndDate().getTime(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equalsIgnoreCase("item")) @@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (_eventPeriod.getEndDate().getTime() > Chronos.currentTimeMillis()) + if (endtime > Chronos.currentTimeMillis()) { - ItemDeletionInfoManager.getInstance().addItemInfo(itemId, _eventPeriod.getEndDate()); + ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } } catch (NumberFormatException nfe) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java index b3d49fc1b7..6ed675188b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Date; import java.util.Map; import java.util.Map.Entry; @@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); // Items. - final Map itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); - packet.writeD(itemInfos.size()); - for (Entry info : itemInfos.entrySet()) + final Map itemDates = ItemDeletionInfoManager.getInstance().getItemDates(); + packet.writeD(itemDates.size()); + for (Entry info : itemDates.entrySet()) { - packet.writeD(info.getKey()); // item id - packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME + packet.writeD(info.getKey()); // item + packet.writeD(info.getValue()); // date } // Skills. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java index 76bb843ac2..4bff1bba31 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.instancemanager.events; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; @@ -28,20 +27,20 @@ public class ItemDeletionInfoManager { protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); - private final Map _items = new HashMap<>(); + private final Map _itemDates = new HashMap<>(); protected ItemDeletionInfoManager() { } - public void addItemInfo(int itemId, Date date) + public void addItemDate(int itemId, int date) { - _items.put(itemId, date); + _itemDates.put(itemId, date); } - public Map getInfo() + public Map getItemDates() { - return _items; + return _itemDates; } public static ItemDeletionInfoManager getInstance() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 04683bf934..ebd92135e8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest { if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) { + final long endtime = _eventPeriod.getEndDate().getTime(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equalsIgnoreCase("item")) @@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (_eventPeriod.getEndDate().getTime() > Chronos.currentTimeMillis()) + if (endtime > Chronos.currentTimeMillis()) { - ItemDeletionInfoManager.getInstance().addItemInfo(itemId, _eventPeriod.getEndDate()); + ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } } catch (NumberFormatException nfe) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java index b3d49fc1b7..6ed675188b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Date; import java.util.Map; import java.util.Map.Entry; @@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); // Items. - final Map itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); - packet.writeD(itemInfos.size()); - for (Entry info : itemInfos.entrySet()) + final Map itemDates = ItemDeletionInfoManager.getInstance().getItemDates(); + packet.writeD(itemDates.size()); + for (Entry info : itemDates.entrySet()) { - packet.writeD(info.getKey()); // item id - packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME + packet.writeD(info.getKey()); // item + packet.writeD(info.getValue()); // date } // Skills. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java index 76bb843ac2..4bff1bba31 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.instancemanager.events; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; @@ -28,20 +27,20 @@ public class ItemDeletionInfoManager { protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); - private final Map _items = new HashMap<>(); + private final Map _itemDates = new HashMap<>(); protected ItemDeletionInfoManager() { } - public void addItemInfo(int itemId, Date date) + public void addItemDate(int itemId, int date) { - _items.put(itemId, date); + _itemDates.put(itemId, date); } - public Map getInfo() + public Map getItemDates() { - return _items; + return _itemDates; } public static ItemDeletionInfoManager getInstance() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 04683bf934..ebd92135e8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest { if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) { + final long endtime = _eventPeriod.getEndDate().getTime(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equalsIgnoreCase("item")) @@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (_eventPeriod.getEndDate().getTime() > Chronos.currentTimeMillis()) + if (endtime > Chronos.currentTimeMillis()) { - ItemDeletionInfoManager.getInstance().addItemInfo(itemId, _eventPeriod.getEndDate()); + ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } } catch (NumberFormatException nfe) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java index b3d49fc1b7..6ed675188b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Date; import java.util.Map; import java.util.Map.Entry; @@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); // Items. - final Map itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); - packet.writeD(itemInfos.size()); - for (Entry info : itemInfos.entrySet()) + final Map itemDates = ItemDeletionInfoManager.getInstance().getItemDates(); + packet.writeD(itemDates.size()); + for (Entry info : itemDates.entrySet()) { - packet.writeD(info.getKey()); // item id - packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME + packet.writeD(info.getKey()); // item + packet.writeD(info.getValue()); // date } // Skills. diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java index 76bb843ac2..4bff1bba31 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.instancemanager.events; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; @@ -28,20 +27,20 @@ public class ItemDeletionInfoManager { protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); - private final Map _items = new HashMap<>(); + private final Map _itemDates = new HashMap<>(); protected ItemDeletionInfoManager() { } - public void addItemInfo(int itemId, Date date) + public void addItemDate(int itemId, int date) { - _items.put(itemId, date); + _itemDates.put(itemId, date); } - public Map getInfo() + public Map getItemDates() { - return _items; + return _itemDates; } public static ItemDeletionInfoManager getInstance() diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 04683bf934..ebd92135e8 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest { if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) { + final long endtime = _eventPeriod.getEndDate().getTime(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equalsIgnoreCase("item")) @@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (_eventPeriod.getEndDate().getTime() > Chronos.currentTimeMillis()) + if (endtime > Chronos.currentTimeMillis()) { - ItemDeletionInfoManager.getInstance().addItemInfo(itemId, _eventPeriod.getEndDate()); + ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } } catch (NumberFormatException nfe) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java index b3d49fc1b7..6ed675188b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Date; import java.util.Map; import java.util.Map.Entry; @@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); // Items. - final Map itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); - packet.writeD(itemInfos.size()); - for (Entry info : itemInfos.entrySet()) + final Map itemDates = ItemDeletionInfoManager.getInstance().getItemDates(); + packet.writeD(itemDates.size()); + for (Entry info : itemDates.entrySet()) { - packet.writeD(info.getKey()); // item id - packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME + packet.writeD(info.getKey()); // item + packet.writeD(info.getValue()); // date } // Skills. diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java index 76bb843ac2..4bff1bba31 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.instancemanager.events; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; @@ -28,20 +27,20 @@ public class ItemDeletionInfoManager { protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); - private final Map _items = new HashMap<>(); + private final Map _itemDates = new HashMap<>(); protected ItemDeletionInfoManager() { } - public void addItemInfo(int itemId, Date date) + public void addItemDate(int itemId, int date) { - _items.put(itemId, date); + _itemDates.put(itemId, date); } - public Map getInfo() + public Map getItemDates() { - return _items; + return _itemDates; } public static ItemDeletionInfoManager getInstance() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 04683bf934..ebd92135e8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest { if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) { + final long endtime = _eventPeriod.getEndDate().getTime(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equalsIgnoreCase("item")) @@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (_eventPeriod.getEndDate().getTime() > Chronos.currentTimeMillis()) + if (endtime > Chronos.currentTimeMillis()) { - ItemDeletionInfoManager.getInstance().addItemInfo(itemId, _eventPeriod.getEndDate()); + ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } } catch (NumberFormatException nfe) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java index b3d49fc1b7..6ed675188b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Date; import java.util.Map; import java.util.Map.Entry; @@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); // Items. - final Map itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); - packet.writeD(itemInfos.size()); - for (Entry info : itemInfos.entrySet()) + final Map itemDates = ItemDeletionInfoManager.getInstance().getItemDates(); + packet.writeD(itemDates.size()); + for (Entry info : itemDates.entrySet()) { - packet.writeD(info.getKey()); // item id - packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME + packet.writeD(info.getKey()); // item + packet.writeD(info.getValue()); // date } // Skills.