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

Addition of item related task managers.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-11-04 22:24:20 +00:00
parent d229e3a550
commit 946bcea559
116 changed files with 7250 additions and 2940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/buylist/Product.java
View File

@ -19,17 +19,15 @@ package org.l2jmobius.gameserver.model.buylist;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.Objects;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.items.type.EtcItemType;
import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager;
/**
* @author NosBit
@ -45,7 +43,6 @@ public class Product
private final long _maxCount;
private final double _baseTax;
private AtomicLong _count = null;
private ScheduledFuture<?> _restockTask = null;
public Product(int buyListId, Item item, long price, long restockDelay, long maxCount, int baseTax)
{
@ -122,10 +119,9 @@ public class Product
{
return false;
}
if ((_restockTask == null) || _restockTask.isDone())
{
_restockTask = ThreadPool.schedule(this::restock, _restockDelay);
}
BuyListTaskManager.getInstance().add(this, _restockDelay);
final boolean result = _count.addAndGet(-value) >= 0;
save();
return result;
@ -141,7 +137,7 @@ public class Product
final long remainTime = nextRestockTime - System.currentTimeMillis();
if (remainTime > 0)
{
_restockTask = ThreadPool.schedule(this::restock, remainTime);
BuyListTaskManager.getInstance().update(this, remainTime);
}
else
{
@ -164,9 +160,10 @@ public class Product
statement.setInt(2, _item.getId());
statement.setLong(3, getCount());
statement.setLong(5, getCount());
if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0))
final long nextRestockTime = BuyListTaskManager.getInstance().getRestockDelay(this);
if (nextRestockTime > 0)
{
final long nextRestockTime = System.currentTimeMillis() + _restockTask.getDelay(TimeUnit.MILLISECONDS);
statement.setLong(4, nextRestockTime);
statement.setLong(6, nextRestockTime);
}
@ -175,6 +172,7 @@ public class Product
statement.setLong(4, 0);
statement.setLong(6, 0);
}
statement.executeUpdate();
}
catch (Exception e)

187
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -34,7 +34,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@ -91,6 +90,9 @@ import org.l2jmobius.gameserver.network.serverpackets.GetItem;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
import org.l2jmobius.gameserver.taskmanager.ItemLifeTimeTaskManager;
import org.l2jmobius.gameserver.taskmanager.ItemManaTaskManager;
import org.l2jmobius.gameserver.util.GMAudit;
/**
@ -142,7 +144,6 @@ public class ItemInstance extends WorldObject
/** Shadow item */
private int _mana = -1;
private boolean _consumingMana = false;
private static final int MANA_CONSUMPTION_RATE = 60000;
/** Custom item types (used loto, race tickets) */
private int _type1;
@ -172,8 +173,6 @@ public class ItemInstance extends WorldObject
private Map<AttributeType, AttributeHolder> _elementals = null;
private ScheduledFuture<?> _itemLootShedule = null;
private ScheduledFuture<?> _lifeTimeTask;
private ScheduledFuture<?> _appearanceLifeTimeTask;
private final DropProtection _dropProtection = new DropProtection();
@ -1288,37 +1287,6 @@ public class ItemInstance extends WorldObject
}
}
/**
* Used to decrease mana (mana means life time for shadow items)
*/
public static class ScheduleConsumeManaTask implements Runnable
{
private static final Logger LOGGER = Logger.getLogger(ScheduleConsumeManaTask.class.getName());
private final ItemInstance _shadowItem;
public ScheduleConsumeManaTask(ItemInstance item)
{
_shadowItem = item;
}
@Override
public void run()
{
try
{
// decrease mana
if (_shadowItem != null)
{
_shadowItem.decreaseMana(true);
}
}
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "", e);
}
}
}
/**
* Returns true if this item is a shadow item Shadow items have a limited life-time
* @return
@ -1463,7 +1431,7 @@ public class ItemInstance extends WorldObject
return;
}
_consumingMana = true;
ThreadPool.schedule(new ScheduleConsumeManaTask(this), MANA_CONSUMPTION_RATE);
ItemManaTaskManager.getInstance().add(this);
}
/**
@ -1532,64 +1500,46 @@ public class ItemInstance extends WorldObject
* <b><u>Example of use</u>:</b><br>
* <li>Drop item</li>
* <li>Call Pet</li>
* @param dropper
* @param locX
* @param locY
* @param locZ
*/
public class ItemDropTask implements Runnable
public void dropMe(Creature dropper, int locX, int locY, int locZ)
{
private int _x;
private int _y;
private int _z;
private final Creature _dropper;
private final ItemInstance _itеm;
int x = locX;
int y = locY;
int z = locZ;
public ItemDropTask(ItemInstance item, Creature dropper, int x, int y, int z)
if (dropper != null)
{
_x = x;
_y = y;
_z = z;
_dropper = dropper;
_itеm = item;
final Instance instance = dropper.getInstanceWorld();
final Location dropDest = GeoEngine.getInstance().canMoveToTargetLoc(dropper.getX(), dropper.getY(), dropper.getZ(), x, y, z, instance);
x = dropDest.getX();
y = dropDest.getY();
z = dropDest.getZ();
setInstance(instance); // Inherit instancezone when dropped in visible world
}
else
{
setInstance(null); // No dropper? Make it a global item...
}
@Override
public void run()
// Set the x,y,z position of the ItemInstance dropped and update its world region
setSpawned(true);
setXYZ(x, y, z);
setDropTime(System.currentTimeMillis());
setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
// Add the ItemInstance dropped in the world as a visible object
World.getInstance().addVisibleObject(this, getWorldRegion());
if (Config.SAVE_DROPPED_ITEM)
{
if (_dropper != null)
{
final Instance instance = _dropper.getInstanceWorld();
final Location dropDest = GeoEngine.getInstance().canMoveToTargetLoc(_dropper.getX(), _dropper.getY(), _dropper.getZ(), _x, _y, _z, instance);
_x = dropDest.getX();
_y = dropDest.getY();
_z = dropDest.getZ();
setInstance(instance); // Inherit instancezone when dropped in visible world
}
else
{
setInstance(null); // No dropper? Make it a global item...
}
synchronized (_itеm)
{
// Set the x,y,z position of the ItemInstance dropped and update its _worldregion
_itеm.setSpawned(true);
_itеm.setXYZ(_x, _y, _z);
}
_itеm.setDropTime(System.currentTimeMillis());
_itеm.setDropperObjectId(_dropper != null ? _dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
// Add the ItemInstance dropped in the world as a visible object
World.getInstance().addVisibleObject(_itеm, _itеm.getWorldRegion());
if (Config.SAVE_DROPPED_ITEM)
{
ItemsOnGroundManager.getInstance().save(_itеm);
}
_itеm.setDropperObjectId(0); // Set the dropper Id back to 0 so it no longer shows the drop packet
ItemsOnGroundManager.getInstance().save(this);
}
}
public void dropMe(Creature dropper, int x, int y, int z)
{
ThreadPool.execute(new ItemDropTask(this, dropper, x, y, z));
setDropperObjectId(0); // Set the dropper Id back to 0 so it no longer shows the drop packet
if ((dropper != null) && dropper.isPlayer())
{
_owner = null;
@ -1907,38 +1857,7 @@ public class ItemInstance extends WorldObject
}
else
{
if (_lifeTimeTask != null)
{
_lifeTimeTask.cancel(true);
}
_lifeTimeTask = ThreadPool.schedule(new ScheduleLifeTimeTask(this), getRemainingTime());
}
}
static class ScheduleLifeTimeTask implements Runnable
{
private static final Logger LOGGER = Logger.getLogger(ScheduleLifeTimeTask.class.getName());
private final ItemInstance _limitedItem;
ScheduleLifeTimeTask(ItemInstance item)
{
_limitedItem = item;
}
@Override
public void run()
{
try
{
if (_limitedItem != null)
{
_limitedItem.endOfLife();
}
}
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "", e);
}
ItemLifeTimeTaskManager.getInstance().add(this, getRemainingTime());
}
}
@ -2485,16 +2404,8 @@ public class ItemInstance extends WorldObject
public void stopAllTasks()
{
if ((_lifeTimeTask != null) && !_lifeTimeTask.isDone())
{
_lifeTimeTask.cancel(false);
_lifeTimeTask = null;
}
if ((_appearanceLifeTimeTask != null) && !_appearanceLifeTimeTask.isDone())
{
_appearanceLifeTimeTask.cancel(false);
_appearanceLifeTimeTask = null;
}
ItemLifeTimeTaskManager.getInstance().remove(this);
ItemAppearanceTaskManager.getInstance().remove(this);
}
public ItemVariables getVariables()
@ -2537,10 +2448,9 @@ public class ItemInstance extends WorldObject
getVariables().set(ItemVariables.VISUAL_ID, visualId);
// When removed, cancel existing lifetime task.
if ((visualId == 0) && (_appearanceLifeTimeTask != null))
if (visualId == 0)
{
_appearanceLifeTimeTask.cancel(true);
_appearanceLifeTimeTask = null;
ItemAppearanceTaskManager.getInstance().remove(this);
onVisualLifeTimeEnd();
}
}
@ -2552,25 +2462,22 @@ public class ItemInstance extends WorldObject
public void scheduleVisualLifeTime()
{
if (_appearanceLifeTimeTask != null)
{
_appearanceLifeTimeTask.cancel(false);
}
ItemAppearanceTaskManager.getInstance().remove(this);
if (getVisualLifeTime() > 0)
{
final long time = getVisualLifeTime() - System.currentTimeMillis();
if (time > 0)
final long endTime = getVisualLifeTime();
if ((endTime - System.currentTimeMillis()) > 0)
{
_appearanceLifeTimeTask = ThreadPool.schedule(this::onVisualLifeTimeEnd, time);
ItemAppearanceTaskManager.getInstance().add(this, endTime);
}
else
{
ThreadPool.execute(this::onVisualLifeTimeEnd);
onVisualLifeTimeEnd();
}
}
}
private void onVisualLifeTimeEnd()
public void onVisualLifeTimeEnd()
{
final ItemVariables vars = getVariables();
vars.remove(ItemVariables.VISUAL_ID);

86
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java Normal file
View File

@ -0,0 +1,86 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.buylist.Product;
/**
* @author Mobius
*/
public class BuyListTaskManager
{
private static final Map<Product, Long> PRODUCTS = new ConcurrentHashMap<>();
private static boolean _working = false;
public BuyListTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
if (_working)
{
return;
}
_working = true;
final long currentTime = System.currentTimeMillis();
for (Entry<Product, Long> entry : PRODUCTS.entrySet())
{
if (currentTime > entry.getValue().longValue())
{
final Product product = entry.getKey();
PRODUCTS.remove(product);
product.restock();
}
}
_working = false;
}, 1000, 60000);
}
public void add(Product product, long endTime)
{
if (!PRODUCTS.containsKey(product))
{
PRODUCTS.put(product, endTime);
}
}
public void update(Product product, long endTime)
{
PRODUCTS.put(product, endTime);
}
public long getRestockDelay(Product product)
{
return PRODUCTS.getOrDefault(product, 0L);
}
public static BuyListTaskManager getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final BuyListTaskManager INSTANCE = new BuyListTaskManager();
}
}

