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

Removed schedule lists from respawn task manager.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-06-09 06:01:25 +00:00
parent 51d45f8261
commit b0f6f357fd
14 changed files with 154 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.spawn.Spawn;
*/
public class RespawnTaskManager
{
private static final Map<NpcInstance, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<NpcInstance, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<NpcInstance, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<NpcInstance, Long> entry : PENDING_RESPAWNS.entrySet())
{
final NpcInstance npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final NpcInstance npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(NpcInstance npc, Long time)
public void add(NpcInstance npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()

36
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@ -16,11 +16,9 @@
*/
package org.l2jmobius.gameserver.taskmanager;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Spawn;
@ -31,45 +29,33 @@ import org.l2jmobius.gameserver.model.actor.Npc;
*/
public class RespawnTaskManager
{
private static final Map<Npc, List<Long>> PENDING_RESPAWNS = new ConcurrentHashMap<>();
private static final Map<Npc, Long> PENDING_RESPAWNS = new ConcurrentHashMap<>();
public RespawnTaskManager()
{
ThreadPool.scheduleAtFixedRate(() ->
{
final long time = System.currentTimeMillis();
for (Entry<Npc, List<Long>> entry : PENDING_RESPAWNS.entrySet())
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
final Npc npc = entry.getKey();
final List<Long> schedules = entry.getValue();
for (Long respawnTime : schedules)
if (time > entry.getValue())
{
if (time > respawnTime)
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
schedules.remove(respawnTime);
if (schedules.isEmpty())
{
PENDING_RESPAWNS.remove(npc);
}
final Spawn spawn = npc.getSpawn();
if (spawn != null)
{
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
spawn.respawnNpc(npc);
spawn._scheduledCount--;
}
}
}
}, 0, 1000);
}
public void add(Npc npc, Long time)
public void add(Npc npc, long time)
{
if (!PENDING_RESPAWNS.containsKey(npc))
{
PENDING_RESPAWNS.put(npc, new CopyOnWriteArrayList<>());
}
PENDING_RESPAWNS.get(npc).add(time);
PENDING_RESPAWNS.put(npc, time);
}
public static RespawnTaskManager getInstance()