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

Simplified DecayTaskManager logic.

Browse Source
This commit is contained in:
MobiusDev
2017-09-27 13:05:52 +00:00
parent 91905ca592
commit c222759584
5 changed files with 26 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
View File

@@ -19,12 +19,11 @@ package com.l2jmobius.gameserver.taskmanager;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
@@ -34,8 +33,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
*/
public final class DecayTaskManager
{
private final ScheduledExecutorService _decayExecutor = Executors.newSingleThreadScheduledExecutor();
protected final Map<L2Character, ScheduledFuture<?>> _decayTasks = new ConcurrentHashMap<>();
/**
@@ -61,34 +58,25 @@ public final class DecayTaskManager
delay = Config.DEFAULT_CORPSE_TIME;
}
if ((character instanceof L2Attackable) && (((L2Attackable) character).isSpoiled() || ((L2Attackable) character).isSeeded()))
if (character.isAttackable() && (((L2Attackable) character).isSpoiled() || ((L2Attackable) character).isSeeded()))
{
delay += Config.SPOILED_CORPSE_EXTEND_TIME;
}
add(character, delay, TimeUnit.SECONDS);
add(character, delay);
}
/**
* Adds a decay task for the specified character.<br>
* <br>
* If the decay task already exists it cancels it and re-adds it.
* @param character the character
* @param delay the delay
* @param timeUnit the time unit of the delay parameter
*/
public void add(L2Character character, long delay, TimeUnit timeUnit)
public void add(L2Character character, long delay)
{
ScheduledFuture<?> decayTask = _decayTasks.put(character, _decayExecutor.schedule(new DecayTask(character), delay, TimeUnit.SECONDS));
if ((decayTask == null) || decayTask.cancel(false))
if (!_decayTasks.containsKey(character))
{
return;
}
decayTask = _decayTasks.remove(character);
if (decayTask != null)
{
decayTask.cancel(false);
_decayTasks.put(character, ThreadPoolManager.schedule(new DecayTask(character), delay * 1000));
}
}