diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 764fab05ff..3d9192bde4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.instancemanager; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; @@ -42,7 +42,7 @@ public class CastleManager return SingletonHolder.INSTANCE; } - private List _castles; + private static final List _castles = new CopyOnWriteArrayList<>(); private static final int _castleCirclets[] = { @@ -223,10 +223,6 @@ public class CastleManager public List getCastles() { - if (_castles == null) - { - _castles = new ArrayList<>(); - } return _castles; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java index 97a576bbfd..924ff07afb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.instancemanager; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; @@ -35,7 +35,7 @@ public class FortManager { protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private static final List _forts = new ArrayList<>(); + private static final List _forts = new CopyOnWriteArrayList<>(); public FortManager() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index fb2ca0f95f..4413b3cd3a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -20,10 +20,10 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; 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 final List _castles = new ArrayList<>(); + private static final List _castles = new CopyOnWriteArrayList<>(); - private final Map _castleSiegeDate = new ConcurrentHashMap<>(); + private static final Map _castleSiegeDate = new ConcurrentHashMap<>(); private static final int _castleCirclets[] = { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java index 21a30abe20..20003ebc1a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.instancemanager; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import java.util.logging.Logger; @@ -34,7 +34,7 @@ public class FortManager implements InstanceListManager { protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private static final List _forts = new ArrayList<>(); + private static final List _forts = new CopyOnWriteArrayList<>(); public int findNearestFortIndex(WorldObject obj) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index fb2ca0f95f..4413b3cd3a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -20,10 +20,10 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; 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 final List _castles = new ArrayList<>(); + private static final List _castles = new CopyOnWriteArrayList<>(); - private final Map _castleSiegeDate = new ConcurrentHashMap<>(); + private static final Map _castleSiegeDate = new ConcurrentHashMap<>(); private static final int _castleCirclets[] = { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java index 21a30abe20..20003ebc1a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.instancemanager; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import java.util.logging.Logger; @@ -34,7 +34,7 @@ public class FortManager implements InstanceListManager { protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private static final List _forts = new ArrayList<>(); + private static final List _forts = new CopyOnWriteArrayList<>(); public int findNearestFortIndex(WorldObject obj) {