Castle and Fort lists changed to concurrent.
This commit is contained in:
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.instancemanager;
|
|||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@@ -42,7 +42,7 @@ public class CastleManager
|
|||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Castle> _castles;
|
private static final List<Castle> _castles = new CopyOnWriteArrayList<>();
|
||||||
|
|
||||||
private static final int _castleCirclets[] =
|
private static final int _castleCirclets[] =
|
||||||
{
|
{
|
||||||
@@ -223,10 +223,6 @@ public class CastleManager
|
|||||||
|
|
||||||
public List<Castle> getCastles()
|
public List<Castle> getCastles()
|
||||||
{
|
{
|
||||||
if (_castles == null)
|
|
||||||
{
|
|
||||||
_castles = new ArrayList<>();
|
|
||||||
}
|
|
||||||
return _castles;
|
return _castles;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.instancemanager;
|
|||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@@ -35,7 +35,7 @@ public class FortManager
|
|||||||
{
|
{
|
||||||
protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
|
||||||
|
|
||||||
private static final List<Fort> _forts = new ArrayList<>();
|
private static final List<Fort> _forts = new CopyOnWriteArrayList<>();
|
||||||
|
|
||||||
public FortManager()
|
public FortManager()
|
||||||
{
|
{
|
||||||
|
@@ -20,10 +20,10 @@ import java.sql.Connection;
|
|||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.Statement;
|
import java.sql.Statement;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
@@ -41,9 +41,9 @@ public class CastleManager implements InstanceListManager
|
|||||||
{
|
{
|
||||||
private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
|
private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
|
||||||
|
|
||||||
private final List<Castle> _castles = new ArrayList<>();
|
private static final List<Castle> _castles = new CopyOnWriteArrayList<>();
|
||||||
|
|
||||||
private final Map<Integer, Long> _castleSiegeDate = new ConcurrentHashMap<>();
|
private static final Map<Integer, Long> _castleSiegeDate = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
private static final int _castleCirclets[] =
|
private static final int _castleCirclets[] =
|
||||||
{
|
{
|
||||||
|
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.instancemanager;
|
|||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.Statement;
|
import java.sql.Statement;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@ public class FortManager implements InstanceListManager
|
|||||||
{
|
{
|
||||||
protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
|
||||||
|
|
||||||
private static final List<Fort> _forts = new ArrayList<>();
|
private static final List<Fort> _forts = new CopyOnWriteArrayList<>();
|
||||||
|
|
||||||
public int findNearestFortIndex(WorldObject obj)
|
public int findNearestFortIndex(WorldObject obj)
|
||||||
{
|
{
|
||||||
|
@@ -20,10 +20,10 @@ import java.sql.Connection;
|
|||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.Statement;
|
import java.sql.Statement;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
@@ -41,9 +41,9 @@ public class CastleManager implements InstanceListManager
|
|||||||
{
|
{
|
||||||
private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
|
private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
|
||||||
|
|
||||||
private final List<Castle> _castles = new ArrayList<>();
|
private static final List<Castle> _castles = new CopyOnWriteArrayList<>();
|
||||||
|
|
||||||
private final Map<Integer, Long> _castleSiegeDate = new ConcurrentHashMap<>();
|
private static final Map<Integer, Long> _castleSiegeDate = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
private static final int _castleCirclets[] =
|
private static final int _castleCirclets[] =
|
||||||
{
|
{
|
||||||
|
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.instancemanager;
|
|||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.Statement;
|
import java.sql.Statement;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@ public class FortManager implements InstanceListManager
|
|||||||
{
|
{
|
||||||
protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
|
||||||
|
|
||||||
private static final List<Fort> _forts = new ArrayList<>();
|
private static final List<Fort> _forts = new CopyOnWriteArrayList<>();
|
||||||
|
|
||||||
public int findNearestFortIndex(WorldObject obj)
|
public int findNearestFortIndex(WorldObject obj)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user