Access zone character list only by getter method.

This commit is contained in:
MobiusDevelopment
2020-02-04 05:21:24 +00:00
parent 232a3bb69b
commit 407ff24524
74 changed files with 126 additions and 224 deletions

View File

@@ -46,7 +46,7 @@ public abstract class ZoneType extends ListenersContainer
private final int _id;
protected ZoneForm _zone;
protected Map<Integer, Creature> _characterList = new ConcurrentHashMap<>();
private final Map<Integer, Creature> _characterList = new ConcurrentHashMap<>();
/** Parameters to affect specific characters */
protected boolean _checkAffected = false;
@@ -489,11 +489,6 @@ public abstract class ZoneType extends ListenersContainer
{
}
public Map<Integer, Creature> getCharacters()
{
return _characterList;
}
public Collection<Creature> getCharactersInside()
{
return _characterList.values();

View File

@@ -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;
}

View File

@@ -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();
}

View File

@@ -167,7 +167,7 @@ public class EffectZone extends ZoneType
}
}
}
if (_characterList.isEmpty() && (getSettings().getTask() != null))
if (getCharactersInside().isEmpty() && (getSettings().getTask() != null))
{
getSettings().clear();
}