diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java index 7b8f4521dd..028598ea19 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java @@ -119,7 +119,7 @@ public class Antharas extends Quest protected static long _LastAction = 0; - protected static BossZone _Zone; + protected static BossZone _zone; // Boss: Antharas public Antharas() @@ -160,7 +160,7 @@ public class Antharas extends Quest // Setting spawn data of monsters. try { - _Zone = GrandBossManager.getInstance().getZone(179700, 113800, -7709); + _zone = GrandBossManager.getInstance().getZone(179700, 113800, -7709); NpcTemplate template1; Spawn tempSpawn; @@ -417,9 +417,9 @@ public class Antharas extends Quest AntharasSpawn(int taskId) { _taskId = taskId; - if (_Zone.getCharactersInside() != null) + if (_zone.getCharactersInside() != null) { - _players = _Zone.getCharactersInside().values(); + _players = _zone.getCharactersInside(); } } @@ -565,9 +565,9 @@ public class Antharas extends Quest protected void broadcastPacket(GameServerPacket mov) { - if (_Zone != null) + if (_zone != null) { - for (Creature creatures : _Zone.getCharactersInside().values()) + for (Creature creatures : _zone.getCharactersInside()) { if (creatures instanceof PlayerInstance) { @@ -760,7 +760,7 @@ public class Antharas extends Quest public void setUnspawn() { // Eliminate players. - _Zone.oustAllPlayers(); + _zone.oustAllPlayers(); // Not executed tasks is canceled. if (_cubeSpawnTask != null) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java index d050b3747f..46909a641e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java @@ -225,7 +225,7 @@ public class Baium extends Quest // baium.setImobilised(false); // for (NpcInstance minion : _Minions) // minion.setShowSummonAnimation(false); - baium.getAttackByList().addAll(_zone.getCharactersInside().values()); + baium.getAttackByList().addAll(_zone.getCharactersInside()); } catch (Exception e) { @@ -239,7 +239,7 @@ public class Baium extends Quest final MonsterInstance angel = (MonsterInstance) addSpawn(ARCHANGEL, element[0], element[1], element[2], element[3], false, 0); angel.setInvul(true); _minions.add(angel); - angel.getAttackByList().addAll(_zone.getCharactersInside().values()); + angel.getAttackByList().addAll(_zone.getCharactersInside()); angel.isAggressive(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java index eb9a9cfdae..46c9be8d2a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java @@ -649,7 +649,7 @@ public class Frintezza extends Quest _zone.broadcastPacket(new SocialAction(_demon1.getObjectId(), 1)); _zone.broadcastPacket(new SocialAction(_demon4.getObjectId(), 1)); - for (Creature pc : _zone.getCharactersInside().values()) + for (Creature pc : _zone.getCharactersInside()) { if (pc instanceof PlayerInstance) { @@ -667,7 +667,7 @@ public class Frintezza extends Quest } else if (event.equals("camera_9c")) { - for (Creature pc : _zone.getCharactersInside().values()) + for (Creature pc : _zone.getCharactersInside()) { if (pc instanceof PlayerInstance) { @@ -830,7 +830,7 @@ public class Frintezza extends Quest } else if (event.equals("stop_pc")) { - for (Creature creature : _zone.getCharactersInside().values()) + for (Creature creature : _zone.getCharactersInside()) { creature.abortAttack(); creature.abortCast(); @@ -855,7 +855,7 @@ public class Frintezza extends Quest } else if (event.equals("start_pc")) { - for (Creature creature : _zone.getCharactersInside().values()) + for (Creature creature : _zone.getCharactersInside()) { if (creature != _frintezza) { @@ -1169,7 +1169,7 @@ public class Frintezza extends Quest } else if (_onSong == 4) { - for (Creature creature : _zone.getCharactersInside().values()) + for (Creature creature : _zone.getCharactersInside()) { if ((creature instanceof PlayerInstance) && (Rnd.get(100) < 80)) { @@ -1180,7 +1180,7 @@ public class Frintezza extends Quest } else if (_onSong == 5) { - for (Creature creature : _zone.getCharactersInside().values()) + for (Creature creature : _zone.getCharactersInside()) { if ((creature instanceof PlayerInstance) && (Rnd.get(100) < 70)) { @@ -1201,7 +1201,7 @@ public class Frintezza extends Quest } else if (event.equals("stop_effect")) { - for (Creature creature : _zone.getCharactersInside().values()) + for (Creature creature : _zone.getCharactersInside()) { if (creature instanceof PlayerInstance) { @@ -1336,7 +1336,7 @@ public class Frintezza extends Quest } else { - for (Creature creature : _zone.getCharactersInside().values()) + for (Creature creature : _zone.getCharactersInside()) { if ((creature instanceof PlayerInstance) && (creature.getFirstEffect(5016) != null)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/zones/ScriptZone.xml b/L2J_Mobius_C6_Interlude/dist/game/data/zones/ScriptZone.xml deleted file mode 100644 index ed0265de9a..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/data/zones/ScriptZone.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ZoneData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ZoneData.java index 33ae7451c7..00d5a398ff 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ZoneData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ZoneData.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; -import org.l2jmobius.gameserver.model.zone.SpawnZone; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.model.zone.form.ZoneCuboid; import org.l2jmobius.gameserver.model.zone.form.ZoneCylinder; @@ -445,7 +445,7 @@ public class ZoneData temp.setParameter(name, val); } - else if ("spawn".equalsIgnoreCase(cd.getNodeName()) && (temp instanceof SpawnZone)) + else if ("spawn".equalsIgnoreCase(cd.getNodeName()) && (temp instanceof ZoneRespawn)) { attrs = cd.getAttributes(); int spawnX = Integer.parseInt(attrs.getNamedItem("X").getNodeValue()); @@ -455,11 +455,11 @@ public class ZoneData Node val = attrs.getNamedItem("isChaotic"); if ((val != null) && Boolean.parseBoolean(val.getNodeValue())) { - ((SpawnZone) temp).addChaoticSpawn(spawnX, spawnY, spawnZ); + ((ZoneRespawn) temp).addChaoticSpawn(spawnX, spawnY, spawnZ); } else { - ((SpawnZone) temp).addSpawn(spawnX, spawnY, spawnZ); + ((ZoneRespawn) temp).addSpawn(spawnX, spawnY, spawnZ); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java index bd4b91696c..f4119334a5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java @@ -196,7 +196,7 @@ public class BanditStrongholdSiege extends ClanHallSiege public void teleportPlayers() { final ClanHallZone zone = clanhall.getZone(); - for (Creature creature : zone.getCharactersInside().values()) + for (Creature creature : zone.getCharactersInside()) { if (creature instanceof PlayerInstance) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java index 64cb9e0ff5..4ea33b0543 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java @@ -189,7 +189,7 @@ public class WildBeastFarmSiege extends ClanHallSiege public void teleportPlayers() { final ClanHallZone zone = clanhall.getZone(); - for (Creature creature : zone.getCharactersInside().values()) + for (Creature creature : zone.getCharactersInside()) { if (creature instanceof PlayerInstance) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/SpawnZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneRespawn.java similarity index 74% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/SpawnZone.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneRespawn.java index 9ea32b9c91..be0030a035 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/SpawnZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneRespawn.java @@ -23,20 +23,20 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; /** - * Abstract zone with spawn locations.
- * It inherits regular ZoneType behavior, with the possible addition of 2 Lists holding Locations. + * Abstract zone with spawn locations + * @author DS, Nyaran (rework 10/07/2011) */ -public abstract class SpawnZone extends ZoneType +public abstract class ZoneRespawn extends ZoneType { private List _spawnLocs = null; private List _chaoticSpawnLocs = null; - public SpawnZone(int id) + public ZoneRespawn(int id) { super(id); } - public final void addSpawn(int x, int y, int z) + public void addSpawn(int x, int y, int z) { if (_spawnLocs == null) { @@ -46,7 +46,7 @@ public abstract class SpawnZone extends ZoneType _spawnLocs.add(new Location(x, y, z)); } - public final void addChaoticSpawn(int x, int y, int z) + public void addChaoticSpawn(int x, int y, int z) { if (_chaoticSpawnLocs == null) { @@ -56,17 +56,17 @@ public abstract class SpawnZone extends ZoneType _chaoticSpawnLocs.add(new Location(x, y, z)); } - public final List getSpawns() + public List getSpawns() { return _spawnLocs; } - public final Location getSpawnLoc() + public Location getSpawnLoc() { return _spawnLocs.get(Rnd.get(_spawnLocs.size())); } - public final Location getChaoticSpawnLoc() + public Location getChaoticSpawnLoc() { if (_chaoticSpawnLocs != null) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index f69f3beb46..0d5fa455da 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model.zone; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -32,7 +33,7 @@ public abstract class ZoneType { private final int _id; protected ZoneForm _zone; - public Map _characterList; + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected; @@ -46,7 +47,6 @@ public abstract class ZoneType protected ZoneType(int id) { _id = id; - _characterList = new ConcurrentHashMap<>(); _checkAffected = false; @@ -354,9 +354,9 @@ public abstract class ZoneType } } - public Map getCharactersInside() + public Collection getCharactersInside() { - return _characterList; + return _characterList.values(); } public void visualizeZone(int z) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ArenaZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ArenaZone.java index 451b8fac90..f1b22c5a7b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ArenaZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ArenaZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.zone.SpawnZone; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; * An arena * @author durgus */ -public class ArenaZone extends SpawnZone +public class ArenaZone extends ZoneRespawn { public ArenaZone(int id) { @@ -70,17 +70,7 @@ public class ArenaZone extends SpawnZone public void oustAllPlayers() { - if (_characterList == null) - { - return; - } - - if (_characterList.isEmpty()) - { - return; - } - - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { if (creature == null) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java index de733acb7e..1d5fa90d65 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java @@ -173,12 +173,7 @@ public class BossZone extends ZoneType */ public void movePlayersTo(int x, int y, int z) { - if (_characterList.isEmpty()) - { - return; - } - - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { if (creature instanceof PlayerInstance) { @@ -277,17 +272,12 @@ public class BossZone extends ZoneType */ public void oustAllPlayers() { - if (_characterList == null) + if (getCharactersInside().isEmpty()) { return; } - if (_characterList.isEmpty()) - { - return; - } - - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { if (creature == null) { @@ -336,13 +326,13 @@ public class BossZone extends ZoneType public void updateKnownList(NpcInstance npc) { - if ((_characterList == null) || _characterList.isEmpty()) + if (getCharactersInside().isEmpty()) { return; } final Map npcKnownPlayers = npc.getKnownList().getKnownPlayers(); - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { if (creature == null) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleTeleportZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleTeleportZone.java index 16d3e4591d..78d29afc84 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleTeleportZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleTeleportZone.java @@ -107,7 +107,7 @@ public class CastleTeleportZone extends ZoneType public List getAllPlayers() { final List players = new ArrayList<>(); - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { if (creature instanceof PlayerInstance) { @@ -119,17 +119,7 @@ public class CastleTeleportZone extends ZoneType public void oustAllPlayers() { - if (_characterList == null) - { - return; - } - - if (_characterList.isEmpty()) - { - return; - } - - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { if ((creature != null) && (creature instanceof PlayerInstance)) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java index 20c3782350..b24539eb8b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance; import org.l2jmobius.gameserver.model.entity.siege.Castle; -import org.l2jmobius.gameserver.model.zone.SpawnZone; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; * A castle zone * @author durgus */ -public class CastleZone extends SpawnZone +public class CastleZone extends ZoneRespawn { private Castle _castle; @@ -120,7 +120,7 @@ public class CastleZone extends SpawnZone { if (_castle.getSiege().isInProgress()) { - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { try { @@ -133,7 +133,7 @@ public class CastleZone extends SpawnZone } else { - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { try { @@ -163,7 +163,7 @@ public class CastleZone extends SpawnZone */ public void banishForeigners(int owningClanId) { - for (Creature temp : _characterList.values()) + for (Creature temp : getCharactersInside()) { if (!(temp instanceof PlayerInstance)) { @@ -185,7 +185,7 @@ public class CastleZone extends SpawnZone */ public void announceToPlayers(String message) { - for (Creature temp : _characterList.values()) + for (Creature temp : getCharactersInside()) { if (temp instanceof PlayerInstance) { @@ -201,15 +201,13 @@ public class CastleZone extends SpawnZone public List getAllPlayers() { final List players = new ArrayList<>(); - - for (Creature temp : _characterList.values()) + for (Creature temp : getCharactersInside()) { if (temp instanceof PlayerInstance) { players.add((PlayerInstance) temp); } } - return players; } @@ -219,7 +217,6 @@ public class CastleZone extends SpawnZone { return _castle.isSiegeInProgress(); } - return false; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index 237c9a9745..b4824e3e64 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -16,14 +16,12 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import java.util.Map; - import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.zone.SpawnZone; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.serverpackets.ClanHallDecoration; @@ -31,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ClanHallDecoration; * A clan hall zone * @author durgus */ -public class ClanHallZone extends SpawnZone +public class ClanHallZone extends ZoneRespawn { private int _clanHallId; @@ -118,7 +116,7 @@ public class ClanHallZone extends SpawnZone */ public void banishForeigners(int owningClanId) { - for (Creature temp : _characterList.values()) + for (Creature temp : getCharactersInside()) { if (!(temp instanceof PlayerInstance)) { @@ -133,10 +131,4 @@ public class ClanHallZone extends SpawnZone ((PlayerInstance) temp).teleToLocation(TeleportWhereType.TOWN); } } - - @Override - public Map getCharactersInside() - { - return _characterList; - } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index 15f8ea2cac..a92d2acdbe 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import java.util.Collection; import java.util.concurrent.Future; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -66,18 +65,13 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty()) + if (getCharactersInside().isEmpty()) { _task.cancel(true); _task = null; } } - protected Collection getCharacterList() - { - return _characterList.values(); - } - protected int getDamagePerSecond() { return _damagePerSec; @@ -95,7 +89,7 @@ public class DamageZone extends ZoneType @Override public void run() { - for (Creature temp : _dmgZone.getCharacterList()) + for (Creature temp : _dmgZone.getCharactersInside()) { if ((temp != null) && !temp.isDead() && (temp instanceof PlayerInstance)) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java index 548ecd0ff1..61e4070793 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java @@ -97,7 +97,7 @@ public class DynamicZone extends ZoneType _region.removeZone(this); - for (Creature member : _characterList.values()) + for (Creature member : getCharactersInside()) { try { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 94fa919530..c2c9ac1a3f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; @@ -160,7 +159,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (_task != null)) + if (getCharactersInside().isEmpty() && (_task != null)) { _task.cancel(true); _task = null; @@ -233,11 +232,6 @@ public class EffectZone extends ZoneType _enabled = value; } - protected Collection getCharacterList() - { - return _characterList.values(); - } - class ApplySkill implements Runnable { ApplySkill() @@ -253,7 +247,7 @@ public class EffectZone extends ZoneType { if (_enabled) { - for (Creature temp : getCharacterList()) + for (Creature temp : getCharactersInside()) { if ((temp != null) && !temp.isDead()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/FortZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/FortZone.java index 7bc0126005..290d0c5198 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/FortZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/FortZone.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance; import org.l2jmobius.gameserver.model.entity.siege.Fort; -import org.l2jmobius.gameserver.model.zone.SpawnZone; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; * A castle zone * @author programmos */ -public class FortZone extends SpawnZone +public class FortZone extends ZoneRespawn { private Fort _fort; @@ -117,7 +117,7 @@ public class FortZone extends SpawnZone { if (_fort.getSiege().isInProgress()) { - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { try { @@ -130,7 +130,7 @@ public class FortZone extends SpawnZone } else { - for (Creature creature : _characterList.values()) + for (Creature creature : getCharactersInside()) { try { @@ -160,7 +160,7 @@ public class FortZone extends SpawnZone */ public void banishForeigners(int owningClanId) { - for (Creature temp : _characterList.values()) + for (Creature temp : getCharactersInside()) { if (!(temp instanceof PlayerInstance)) { @@ -182,7 +182,7 @@ public class FortZone extends SpawnZone */ public void announceToPlayers(String message) { - for (Creature temp : _characterList.values()) + for (Creature temp : getCharactersInside()) { if (temp instanceof PlayerInstance) { @@ -198,7 +198,7 @@ public class FortZone extends SpawnZone public List getAllPlayers() { final List players = new ArrayList<>(); - for (Creature temp : _characterList.values()) + for (Creature temp : getCharactersInside()) { if (temp instanceof PlayerInstance) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java index 146526000d..fc40363bb4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java @@ -113,7 +113,7 @@ public class PoisonZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (_task != null)) + if (getCharactersInside().isEmpty() && (_task != null)) { _task.cancel(true); _task = null; @@ -152,7 +152,7 @@ public class PoisonZone extends ZoneType { if (_enabled) { - for (Creature temp : _characterList.values()) + for (Creature temp : getCharactersInside()) { if ((temp != null) && !temp.isDead() && (((temp instanceof Playable) && _target.equalsIgnoreCase("pc")) || ((temp instanceof PlayerInstance) && _target.equalsIgnoreCase("pc_only")) || ((temp instanceof MonsterInstance) && _target.equalsIgnoreCase("npc"))) && (Rnd.get(100) < _chance)) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java index f30310d06e..4ae34d8407 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java @@ -19,14 +19,14 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.zone.SpawnZone; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneId; /** * A Town zone * @author durgus */ -public class TownZone extends SpawnZone +public class TownZone extends ZoneRespawn { private String _townName; private int _townId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java index bd07222f5a..25c0ed8e94 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -193,7 +193,7 @@ public class Broadcast { for (ZoneType zone : ZoneData.getInstance().getAllZones(zoneType)) { - for (Creature creature : zone.getCharactersInside().values()) + for (Creature creature : zone.getCharactersInside()) { if (creature == null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index ffd2451341..80290c4933 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -46,7 +46,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ protected boolean _checkAffected = false; @@ -489,11 +489,6 @@ public abstract class ZoneType extends ListenersContainer { } - public Map getCharacters() - { - return _characterList; - } - public Collection getCharactersInside() { return _characterList.values(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java index 8ebdd7c0ff..1caeb11dec 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java @@ -343,11 +343,6 @@ public class BossZone extends ZoneType */ public void movePlayersTo(Location loc) { - if (_characterList.isEmpty()) - { - return; - } - for (Creature creature : getCharactersInside()) { if ((creature != null) && creature.isPlayer()) @@ -367,7 +362,7 @@ public class BossZone extends ZoneType */ public void oustAllPlayers() { - if (_characterList.isEmpty()) + if (getCharactersInside().isEmpty()) { return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index bb71180c02..6ea689cea4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -129,7 +129,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 5fb64d7912..35f3d0c2f0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -167,7 +167,7 @@ public class EffectZone extends ZoneType } } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index ffd2451341..80290c4933 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -46,7 +46,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ protected boolean _checkAffected = false; @@ -489,11 +489,6 @@ public abstract class ZoneType extends ListenersContainer { } - public Map getCharacters() - { - return _characterList; - } - public Collection getCharactersInside() { return _characterList.values(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java index 8ebdd7c0ff..1caeb11dec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java @@ -343,11 +343,6 @@ public class BossZone extends ZoneType */ public void movePlayersTo(Location loc) { - if (_characterList.isEmpty()) - { - return; - } - for (Creature creature : getCharactersInside()) { if ((creature != null) && creature.isPlayer()) @@ -367,7 +362,7 @@ public class BossZone extends ZoneType */ public void oustAllPlayers() { - if (_characterList.isEmpty()) + if (getCharactersInside().isEmpty()) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index bb71180c02..6ea689cea4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -129,7 +129,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 5fb64d7912..35f3d0c2f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -167,7 +167,7 @@ public class EffectZone extends ZoneType } } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java index 98795b8e6c..3236fdbf81 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java @@ -49,7 +49,7 @@ public abstract class ZoneType extends ListenersContainer private final int _id; protected ZoneForm _zone; protected List _blockedZone; - protected Map _characterList = new ConcurrentHashMap<>(); + private final Map _characterList = new ConcurrentHashMap<>(); /** Parameters to affect specific characters */ private boolean _checkAffected = false; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index fa8619176c..abf863cde3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -130,7 +130,7 @@ public class DamageZone extends ZoneType @Override protected void onExit(Creature creature) { - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 93a7f3a5b0..4f76d1f2bc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -183,7 +183,7 @@ public class EffectZone extends ZoneType } } - if (_characterList.isEmpty() && (getSettings().getTask() != null)) + if (getCharactersInside().isEmpty() && (getSettings().getTask() != null)) { getSettings().clear(); }