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

Added missing final modifiers.

Browse Source
This commit is contained in:
MobiusDev
2015-12-26 12:03:36 +00:00
parent cc92e5d062
commit e0d681a17e
974 changed files with 5919 additions and 5917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java
View File

@@ -51,7 +51,7 @@ public abstract class L2ZoneForm
protected final void dropDebugItem(int itemId, int num, int x, int y, int z)
{
L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId);
final L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId);
item.setCount(num);
item.spawnMe(x, y, z + 5);
ZoneManager.getInstance().getDebugItems().add(item);

6
trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java
View File

@@ -132,7 +132,7 @@ public abstract class L2ZoneType extends ListenersContainer
}
else
{
int[] temp = new int[_race.length + 1];
final int[] temp = new int[_race.length + 1];
int i = 0;
for (; i < _race.length; i++)
@@ -156,7 +156,7 @@ public abstract class L2ZoneType extends ListenersContainer
}
else
{
int[] temp = new int[_class.length + 1];
final int[] temp = new int[_class.length + 1];
int i = 0;
for (; i < _class.length; i++)
@@ -527,7 +527,7 @@ public abstract class L2ZoneType extends ListenersContainer
public List<L2PcInstance> getPlayersInside()
{
List<L2PcInstance> players = new ArrayList<>();
final List<L2PcInstance> players = new ArrayList<>();
for (L2Character ch : _characterList.values())
{
if ((ch != null) && ch.isPlayer())

28
trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboid.java
View File

@@ -36,10 +36,10 @@ public class ZoneCuboid extends L2ZoneForm
public ZoneCuboid(int x1, int x2, int y1, int y2, int z1, int z2)
{
int _x1 = Math.min(x1, x2);
int _x2 = Math.max(x1, x2);
int _y1 = Math.min(y1, y2);
int _y2 = Math.max(y1, y2);
final int _x1 = Math.min(x1, x2);
final int _x2 = Math.max(x1, x2);
final int _y1 = Math.min(y1, y2);
final int _y2 = Math.max(y1, y2);
_r = new Rectangle(_x1, _y1, _x2 - _x1, _y2 - _y1);
@@ -62,10 +62,10 @@ public class ZoneCuboid extends L2ZoneForm
@Override
public double getDistanceToZone(int x, int y)
{
int _x1 = _r.x;
int _x2 = _r.x + _r.width;
int _y1 = _r.y;
int _y2 = _r.y + _r.height;
final int _x1 = _r.x;
final int _x2 = _r.x + _r.width;
final int _y1 = _r.y;
final int _y2 = _r.y + _r.height;
double test, shortestDist = Math.pow(_x1 - x, 2) + Math.pow(_y1 - y, 2);
test = Math.pow(_x1 - x, 2) + Math.pow(_y2 - y, 2);
@@ -107,10 +107,10 @@ public class ZoneCuboid extends L2ZoneForm
@Override
public void visualizeZone(int z)
{
int _x1 = _r.x;
int _x2 = _r.x + _r.width;
int _y1 = _r.y;
int _y2 = _r.y + _r.height;
final int _x1 = _r.x;
final int _x2 = _r.x + _r.width;
final int _y1 = _r.y;
final int _y2 = _r.y + _r.height;
// x1->x2
for (int x = _x1; x < _x2; x = x + STEP)
@@ -129,8 +129,8 @@ public class ZoneCuboid extends L2ZoneForm
@Override
public int[] getRandomPoint()
{
int x = Rnd.get(_r.x, _r.x + _r.width);
int y = Rnd.get(_r.y, _r.y + _r.height);
final int x = Rnd.get(_r.x, _r.x + _r.width);
final int y = Rnd.get(_r.y, _r.y + _r.height);
return new int[]
{

8
trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinder.java
View File

@@ -127,12 +127,12 @@ public class ZoneCylinder extends L2ZoneForm
@Override
public void visualizeZone(int z)
{
int count = (int) ((2 * Math.PI * _rad) / STEP);
double angle = (2 * Math.PI) / count;
final int count = (int) ((2 * Math.PI * _rad) / STEP);
final double angle = (2 * Math.PI) / count;
for (int i = 0; i < count; i++)
{
int x = (int) (Math.cos(angle * i) * _rad);
int y = (int) (Math.sin(angle * i) * _rad);
final int x = (int) (Math.cos(angle * i) * _rad);
final int y = (int) (Math.sin(angle * i) * _rad);
dropDebugItem(Inventory.ADENA_ID, 1, _x + x, _y + y, z);
}
}

22
trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneNPoly.java
View File

@@ -64,8 +64,8 @@ public class ZoneNPoly extends L2ZoneForm
@Override
public double getDistanceToZone(int x, int y)
{
int[] _x = _p.xpoints;
int[] _y = _p.ypoints;
final int[] _x = _p.xpoints;
final int[] _y = _p.ypoints;
double test, shortestDist = Math.pow(_x[0] - x, 2) + Math.pow(_y[0] - y, 2);
for (int i = 1; i < _p.npoints; i++)
@@ -96,8 +96,8 @@ public class ZoneNPoly extends L2ZoneForm
@Override
public void visualizeZone(int z)
{
int[] _x = _p.xpoints;
int[] _y = _p.ypoints;
final int[] _x = _p.xpoints;
final int[] _y = _p.ypoints;
for (int i = 0; i < _p.npoints; i++)
{
@@ -107,13 +107,13 @@ public class ZoneNPoly extends L2ZoneForm
{
nextIndex = 0;
}
int vx = _x[nextIndex] - _x[i];
int vy = _y[nextIndex] - _y[i];
final int vx = _x[nextIndex] - _x[i];
final int vy = _y[nextIndex] - _y[i];
float lenght = (float) Math.sqrt((vx * vx) + (vy * vy));
lenght /= STEP;
for (int o = 1; o <= lenght; o++)
{
float k = o / lenght;
final float k = o / lenght;
dropDebugItem(Inventory.ADENA_ID, 1, (int) (_x[i] + (k * vx)), (int) (_y[i] + (k * vy)), z);
}
}
@@ -124,10 +124,10 @@ public class ZoneNPoly extends L2ZoneForm
{
int x, y;
int _minX = _p.getBounds().x;
int _maxX = _p.getBounds().x + _p.getBounds().width;
int _minY = _p.getBounds().y;
int _maxY = _p.getBounds().y + _p.getBounds().height;
final int _minX = _p.getBounds().x;
final int _maxX = _p.getBounds().x + _p.getBounds().width;
final int _minY = _p.getBounds().y;
final int _maxY = _p.getBounds().y + _p.getBounds().height;
x = Rnd.get(_minX, _maxX);
y = Rnd.get(_minY, _maxY);

12
trunk/java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java
View File

@@ -168,7 +168,7 @@ public class L2BossZone extends L2ZoneType
// with legal entries, do nothing.
if (expirationTime == null) // legal null expirationTime entries
{
long serverStartTime = GameServer.dateTimeServerStarted.getTimeInMillis();
final long serverStartTime = GameServer.dateTimeServerStarted.getTimeInMillis();
if ((serverStartTime > (System.currentTimeMillis() - _timeInvade)))
{
return;
@@ -278,7 +278,7 @@ public class L2BossZone extends L2ZoneType
{
for (int i = 0; i < getSettings().getRaidList().size(); i++)
{
L2Attackable raid = (L2Attackable) getSettings().getRaidList().get(i);
final L2Attackable raid = (L2Attackable) getSettings().getRaidList().get(i);
if ((raid == null) || (raid.getSpawn() == null) || raid.isDead())
{
continue;
@@ -366,7 +366,7 @@ public class L2BossZone extends L2ZoneType
{
if ((character != null) && character.isPlayer())
{
L2PcInstance player = character.getActingPlayer();
final L2PcInstance player = character.getActingPlayer();
if (player.isOnline())
{
player.teleToLocation(loc);
@@ -390,7 +390,7 @@ public class L2BossZone extends L2ZoneType
{
if ((character != null) && character.isPlayer())
{
L2PcInstance player = character.getActingPlayer();
final L2PcInstance player = character.getActingPlayer();
if (player.isOnline())
{
if ((_oustLoc[0] != 0) && (_oustLoc[1] != 0) && (_oustLoc[2] != 0))
@@ -441,12 +441,12 @@ public class L2BossZone extends L2ZoneType
return;
}
Map<Integer, L2PcInstance> npcKnownPlayers = npc.getKnownList().getKnownPlayers();
final Map<Integer, L2PcInstance> npcKnownPlayers = npc.getKnownList().getKnownPlayers();
for (L2Character character : getCharactersInside())
{
if ((character != null) && character.isPlayer())
{
L2PcInstance player = character.getActingPlayer();
final L2PcInstance player = character.getActingPlayer();
if (player.isOnline())
{
npcKnownPlayers.put(player.getObjectId(), player);

6
trunk/java/com/l2jserver/gameserver/model/zone/type/L2ClanHallZone.java
View File

@@ -43,7 +43,7 @@ public class L2ClanHallZone extends L2ResidenceZone
{
setResidenceId(Integer.parseInt(value));
// Register self to the correct clan hall
ClanHall hall = ClanHallManager.getInstance().getClanHallById(getResidenceId());
final ClanHall hall = ClanHallManager.getInstance().getClanHallById(getResidenceId());
if (hall == null)
{
_log.warning("L2ClanHallZone: Clan hall with id " + getResidenceId() + " does not exist!");
@@ -67,14 +67,14 @@ public class L2ClanHallZone extends L2ResidenceZone
// Set as in clan hall
character.setInsideZone(ZoneId.CLAN_HALL, true);
AuctionableHall clanHall = ClanHallManager.getInstance().getAuctionableHallById(getResidenceId());
final AuctionableHall clanHall = ClanHallManager.getInstance().getAuctionableHallById(getResidenceId());
if (clanHall == null)
{
return;
}
// Send decoration packet
AgitDecoInfo deco = new AgitDecoInfo(clanHall);
final AgitDecoInfo deco = new AgitDecoInfo(clanHall);
character.sendPacket(deco);
}

4
trunk/java/com/l2jserver/gameserver/model/zone/type/L2DamageZone.java
View File

@@ -110,7 +110,7 @@ public class L2DamageZone extends L2ZoneType
{
if ((getSettings().getTask() == null) && ((_damageHPPerSec != 0) || (_damageMPPerSec != 0)))
{
L2PcInstance player = character.getActingPlayer();
final L2PcInstance player = character.getActingPlayer();
if (getCastle() != null) // Castle zone
{
if (!(getCastle().getSiege().isInProgress() && (player != null) && (player.getSiegeState() != 2))) // Siege and no defender
@@ -204,7 +204,7 @@ public class L2DamageZone extends L2ZoneType
}
}
double multiplier = 1 + (temp.calcStat(Stats.DAMAGE_ZONE_VULN, 0, null, null) / 100);
final double multiplier = 1 + (temp.calcStat(Stats.DAMAGE_ZONE_VULN, 0, null, null) / 100);
if (getHPDamagePerSecond() != 0)
{

6
trunk/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java
View File

@@ -97,11 +97,11 @@ public class L2EffectZone extends L2ZoneType
}
else if (name.equals("skillIdLvl"))
{
String[] propertySplit = value.split(";");
final String[] propertySplit = value.split(";");
_skills = new ConcurrentHashMap<>(propertySplit.length);
for (String skill : propertySplit)
{
String[] skillSplit = skill.split("-");
final String[] skillSplit = skill.split("-");
if (skillSplit.length != 2)
{
_log.warning(StringUtil.concat(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"", skill, "\""));
@@ -259,7 +259,7 @@ public class L2EffectZone extends L2ZoneType
{
for (Entry<Integer, Integer> e : _skills.entrySet())
{
Skill skill = getSkill(e.getKey(), e.getValue());
final Skill skill = getSkill(e.getKey(), e.getValue());
if ((skill != null) && (_bypassConditions || skill.checkCondition(temp, temp, false)))
{
if (!temp.isAffectedBySkill(e.getKey()))

2
trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java
View File

@@ -72,7 +72,7 @@ public class L2FishingZone extends L2ZoneType
character.setInsideZone(ZoneId.FISHING, false);
}
_task.remove(character.getObjectId());
Future<?> t = _task.get(character.getObjectId());
final Future<?> t = _task.get(character.getObjectId());
if (t != null)
{
t.cancel(false);

6
trunk/java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java
View File

@@ -83,7 +83,7 @@ public class L2JumpZone extends L2ZoneType
if (character instanceof L2PcInstance)
{
L2PcInstance plr = (L2PcInstance) character;
final L2PcInstance plr = (L2PcInstance) character;
if (!plr.isAwaken() && !Config.FREE_JUMPS_FOR_ALL)
{
return;
@@ -117,8 +117,8 @@ public class L2JumpZone extends L2ZoneType
protected void stopTask(L2Character character)
{
int poid = character.getObjectId();
Future<?> t = _task.get(poid);
final int poid = character.getObjectId();
final Future<?> t = _task.get(poid);
_task.remove(poid);
if (t != null)
{

4
trunk/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java
View File

@@ -70,7 +70,7 @@ public class L2MotherTreeZone extends L2ZoneType
{
if (character.isPlayer())
{
L2PcInstance player = character.getActingPlayer();
final L2PcInstance player = character.getActingPlayer();
character.setInsideZone(ZoneId.MOTHER_TREE, true);
if (_enterMsg != 0)
{
@@ -84,7 +84,7 @@ public class L2MotherTreeZone extends L2ZoneType
{
if (character.isPlayer())
{
L2PcInstance player = character.getActingPlayer();
final L2PcInstance player = character.getActingPlayer();
player.setInsideZone(ZoneId.MOTHER_TREE, false);
if (_leaveMsg != 0)
{

2
trunk/java/com/l2jserver/gameserver/model/zone/type/L2PeaceZone.java
View File

@@ -40,7 +40,7 @@ public class L2PeaceZone extends L2ZoneType
{
if (character.isPlayer())
{
L2PcInstance player = character.getActingPlayer();
final L2PcInstance player = character.getActingPlayer();
// PVP possible during siege, now for siege participants only
// Could also check if this town is in siege, or if any siege is going on
if ((player.getSiegeState() != 0) && (Config.PEACE_ZONE_MODE == 1))

14
trunk/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java
View File

@@ -139,7 +139,7 @@ public class L2SiegeZone extends L2ZoneType
throw new IllegalArgumentException("Siege object already defined!");
}
getSettings().setSiegeableId(Integer.parseInt(value));
SiegableHall hall = CHSiegeManager.getInstance().getConquerableHalls().get(getSettings().getSiegeableId());
final SiegableHall hall = CHSiegeManager.getInstance().getConquerableHalls().get(getSettings().getSiegeableId());
if (hall == null)
{
_log.warning("L2SiegeZone: Siegable clan hall with id " + value + " does not exist!");
@@ -166,7 +166,7 @@ public class L2SiegeZone extends L2ZoneType
if (character.isPlayer())
{
L2PcInstance plyer = character.getActingPlayer();
final L2PcInstance plyer = character.getActingPlayer();
if (plyer.isRegisteredOnThisSiegeField(getSettings().getSiegeableId()))
{
plyer.setIsInSiege(true); // in siege
@@ -206,7 +206,7 @@ public class L2SiegeZone extends L2ZoneType
{
if (character.isPlayer())
{
L2PcInstance player = character.getActingPlayer();
final L2PcInstance player = character.getActingPlayer();
character.sendPacket(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
if (player.getMountType() == MountType.WYVERN)
{
@@ -221,21 +221,21 @@ public class L2SiegeZone extends L2ZoneType
}
if (character.isPlayer())
{
L2PcInstance activeChar = character.getActingPlayer();
final L2PcInstance activeChar = character.getActingPlayer();
activeChar.stopFameTask();
activeChar.setIsInSiege(false);
if ((getSettings().getSiege() instanceof FortSiege) && (activeChar.getInventory().getItemByItemId(9819) != null))
{
// drop combat flag
Fort fort = FortManager.getInstance().getFortById(getSettings().getSiegeableId());
final Fort fort = FortManager.getInstance().getFortById(getSettings().getSiegeableId());
if (fort != null)
{
FortSiegeManager.getInstance().dropCombatFlag(activeChar, fort.getResidenceId());
}
else
{
int slot = activeChar.getInventory().getSlotFromItem(activeChar.getInventory().getItemByItemId(9819));
final int slot = activeChar.getInventory().getSlotFromItem(activeChar.getInventory().getItemByItemId(9819));
activeChar.getInventory().unEquipItemInBodySlot(slot);
activeChar.destroyItem("CombatFlag", activeChar.getInventory().getItemByItemId(9819), null, true);
}
@@ -348,7 +348,7 @@ public class L2SiegeZone extends L2ZoneType
*/
public void banishForeigners(int owningClanId)
{
TeleportWhereType type = TeleportWhereType.TOWN;
final TeleportWhereType type = TeleportWhereType.TOWN;
for (L2PcInstance temp : getPlayersInside())
{
if (temp.getClanId() == owningClanId)

6
trunk/java/com/l2jserver/gameserver/model/zone/type/L2WaterZone.java
View File

@@ -43,7 +43,7 @@ public class L2WaterZone extends L2ZoneType
// TODO: update to only send speed status when that packet is known
if (character.isPlayer())
{
L2PcInstance player = character.getActingPlayer();
final L2PcInstance player = character.getActingPlayer();
if (player.isTransformed() && !player.getTransformation().canSwim())
{
character.stopTransformation(true);
@@ -55,7 +55,7 @@ public class L2WaterZone extends L2ZoneType
}
else if (character.isNpc())
{
Collection<L2PcInstance> plrs = character.getKnownList().getKnownPlayers().values();
final Collection<L2PcInstance> plrs = character.getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
{
@@ -83,7 +83,7 @@ public class L2WaterZone extends L2ZoneType
}
else if (character.isNpc())
{
Collection<L2PcInstance> plrs = character.getKnownList().getKnownPlayers().values();
final Collection<L2PcInstance> plrs = character.getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
{
if (character.getRunSpeed() == 0)