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

8
trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java vendored
View File

@@ -91,7 +91,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
private final void buildMessengerMessage()
{
String html = HtmCache.getInstance().getHtm(null, "scripts/conquerablehalls/FortressOfResistance/partisan_ordery_brakel001.htm");
final String html = HtmCache.getInstance().getHtm(null, "scripts/conquerablehalls/FortressOfResistance/partisan_ordery_brakel001.htm");
if (html != null)
{
// FIXME: We don't have an object id to put in here :(
@@ -116,10 +116,10 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
return null;
}
int clanId = player.getClanId();
final int clanId = player.getClanId();
if (clanId > 0)
{
long clanDmg = (_damageToNurka.containsKey(clanId)) ? _damageToNurka.get(clanId) + damage : damage;
final long clanDmg = (_damageToNurka.containsKey(clanId)) ? _damageToNurka.get(clanId) + damage : damage;
_damageToNurka.put(clanId, clanDmg);
}
@@ -153,7 +153,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
long counter = 0;
for (Entry<Integer, Long> e : _damageToNurka.entrySet())
{
long dam = e.getValue();
final long dam = e.getValue();
if (dam > counter)
{
winnerId = e.getKey();

4
trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java vendored
View File

@@ -155,12 +155,12 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
public void startSiege()
{
// Siege must start at night
int hoursLeft = (GameTimeController.getInstance().getGameTime() / 60) % 24;
final int hoursLeft = (GameTimeController.getInstance().getGameTime() / 60) % 24;
if ((hoursLeft < 0) || (hoursLeft > 6))
{
cancelSiegeTask();
long scheduleTime = (24 - hoursLeft) * 10 * 60000;
final long scheduleTime = (24 - hoursLeft) * 10 * 60000;
_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), scheduleTime);
}
else

54
trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@@ -79,7 +79,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
int spotLeft = 4;
if (_rainbow.getOwnerId() > 0)
{
L2Clan owner = ClanTable.getInstance().getClan(_rainbow.getOwnerId());
final L2Clan owner = ClanTable.getInstance().getClan(_rainbow.getOwnerId());
if (owner != null)
{
_rainbow.free();
@@ -94,7 +94,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
L2Clan clan = null;
for (int clanId : _warDecreesCount.keySet())
{
L2Clan actingClan = ClanTable.getInstance().getClan(clanId);
final L2Clan actingClan = ClanTable.getInstance().getClan(clanId);
if ((actingClan == null) || (actingClan.getDissolvingExpiryTime() > 0))
{
_warDecreesCount.remove(clanId);
@@ -111,7 +111,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
if ((clan != null) && (_acceptedClans.size() < 4))
{
_acceptedClans.add(clan);
L2PcInstance leader = clan.getLeader().getPlayerInstance();
final L2PcInstance leader = clan.getLeader().getPlayerInstance();
if (leader != null)
{
leader.sendMessage("Your clan has been accepted to join the RainBow Srpings Chateau siege!");
@@ -287,7 +287,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
_rainbow = CHSiegeManager.getInstance().getSiegableHall(RAINBOW_SPRINGS);
if (_rainbow != null)
{
long delay = _rainbow.getNextSiegeTime();
final long delay = _rainbow.getNextSiegeTime();
if (delay > -1)
{
setRegistrationEndString(delay - 3600000);
@@ -337,10 +337,10 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
else
{
L2Clan clan = player.getClan();
final L2Clan clan = player.getClan();
if (_acceptedClans.contains(clan))
{
int index = _acceptedClans.indexOf(clan);
final int index = _acceptedClans.indexOf(clan);
if (npcId == YETIS[index])
{
html = "yeti_main.htm";
@@ -393,7 +393,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
else
{
long count = warDecrees.getCount();
final long count = warDecrees.getCount();
_warDecreesCount.put(clan.getId(), count);
player.destroyItem("Rainbow Springs Registration", warDecrees, npc, true);
addAttacker(clan.getId(), count);
@@ -524,7 +524,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
return null;
}
String[] split = event.split("_ ");
final String[] split = event.split("_ ");
if (split.length < 2)
{
return null;
@@ -539,7 +539,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
if (_usedTextPassages.containsKey(passage))
{
ArrayList<L2Clan> list = _usedTextPassages.get(passage);
final ArrayList<L2Clan> list = _usedTextPassages.get(passage);
if (list.contains(clan))
{
@@ -635,14 +635,14 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
return null;
}
L2Object target = player.getTarget();
final L2Object target = player.getTarget();
if ((target == null) || !(target instanceof L2Npc))
{
return null;
}
int yeti = target.getId();
final int yeti = target.getId();
if (!isYetiTarget(yeti))
{
return null;
@@ -744,12 +744,12 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
private static void moveGourds()
{
L2Spawn[] tempArray = _gourds;
int iterator = _acceptedClans.size();
final L2Spawn[] tempArray = _gourds;
final int iterator = _acceptedClans.size();
for (int i = 0; i < iterator; i++)
{
L2Spawn oldSpawn = _gourds[(iterator - 1) - i];
L2Spawn curSpawn = tempArray[i];
final L2Spawn oldSpawn = _gourds[(iterator - 1) - i];
final L2Spawn curSpawn = tempArray[i];
_gourds[(iterator - 1) - i] = curSpawn;
@@ -759,14 +759,14 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
private static void reduceGourdHp(int index, L2PcInstance player)
{
L2Spawn gourd = _gourds[index];
final L2Spawn gourd = _gourds[index];
gourd.getLastSpawn().reduceCurrentHp(1000, player, null);
}
private static void increaseGourdHp(int index)
{
L2Spawn gourd = _gourds[index];
L2Npc gourdNpc = gourd.getLastSpawn();
final L2Spawn gourd = _gourds[index];
final L2Npc gourdNpc = gourd.getLastSpawn();
gourdNpc.setCurrentHp(gourdNpc.getCurrentHp() + 1000);
}
@@ -795,15 +795,15 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
private static void shoutRandomText(L2Npc npc)
{
int length = _textPassages.length;
final int length = _textPassages.length;
if (_usedTextPassages.size() >= length)
{
return;
}
int randomPos = getRandom(length);
String message = _textPassages[randomPos];
final int randomPos = getRandom(length);
final String message = _textPassages[randomPos];
if (_usedTextPassages.containsKey(message))
{
@@ -883,13 +883,13 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
protected static void setRegistrationEndString(long time)
{
Calendar c = Calendar.getInstance();
final Calendar c = Calendar.getInstance();
c.setTime(new Date(time));
int year = c.get(Calendar.YEAR);
int month = c.get(Calendar.MONTH) + 1;
int day = c.get(Calendar.DAY_OF_MONTH);
int hour = c.get(Calendar.HOUR);
int mins = c.get(Calendar.MINUTE);
final int year = c.get(Calendar.YEAR);
final int month = c.get(Calendar.MONTH) + 1;
final int day = c.get(Calendar.DAY_OF_MONTH);
final int hour = c.get(Calendar.HOUR);
final int mins = c.get(Calendar.MINUTE);
_registrationEnds = year + "-" + month + "-" + day + " " + hour + (mins < 10 ? ":0" : ":") + mins;
}

4
trunk/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java vendored
View File

@@ -64,7 +64,7 @@ public final class BanditStronghold extends FlagWar
FLAG_COORDS[5] = new Location(81981, -15708, -1858, 60392);
FLAG_COORDS[6] = new Location(84375, -17060, -1860, 27712);
Collection<L2ResidenceHallTeleportZone> zoneList = ZoneManager.getInstance().getAllZones(L2ResidenceHallTeleportZone.class);
final Collection<L2ResidenceHallTeleportZone> zoneList = ZoneManager.getInstance().getAllZones(L2ResidenceHallTeleportZone.class);
for (L2ResidenceHallTeleportZone teleZone : zoneList)
{
@@ -73,7 +73,7 @@ public final class BanditStronghold extends FlagWar
continue;
}
int id = teleZone.getResidenceZoneId();
final int id = teleZone.getResidenceZoneId();
if ((id < 0) || (id >= 6))
{

40
trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java vendored
View File

@@ -131,7 +131,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
if (!checkIsAttacker(player.getClan()))
{
L2Clan clan = ClanTable.getInstance().getClan(_hall.getOwnerId());
final L2Clan clan = ClanTable.getInstance().getClan(_hall.getOwnerId());
String content = getHtm(player.getHtmlPrefix(), "messenger_initial.htm");
content = content.replaceAll("%clanName%", (clan == null) ? "no owner" : clan.getName());
content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId()));
@@ -144,7 +144,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
else
{
int index = npc.getId() - TELEPORT_1;
final int index = npc.getId() - TELEPORT_1;
if ((index == 0) && _firstPhase)
{
html = "teleporter_notyet.htm";
@@ -162,7 +162,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
public synchronized String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String html = event;
L2Clan clan = player.getClan();
final L2Clan clan = player.getClan();
if (event.startsWith("register_clan")) // Register the clan for the siege
{
@@ -196,7 +196,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
else
{
String[] arg = event.split(" ");
final String[] arg = event.split(" ");
if (arg.length >= 2)
{
// Register passing the quest
@@ -241,7 +241,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
else
{
String[] var = event.split(" ");
final String[] var = event.split(" ");
if (var.length >= 2)
{
int id = 0;
@@ -307,7 +307,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
else
{
ClanData data = _data.get(clan.getId());
final ClanData data = _data.get(clan.getId());
data.players.add(player.getObjectId());
saveMember(clan.getId(), player.getObjectId());
if (data.npc == 0)
@@ -333,7 +333,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
int i = 0;
for (Entry<Integer, ClanData> clanData : _data.entrySet())
{
L2Clan attacker = ClanTable.getInstance().getClan(clanData.getKey());
final L2Clan attacker = ClanTable.getInstance().getClan(clanData.getKey());
if (attacker == null)
{
continue;
@@ -454,7 +454,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
_hall.banishForeigners();
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED);
msg.addString(getName());
Broadcast.toAllOnlinePlayers(msg);
_hall.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
@@ -470,7 +470,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
onSiegeEnds();
getAttackers().clear();
_hall.updateNextSiege();
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_BEEN_CANCELED_DUE_TO_LACK_OF_INTEREST);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_BEEN_CANCELED_DUE_TO_LACK_OF_INTEREST);
sm.addString(_hall.getName());
Broadcast.toAllOnlinePlayers(sm);
return;
@@ -485,7 +485,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
// Teleport owner inside
if (_hall.getOwnerId() > 0)
{
L2Clan owner = ClanTable.getInstance().getClan(_hall.getOwnerId());
final L2Clan owner = ClanTable.getInstance().getClan(_hall.getOwnerId());
final Location loc = _hall.getZone().getSpawns().get(0); // Owner restart point
for (L2ClanMember pc : owner.getMembers())
{
@@ -539,7 +539,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
// Spawns challengers flags and npcs
try
{
ClanData data = clan.getValue();
final ClanData data = clan.getValue();
doSpawns(clan.getKey(), data);
fillPlayerList(data);
}
@@ -556,7 +556,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
if (_hall.getOwnerId() > 0)
{
L2Clan clan = ClanTable.getInstance().getClan(_hall.getOwnerId());
final L2Clan clan = ClanTable.getInstance().getClan(_hall.getOwnerId());
clan.setHideoutId(0);
_hall.free();
}
@@ -593,10 +593,10 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
else
{
ClanData cd = _data.get(player.getClanId());
final ClanData cd = _data.get(player.getClanId());
if (cd != null)
{
int index = cd.flag - FLAG_RED;
final int index = cd.flag - FLAG_RED;
if ((index >= 0) && (index <= 4))
{
loc = _hall.getZone().getChallengerSpawns().get(index);
@@ -635,7 +635,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
index = clanId == _hall.getOwnerId() ? 5 : 6;
}
Location loc = FLAG_COORDS[index];
final Location loc = FLAG_COORDS[index];
data.flagInstance = new L2Spawn(data.flag);
data.flagInstance.setLocation(loc);
@@ -660,7 +660,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
for (int objId : data.players)
{
L2PcInstance plr = L2World.getInstance().getPlayer(objId);
final L2PcInstance plr = L2World.getInstance().getPlayer(objId);
if (plr != null)
{
data.playersInstance.add(plr);
@@ -672,10 +672,10 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
final int clanId = clan.getId();
L2SiegeClan sc = new L2SiegeClan(clanId, SiegeClanType.ATTACKER);
final L2SiegeClan sc = new L2SiegeClan(clanId, SiegeClanType.ATTACKER);
getAttackers().put(clanId, sc);
ClanData data = new ClanData();
final ClanData data = new ClanData();
data.flag = ROYAL_FLAG + _data.size();
data.players.add(clan.getLeaderId());
_data.put(clanId, data);
@@ -700,7 +700,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
private final void removeParticipant(int clanId, boolean teleport)
{
ClanData dat = _data.remove(clanId);
final ClanData dat = _data.remove(clanId);
if (dat != null)
{
@@ -778,7 +778,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
continue;
}
ClanData data = new ClanData();
final ClanData data = new ClanData();
data.flag = rset.getInt("flag");
data.npc = rset.getInt("npc");

4
trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java vendored
View File

@@ -64,7 +64,7 @@ public final class WildBeastReserve extends FlagWar
INNER_DOORS_TO_OPEN[0] = 21150001;
INNER_DOORS_TO_OPEN[1] = 21150002;
Collection<L2ResidenceHallTeleportZone> zoneList = ZoneManager.getInstance().getAllZones(L2ResidenceHallTeleportZone.class);
final Collection<L2ResidenceHallTeleportZone> zoneList = ZoneManager.getInstance().getAllZones(L2ResidenceHallTeleportZone.class);
for (L2ResidenceHallTeleportZone teleZone : zoneList)
{
@@ -73,7 +73,7 @@ public final class WildBeastReserve extends FlagWar
continue;
}
int id = teleZone.getResidenceZoneId();
final int id = teleZone.getResidenceZoneId();
if ((id < 0) || (id >= 6))
{