From cf37fa4b7b89bd745b87e13e41f58bb1a58ddedd Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 4 Mar 2019 09:44:21 +0000 Subject: [PATCH] FortManager fort list made static. --- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 13 ++++++------- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- .../gameserver/instancemanager/FortManager.java | 2 +- 13 files changed, 18 insertions(+), 19 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 53c4bba516..cd0b4a3c08 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -31,17 +31,11 @@ import com.l2jmobius.gameserver.model.entity.siege.Fort; /** * @author programmos, scoria dev */ - public class FortManager { protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - public static final FortManager getInstance() - { - return SingletonHolder._instance; - } - - private final List _forts = new ArrayList<>(); + private static final List _forts = new ArrayList<>(); public FortManager() { @@ -194,6 +188,11 @@ public class FortManager return _forts; } + public static final FortManager getInstance() + { + return SingletonHolder._instance; + } + private static class SingletonHolder { protected static final FortManager _instance = new FortManager(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index a363d10fc1..16994d3cdd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -34,7 +34,7 @@ public final class FortManager implements InstanceListManager { protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final List _forts = new ArrayList<>(); + private static final List _forts = new ArrayList<>(); public final int findNearestFortIndex(L2Object obj) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 56ab9144cf..c40ab76e83 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -35,7 +35,7 @@ public final class FortManager implements InstanceListManager { private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); - private final Map _forts = new ConcurrentSkipListMap<>(); + private static final Map _forts = new ConcurrentSkipListMap<>(); public final Fort findNearestFort(L2Object obj) {