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

Removed ItemDeletionInfo date recalculation.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-04-03 21:30:31 +00:00
parent 790e91109c
commit 0b582d92d6
24 changed files with 104 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.instancemanager.events; package org.l2jmobius.gameserver.instancemanager.events;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -28,20 +27,20 @@ public class ItemDeletionInfoManager
{ {
protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName());
private final Map<Integer, Date> _items = new HashMap<>(); private final Map<Integer, Integer> _itemDates = new HashMap<>();
protected ItemDeletionInfoManager() 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<Integer, Date> getInfo() public Map<Integer, Integer> getItemDates()
{ {
return _items; return _itemDates;
} }
public static ItemDeletionInfoManager getInstance() public static ItemDeletionInfoManager getInstance()

5
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest
{ {
if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd"))
{ {
final long endtime = _eventPeriod.getEndDate().getTime();
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
{ {
if (d.getNodeName().equalsIgnoreCase("item")) if (d.getNodeName().equalsIgnoreCase("item"))
@@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest
_destroyItemsOnEnd.add(itemId); _destroyItemsOnEnd.add(itemId);
// Add item deletion info to manager. // 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) catch (NumberFormatException nfe)

11
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket
OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet);
// Items. // Items.
final Map<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
packet.writeD(itemInfos.size()); packet.writeD(itemDates.size());
for (Entry<Integer, Date> info : itemInfos.entrySet()) for (Entry<Integer, Integer> info : itemDates.entrySet())
{ {
packet.writeD(info.getKey()); // item id packet.writeD(info.getKey()); // item
packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME packet.writeD(info.getValue()); // date
} }
// Skills. // Skills.

11
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.instancemanager.events; package org.l2jmobius.gameserver.instancemanager.events;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -28,20 +27,20 @@ public class ItemDeletionInfoManager
{ {
protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName());
private final Map<Integer, Date> _items = new HashMap<>(); private final Map<Integer, Integer> _itemDates = new HashMap<>();
protected ItemDeletionInfoManager() 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<Integer, Date> getInfo() public Map<Integer, Integer> getItemDates()
{ {
return _items; return _itemDates;
} }
public static ItemDeletionInfoManager getInstance() public static ItemDeletionInfoManager getInstance()

5
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest
{ {
if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd"))
{ {
final long endtime = _eventPeriod.getEndDate().getTime();
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
{ {
if (d.getNodeName().equalsIgnoreCase("item")) if (d.getNodeName().equalsIgnoreCase("item"))
@@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest
_destroyItemsOnEnd.add(itemId); _destroyItemsOnEnd.add(itemId);
// Add item deletion info to manager. // 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) catch (NumberFormatException nfe)

11
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket
OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet);
// Items. // Items.
final Map<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
packet.writeD(itemInfos.size()); packet.writeD(itemDates.size());
for (Entry<Integer, Date> info : itemInfos.entrySet()) for (Entry<Integer, Integer> info : itemDates.entrySet())
{ {
packet.writeD(info.getKey()); // item id packet.writeD(info.getKey()); // item
packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME packet.writeD(info.getValue()); // date
} }
// Skills. // Skills.

11
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.instancemanager.events; package org.l2jmobius.gameserver.instancemanager.events;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -28,20 +27,20 @@ public class ItemDeletionInfoManager
{ {
protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName());
private final Map<Integer, Date> _items = new HashMap<>(); private final Map<Integer, Integer> _itemDates = new HashMap<>();
protected ItemDeletionInfoManager() 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<Integer, Date> getInfo() public Map<Integer, Integer> getItemDates()
{ {
return _items; return _itemDates;
} }
public static ItemDeletionInfoManager getInstance() public static ItemDeletionInfoManager getInstance()

5
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest
{ {
if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd"))
{ {
final long endtime = _eventPeriod.getEndDate().getTime();
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
{ {
if (d.getNodeName().equalsIgnoreCase("item")) if (d.getNodeName().equalsIgnoreCase("item"))
@@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest
_destroyItemsOnEnd.add(itemId); _destroyItemsOnEnd.add(itemId);
// Add item deletion info to manager. // 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) catch (NumberFormatException nfe)

11
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket
OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet);
// Items. // Items.
final Map<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
packet.writeD(itemInfos.size()); packet.writeD(itemDates.size());
for (Entry<Integer, Date> info : itemInfos.entrySet()) for (Entry<Integer, Integer> info : itemDates.entrySet())
{ {
packet.writeD(info.getKey()); // item id packet.writeD(info.getKey()); // item
packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME packet.writeD(info.getValue()); // date
} }
// Skills. // Skills.

11
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.instancemanager.events; package org.l2jmobius.gameserver.instancemanager.events;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -28,20 +27,20 @@ public class ItemDeletionInfoManager
{ {
protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName());
private final Map<Integer, Date> _items = new HashMap<>(); private final Map<Integer, Integer> _itemDates = new HashMap<>();
protected ItemDeletionInfoManager() 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<Integer, Date> getInfo() public Map<Integer, Integer> getItemDates()
{ {
return _items; return _itemDates;
} }
public static ItemDeletionInfoManager getInstance() public static ItemDeletionInfoManager getInstance()

5
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest
{ {
if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd"))
{ {
final long endtime = _eventPeriod.getEndDate().getTime();
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
{ {
if (d.getNodeName().equalsIgnoreCase("item")) if (d.getNodeName().equalsIgnoreCase("item"))
@@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest
_destroyItemsOnEnd.add(itemId); _destroyItemsOnEnd.add(itemId);
// Add item deletion info to manager. // 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) catch (NumberFormatException nfe)

11
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket
OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet);
// Items. // Items.
final Map<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
packet.writeD(itemInfos.size()); packet.writeD(itemDates.size());
for (Entry<Integer, Date> info : itemInfos.entrySet()) for (Entry<Integer, Integer> info : itemDates.entrySet())
{ {
packet.writeD(info.getKey()); // item id packet.writeD(info.getKey()); // item
packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME packet.writeD(info.getValue()); // date
} }
// Skills. // Skills.

11
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.instancemanager.events; package org.l2jmobius.gameserver.instancemanager.events;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -28,20 +27,20 @@ public class ItemDeletionInfoManager
{ {
protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName());
private final Map<Integer, Date> _items = new HashMap<>(); private final Map<Integer, Integer> _itemDates = new HashMap<>();
protected ItemDeletionInfoManager() 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<Integer, Date> getInfo() public Map<Integer, Integer> getItemDates()
{ {
return _items; return _itemDates;
} }
public static ItemDeletionInfoManager getInstance() public static ItemDeletionInfoManager getInstance()

5
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest
{ {
if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd"))
{ {
final long endtime = _eventPeriod.getEndDate().getTime();
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
{ {
if (d.getNodeName().equalsIgnoreCase("item")) if (d.getNodeName().equalsIgnoreCase("item"))
@@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest
_destroyItemsOnEnd.add(itemId); _destroyItemsOnEnd.add(itemId);
// Add item deletion info to manager. // 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) catch (NumberFormatException nfe)

11
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket
OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet);
// Items. // Items.
final Map<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
packet.writeD(itemInfos.size()); packet.writeD(itemDates.size());
for (Entry<Integer, Date> info : itemInfos.entrySet()) for (Entry<Integer, Integer> info : itemDates.entrySet())
{ {
packet.writeD(info.getKey()); // item id packet.writeD(info.getKey()); // item
packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME packet.writeD(info.getValue()); // date
} }
// Skills. // Skills.

11
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.instancemanager.events; package org.l2jmobius.gameserver.instancemanager.events;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -28,20 +27,20 @@ public class ItemDeletionInfoManager
{ {
protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName());
private final Map<Integer, Date> _items = new HashMap<>(); private final Map<Integer, Integer> _itemDates = new HashMap<>();
protected ItemDeletionInfoManager() 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<Integer, Date> getInfo() public Map<Integer, Integer> getItemDates()
{ {
return _items; return _itemDates;
} }
public static ItemDeletionInfoManager getInstance() public static ItemDeletionInfoManager getInstance()

5
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest
{ {
if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd"))
{ {
final long endtime = _eventPeriod.getEndDate().getTime();
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
{ {
if (d.getNodeName().equalsIgnoreCase("item")) if (d.getNodeName().equalsIgnoreCase("item"))
@@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest
_destroyItemsOnEnd.add(itemId); _destroyItemsOnEnd.add(itemId);
// Add item deletion info to manager. // 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) catch (NumberFormatException nfe)

11
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket
OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet);
// Items. // Items.
final Map<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
packet.writeD(itemInfos.size()); packet.writeD(itemDates.size());
for (Entry<Integer, Date> info : itemInfos.entrySet()) for (Entry<Integer, Integer> info : itemDates.entrySet())
{ {
packet.writeD(info.getKey()); // item id packet.writeD(info.getKey()); // item
packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME packet.writeD(info.getValue()); // date
} }
// Skills. // Skills.

11
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.instancemanager.events; package org.l2jmobius.gameserver.instancemanager.events;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -28,20 +27,20 @@ public class ItemDeletionInfoManager
{ {
protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName());
private final Map<Integer, Date> _items = new HashMap<>(); private final Map<Integer, Integer> _itemDates = new HashMap<>();
protected ItemDeletionInfoManager() 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<Integer, Date> getInfo() public Map<Integer, Integer> getItemDates()
{ {
return _items; return _itemDates;
} }
public static ItemDeletionInfoManager getInstance() public static ItemDeletionInfoManager getInstance()

5
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest
{ {
if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd"))
{ {
final long endtime = _eventPeriod.getEndDate().getTime();
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
{ {
if (d.getNodeName().equalsIgnoreCase("item")) if (d.getNodeName().equalsIgnoreCase("item"))
@@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest
_destroyItemsOnEnd.add(itemId); _destroyItemsOnEnd.add(itemId);
// Add item deletion info to manager. // 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) catch (NumberFormatException nfe)

11
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket
OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet);
// Items. // Items.
final Map<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
packet.writeD(itemInfos.size()); packet.writeD(itemDates.size());
for (Entry<Integer, Date> info : itemInfos.entrySet()) for (Entry<Integer, Integer> info : itemDates.entrySet())
{ {
packet.writeD(info.getKey()); // item id packet.writeD(info.getKey()); // item
packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME packet.writeD(info.getValue()); // date
} }
// Skills. // Skills.

11
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/events/ItemDeletionInfoManager.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.instancemanager.events; package org.l2jmobius.gameserver.instancemanager.events;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -28,20 +27,20 @@ public class ItemDeletionInfoManager
{ {
protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName()); protected static final Logger LOGGER = Logger.getLogger(ItemDeletionInfoManager.class.getName());
private final Map<Integer, Date> _items = new HashMap<>(); private final Map<Integer, Integer> _itemDates = new HashMap<>();
protected ItemDeletionInfoManager() 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<Integer, Date> getInfo() public Map<Integer, Integer> getItemDates()
{ {
return _items; return _itemDates;
} }
public static ItemDeletionInfoManager getInstance() public static ItemDeletionInfoManager getInstance()

5
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -284,6 +284,7 @@ public class LongTimeEvent extends Quest
{ {
if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd")) if (n.getNodeName().equalsIgnoreCase("destroyItemsOnEnd"))
{ {
final long endtime = _eventPeriod.getEndDate().getTime();
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
{ {
if (d.getNodeName().equalsIgnoreCase("item")) if (d.getNodeName().equalsIgnoreCase("item"))
@@ -299,9 +300,9 @@ public class LongTimeEvent extends Quest
_destroyItemsOnEnd.add(itemId); _destroyItemsOnEnd.add(itemId);
// Add item deletion info to manager. // 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) catch (NumberFormatException nfe)

11
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ItemDeletionInfo.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -39,12 +38,12 @@ public class ItemDeletionInfo implements IClientOutgoingPacket
OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet); OutgoingPackets.EX_ITEM_DELETION_INFO.writeId(packet);
// Items. // Items.
final Map<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo(); final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
packet.writeD(itemInfos.size()); packet.writeD(itemDates.size());
for (Entry<Integer, Date> info : itemInfos.entrySet()) for (Entry<Integer, Integer> info : itemDates.entrySet())
{ {
packet.writeD(info.getKey()); // item id packet.writeD(info.getKey()); // item
packet.writeD((int) (info.getValue().getTime() / 1000)); // UNIX TIME packet.writeD(info.getValue()); // date
} }
// Skills. // Skills.