81
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java Normal file
View File

@ -0,0 +1,81 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
/**
* @author Mobius
*/
public class ItemAppearanceTaskManager
{
private static final Map<ItemInstance, Long> ITEMS = new ConcurrentHashMap<>();
private static boolean _working = false;
public ItemAppearanceTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
if (_working)
{
return;
}
_working = true;
final long currentTime = System.currentTimeMillis();
for (Entry<ItemInstance, Long> entry : ITEMS.entrySet())
{
if (currentTime > entry.getValue().longValue())
{
final ItemInstance item = entry.getKey();
ITEMS.remove(item);
item.onVisualLifeTimeEnd();
}
}
_working = false;
}, 1000, 1000);
}
public void add(ItemInstance item, long endTime)
{
if (!ITEMS.containsKey(item))
{
ITEMS.put(item, endTime);
}
}
public void remove(ItemInstance item)
{
ITEMS.remove(item);
}
public static ItemAppearanceTaskManager getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final ItemAppearanceTaskManager INSTANCE = new ItemAppearanceTaskManager();
}
}

81
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java Normal file
View File

@ -0,0 +1,81 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
/**
* @author Mobius
*/
public class ItemLifeTimeTaskManager
{
private static final Map<ItemInstance, Long> ITEMS = new ConcurrentHashMap<>();
private static boolean _working = false;
public ItemLifeTimeTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
if (_working)
{
return;
}
_working = true;
final long currentTime = System.currentTimeMillis();
for (Entry<ItemInstance, Long> entry : ITEMS.entrySet())
{
if (currentTime > entry.getValue().longValue())
{
final ItemInstance item = entry.getKey();
ITEMS.remove(item);
item.endOfLife();
}
}
_working = false;
}, 1000, 1000);
}
public void add(ItemInstance item, long endTime)
{
if (!ITEMS.containsKey(item))
{
ITEMS.put(item, endTime);
}
}
public void remove(ItemInstance item)
{
ITEMS.remove(item);
}
public static ItemLifeTimeTaskManager getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final ItemLifeTimeTaskManager INSTANCE = new ItemLifeTimeTaskManager();
}
}

77
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java Normal file
View File

@ -0,0 +1,77 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
/**
* @author Mobius
*/
public class ItemManaTaskManager
{
private static final Map<ItemInstance, Long> ITEMS = new ConcurrentHashMap<>();
private static final int MANA_CONSUMPTION_RATE = 60000;
private static boolean _working = false;
public ItemManaTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
if (_working)
{
return;
}
_working = true;
final long currentTime = System.currentTimeMillis();
for (Entry<ItemInstance, Long> entry : ITEMS.entrySet())
{
if (currentTime > entry.getValue().longValue())
{
final ItemInstance item = entry.getKey();
ITEMS.remove(item);
item.decreaseMana(true);
}
}
_working = false;
}, 1000, 1000);
}
public void add(ItemInstance item)
{
if (!ITEMS.containsKey(item))
{
ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE);
}
}
public static ItemManaTaskManager getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final ItemManaTaskManager INSTANCE = new ItemManaTaskManager();
}
}