Removed ItemDeletionInfo date recalculation.
This commit is contained in:
parent
790e91109c
commit
0b582d92d6
@ -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<Integer, Date> _items = new HashMap<>();
|
||||
private final Map<Integer, Integer> _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<Integer, Date> getInfo()
|
||||
public Map<Integer, Integer> getItemDates()
|
||||
{
|
||||
return _items;
|
||||
return _itemDates;
|
||||
}
|
||||
|
||||
public static ItemDeletionInfoManager getInstance()
|
||||
|
@ -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)
|
||||
|
@ -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<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo();
|
||||
packet.writeD(itemInfos.size());
|
||||
for (Entry<Integer, Date> info : itemInfos.entrySet())
|
||||
final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
|
||||
packet.writeD(itemDates.size());
|
||||
for (Entry<Integer, Integer> 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.
|
||||
|
@ -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<Integer, Date> _items = new HashMap<>();
|
||||
private final Map<Integer, Integer> _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<Integer, Date> getInfo()
|
||||
public Map<Integer, Integer> getItemDates()
|
||||
{
|
||||
return _items;
|
||||
return _itemDates;
|
||||
}
|
||||
|
||||
public static ItemDeletionInfoManager getInstance()
|
||||
|
@ -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)
|
||||
|
@ -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<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo();
|
||||
packet.writeD(itemInfos.size());
|
||||
for (Entry<Integer, Date> info : itemInfos.entrySet())
|
||||
final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
|
||||
packet.writeD(itemDates.size());
|
||||
for (Entry<Integer, Integer> 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.
|
||||
|
@ -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<Integer, Date> _items = new HashMap<>();
|
||||
private final Map<Integer, Integer> _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<Integer, Date> getInfo()
|
||||
public Map<Integer, Integer> getItemDates()
|
||||
{
|
||||
return _items;
|
||||
return _itemDates;
|
||||
}
|
||||
|
||||
public static ItemDeletionInfoManager getInstance()
|
||||
|
@ -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)
|
||||
|
@ -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<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo();
|
||||
packet.writeD(itemInfos.size());
|
||||
for (Entry<Integer, Date> info : itemInfos.entrySet())
|
||||
final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
|
||||
packet.writeD(itemDates.size());
|
||||
for (Entry<Integer, Integer> 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.
|
||||
|
@ -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<Integer, Date> _items = new HashMap<>();
|
||||
private final Map<Integer, Integer> _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<Integer, Date> getInfo()
|
||||
public Map<Integer, Integer> getItemDates()
|
||||
{
|
||||
return _items;
|
||||
return _itemDates;
|
||||
}
|
||||
|
||||
public static ItemDeletionInfoManager getInstance()
|
||||
|
@ -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)
|
||||
|
@ -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<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo();
|
||||
packet.writeD(itemInfos.size());
|
||||
for (Entry<Integer, Date> info : itemInfos.entrySet())
|
||||
final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
|
||||
packet.writeD(itemDates.size());
|
||||
for (Entry<Integer, Integer> 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.
|
||||
|
@ -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<Integer, Date> _items = new HashMap<>();
|
||||
private final Map<Integer, Integer> _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<Integer, Date> getInfo()
|
||||
public Map<Integer, Integer> getItemDates()
|
||||
{
|
||||
return _items;
|
||||
return _itemDates;
|
||||
}
|
||||
|
||||
public static ItemDeletionInfoManager getInstance()
|
||||
|
@ -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)
|
||||
|
@ -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<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo();
|
||||
packet.writeD(itemInfos.size());
|
||||
for (Entry<Integer, Date> info : itemInfos.entrySet())
|
||||
final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
|
||||
packet.writeD(itemDates.size());
|
||||
for (Entry<Integer, Integer> 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.
|
||||
|
@ -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<Integer, Date> _items = new HashMap<>();
|
||||
private final Map<Integer, Integer> _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<Integer, Date> getInfo()
|
||||
public Map<Integer, Integer> getItemDates()
|
||||
{
|
||||
return _items;
|
||||
return _itemDates;
|
||||
}
|
||||
|
||||
public static ItemDeletionInfoManager getInstance()
|
||||
|
@ -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)
|
||||
|
@ -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<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo();
|
||||
packet.writeD(itemInfos.size());
|
||||
for (Entry<Integer, Date> info : itemInfos.entrySet())
|
||||
final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
|
||||
packet.writeD(itemDates.size());
|
||||
for (Entry<Integer, Integer> 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.
|
||||
|
@ -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<Integer, Date> _items = new HashMap<>();
|
||||
private final Map<Integer, Integer> _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<Integer, Date> getInfo()
|
||||
public Map<Integer, Integer> getItemDates()
|
||||
{
|
||||
return _items;
|
||||
return _itemDates;
|
||||
}
|
||||
|
||||
public static ItemDeletionInfoManager getInstance()
|
||||
|
@ -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)
|
||||
|
@ -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<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo();
|
||||
packet.writeD(itemInfos.size());
|
||||
for (Entry<Integer, Date> info : itemInfos.entrySet())
|
||||
final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
|
||||
packet.writeD(itemDates.size());
|
||||
for (Entry<Integer, Integer> 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.
|
||||
|
@ -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<Integer, Date> _items = new HashMap<>();
|
||||
private final Map<Integer, Integer> _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<Integer, Date> getInfo()
|
||||
public Map<Integer, Integer> getItemDates()
|
||||
{
|
||||
return _items;
|
||||
return _itemDates;
|
||||
}
|
||||
|
||||
public static ItemDeletionInfoManager getInstance()
|
||||
|
@ -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)
|
||||
|
@ -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<Integer, Date> itemInfos = ItemDeletionInfoManager.getInstance().getInfo();
|
||||
packet.writeD(itemInfos.size());
|
||||
for (Entry<Integer, Date> info : itemInfos.entrySet())
|
||||
final Map<Integer, Integer> itemDates = ItemDeletionInfoManager.getInstance().getItemDates();
|
||||
packet.writeD(itemDates.size());
|
||||
for (Entry<Integer, Integer> 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.
|
||||
|
Loading…
Reference in New Issue
Block a user