lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2jServer HighFive Mar 25th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-03-25 06:48:51 +00:00
parent e0c66b1412
commit 82606870c0
194 changed files with 2619 additions and 2869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
trunk/java/com/l2jserver/gameserver/instancemanager/FortManager.java
View File

@@ -36,7 +36,7 @@ public final class FortManager implements InstanceListManager
{
protected static final Logger _log = Logger.getLogger(FortManager.class.getName());
private List<Fort> _forts;
private final List<Fort> _forts = new ArrayList<>();
public final int findNearestFortIndex(L2Object obj)
{
@@ -50,9 +50,9 @@ public final class FortManager implements InstanceListManager
{
double distance;
Fort fort;
for (int i = 0; i < getForts().size(); i++)
for (int i = 0; i < _forts.size(); i++)
{
fort = getForts().get(i);
fort = _forts.get(i);
if (fort == null)
{
continue;
@@ -70,7 +70,7 @@ public final class FortManager implements InstanceListManager
public final Fort getFortById(int fortId)
{
for (Fort f : getForts())
for (Fort f : _forts)
{
if (f.getResidenceId() == fortId)
{
@@ -82,7 +82,7 @@ public final class FortManager implements InstanceListManager
public final Fort getFortByOwner(L2Clan clan)
{
for (Fort f : getForts())
for (Fort f : _forts)
{
if (f.getOwnerClan() == clan)
{
@@ -94,7 +94,7 @@ public final class FortManager implements InstanceListManager
public final Fort getFort(String name)
{
for (Fort f : getForts())
for (Fort f : _forts)
{
if (f.getName().equalsIgnoreCase(name.trim()))
{
@@ -106,7 +106,7 @@ public final class FortManager implements InstanceListManager
public final Fort getFort(int x, int y, int z)
{
for (Fort f : getForts())
for (Fort f : _forts)
{
if (f.checkIfInZone(x, y, z))
{
@@ -124,9 +124,9 @@ public final class FortManager implements InstanceListManager
public final int getFortIndex(int fortId)
{
Fort fort;
for (int i = 0; i < getForts().size(); i++)
for (int i = 0; i < _forts.size(); i++)
{
fort = getForts().get(i);
fort = _forts.get(i);
if ((fort != null) && (fort.getResidenceId() == fortId))
{
return i;
@@ -143,9 +143,9 @@ public final class FortManager implements InstanceListManager
public final int getFortIndex(int x, int y, int z)
{
Fort fort;
for (int i = 0; i < getForts().size(); i++)
for (int i = 0; i < _forts.size(); i++)
{
fort = getForts().get(i);
fort = _forts.get(i);
if ((fort != null) && fort.checkIfInZone(x, y, z))
{
return i;
@@ -156,10 +156,6 @@ public final class FortManager implements InstanceListManager
public final List<Fort> getForts()
{
if (_forts == null)
{
_forts = new ArrayList<>();
}
return _forts;
}
@@ -172,11 +168,11 @@ public final class FortManager implements InstanceListManager
{
while (rs.next())
{
getForts().add(new Fort(rs.getInt("id")));
_forts.add(new Fort(rs.getInt("id")));
}
_log.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress");
for (Fort fort : getForts())
_log.info(getClass().getSimpleName() + ": Loaded: " + _forts.size() + " fortress");
for (Fort fort : _forts)
{
fort.getSiege().getSiegeGuardManager().loadSiegeGuard();
}