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

Auto spawn handler rework.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-04-22 11:28:02 +00:00
parent c30e5fe198
commit 5916e8d706
10 changed files with 572 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AutoSpawnHandler.java
View File

@@ -20,7 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Collection;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
@@ -78,11 +77,6 @@ public class AutoSpawnHandler
restoreSpawnData();
}
public static AutoSpawnHandler getInstance()
{
return SingletonHolder.INSTANCE;
}
public int size()
{
return _registeredSpawns.size();
@@ -638,9 +632,14 @@ public class AutoSpawnHandler
return _npcList;
}
public Collection<Spawn> getSpawns()
public List<Spawn> getSpawns()
{
return _npcList.stream().map(Npc::getSpawn).collect(Collectors.toList());
final List<Spawn> npcSpawns = new ArrayList<>();
for (Npc npcInst : _npcList)
{
npcSpawns.add(npcInst.getSpawn());
}
return npcSpawns;
}
public void setSpawnCount(int spawnCount)
@@ -696,6 +695,11 @@ public class AutoSpawnHandler
}
}
public static AutoSpawnHandler getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final AutoSpawnHandler INSTANCE = new AutoSpawnHandler();