diff --git a/trunk/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java b/trunk/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java index cf20d41131..bb98888ce6 100644 --- a/trunk/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java +++ b/trunk/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java @@ -71,15 +71,15 @@ public class HandysBlockCheckerEvent extends Quest if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena)) { - ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena); + final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena); final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena); player.sendPacket(tl); - int countBlue = holder.getBlueTeamSize(); - int countRed = holder.getRedTeamSize(); - int minMembers = Config.MIN_BLOCK_CHECKER_TEAM_MEMBERS; + final int countBlue = holder.getBlueTeamSize(); + final int countRed = holder.getRedTeamSize(); + final int minMembers = Config.MIN_BLOCK_CHECKER_TEAM_MEMBERS; if ((countBlue >= minMembers) && (countRed >= minMembers)) { diff --git a/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java b/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java index 86aacf8f05..7d00f9bfe1 100644 --- a/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java +++ b/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java @@ -290,9 +290,9 @@ public class MC_Show extends AbstractNpcAI private void scheduleTimer() { - int gameTime = GameTimeController.getInstance().getGameTime(); - int hours = (gameTime / 60) % 24; - int minutes = gameTime % 60; + final int gameTime = GameTimeController.getInstance().getGameTime(); + final int hours = (gameTime / 60) % 24; + final int minutes = gameTime % 60; int hourDiff, minDiff; hourDiff = (20 - hours); if (hourDiff < 0) @@ -310,7 +310,7 @@ public class MC_Show extends AbstractNpcAI diff = hourDiff + minDiff; if (Config.DEBUG) { - SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); + final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); _log.info("Fantasy Isle: MC show script starting at " + format.format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); } // TODO startRepeatingQuestTimer("Start", diff, 14400000, null, null); diff --git a/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java b/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java index e27e290199..34634b5243 100644 --- a/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java +++ b/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java @@ -160,7 +160,7 @@ public class Parade extends AbstractNpcAI private long timeLeftMilli(int hh, int mm, int ss) { - int now = (GameTimeController.getInstance().getGameTicks() * 60) / 100; + final int now = (GameTimeController.getInstance().getGameTicks() * 60) / 100; int dd = ((hh * 3600) + (mm * 60) + ss) - (now % 86400); if (dd < 0) { @@ -194,16 +194,16 @@ public class Parade extends AbstractNpcAI spawnTask.cancel(false); break; } - int npcId = ACTORS[npcIndex++]; + final int npcId = ACTORS[npcIndex++]; if (npcId == 0) { continue; } for (int route = 0; route < 5; ++route) { - int[] start = START[route][i]; - int[] goal = GOAL[route][i]; - L2Npc actor = addSpawn(npcId, start[0], start[1], start[2], start[3], false, 0); + final int[] start = START[route][i]; + final int[] goal = GOAL[route][i]; + final L2Npc actor = addSpawn(npcId, start[0], start[1], start[2], start[3], false, 0); actor.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(goal[0], goal[1], goal[2], goal[3])); spawns.add(actor); } diff --git a/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java b/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java index aedc4fbcd5..3735027952 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java +++ b/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java @@ -226,7 +226,7 @@ public class ArcanRitual extends Quest player.sendPacket(trigger); if (message) { - L2GameServerPacket sm = new ExShowScreenMessage(NpcStringId.DARK_POWER_SEEPS_OUT_FROM_THE_MIDDLE_OF_THE_TOWN, ExShowScreenMessage.TOP_CENTER, 5000); + final L2GameServerPacket sm = new ExShowScreenMessage(NpcStringId.DARK_POWER_SEEPS_OUT_FROM_THE_MIDDLE_OF_THE_TOWN, ExShowScreenMessage.TOP_CENTER, 5000); player.sendPacket(sm); } } diff --git a/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java b/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java index fa94d74421..43db814d76 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java +++ b/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java @@ -254,7 +254,7 @@ public final class BeastFarm extends AbstractNpcAI { final L2TamedBeastInstance nextNpc = new L2TamedBeastInstance(nextNpcId, player, food, npc.getX(), npc.getY(), npc.getZ(), true); - TamedBeast beast = TAMED_BEAST_DATA.get(getRandom(TAMED_BEAST_DATA.size())); + final TamedBeast beast = TAMED_BEAST_DATA.get(getRandom(TAMED_BEAST_DATA.size())); String name = beast.getName(); switch (nextNpcId) { @@ -275,7 +275,7 @@ public final class BeastFarm extends AbstractNpcAI nextNpc.broadcastPacket(new NpcInfo(nextNpc)); nextNpc.setRunning(); - SkillData st = SkillData.getInstance(); + final SkillData st = SkillData.getInstance(); for (SkillHolder sh : beast.getSkills()) { nextNpc.addBeastSkill(st.getSkill(sh.getSkillId(), sh.getSkillLvl())); @@ -287,7 +287,7 @@ public final class BeastFarm extends AbstractNpcAI { // if not trained, the newly spawned mob will automatically be agro against its feeder // (what happened to "never bite the hand that feeds you" anyway?!) - L2Attackable nextNpc = (L2Attackable) addSpawn(nextNpcId, npc); + final L2Attackable nextNpc = (L2Attackable) addSpawn(nextNpcId, npc); // register the player in the feedinfo for the mob that just spawned FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId()); @@ -309,8 +309,8 @@ public final class BeastFarm extends AbstractNpcAI return super.onSkillSee(npc, caster, skill, targets, isSummon); } // gather some values on local variables - int npcId = npc.getId(); - int skillId = skill.getId(); + final int npcId = npc.getId(); + final int skillId = skill.getId(); // check if the npc and skills used are valid for this script. Exit if invalid. if (!Util.contains(FEEDABLE_BEASTS, npcId) || ((skillId != SKILL_GOLDEN_SPICE) && (skillId != SKILL_CRYSTAL_SPICE) && (skillId != SKILL_BLESSED_GOLDEN_SPICE) && (skillId != SKILL_BLESSED_CRYSTAL_SPICE) && (skillId != SKILL_SGRADE_GOLDEN_SPICE) && (skillId != SKILL_SGRADE_CRYSTAL_SPICE))) { @@ -318,7 +318,7 @@ public final class BeastFarm extends AbstractNpcAI } // first gather some values on local variables - int objectId = npc.getObjectId(); + final int objectId = npc.getObjectId(); int growthLevel = 3; // if a mob is in FEEDABLE_BEASTS but not in _GrowthCapableMobs, then it's at max growth (3) if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId)) { @@ -351,7 +351,7 @@ public final class BeastFarm extends AbstractNpcAI if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId)) { // do nothing if this mob doesn't eat the specified food (food gets consumed but has no effect). - int newNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getLeveledNpcId(skillId); + final int newNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getLeveledNpcId(skillId); if (newNpcId == -1) { if (growthLevel == 0) diff --git a/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java b/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java index 7f8a977c73..4b6f89dab2 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java +++ b/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java @@ -121,7 +121,7 @@ public final class DenOfEvil extends AbstractNpcAI { npc.disableCoreAI(true); npc.setIsImmobilized(true); - L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); + final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { if (DEBUG) @@ -130,8 +130,8 @@ public final class DenOfEvil extends AbstractNpcAI } return null; } - int skillId = getSkillIdByNpcId(npc.getId()); - int skillLevel = zone.getSkillLevel(skillId); + final int skillId = getSkillIdByNpcId(npc.getId()); + final int skillLevel = zone.getSkillLevel(skillId); zone.addSkill(skillId, skillLevel + 1); if (skillLevel == 3) // 3+1=4 { @@ -149,7 +149,7 @@ public final class DenOfEvil extends AbstractNpcAI public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { ThreadPoolManager.getInstance().scheduleAi(new RespawnNewEye(npc.getLocation()), 15000); - L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); + final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { if (DEBUG) @@ -158,8 +158,8 @@ public final class DenOfEvil extends AbstractNpcAI } return null; } - int skillId = getSkillIdByNpcId(npc.getId()); - int skillLevel = zone.getSkillLevel(skillId); + final int skillId = getSkillIdByNpcId(npc.getId()); + final int skillLevel = zone.getSkillLevel(skillId); zone.addSkill(skillId, skillLevel - 1); return super.onKill(npc, killer, isSummon); } @@ -213,7 +213,7 @@ public final class DenOfEvil extends AbstractNpcAI } if (character.isPlayable()) { - Skill skill = SkillData.getInstance().getSkill(6149, 1); + final Skill skill = SkillData.getInstance().getSkill(6149, 1); skill.applyEffects(character, character); } else @@ -223,7 +223,7 @@ public final class DenOfEvil extends AbstractNpcAI if (character.isNpc()) { // respawn eye - L2Npc npc = (L2Npc) character; + final L2Npc npc = (L2Npc) character; if (Util.contains(EYE_IDS, npc.getId())) { ThreadPoolManager.getInstance().scheduleAi(new RespawnNewEye(npc.getLocation()), 15000); diff --git a/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java index a22f74a9a0..ea71fa6db6 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java +++ b/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java @@ -165,7 +165,7 @@ public final class FeedableBeasts extends AbstractNpcAI { int[][] temp; temp = _spiceToMob.get(spice); - int rand = getRandom(temp[0].length); + final int rand = getRandom(temp[0].length); return temp[0][rand]; } @@ -359,7 +359,7 @@ public final class FeedableBeasts extends AbstractNpcAI private void spawnNext(L2Npc npc, int growthLevel, L2PcInstance player, int food) { - int npcId = npc.getId(); + final int npcId = npc.getId(); int nextNpcId = 0; // find the next mob to spawn, based on the current npcId, growthlevel, and food. @@ -442,8 +442,8 @@ public final class FeedableBeasts extends AbstractNpcAI // also, perform a rare random chat if (getRandom(20) == 0) { - NpcStringId message = NpcStringId.getNpcStringId(getRandom(2024, 2029)); - NpcSay packet = new NpcSay(nextNpc, ChatType.NPC_GENERAL, message); + final NpcStringId message = NpcStringId.getNpcStringId(getRandom(2024, 2029)); + final NpcSay packet = new NpcSay(nextNpc, ChatType.NPC_GENERAL, message); if (message.getParamCount() > 0) // player name, $s1 { packet.addStringParameter(player.getName()); @@ -469,7 +469,7 @@ public final class FeedableBeasts extends AbstractNpcAI { // if not trained, the newly spawned mob will automatically be aggro against its feeder // (what happened to "never bite the hand that feeds you" anyway?!) - L2Attackable nextNpc = (L2Attackable) addSpawn(nextNpcId, npc); + final L2Attackable nextNpc = (L2Attackable) addSpawn(nextNpcId, npc); if (MAD_COW_POLYMORPH.containsKey(nextNpcId)) { @@ -499,7 +499,7 @@ public final class FeedableBeasts extends AbstractNpcAI // despawn the mad cow npc.deleteMe(); // spawn the new mob - L2Attackable nextNpc = (L2Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); + final L2Attackable nextNpc = (L2Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); // register the player in the feedinfo for the mob that just spawned FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId()); @@ -521,8 +521,8 @@ public final class FeedableBeasts extends AbstractNpcAI return super.onSkillSee(npc, caster, skill, targets, isSummon); } // gather some values on local variables - int npcId = npc.getId(); - int skillId = skill.getId(); + final int npcId = npc.getId(); + final int skillId = skill.getId(); // check if the npc and skills used are valid for this script. Exit if invalid. if ((skillId != SKILL_GOLDEN_SPICE) && (skillId != SKILL_CRYSTAL_SPICE)) { @@ -530,7 +530,7 @@ public final class FeedableBeasts extends AbstractNpcAI } // first gather some values on local variables - int objectId = npc.getObjectId(); + final int objectId = npc.getObjectId(); int growthLevel = 3; // if a mob is in FEEDABLE_BEASTS but not in _GrowthCapableMobs, then it's at max growth (3) if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId)) { @@ -571,8 +571,8 @@ public final class FeedableBeasts extends AbstractNpcAI // rare random talk... if (getRandom(20) == 0) { - NpcStringId message = TEXT[growthLevel][getRandom(TEXT[growthLevel].length)]; - NpcSay packet = new NpcSay(npc, ChatType.NPC_GENERAL, message); + final NpcStringId message = TEXT[growthLevel][getRandom(TEXT[growthLevel].length)]; + final NpcSay packet = new NpcSay(npc, ChatType.NPC_GENERAL, message); if (message.getParamCount() > 0) // player name, $s1 { packet.addStringParameter(caster.getName()); @@ -595,12 +595,12 @@ public final class FeedableBeasts extends AbstractNpcAI } else if (Util.contains(TAMED_BEASTS, npcId) && (npc instanceof L2TamedBeastInstance)) { - L2TamedBeastInstance beast = ((L2TamedBeastInstance) npc); + final L2TamedBeastInstance beast = ((L2TamedBeastInstance) npc); if (skillId == beast.getFoodType()) { beast.onReceiveFood(); - NpcStringId message = TAMED_TEXT[getRandom(TAMED_TEXT.length)]; - NpcSay packet = new NpcSay(npc, ChatType.NPC_GENERAL, message); + final NpcStringId message = TAMED_TEXT[getRandom(TAMED_TEXT.length)]; + final NpcSay packet = new NpcSay(npc, ChatType.NPC_GENERAL, message); if (message.getParamCount() > 0) { packet.addStringParameter(caster.getName()); diff --git a/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java b/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java index 359c24002a..576be2dcc1 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java +++ b/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java @@ -84,13 +84,13 @@ public class HillsOfGold extends AbstractNpcAI @Override public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon) { - L2Npc mob1 = addSpawn(SPICULA_ELITE_GUARD, npc.getX(), npc.getY(), npc.getZ(), attacker.getHeading() + 32500, true, npc.getSpawn().getRespawnDelay()); + final L2Npc mob1 = addSpawn(SPICULA_ELITE_GUARD, npc.getX(), npc.getY(), npc.getZ(), attacker.getHeading() + 32500, true, npc.getSpawn().getRespawnDelay()); ((L2MonsterInstance) mob1).addDamage(attacker, 1, null); - L2Npc mob2 = addSpawn(SPICULA_ELITE_GUARD, npc.getX(), npc.getY(), npc.getZ(), attacker.getHeading() + 32500, true, npc.getSpawn().getRespawnDelay()); + final L2Npc mob2 = addSpawn(SPICULA_ELITE_GUARD, npc.getX(), npc.getY(), npc.getZ(), attacker.getHeading() + 32500, true, npc.getSpawn().getRespawnDelay()); ((L2MonsterInstance) mob2).addDamage(attacker, 1, null); - L2Npc mob3 = addSpawn(SPICULA_ELITE_GUARD, npc.getX(), npc.getY(), npc.getZ(), attacker.getHeading() + 32500, true, npc.getSpawn().getRespawnDelay()); + final L2Npc mob3 = addSpawn(SPICULA_ELITE_GUARD, npc.getX(), npc.getY(), npc.getZ(), attacker.getHeading() + 32500, true, npc.getSpawn().getRespawnDelay()); ((L2MonsterInstance) mob3).addDamage(attacker, 1, null); - L2Npc mob4 = addSpawn(SPICULA_ELITE_GUARD, npc.getX(), npc.getY(), npc.getZ(), attacker.getHeading() + 32500, true, npc.getSpawn().getRespawnDelay()); + final L2Npc mob4 = addSpawn(SPICULA_ELITE_GUARD, npc.getX(), npc.getY(), npc.getZ(), attacker.getHeading() + 32500, true, npc.getSpawn().getRespawnDelay()); ((L2MonsterInstance) mob4).addDamage(attacker, 1, null); npc.deleteMe(); return super.onAttack(npc, attacker, damage, isSummon); diff --git a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java index 4f9f3c597b..6a21af15fb 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java @@ -97,7 +97,7 @@ public final class PolymorphingOnAttack extends AbstractNpcAI { if (tmp.get(3) >= 0) { - NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; + final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); } diff --git a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java index 689d845954..105411fd1f 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java @@ -331,7 +331,7 @@ public final class PrimevalIsle extends AbstractNpcAI { if ((characters != null) && (characters.isAttackable()) && (getRandomBoolean())) { - L2Attackable monster = (L2Attackable) characters; + final L2Attackable monster = (L2Attackable) characters; addAttackPlayerDesire(monster, playable); } } diff --git a/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java b/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java index b7da8462e2..0d179c58cc 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java +++ b/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java @@ -99,7 +99,7 @@ public final class StakatoNest extends AbstractNpcAI if (_follower != null) { - double _hp = _follower.getCurrentHp(); + final double _hp = _follower.getCurrentHp(); if (_hp > (_follower.getMaxHp() * 0.3)) { @@ -129,7 +129,7 @@ public final class StakatoNest extends AbstractNpcAI Broadcast.toSelfAndKnownPlayers(npc, new MagicSkillUse(npc, 2046, 1, 1000, 0)); for (int i = 0; i < 3; i++) { - L2Npc spawned = addSpawn(STAKATO_CAPTAIN, monster, true); + final L2Npc spawned = addSpawn(STAKATO_CAPTAIN, monster, true); addAttackPlayerDesire(spawned, killer); } } @@ -148,7 +148,7 @@ public final class StakatoNest extends AbstractNpcAI Broadcast.toSelfAndKnownPlayers(npc, new MagicSkillUse(npc, 2046, 1, 1000, 0)); for (int i = 0; i < 3; i++) { - L2Npc spawned = addSpawn(STAKATO_GUARD, monster, true); + final L2Npc spawned = addSpawn(STAKATO_GUARD, monster, true); addAttackPlayerDesire(spawned, killer); } } @@ -163,7 +163,7 @@ public final class StakatoNest extends AbstractNpcAI case STAKATO_CHIEF: if (killer.isInParty()) { - List party = killer.getParty().getMembers(); + final List party = killer.getParty().getMembers(); for (L2PcInstance member : party) { giveCocoon(member, npc); diff --git a/trunk/dist/game/data/scripts/ai/individual/Anais.java b/trunk/dist/game/data/scripts/ai/individual/Anais.java index a3e830585b..b8eeccc81f 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Anais.java +++ b/trunk/dist/game/data/scripts/ai/individual/Anais.java @@ -59,13 +59,13 @@ public final class Anais extends AbstractNpcAI private void burnerOnAttack(int pot, L2Npc anais) { - L2Npc npc = _divineBurners.get(pot); + final L2Npc npc = _divineBurners.get(pot); npc.setDisplayEffect(1); npc.setIsRunning(false); if (pot < 4) { _current = npc; - QuestTimer checkAround = getQuestTimer("CHECK", anais, null); + final QuestTimer checkAround = getQuestTimer("CHECK", anais, null); if (checkAround == null) // || !checkAround.getIsActive() { startQuestTimer("CHECK", 3000, anais, null); @@ -101,7 +101,7 @@ public final class Anais extends AbstractNpcAI _pot = _pot + 1; b.setDisplayEffect(1); b.setIsRunning(false); - L2Npc ward = addSpawn(GRAIL_WARD, new Location(b.getX(), b.getY(), b.getZ()), true, 0); + final L2Npc ward = addSpawn(GRAIL_WARD, new Location(b.getX(), b.getY(), b.getZ()), true, 0); ((L2Attackable) ward).addDamageHate(_nextTarget, 0, 999); ward.setIsRunning(true); ward.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _nextTarget, null); diff --git a/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java b/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java index b7cfd82d8b..59f3d816fb 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java +++ b/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java @@ -682,7 +682,7 @@ public final class Antharas extends AbstractNpcAI zone.broadcastPacket(new SpecialCamera(npc, 1200, 20, -10, 0, 10000, 13000, 0, 0, 0, 0, 0)); zone.broadcastPacket(new PlaySound("BS01_D")); addSpawn(CUBE, 177615, 114941, -7709, 0, false, 900000); - long respawnTime = (Config.ANTHARAS_SPAWN_INTERVAL + getRandom(-Config.ANTHARAS_SPAWN_RANDOM, Config.ANTHARAS_SPAWN_RANDOM)) * 3600000; + final long respawnTime = (Config.ANTHARAS_SPAWN_INTERVAL + getRandom(-Config.ANTHARAS_SPAWN_RANDOM, Config.ANTHARAS_SPAWN_RANDOM)) * 3600000; setRespawn(respawnTime); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); cancelQuestTimer("SET_REGEN", npc, null); diff --git a/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java b/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java index 25b5cab9df..41c9bb0bf1 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java +++ b/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java @@ -254,7 +254,7 @@ public final class Baium extends AbstractNpcAI } else { - L2PcInstance randomPlayer = getRandomPlayer(npc); + final L2PcInstance randomPlayer = getRandomPlayer(npc); if (randomPlayer != null) { randomPlayer.teleToLocation(BAIUM_GIFT_LOC); @@ -305,7 +305,7 @@ public final class Baium extends AbstractNpcAI } else { - L2PcInstance randomPlayer = getRandomPlayer(npc); + final L2PcInstance randomPlayer = getRandomPlayer(npc); if (randomPlayer != null) { addAttackPlayerDesire(npc, randomPlayer); @@ -556,7 +556,7 @@ public final class Baium extends AbstractNpcAI setStatus(DEAD); addSpawn(TELE_CUBE, TELEPORT_CUBIC_LOC, false, 900000); zone.broadcastPacket(new PlaySound("BS01_D")); - long respawnTime = (Config.BAIUM_SPAWN_INTERVAL + getRandom(-Config.BAIUM_SPAWN_RANDOM, Config.BAIUM_SPAWN_RANDOM)) * 3600000; + final long respawnTime = (Config.BAIUM_SPAWN_INTERVAL + getRandom(-Config.BAIUM_SPAWN_RANDOM, Config.BAIUM_SPAWN_RANDOM)) * 3600000; setRespawn(respawnTime); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); startQuestTimer("CLEAR_ZONE", 900000, null, null); diff --git a/trunk/dist/game/data/scripts/ai/individual/Beleth.java b/trunk/dist/game/data/scripts/ai/individual/Beleth.java index fa86f41cb5..3803950da9 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Beleth.java +++ b/trunk/dist/game/data/scripts/ai/individual/Beleth.java @@ -106,8 +106,8 @@ public final class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); - int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); + final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { final long time = (info.getLong("respawn_time") - System.currentTimeMillis()); @@ -247,9 +247,9 @@ public final class Beleth extends AbstractNpcAI for (int i = 0; i < 6; i++) { - int x = (int) ((150 * Math.cos(i * 1.046666667)) + 16323); - int y = (int) ((150 * Math.sin(i * 1.046666667)) + 213059); - L2Npc minion = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152)); + final int x = (int) ((150 * Math.cos(i * 1.046666667)) + 16323); + final int y = (int) ((150 * Math.sin(i * 1.046666667)) + 213059); + final L2Npc minion = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152)); minion.setShowSummonAnimation(true); minion.decayMe(); @@ -391,8 +391,8 @@ public final class Beleth extends AbstractNpcAI { a++; - int x = (int) ((650 * Math.cos(i * 0.39)) + 16323); - int y = (int) ((650 * Math.sin(i * 0.39)) + 213170); + final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323); + final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170); npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152)); _minions.add(npc); @@ -404,8 +404,8 @@ public final class Beleth extends AbstractNpcAI } } - int[] xm = new int[16]; - int[] ym = new int[16]; + final int[] xm = new int[16]; + final int[] ym = new int[16]; for (int i = 0; i < 4; i++) { xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323); @@ -523,7 +523,7 @@ public final class Beleth extends AbstractNpcAI ZONE.broadcastPacket(new SpecialCamera(_camera2, 800, 180, 0, 0, 4000, 0, 10, 1, 0, 0)); ZONE.broadcastPacket(new SpecialCamera(_camera2, 800, 180, 0, 0, 4000, 0, 10, 1, 0, 0)); - L2DoorInstance door2 = DoorData.getInstance().getDoor(DOOR2); + final L2DoorInstance door2 = DoorData.getInstance().getDoor(DOOR2); door2.openMe(); ZONE.broadcastPacket(new StaticObject(door2, false)); @@ -639,8 +639,8 @@ public final class Beleth extends AbstractNpcAI { npc.setTarget(player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); - double speed = npc.isRunning() ? npc.getRunSpeed() : npc.getWalkSpeed(); - int time = (int) (((distance2 - 890) / speed) * 1000); + final double speed = npc.isRunning() ? npc.getRunSpeed() : npc.getWalkSpeed(); + final int time = (int) (((distance2 - 890) / speed) * 1000); startQuestTimer("CAST", time, npc, null); } else if (distance2 < 890) @@ -759,7 +759,7 @@ public final class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); diff --git a/trunk/dist/game/data/scripts/ai/individual/Core.java b/trunk/dist/game/data/scripts/ai/individual/Core.java index da9616ff1d..30db515369 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Core.java +++ b/trunk/dist/game/data/scripts/ai/individual/Core.java @@ -69,7 +69,7 @@ public final class Core extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Core from DB - long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); // if Core is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -79,7 +79,7 @@ public final class Core extends AbstractNpcAI else { // the time has already expired while the server was offline. Immediately spawn Core. - L2GrandBossInstance core = (L2GrandBossInstance) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0); + final L2GrandBossInstance core = (L2GrandBossInstance) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0); GrandBossManager.getInstance().setBossStatus(CORE, ALIVE); spawnBoss(core); } @@ -131,7 +131,7 @@ public final class Core extends AbstractNpcAI } for (int i = 0; i < 4; i++) { - int x = 16800 + (i * 450); + final int x = 16800 + (i * 450); mob = (L2Attackable) addSpawn(SUSCEPTOR, x, 110300, npc.getZ(), 280 + getRandom(40), false, 0); mob.setIsRaidMinion(true); _minions.add(mob); @@ -143,13 +143,13 @@ public final class Core extends AbstractNpcAI { if (event.equalsIgnoreCase("core_unlock")) { - L2GrandBossInstance core = (L2GrandBossInstance) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0); + final L2GrandBossInstance core = (L2GrandBossInstance) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0); GrandBossManager.getInstance().setBossStatus(CORE, ALIVE); spawnBoss(core); } else if (event.equalsIgnoreCase("spawn_minion")) { - L2Attackable mob = (L2Attackable) addSpawn(npc.getId(), npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0); + final L2Attackable mob = (L2Attackable) addSpawn(npc.getId(), npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0); mob.setIsRaidMinion(true); _minions.add(mob); } @@ -188,7 +188,7 @@ public final class Core extends AbstractNpcAI { if (npc.getId() == CORE) { - int objId = npc.getObjectId(); + final int objId = npc.getObjectId(); npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, objId, npc.getX(), npc.getY(), npc.getZ())); npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.A_FATAL_ERROR_HAS_OCCURRED)); npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN)); @@ -197,10 +197,10 @@ public final class Core extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(CORE, DEAD); // Calculate Min and Max respawn times randomly. - long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; + final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); GrandBossManager.getInstance().setStatsSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java b/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java index 37910e06eb..afa4e325bd 100644 --- a/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java +++ b/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java @@ -49,7 +49,7 @@ public final class DarkWaterDragon extends AbstractNpcAI private DarkWaterDragon() { super(DarkWaterDragon.class.getSimpleName(), "ai/individual"); - int[] mobs = + final int[] mobs = { DRAGON, SHADE1, @@ -144,15 +144,15 @@ public final class DarkWaterDragon extends AbstractNpcAI @Override public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon) { - int npcId = npc.getId(); - int npcObjId = npc.getObjectId(); + final int npcId = npc.getId(); + final int npcObjId = npc.getObjectId(); if (npcId == DRAGON) { if (!MY_TRACKING_SET.contains(npcObjId)) // this allows to handle multiple instances of npc { MY_TRACKING_SET.add(npcObjId); // Spawn first 5 shades on first attack on Dark Water Dragon - L2Character originalAttacker = isSummon ? attacker.getServitors().values().stream().findFirst().orElse(attacker.getPet()) : attacker; + final L2Character originalAttacker = isSummon ? attacker.getServitors().values().stream().findFirst().orElse(attacker.getPet()) : attacker; spawnShade(originalAttacker, SHADE1, npc.getX() + 100, npc.getY() + 100, npc.getZ()); spawnShade(originalAttacker, SHADE2, npc.getX() + 100, npc.getY() - 100, npc.getZ()); spawnShade(originalAttacker, SHADE1, npc.getX() - 100, npc.getY() + 100, npc.getZ()); @@ -163,7 +163,7 @@ public final class DarkWaterDragon extends AbstractNpcAI { SECOND_SPAWN.add(npcObjId); // Spawn second 5 shades on half hp of on Dark Water Dragon - L2Character originalAttacker = isSummon ? attacker.getServitors().values().stream().findFirst().orElse(attacker.getPet()) : attacker; + final L2Character originalAttacker = isSummon ? attacker.getServitors().values().stream().findFirst().orElse(attacker.getPet()) : attacker; spawnShade(originalAttacker, SHADE2, npc.getX() + 100, npc.getY() + 100, npc.getZ()); spawnShade(originalAttacker, SHADE1, npc.getX() + 100, npc.getY() - 100, npc.getZ()); spawnShade(originalAttacker, SHADE2, npc.getX() - 100, npc.getY() + 100, npc.getZ()); @@ -177,13 +177,13 @@ public final class DarkWaterDragon extends AbstractNpcAI @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - int npcId = npc.getId(); - int npcObjId = npc.getObjectId(); + final int npcId = npc.getId(); + final int npcObjId = npc.getObjectId(); if (npcId == DRAGON) { MY_TRACKING_SET.remove(npcObjId); SECOND_SPAWN.remove(npcObjId); - L2Attackable faf = (L2Attackable) addSpawn(FAFURION, npc.getX(), npc.getY(), npc.getZ(), 0, false, 0); // spawns Fafurion Kindred when Dard Water Dragon is dead + final L2Attackable faf = (L2Attackable) addSpawn(FAFURION, npc.getX(), npc.getY(), npc.getZ(), 0, false, 0); // spawns Fafurion Kindred when Dard Water Dragon is dead ID_MAP.put(faf.getObjectId(), killer); } else if (npcId == FAFURION) @@ -207,16 +207,16 @@ public final class DarkWaterDragon extends AbstractNpcAI @Override public String onSpawn(L2Npc npc) { - int npcId = npc.getId(); - int npcObjId = npc.getObjectId(); + final int npcId = npc.getId(); + final int npcObjId = npc.getObjectId(); if (npcId == FAFURION) { if (!MY_TRACKING_SET.contains(npcObjId)) { MY_TRACKING_SET.add(npcObjId); // Spawn 4 Detractors on spawn of Fafurion - int x = npc.getX(); - int y = npc.getY(); + final int x = npc.getX(); + final int y = npc.getY(); addSpawn(DETRACTOR2, x + 100, y + 100, npc.getZ(), 0, false, 40000); addSpawn(DETRACTOR1, x + 100, y - 100, npc.getZ(), 0, false, 40000); addSpawn(DETRACTOR2, x - 100, y + 100, npc.getZ(), 0, false, 40000); diff --git a/trunk/dist/game/data/scripts/ai/individual/Epidos.java b/trunk/dist/game/data/scripts/ai/individual/Epidos.java index 8e8cb2c6f8..66ce77bc54 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Epidos.java +++ b/trunk/dist/game/data/scripts/ai/individual/Epidos.java @@ -75,9 +75,9 @@ public final class Epidos extends AbstractNpcAI { if ((getRandom(1000) > 250) && _lastHp.containsKey(npc.getObjectId())) { - int hpDecreasePercent = (int) (((_lastHp.get(npc.getObjectId()) - npc.getCurrentHp()) * 100) / npc.getMaxHp()); + final int hpDecreasePercent = (int) (((_lastHp.get(npc.getObjectId()) - npc.getCurrentHp()) * 100) / npc.getMaxHp()); int minionsCount = 0; - int spawnedMinions = ((L2MonsterInstance) npc).getMinionList().countSpawnedMinions(); + final int spawnedMinions = ((L2MonsterInstance) npc).getMinionList().countSpawnedMinions(); if ((hpDecreasePercent > 5) && (hpDecreasePercent <= 15) && (spawnedMinions <= 9)) { diff --git a/trunk/dist/game/data/scripts/ai/individual/Orfen.java b/trunk/dist/game/data/scripts/ai/individual/Orfen.java index 22ea60bcda..61d46de131 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Orfen.java +++ b/trunk/dist/game/data/scripts/ai/individual/Orfen.java @@ -81,7 +81,7 @@ public final class Orfen extends AbstractNpcAI private Orfen() { super(Orfen.class.getSimpleName(), "ai/individual"); - int[] mobs = + final int[] mobs = { ORFEN, RAIKEL_LEOS, @@ -90,12 +90,12 @@ public final class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = GrandBossManager.getInstance().getZone(POS[0]); - StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); - int status = GrandBossManager.getInstance().getBossStatus(ORFEN); + final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { // load the unlock date and time for Orfen from DB - long temp = info.getLong("respawn_time") - System.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -105,7 +105,7 @@ public final class Orfen extends AbstractNpcAI else { // the time has already expired while the server was offline. Immediately spawn Orfen. - int i = getRandom(10); + final int i = getRandom(10); Location loc; if (i < 4) { @@ -119,20 +119,20 @@ public final class Orfen extends AbstractNpcAI { loc = POS[3]; } - L2GrandBossInstance orfen = (L2GrandBossInstance) addSpawn(ORFEN, loc, false, 0); + final L2GrandBossInstance orfen = (L2GrandBossInstance) addSpawn(ORFEN, loc, false, 0); GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE); spawnBoss(orfen); } } else { - int loc_x = info.getInt("loc_x"); - int loc_y = info.getInt("loc_y"); - int loc_z = info.getInt("loc_z"); - int heading = info.getInt("heading"); - int hp = info.getInt("currentHP"); - int mp = info.getInt("currentMP"); - L2GrandBossInstance orfen = (L2GrandBossInstance) addSpawn(ORFEN, loc_x, loc_y, loc_z, heading, false, 0); + final int loc_x = info.getInt("loc_x"); + final int loc_y = info.getInt("loc_y"); + final int loc_z = info.getInt("loc_z"); + final int heading = info.getInt("heading"); + final int hp = info.getInt("currentHP"); + final int mp = info.getInt("currentMP"); + final L2GrandBossInstance orfen = (L2GrandBossInstance) addSpawn(ORFEN, loc_x, loc_y, loc_z, heading, false, 0); orfen.setCurrentHpMp(hp, mp); spawnBoss(orfen); } @@ -142,7 +142,7 @@ public final class Orfen extends AbstractNpcAI { ((L2Attackable) npc).clearAggroList(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null, null); - L2Spawn spawn = npc.getSpawn(); + final L2Spawn spawn = npc.getSpawn(); spawn.setLocation(POS[index]); npc.teleToLocation(POS[index], false); } @@ -153,8 +153,8 @@ public final class Orfen extends AbstractNpcAI npc.broadcastPacket(new PlaySound(1, "BS01_A", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ())); startQuestTimer("check_orfen_pos", 10000, npc, null, true); // Spawn minions - int x = npc.getX(); - int y = npc.getY(); + final int x = npc.getX(); + final int y = npc.getY(); L2Attackable mob; mob = (L2Attackable) addSpawn(RAIKEL_LEOS, x + 100, y + 100, npc.getZ(), 0, false, 0); mob.setIsRaidMinion(true); @@ -176,7 +176,7 @@ public final class Orfen extends AbstractNpcAI { if (event.equalsIgnoreCase("orfen_unlock")) { - int i = getRandom(10); + final int i = getRandom(10); Location loc; if (i < 4) { @@ -190,7 +190,7 @@ public final class Orfen extends AbstractNpcAI { loc = POS[3]; } - L2GrandBossInstance orfen = (L2GrandBossInstance) addSpawn(ORFEN, loc, false, 0); + final L2GrandBossInstance orfen = (L2GrandBossInstance) addSpawn(ORFEN, loc, false, 0); GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE); spawnBoss(orfen); } @@ -210,7 +210,7 @@ public final class Orfen extends AbstractNpcAI { for (int i = 0; i < MINIONS.size(); i++) { - L2Attackable mob = MINIONS.get(i); + final L2Attackable mob = MINIONS.get(i); if (!npc.isInsideRadius(mob, 3000, false, false)) { mob.teleToLocation(npc.getLocation()); @@ -223,7 +223,7 @@ public final class Orfen extends AbstractNpcAI { for (int i = 0; i < MINIONS.size(); i++) { - L2Attackable mob = MINIONS.get(i); + final L2Attackable mob = MINIONS.get(i); if (mob != null) { mob.decayMe(); @@ -233,7 +233,7 @@ public final class Orfen extends AbstractNpcAI } else if (event.equalsIgnoreCase("spawn_minion")) { - L2Attackable mob = (L2Attackable) addSpawn(RAIKEL_LEOS, npc.getX(), npc.getY(), npc.getZ(), 0, false, 0); + final L2Attackable mob = (L2Attackable) addSpawn(RAIKEL_LEOS, npc.getX(), npc.getY(), npc.getZ(), 0, false, 0); mob.setIsRaidMinion(true); MINIONS.add(mob); } @@ -245,10 +245,10 @@ public final class Orfen extends AbstractNpcAI { if (npc.getId() == ORFEN) { - L2Character originalCaster = isSummon ? caster.getServitors().values().stream().findFirst().orElse(caster.getPet()) : caster; + final L2Character originalCaster = isSummon ? caster.getServitors().values().stream().findFirst().orElse(caster.getPet()) : caster; if ((skill.getEffectPoint() > 0) && (getRandom(5) == 0) && npc.isInsideRadius(originalCaster, 1000, false, false)) { - NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), TEXT[getRandom(4)]); + final NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), TEXT[getRandom(4)]); packet.addStringParameter(caster.getName().toString()); npc.broadcastPacket(packet); originalCaster.teleToLocation(npc.getLocation()); @@ -266,8 +266,8 @@ public final class Orfen extends AbstractNpcAI { return super.onFactionCall(npc, caller, attacker, isSummon); } - int npcId = npc.getId(); - int callerId = caller.getId(); + final int npcId = npc.getId(); + final int callerId = caller.getId(); if ((npcId == RAIKEL_LEOS) && (getRandom(20) == 0)) { npc.setTarget(attacker); @@ -293,7 +293,7 @@ public final class Orfen extends AbstractNpcAI @Override public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon) { - int npcId = npc.getId(); + final int npcId = npc.getId(); if (npcId == ORFEN) { if (!_IsTeleported && ((npc.getCurrentHp() - damage) < (npc.getMaxHp() / 2))) @@ -303,7 +303,7 @@ public final class Orfen extends AbstractNpcAI } else if (npc.isInsideRadius(attacker, 1000, false, false) && !npc.isInsideRadius(attacker, 300, false, false) && (getRandom(10) == 0)) { - NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npcId, TEXT[getRandom(3)]); + final NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npcId, TEXT[getRandom(3)]); packet.addStringParameter(attacker.getName().toString()); npc.broadcastPacket(packet); attacker.teleToLocation(npc.getLocation()); @@ -334,7 +334,7 @@ public final class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatsSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); diff --git a/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java b/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java index a798bc4dca..4027695fe2 100644 --- a/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java +++ b/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java @@ -95,12 +95,12 @@ public final class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = GrandBossManager.getInstance().getZone(QUEEN_X, QUEEN_Y, QUEEN_Z); - StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); - int status = GrandBossManager.getInstance().getBossStatus(QUEEN); + final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { // load the unlock date and time for queen ant from DB - long temp = info.getLong("respawn_time") - System.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -110,21 +110,21 @@ public final class QueenAnt extends AbstractNpcAI else { // the time has already expired while the server was offline. Immediately spawn queen ant. - L2GrandBossInstance queen = (L2GrandBossInstance) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0); + final L2GrandBossInstance queen = (L2GrandBossInstance) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0); GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE); spawnBoss(queen); } } else { - int loc_x = QUEEN_X; - int loc_y = QUEEN_Y; - int loc_z = QUEEN_Z; - int heading = info.getInt("heading"); - int hp = info.getInt("currentHP"); - int mp = info.getInt("currentMP"); + final int loc_x = QUEEN_X; + final int loc_y = QUEEN_Y; + final int loc_z = QUEEN_Z; + final int heading = info.getInt("heading"); + final int hp = info.getInt("currentHP"); + final int mp = info.getInt("currentMP"); - L2GrandBossInstance queen = (L2GrandBossInstance) addSpawn(QUEEN, loc_x, loc_y, loc_z, heading, false, 0); + final L2GrandBossInstance queen = (L2GrandBossInstance) addSpawn(QUEEN, loc_x, loc_y, loc_z, heading, false, 0); queen.setCurrentHpMp(hp, mp); spawnBoss(queen); } @@ -215,7 +215,7 @@ public final class QueenAnt extends AbstractNpcAI } else if (event.equalsIgnoreCase("queen_unlock")) { - L2GrandBossInstance queen = (L2GrandBossInstance) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0); + final L2GrandBossInstance queen = (L2GrandBossInstance) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0); GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE); spawnBoss(queen); } @@ -329,7 +329,7 @@ public final class QueenAnt extends AbstractNpcAI @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - int npcId = npc.getId(); + final int npcId = npc.getId(); if (npcId == QUEEN) { npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ())); @@ -341,7 +341,7 @@ public final class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatsSet(QUEEN, info); _nurses.clear(); @@ -358,7 +358,7 @@ public final class QueenAnt extends AbstractNpcAI { if (npcId == ROYAL) { - L2MonsterInstance mob = (L2MonsterInstance) npc; + final L2MonsterInstance mob = (L2MonsterInstance) npc; if (mob.getLeader() != null) { mob.getLeader().getMinionList().onMinionDie(mob, (280 + getRandom(40)) * 1000); @@ -366,7 +366,7 @@ public final class QueenAnt extends AbstractNpcAI } else if (npcId == NURSE) { - L2MonsterInstance mob = (L2MonsterInstance) npc; + final L2MonsterInstance mob = (L2MonsterInstance) npc; _nurses.remove(mob); if (mob.getLeader() != null) { diff --git a/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java b/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java index 6493c0c133..02ec2fef79 100644 --- a/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java +++ b/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java @@ -176,7 +176,7 @@ public class ScarletVanHalisha extends AbstractNpcAI _skill = getRndSkills(npc); _target = getRandomTarget(npc, _skill); } - L2Character target = _target; + final L2Character target = _target; Skill skill = _skill; if (skill == null) { @@ -213,7 +213,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private L2Character getRandomTarget(L2Npc npc, Skill skill) { final Collection objs = npc.getKnownList().getKnownObjects().values(); - ArrayList result = new ArrayList<>(); + final ArrayList result = new ArrayList<>(); { for (L2Object obj : objs) { @@ -269,7 +269,7 @@ public class ScarletVanHalisha extends AbstractNpcAI } if (!result.isEmpty() && (result.size() != 0)) { - Object[] characters = result.toArray(); + final Object[] characters = result.toArray(); return (L2Character) characters[Rnd.get(characters.length)]; } return null; diff --git a/trunk/dist/game/data/scripts/ai/individual/Valakas.java b/trunk/dist/game/data/scripts/ai/individual/Valakas.java index 7a9445057c..3f8e16a0ce 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Valakas.java +++ b/trunk/dist/game/data/scripts/ai/individual/Valakas.java @@ -129,7 +129,7 @@ public final class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -446,7 +446,7 @@ public final class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); GrandBossManager.getInstance().setStatsSet(VALAKAS, info); @@ -477,12 +477,12 @@ public final class Valakas extends AbstractNpcAI { if (getRandom(10) == 0) { - int x = npc.getX(); - int y = npc.getY(); - int z = npc.getZ(); + final int x = npc.getX(); + final int y = npc.getY(); + final int z = npc.getZ(); - int posX = x + getRandom(-1400, 1400); - int posY = y + getRandom(-1400, 1400); + final int posX = x + getRandom(-1400, 1400); + final int posY = y + getRandom(-1400, 1400); if (GeoData.getInstance().canMove(x, y, z, posX, posY, z, npc.getInstanceId())) { @@ -547,7 +547,7 @@ public final class Valakas extends AbstractNpcAI */ private L2Playable getRandomTarget(L2Npc npc) { - List result = new ArrayList<>(); + final List result = new ArrayList<>(); for (L2Character obj : npc.getKnownList().getKnownCharacters()) { diff --git a/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java b/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java index bf342dfafb..1167208f56 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java +++ b/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java @@ -330,7 +330,7 @@ public final class Venom extends AbstractNpcAI broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.IT_S_NOT_OVER_YET_IT_WON_T_BE_OVER_LIKE_THIS_NEVER); if (!CastleManager.getInstance().getCastleById(CASTLE).getSiege().isInProgress()) { - L2Npc cube = addSpawn(TELEPORT_CUBE, CUBE, false, 0); + final L2Npc cube = addSpawn(TELEPORT_CUBE, CUBE, false, 0); startQuestTimer("cube_despawn", 120000, cube, null); } cancelQuestTimer("raid_check", npc, null); diff --git a/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java b/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java index 3abe47fdcf..f8c4b75415 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java +++ b/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java @@ -168,7 +168,7 @@ public final class Alarm extends AbstractNpcAI { if (verifyMemoState(player, ART_OF_PERSUASION_ID, 3)) { - int i0 = getMemoStateEx(player, ART_OF_PERSUASION_ID, 1); + final int i0 = getMemoStateEx(player, ART_OF_PERSUASION_ID, 1); if (i0 >= 3) { if ((npc0 != null) && npc0.getVariables().getBoolean("SPAWNED")) @@ -187,7 +187,7 @@ public final class Alarm extends AbstractNpcAI } else if (verifyMemoState(player, NIKOLAS_COOPERATION_ID, 3)) { - int i0 = getMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1); + final int i0 = getMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1); if (i0 >= 3) { if ((npc0 != null) && npc0.getVariables().getBoolean("SPAWNED")) diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java b/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java index 79dfde7ddb..23e780f69c 100644 --- a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java +++ b/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java @@ -85,7 +85,7 @@ public final class AwakeningMaster extends AbstractNpcAI { return null; } - String htmltext = null; + final String htmltext = null; switch (event) { case "awakening": diff --git a/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java b/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java index 085adc36a7..d7cf524b1d 100644 --- a/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java +++ b/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java @@ -70,7 +70,7 @@ public class BlackJudge extends AbstractNpcAI { if (player.getShilensBreathDebuffLevel() > 0) { - int cost = COSTS[level]; + final int cost = COSTS[level]; if (player.getAdena() >= cost) { diff --git a/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java b/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java index dd2412e001..4569fd313f 100644 --- a/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java +++ b/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java @@ -159,7 +159,7 @@ public final class DragonVortex extends AbstractNpcAI */ public void spawnRaid(int raidId, L2Npc npc, L2PcInstance player) { - L2Spawn spawnDat = addSpawn(raidId, npc.getX() + getRandom(-500, 500), npc.getY() + getRandom(-500, 500), npc.getZ() + 10, 0, false, DESPAWN_DELAY, true).getSpawn(); + final L2Spawn spawnDat = addSpawn(raidId, npc.getX() + getRandom(-500, 500), npc.getY() + getRandom(-500, 500), npc.getZ() + 10, 0, false, DESPAWN_DELAY, true).getSpawn(); SpawnTable.getInstance().addNewSpawn(spawnDat, false); takeItems(player, LARGE_DRAGON_BONE, 1); } @@ -173,7 +173,7 @@ public final class DragonVortex extends AbstractNpcAI { for (L2Spawn spawn : SpawnTable.getInstance().getSpawns(npcId)) { - L2Npc spawnedWarpgate = spawn.getLastSpawn(); + final L2Npc spawnedWarpgate = spawn.getLastSpawn(); if ((spawnedWarpgate != null)) { return true; diff --git a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java index 363f33351a..78e99f17c8 100644 --- a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java +++ b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java @@ -111,7 +111,7 @@ public final class ForgeOfTheGods extends AbstractNpcAI @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - int rand = getRandom(100); + final int rand = getRandom(100); L2Npc mob = null; _npcCount++; diff --git a/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java b/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java index 896dd7395d..5335e6c9dd 100644 --- a/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java +++ b/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java @@ -508,7 +508,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader return; } - int amount = MENTEE_COINS.get(player.getLevel()); + final int amount = MENTEE_COINS.get(player.getLevel()); if (amount > 0) { sendMail(mentor.getObjectId(), player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount); diff --git a/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java b/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java index 4571890e32..65ebc340dc 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java +++ b/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java @@ -146,7 +146,7 @@ public final class Minigame extends AbstractNpcAI { if (room.getCurrentPot() < 9) { - L2Npc b = room.getBurners()[room.getOrder()[room.getCurrentPot()]]; + final L2Npc b = room.getBurners()[room.getOrder()[room.getCurrentPot()]]; b.setDisplayEffect(1); b.setIsRunning(false); startQuestTimer("off", 2000, b, null); // Stopping burning each pot 2s after @@ -220,7 +220,7 @@ public final class Minigame extends AbstractNpcAI } else { - int attemptNumber = room.getAttemptNumber(); + final int attemptNumber = room.getAttemptNumber(); if (attemptNumber == 2) { @@ -270,7 +270,7 @@ public final class Minigame extends AbstractNpcAI { if ((obj != null) && obj.isNpc()) { - L2Npc npc = (L2Npc) obj; + final L2Npc npc = (L2Npc) obj; if (npc.getId() == BURNER) { npc.doCast(TRIGGER_MIRAGE.getSkill()); diff --git a/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java b/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java index 42139aa250..f7e74f4819 100644 --- a/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java +++ b/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java @@ -100,7 +100,7 @@ public final class MonumentOfHeroes extends AbstractNpcAI } default: { - int weaponId = Integer.parseInt(event); + final int weaponId = Integer.parseInt(event); if (Util.contains(WEAPONS, weaponId)) { giveItems(player, weaponId, 1); diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java b/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java index 9439159cf0..2f857d1c79 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java +++ b/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java @@ -646,7 +646,7 @@ public final class Raina extends AbstractNpcAI { final int currentBaseId = player.getBaseClassId(); final ClassId baseCID = ClassId.getClassId(currentBaseId); - int baseClassId = (baseCID.level() > 2) ? baseCID.getParent().ordinal() : currentBaseId; + final int baseClassId = (baseCID.level() > 2) ? baseCID.getParent().ordinal() : currentBaseId; final Set availSubs = getSubclasses(player, baseClassId); @@ -803,7 +803,7 @@ public final class Raina extends AbstractNpcAI subclasses.removeAll(PlayerClass.getSet(Race.KAMAEL, THIRD)); } - Set unavailableClasses = subclassSetMap.get(this); + final Set unavailableClasses = subclassSetMap.get(this); if (unavailableClasses != null) { diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java index ba1745200a..933541051a 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java @@ -95,7 +95,7 @@ public final class GrandBossTeleporters extends AbstractNpcAI { if (valakasAI() != null) { - int status = GrandBossManager.getInstance().getBossStatus(29028); + final int status = GrandBossManager.getInstance().getBossStatus(29028); if ((status == 0) || (status == 1)) { @@ -106,7 +106,7 @@ public final class GrandBossTeleporters extends AbstractNpcAI else if (st.getInt("allowEnter") == 1) { st.unset("allowEnter"); - L2BossZone zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632); + final L2BossZone zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632); if (zone != null) { @@ -119,7 +119,7 @@ public final class GrandBossTeleporters extends AbstractNpcAI if (status == 0) { - L2GrandBossInstance valakas = GrandBossManager.getInstance().getBoss(29028); + final L2GrandBossInstance valakas = GrandBossManager.getInstance().getBoss(29028); valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null); GrandBossManager.getInstance().setBossStatus(29028, 1); } diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java index 3a9456052f..c804b1ca95 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java @@ -54,10 +54,10 @@ public final class MithrilMinesTeleporter extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - int index = Integer.parseInt(event) - 1; + final int index = Integer.parseInt(event) - 1; if (LOCS.length > index) { - Location loc = LOCS[index]; + final Location loc = LOCS[index]; player.teleToLocation(loc, false); } return super.onAdvEvent(event, npc, player); diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java index 426cea1d58..fe4bb92f82 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java @@ -54,11 +54,11 @@ public final class StakatoNestTeleporter extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - int index = Integer.parseInt(event) - 1; + final int index = Integer.parseInt(event) - 1; if (LOCS.length > index) { - Location loc = LOCS[index]; + final Location loc = LOCS[index]; if (player.getParty() != null) { @@ -78,7 +78,7 @@ public final class StakatoNestTeleporter extends AbstractNpcAI @Override public String onTalk(L2Npc npc, L2PcInstance player) { - QuestState accessQuest = player.getQuestState(Q00240_ImTheOnlyOneYouCanTrust.class.getSimpleName()); + final QuestState accessQuest = player.getQuestState(Q00240_ImTheOnlyOneYouCanTrust.class.getSimpleName()); return (((accessQuest != null) && accessQuest.isCompleted()) ? "32640.htm" : "32640-no.htm"); } diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java index b19e1f4b51..9d790bf3b4 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java @@ -108,7 +108,7 @@ public final class TeleportToUndergroundColiseum extends AbstractNpcAI } else if (Util.isDigit(event)) { - int val = Integer.parseInt(event) - 1; + final int val = Integer.parseInt(event) - 1; player.teleToLocation(MANAGERS_LOCS[val][getRandom(MANAGERS_LOCS[val].length)], false); } return null; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java index 0482b0e1f7..b819a6b254 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java @@ -91,7 +91,7 @@ public final class ToIVortex extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - int npcId = npc.getId(); + final int npcId = npc.getId(); switch (event) { diff --git a/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java b/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java index 9c04a038cb..4771d3993a 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java +++ b/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java @@ -56,7 +56,7 @@ public final class Tunatun extends AbstractNpcAI return "31537-01.html"; } - QuestState st = player.getQuestState(Q00020_BringUpWithLove.class.getSimpleName()); + final QuestState st = player.getQuestState(Q00020_BringUpWithLove.class.getSimpleName()); if ((st == null) && (player.getLevel() < MIN_LEVEL)) { return "31537-02.html"; diff --git a/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java b/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java index 2ac2b8aae1..fbcb912d4c 100644 --- a/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java +++ b/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java @@ -164,7 +164,7 @@ public final class WeaverOlf extends AbstractNpcAI { if (event.contains("_grade_")) { - int grade = Integer.parseInt(event.substring(0, 1)); + final int grade = Integer.parseInt(event.substring(0, 1)); int price; int[] itemIds; if (event.endsWith("_pin")) @@ -198,7 +198,7 @@ public final class WeaverOlf extends AbstractNpcAI { takeItems(player, Inventory.ADENA_ID, price); takeItems(player, itemIds[0], 1); - int rand = getRandom(200); + final int rand = getRandom(200); if (rand <= CHANCES[0]) { giveItems(player, itemIds[1], 1); diff --git a/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java b/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java index 51282c4ab1..e5bdd704af 100644 --- a/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java @@ -172,7 +172,7 @@ public final class WyvernManager extends AbstractNpcAI } case CLAN_HALL: { - SiegableHall hall = npc.getConquerableHall(); + final SiegableHall hall = npc.getConquerableHall(); return (hall != null) ? hall.isInSiege() : npc.getCastle().getSiege().isInProgress(); } case FORT: diff --git a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java index 7778272ce3..385037bbe8 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java @@ -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 e : _damageToNurka.entrySet()) { - long dam = e.getValue(); + final long dam = e.getValue(); if (dam > counter) { winnerId = e.getKey(); diff --git a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java index 433e2b34e2..fa6080c861 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java @@ -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 diff --git a/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index 9f728a86ff..cfa03bd78b 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -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 list = _usedTextPassages.get(passage); + final ArrayList 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; } diff --git a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java index d90f4dc263..e2764a3d76 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java @@ -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 zoneList = ZoneManager.getInstance().getAllZones(L2ResidenceHallTeleportZone.class); + final Collection 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)) { diff --git a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java index eefed5db59..53ecf0f200 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java @@ -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 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"); diff --git a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java index d7177a90e9..560b9ead77 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java @@ -64,7 +64,7 @@ public final class WildBeastReserve extends FlagWar INNER_DOORS_TO_OPEN[0] = 21150001; INNER_DOORS_TO_OPEN[1] = 21150002; - Collection zoneList = ZoneManager.getInstance().getAllZones(L2ResidenceHallTeleportZone.class); + final Collection 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)) { diff --git a/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java b/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java index 39a75d9406..1e259830d8 100644 --- a/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java +++ b/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java @@ -65,7 +65,7 @@ public class FactionManager extends AbstractNpcAI { if (Config.FACTION_BALANCE_ONLINE_PLAYERS && (L2World.getInstance().getAllGoodPlayersCount() >= ((L2World.getInstance().getAllEvilPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))) { - String htmltext = null; + final String htmltext = null; final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); packet.setHtml(getHtm(player.getHtmlPrefix(), "onlinelimit.html")); packet.replace("%name%", player.getName()); @@ -92,7 +92,7 @@ public class FactionManager extends AbstractNpcAI { if (Config.FACTION_BALANCE_ONLINE_PLAYERS && (L2World.getInstance().getAllEvilPlayersCount() >= ((L2World.getInstance().getAllGoodPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))) { - String htmltext = null; + final String htmltext = null; final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); packet.setHtml(getHtm(player.getHtmlPrefix(), "onlinelimit.html")); packet.replace("%name%", player.getName()); @@ -130,7 +130,7 @@ public class FactionManager extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - String htmltext = null; + final String htmltext = null; final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); packet.setHtml(getHtm(player.getHtmlPrefix(), "manager.html")); packet.replace("%name%", player.getName()); diff --git a/trunk/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/trunk/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java index bded469711..0cbbdd510f 100644 --- a/trunk/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java +++ b/trunk/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java @@ -55,8 +55,8 @@ public final class ShadowWeapons extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { String htmltext; - boolean has_d = hasQuestItems(player, 8869); // Shadow Item Exchange Coupon (D-Grade) - boolean has_c = hasQuestItems(player, 8870); // Shadow Item Exchange Coupon (C-Grade) + final boolean has_d = hasQuestItems(player, 8869); // Shadow Item Exchange Coupon (D-Grade) + final boolean has_c = hasQuestItems(player, 8870); // Shadow Item Exchange Coupon (C-Grade) if (has_d || has_c) { diff --git a/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 8f9fe6935d..605f71fc2f 100644 --- a/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -98,10 +98,10 @@ public final class Elpies extends Event EVENT_ACTIVE = true; - EventLocation[] locations = EventLocation.values(); - EventLocation randomLoc = locations[getRandom(locations.length)]; + final EventLocation[] locations = EventLocation.values(); + final EventLocation randomLoc = locations[getRandom(locations.length)]; - long despawnDelay = EVENT_DURATION_MINUTES * 60000; + final long despawnDelay = EVENT_DURATION_MINUTES * 60000; for (int i = 0; i < ELPY_AMOUNT; i++) { diff --git a/trunk/dist/game/data/scripts/custom/events/Race/Race.java b/trunk/dist/game/data/scripts/custom/events/Race/Race.java index 959cfa2b31..d1f1c41db7 100644 --- a/trunk/dist/game/data/scripts/custom/events/Race/Race.java +++ b/trunk/dist/game/data/scripts/custom/events/Race/Race.java @@ -159,7 +159,7 @@ public final class Race extends Event // Announce Broadcast.toAllOnlinePlayers("Race started!"); // Get random Finish - int location = getRandom(0, _locations.length - 1); + final int location = getRandom(0, _locations.length - 1); _randspawn = _coords[location]; // And spawn NPC recordSpawn(_stop_npc, _randspawn[0], _randspawn[1], _randspawn[2], _randspawn[3], false, 0); @@ -238,8 +238,8 @@ public final class Race extends Event } else { - int _number = Integer.valueOf(bypass.substring(5)); - Skill _sk = SkillData.getInstance().getSkill(_number, 1); + final int _number = Integer.valueOf(bypass.substring(5)); + final Skill _sk = SkillData.getInstance().getSkill(_number, 1); if (_sk != null) { _skill = _number; @@ -271,8 +271,8 @@ public final class Race extends Event @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = event; - QuestState st = getQuestState(player, false); + final String htmltext = event; + final QuestState st = getQuestState(player, false); if (st == null) { return null; @@ -380,7 +380,7 @@ public final class Race extends Event private void showMenu(L2PcInstance activeChar) { final NpcHtmlMessage html = new NpcHtmlMessage(); - String content = getHtm(activeChar.getHtmlPrefix(), "admin_menu.htm"); + final String content = getHtm(activeChar.getHtmlPrefix(), "admin_menu.htm"); html.setHtml(content); activeChar.sendPacket(html); } @@ -393,7 +393,7 @@ public final class Race extends Event private void winRace(L2PcInstance player) { - int[] _reward = _rewards[getRandom(_rewards.length - 1)]; + final int[] _reward = _rewards[getRandom(_rewards.length - 1)]; player.addItem("eventModRace", _reward[0], _reward[1], _npc, true); Broadcast.toAllOnlinePlayers(player.getName() + " is a winner!"); eventStop(); diff --git a/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java b/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java index 0ce6fe2fbf..e3fb8b517b 100644 --- a/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java +++ b/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java @@ -70,7 +70,7 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan { case "join": { - int playerLevel = player.getLevel(); + final int playerLevel = player.getLevel(); final int team1Count = TvTEvent.getTeamsPlayerCounts()[0]; final int team2Count = TvTEvent.getTeamsPlayerCounts()[1]; if (player.isCursedWeaponEquipped()) @@ -139,7 +139,7 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan if (TvTEvent.isParticipating()) { final boolean isParticipant = TvTEvent.isPlayerParticipant(player.getObjectId()); - int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts(); + final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts(); htmltext = getHtm(player.getHtmlPrefix(), (!isParticipant ? "Participation.html" : "RemoveParticipation.html")); htmltext = htmltext.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); htmltext = htmltext.replaceAll("%team1name%", Config.TVT_EVENT_TEAM_1_NAME); @@ -199,8 +199,8 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan private String getTvTStatus(L2PcInstance player) { - int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts(); - int[] teamsPointsCounts = TvTEvent.getTeamsPoints(); + final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts(); + final int[] teamsPointsCounts = TvTEvent.getTeamsPoints(); String htmltext = getHtm(player.getHtmlPrefix(), "Status.html"); htmltext = htmltext.replaceAll("%team1name%", Config.TVT_EVENT_TEAM_1_NAME); htmltext = htmltext.replaceAll("%team1playercount%", String.valueOf(teamsPlayerCounts[0])); diff --git a/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java index e328067cd6..ac94e942c2 100644 --- a/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java +++ b/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java @@ -130,7 +130,7 @@ public final class Wedding extends AbstractNpcAI // Accept the wedding request player.setMarryAccepted(true); - Couple couple = CoupleManager.getInstance().getCouple(player.getCoupleId()); + final Couple couple = CoupleManager.getInstance().getCouple(player.getCoupleId()); couple.marry(); // Messages to the couple @@ -146,7 +146,7 @@ public final class Wedding extends AbstractNpcAI partner.broadcastPacket(new MagicSkillUse(partner, partner, 2230, 1, 1, 0)); // Fireworks - Skill skill = CommonSkill.LARGE_FIREWORK.getSkill(); + final Skill skill = CommonSkill.LARGE_FIREWORK.getSkill(); if (skill != null) { player.doCast(skill); diff --git a/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index e3e428c95d..cfad8cb282 100644 --- a/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -106,7 +106,7 @@ public final class CharacterBirthday extends Quest if (!Util.checkIfInRange(10, npc, player, true)) { - L2Npc spawned = addSpawn(32600, player.getX() + 10, player.getY() + 10, player.getZ() + 10, 0, false, 0, true); + final L2Npc spawned = addSpawn(32600, player.getX() + 10, player.getY() + 10, player.getZ() + 10, 0, false, 0, true); startQuestTimer("despawn_npc", 180000, spawned, player); SPAWNS++; } diff --git a/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index af18e41412..3050ed0ed4 100644 --- a/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -81,9 +81,9 @@ public final class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - long _curr_time = System.currentTimeMillis(); - String value = loadGlobalQuestVar(player.getAccountName()); - long _reuse_time = value == "" ? 0 : Long.parseLong(value); + final long _curr_time = System.currentTimeMillis(); + final String value = loadGlobalQuestVar(player.getAccountName()); + final long _reuse_time = value == "" ? 0 : Long.parseLong(value); if (_curr_time > _reuse_time) { @@ -93,10 +93,10 @@ public final class FreyaCelebration extends LongTimeEvent } else { - long remainingTime = (_reuse_time - System.currentTimeMillis()) / 1000; - int hours = (int) (remainingTime / 3600); - int minutes = (int) ((remainingTime % 3600) / 60); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); + final long remainingTime = (_reuse_time - System.currentTimeMillis()) / 1000; + final int hours = (int) (remainingTime / 3600); + final int minutes = (int) ((remainingTime % 3600) / 60); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); sm.addItemName(FREYA_POTION); sm.addInt(hours); sm.addInt(minutes); @@ -105,7 +105,7 @@ public final class FreyaCelebration extends LongTimeEvent } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S2_S1_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S2_S1_S); sm.addItemName(Inventory.ADENA_ID); sm.addInt(1); player.sendPacket(sm); @@ -126,7 +126,7 @@ public final class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); diff --git a/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index ec8cb15800..fb9614f5ec 100644 --- a/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -98,10 +98,10 @@ public final class GiftOfVitality extends LongTimeEvent final long reuse = player.getVariables().getLong(REUSE, 0); if (reuse > System.currentTimeMillis()) { - long remainingTime = (reuse - System.currentTimeMillis()) / 1000; - int hours = (int) (remainingTime / 3600); - int minutes = (int) ((remainingTime % 3600) / 60); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); + final long remainingTime = (reuse - System.currentTimeMillis()) / 1000; + final int hours = (int) (remainingTime / 3600); + final int minutes = (int) ((remainingTime % 3600) / 60); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); sm.addSkillName(23179); sm.addInt(hours); sm.addInt(minutes); diff --git a/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 965ec55456..6bec7e95bd 100644 --- a/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -94,9 +94,9 @@ public final class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - long curTime = System.currentTimeMillis(); - String value = loadGlobalQuestVar(player.getAccountName()); - long reuse = value == "" ? 0 : Long.parseLong(value); + final long curTime = System.currentTimeMillis(); + final String value = loadGlobalQuestVar(player.getAccountName()); + final long reuse = value == "" ? 0 : Long.parseLong(value); if (player.getCreateDate().after(EVENT_START)) { return "32599-bidth.htm"; @@ -118,12 +118,12 @@ public final class MasterOfEnchanting extends LongTimeEvent } else { - long remainingTime = (reuse - curTime) / 1000; - int hours = (int) remainingTime / 3600; - int minutes = ((int) remainingTime % 3600) / 60; + final long remainingTime = (reuse - curTime) / 1000; + final int hours = (int) remainingTime / 3600; + final int minutes = ((int) remainingTime % 3600) / 60; if (hours > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_HOUR_S_AND_S2_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_PURCHASED_AGAIN); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_HOUR_S_AND_S2_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_PURCHASED_AGAIN); sm.addInt(hours); sm.addInt(minutes); player.sendPacket(sm); @@ -131,7 +131,7 @@ public final class MasterOfEnchanting extends LongTimeEvent } else if (minutes > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_PURCHASED_AGAIN); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_PURCHASED_AGAIN); sm.addInt(minutes); player.sendPacket(sm); htmltext = "32599-scroll24.htm"; diff --git a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java index 76c90fdd81..784396af7c 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java +++ b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java @@ -130,7 +130,7 @@ public class EnergySeeds extends AbstractNpcAI if (_spawnedNpcs.containsKey(npc) && SPAWNS.containsKey(_spawnedNpcs.get(npc))) { - ESSpawn spawn = SPAWNS.get(_spawnedNpcs.get(npc)); + final ESSpawn spawn = SPAWNS.get(_spawnedNpcs.get(npc)); spawn.scheduleRespawn(RESPAWN + getRandom(RANDOM_RESPAWN_OFFSET)); _spawnedNpcs.remove(npc); if (isSeedActive(spawn._seedId)) @@ -184,7 +184,7 @@ public class EnergySeeds extends AbstractNpcAI { for (int doorId : SEED_OF_DESTRUCTION_DOORS) { - L2DoorInstance doorInstance = DoorData.getInstance().getDoor(doorId); + final L2DoorInstance doorInstance = DoorData.getInstance().getDoor(doorId); if (doorInstance != null) { doorInstance.openMe(); @@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI { for (int doorId : SEED_OF_DESTRUCTION_DOORS) { - L2DoorInstance doorInstance = DoorData.getInstance().getDoor(doorId); + final L2DoorInstance doorInstance = DoorData.getInstance().getDoor(doorId); if (doorInstance != null) { doorInstance.closeMe(); @@ -316,7 +316,7 @@ public class EnergySeeds extends AbstractNpcAI case ANNIHILATION_BISTAKON: if (getRandom(100) < 50) { - L2MonsterInstance mob = spawnSupriseMob(seedEnergy, ANNIHILATION_SUPRISE_MOB_IDS[0][getRandom(ANNIHILATION_SUPRISE_MOB_IDS[0].length)]); + final L2MonsterInstance mob = spawnSupriseMob(seedEnergy, ANNIHILATION_SUPRISE_MOB_IDS[0][getRandom(ANNIHILATION_SUPRISE_MOB_IDS[0].length)]); mob.setRunning(); mob.addDamageHate(player, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); @@ -325,7 +325,7 @@ public class EnergySeeds extends AbstractNpcAI case ANNIHILATION_REPTILIKON: if (getRandom(100) < 50) { - L2MonsterInstance mob = spawnSupriseMob(seedEnergy, ANNIHILATION_SUPRISE_MOB_IDS[1][getRandom(ANNIHILATION_SUPRISE_MOB_IDS[1].length)]); + final L2MonsterInstance mob = spawnSupriseMob(seedEnergy, ANNIHILATION_SUPRISE_MOB_IDS[1][getRandom(ANNIHILATION_SUPRISE_MOB_IDS[1].length)]); mob.setRunning(); mob.addDamageHate(player, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); @@ -334,7 +334,7 @@ public class EnergySeeds extends AbstractNpcAI case ANNIHILATION_COKRAKON: if (getRandom(100) < 50) { - L2MonsterInstance mob = spawnSupriseMob(seedEnergy, ANNIHILATION_SUPRISE_MOB_IDS[2][getRandom(ANNIHILATION_SUPRISE_MOB_IDS[2].length)]); + final L2MonsterInstance mob = spawnSupriseMob(seedEnergy, ANNIHILATION_SUPRISE_MOB_IDS[2][getRandom(ANNIHILATION_SUPRISE_MOB_IDS[2].length)]); mob.setRunning(); mob.addDamageHate(player, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); @@ -345,8 +345,8 @@ public class EnergySeeds extends AbstractNpcAI private L2MonsterInstance spawnSupriseMob(L2Npc energy, int npcId) { - L2NpcTemplate surpriseMobTemplate = NpcData.getInstance().getTemplate(npcId); - L2MonsterInstance monster = new L2MonsterInstance(surpriseMobTemplate); + final L2NpcTemplate surpriseMobTemplate = NpcData.getInstance().getTemplate(npcId); + final L2MonsterInstance monster = new L2MonsterInstance(surpriseMobTemplate); monster.setCurrentHpMp(monster.getMaxHp(), monster.getMaxMp()); monster.setHeading(energy.getHeading()); monster.setInstanceId(energy.getInstanceId()); @@ -717,7 +717,7 @@ public class EnergySeeds extends AbstractNpcAI if (isSeedActive(_seedId)) { // get a random NPC that should spawn at this location - Integer spawnId = _spawnId; // the map uses "Integer", not "int" + final Integer spawnId = _spawnId; // the map uses "Integer", not "int" _spawnedNpcs.put(addSpawn(_npcIds[getRandom(_npcIds.length)], _loc, false, 0), spawnId); } }, waitTime); diff --git a/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java b/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java index 4ec96325d4..a96eee191c 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java +++ b/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java @@ -102,13 +102,13 @@ public class Lindvior extends AbstractNpcAI public void scheduleNextLindviorVisit() { - long delay = (ALT_MODE) ? ALT_MODE_MIN * 60000 : scheduleNextLindviorDate(); + final long delay = (ALT_MODE) ? ALT_MODE_MIN * 60000 : scheduleNextLindviorDate(); startQuestTimer("start", delay, null, null); } protected long scheduleNextLindviorDate() { - GregorianCalendar date = new GregorianCalendar(); + final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); if (System.currentTimeMillis() >= date.getTimeInMillis()) @@ -116,7 +116,7 @@ public class Lindvior extends AbstractNpcAI date.add(Calendar.DAY_OF_WEEK, 1); } - int dayOfWeek = date.get(Calendar.DAY_OF_WEEK); + final int dayOfWeek = date.get(Calendar.DAY_OF_WEEK); if (dayOfWeek <= RESET_DAY_1) { date.add(Calendar.DAY_OF_WEEK, RESET_DAY_1 - dayOfWeek); diff --git a/trunk/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java b/trunk/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java index 8cd94607df..bc4324d836 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java +++ b/trunk/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java @@ -82,7 +82,7 @@ public final class GeneralDilios extends AbstractNpcAI } else if (event.startsWith("guard_animation_")) { - int value = Integer.parseInt(event.substring(16)); + final int value = Integer.parseInt(event.substring(16)); for (L2Spawn guard : _guards) { guard.getLastSpawn().broadcastSocialAction(4); diff --git a/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java b/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java index dd72e09ce5..1e65c15ca9 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -228,7 +228,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI }); int buffsNow = 0; - String var = loadGlobalQuestVar("SeedNextStatusChange"); + final String var = loadGlobalQuestVar("SeedNextStatusChange"); if (var.equalsIgnoreCase("") || (Long.parseLong(var) < System.currentTimeMillis())) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); @@ -249,7 +249,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI private Long getNextSeedsStatusChangeTime() { - Calendar reenter = Calendar.getInstance(); + final Calendar reenter = Calendar.getInstance(); reenter.set(Calendar.SECOND, 0); reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); @@ -301,7 +301,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI { if (event.equalsIgnoreCase("ChangeSeedsStatus")) { - int buffsNow = getRandom(ZONE_BUFFS_LIST.length); + final int buffsNow = getRandom(ZONE_BUFFS_LIST.length); saveGlobalQuestVar("SeedBuffsList", String.valueOf(buffsNow)); _seedsNextStatusChange = getNextSeedsStatusChangeTime(); saveGlobalQuestVar("SeedNextStatusChange", String.valueOf(_seedsNextStatusChange)); @@ -314,7 +314,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI af.setDisplayEffect(_regionsData[i].activeBuff); } - L2EffectZone zone = ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class); + final L2EffectZone zone = ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class); zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } @@ -342,7 +342,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI { if (TELEPORT_ZONES.containsKey(zone.getId())) { - Location teleLoc = TELEPORT_ZONES.get(zone.getId()); + final Location teleLoc = TELEPORT_ZONES.get(zone.getId()); character.teleToLocation(teleLoc, false); } return super.onEnterZone(character, zone); diff --git a/trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java b/trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java index 85ad3bd649..70aac72da2 100644 --- a/trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java +++ b/trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java @@ -83,7 +83,7 @@ public final class SecretArea extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); + final String htmltext = getNoQuestMsg(player); if ((npc.getId() == GINBY) && event.equalsIgnoreCase("enter")) { enterInstance(player); diff --git a/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java b/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java index a3f538b945..c710606a1c 100644 --- a/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java +++ b/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java @@ -249,19 +249,19 @@ public final class Stage1 extends Quest int spawnCount = 0; try { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); - File file = new File(Config.DATAPACK_ROOT + "/spawnZones/seed_of_destruction.xml"); + final File file = new File(Config.DATAPACK_ROOT + "/spawnZones/seed_of_destruction.xml"); if (!file.exists()) { _log.severe("[Seed of Destruction] Missing seed_of_destruction.xml. The quest wont work without it!"); return; } - Document doc = factory.newDocumentBuilder().parse(file); - Node first = doc.getFirstChild(); + final Document doc = factory.newDocumentBuilder().parse(file); + final Node first = doc.getFirstChild(); if ((first != null) && "list".equalsIgnoreCase(first.getNodeName())) { for (Node n = first.getFirstChild(); n != null; n = n.getNextSibling()) @@ -279,7 +279,7 @@ public final class Stage1 extends Quest _log.severe("[Seed of Destruction] Missing npcId in npc List, skipping"); continue; } - int npcId = Integer.parseInt(attrs.getNamedItem("npcId").getNodeValue()); + final int npcId = Integer.parseInt(attrs.getNamedItem("npcId").getNodeValue()); att = attrs.getNamedItem("flag"); if (att == null) @@ -287,7 +287,7 @@ public final class Stage1 extends Quest _log.severe("[Seed of Destruction] Missing flag in npc List npcId: " + npcId + ", skipping"); continue; } - int flag = Integer.parseInt(attrs.getNamedItem("flag").getNodeValue()); + final int flag = Integer.parseInt(attrs.getNamedItem("flag").getNodeValue()); if (!_spawnList.containsKey(flag)) { _spawnList.put(flag, new ArrayList()); @@ -298,7 +298,7 @@ public final class Stage1 extends Quest if ("loc".equalsIgnoreCase(cd.getNodeName())) { attrs = cd.getAttributes(); - SODSpawn spw = new SODSpawn(); + final SODSpawn spw = new SODSpawn(); spw.npcId = npcId; att = attrs.getNamedItem("x"); @@ -352,7 +352,7 @@ public final class Stage1 extends Quest else if ("zone".equalsIgnoreCase(cd.getNodeName())) { attrs = cd.getAttributes(); - SODSpawn spw = new SODSpawn(); + final SODSpawn spw = new SODSpawn(); spw.npcId = npcId; spw.isZone = true; @@ -403,22 +403,22 @@ public final class Stage1 extends Quest _log.severe("[Seed of Destruction] Missing id in spawnZones List, skipping"); continue; } - int id = Integer.parseInt(att.getNodeValue()); + final int id = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("minZ"); if (att == null) { _log.severe("[Seed of Destruction] Missing minZ in spawnZones List id: " + id + ", skipping"); continue; } - int minz = Integer.parseInt(att.getNodeValue()); + final int minz = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("maxZ"); if (att == null) { _log.severe("[Seed of Destruction] Missing maxZ in spawnZones List id: " + id + ", skipping"); continue; } - int maxz = Integer.parseInt(att.getNodeValue()); - L2Territory ter = new L2Territory(id); + final int maxz = Integer.parseInt(att.getNodeValue()); + final L2Territory ter = new L2Territory(id); for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) { @@ -495,22 +495,22 @@ public final class Stage1 extends Quest { if (partyMember.getLevel() < 75) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; } if (!Util.checkIfInRange(1000, player, partyMember, true)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; } - Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); + final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); if (System.currentTimeMillis() < reentertime) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; @@ -640,7 +640,7 @@ public final class Stage1 extends Quest spawnFlaggedNPCs(world, 0); break; case 1: - ExShowScreenMessage message1 = new ExShowScreenMessage(NpcStringId.THE_ENEMIES_HAVE_ATTACKED_EVERYONE_COME_OUT_AND_FIGHT_URGH, 5, 1); + final ExShowScreenMessage message1 = new ExShowScreenMessage(NpcStringId.THE_ENEMIES_HAVE_ATTACKED_EVERYONE_COME_OUT_AND_FIGHT_URGH, 5, 1); sendScreenMessage(world, message1); for (int i : ENTRANCE_ROOM_DOORS) { @@ -653,7 +653,7 @@ public final class Stage1 extends Quest // handled elsewhere return true; case 4: - ExShowScreenMessage message2 = new ExShowScreenMessage(NpcStringId.OBELISK_HAS_COLLAPSED_DON_T_LET_THE_ENEMIES_JUMP_AROUND_WILDLY_ANYMORE, 5, 1); + final ExShowScreenMessage message2 = new ExShowScreenMessage(NpcStringId.OBELISK_HAS_COLLAPSED_DON_T_LET_THE_ENEMIES_JUMP_AROUND_WILDLY_ANYMORE, 5, 1); sendScreenMessage(world, message2); for (int i : SQUARE_DOORS) { @@ -673,7 +673,7 @@ public final class Stage1 extends Quest spawnFlaggedNPCs(world, 7); break; case 8: - ExShowScreenMessage message4 = new ExShowScreenMessage(NpcStringId.COME_OUT_WARRIORS_PROTECT_SEED_OF_DESTRUCTION, 5, 1); + final ExShowScreenMessage message4 = new ExShowScreenMessage(NpcStringId.COME_OUT_WARRIORS_PROTECT_SEED_OF_DESTRUCTION, 5, 1); sendScreenMessage(world, message4); world.deviceSpawnedMobCount = 0; spawnFlaggedNPCs(world, 8); @@ -718,7 +718,7 @@ public final class Stage1 extends Quest addTrap(npcId, x, y, z, h, skill, world.getInstanceId()); return; } - L2Npc npc = addSpawn(npcId, x, y, z, h, false, 0, false, world.getInstanceId()); + final L2Npc npc = addSpawn(npcId, x, y, z, h, false, 0, false, world.getInstanceId()); if (addToKillTable) { world.npcList.put(npc, false); @@ -748,7 +748,7 @@ public final class Stage1 extends Quest protected void setInstanceTimeRestrictions(SOD1World world) { - Calendar reenter = Calendar.getInstance(); + final Calendar reenter = Calendar.getInstance(); reenter.set(Calendar.MINUTE, RESET_MIN); reenter.set(Calendar.HOUR_OF_DAY, RESET_HOUR); // if time is >= RESET_HOUR - roll to the next day @@ -771,13 +771,13 @@ public final class Stage1 extends Quest } } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); sm.addInstanceName(INSTANCEID); // set instance reenter time for all allowed players for (int objectId : world.getAllowed()) { - L2PcInstance player = L2World.getInstance().getPlayer(objectId); + final L2PcInstance player = L2World.getInstance().getPlayer(objectId); InstanceManager.getInstance().setInstanceTime(objectId, INSTANCEID, reenter.getTimeInMillis()); if ((player != null) && player.isOnline()) { @@ -790,7 +790,7 @@ public final class Stage1 extends Quest { for (int objId : world.getAllowed()) { - L2PcInstance player = L2World.getInstance().getPlayer(objId); + final L2PcInstance player = L2World.getInstance().getPlayer(objId); if (player != null) { player.sendPacket(message); @@ -817,17 +817,17 @@ public final class Stage1 extends Quest { if (!isSummon && (player != null)) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId()); if (tmpworld instanceof SOD1World) { - SOD1World world = (SOD1World) tmpworld; + final SOD1World world = (SOD1World) tmpworld; if (world.getStatus() == 7) { if (spawnState(world)) { for (int objId : world.getAllowed()) { - L2PcInstance pl = L2World.getInstance().getPlayer(objId); + final L2PcInstance pl = L2World.getInstance().getPlayer(objId); if (pl != null) { pl.showQuestMovie(5); @@ -844,10 +844,10 @@ public final class Stage1 extends Quest @Override public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof SOD1World) { - SOD1World world = (SOD1World) tmpworld; + final SOD1World world = (SOD1World) tmpworld; if ((world.getStatus() == 2) && (npc.getId() == OBELISK)) { world.setStatus(4); @@ -876,16 +876,16 @@ public final class Stage1 extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof SOD1World) { - SOD1World world = (SOD1World) tmpworld; + final SOD1World world = (SOD1World) tmpworld; if (event.equalsIgnoreCase("Spawn")) { - L2PcInstance target = L2World.getInstance().getPlayer(world.getAllowed().get(getRandom(world.getAllowed().size()))); + final L2PcInstance target = L2World.getInstance().getPlayer(world.getAllowed().get(getRandom(world.getAllowed().size()))); if ((world.deviceSpawnedMobCount < MAX_DEVICESPAWNEDMOBCOUNT) && (target != null) && (target.getInstanceId() == npc.getInstanceId()) && !target.isDead()) { - L2Attackable mob = (L2Attackable) addSpawn(SPAWN_MOB_IDS[getRandom(SPAWN_MOB_IDS.length)], npc.getSpawn().getLocation(), false, 0, false, world.getInstanceId()); + final L2Attackable mob = (L2Attackable) addSpawn(SPAWN_MOB_IDS[getRandom(SPAWN_MOB_IDS.length)], npc.getSpawn().getLocation(), false, 0, false, world.getInstanceId()); world.deviceSpawnedMobCount++; mob.setSeeThroughSilentMove(true); mob.setRunning(); @@ -901,12 +901,12 @@ public final class Stage1 extends Quest } else if (event.equalsIgnoreCase("DoorCheck")) { - L2DoorInstance tmp = getDoor(FORTRESS_DOOR, npc.getInstanceId()); + final L2DoorInstance tmp = getDoor(FORTRESS_DOOR, npc.getInstanceId()); if (tmp.getCurrentHp() < tmp.getMaxHp()) { world.deviceSpawnedMobCount = 0; spawnFlaggedNPCs(world, 6); - ExShowScreenMessage message3 = new ExShowScreenMessage(NpcStringId.ENEMIES_ARE_TRYING_TO_DESTROY_THE_FORTRESS_EVERYONE_DEFEND_THE_FORTRESS, 5, 1); + final ExShowScreenMessage message3 = new ExShowScreenMessage(NpcStringId.ENEMIES_ARE_TRYING_TO_DESTROY_THE_FORTRESS_EVERYONE_DEFEND_THE_FORTRESS, 5, 1); sendScreenMessage(world, message3); } else @@ -926,7 +926,7 @@ public final class Stage1 extends Quest L2Character mostHate = ((L2Attackable) npc).getMostHated(); if (mostHate != null) { - double dist = Util.calculateDistance(mostHate.getXdestination(), mostHate.getYdestination(), 0, npc.getSpawn().getX(), npc.getSpawn().getY(), 0, false, false); + final double dist = Util.calculateDistance(mostHate.getXdestination(), mostHate.getYdestination(), 0, npc.getSpawn().getX(), npc.getSpawn().getY(), 0, false, false); if (dist > 900) { ((L2Attackable) npc).reduceHate(mostHate, ((L2Attackable) npc).getHating(mostHate)); @@ -950,10 +950,10 @@ public final class Stage1 extends Quest cancelQuestTimer("Spawn", npc, null); return ""; } - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof SOD1World) { - SOD1World world = (SOD1World) tmpworld; + final SOD1World world = (SOD1World) tmpworld; if (world.getStatus() == 1) { if (checkKillProgress(npc, world)) @@ -993,7 +993,7 @@ public final class Stage1 extends Quest world.incStatus(); for (int objId : world.getAllowed()) { - L2PcInstance pl = L2World.getInstance().getPlayer(objId); + final L2PcInstance pl = L2World.getInstance().getPlayer(objId); if (pl != null) { pl.showQuestMovie(6); @@ -1018,11 +1018,11 @@ public final class Stage1 extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - int npcId = npc.getId(); + final int npcId = npc.getId(); getQuestState(player, true); if (npcId == ALENOS) { - InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); + final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if ((GraciaSeedsManager.getInstance().getSoDState() == 1) || ((world != null) && (world instanceof SOD1World))) { enterInstance(player, "SeedOfDestructionStage1.xml", ENTER_TELEPORT_1); @@ -1042,10 +1042,10 @@ public final class Stage1 extends Quest @Override public String onTrapAction(L2TrapInstance trap, L2Character trigger, TrapAction action) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(trap.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(trap.getInstanceId()); if (tmpworld instanceof SOD1World) { - SOD1World world = (SOD1World) tmpworld; + final SOD1World world = (SOD1World) tmpworld; switch (action) { case TRAP_TRIGGERED: diff --git a/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java b/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java index da012e695e..704c833e8c 100644 --- a/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java +++ b/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java @@ -266,7 +266,7 @@ public final class HallOfSuffering extends AbstractNpcAI { return; } - L2Party party = player.getParty(); + final L2Party party = player.getParty(); final int instanceId = InstanceManager.getInstance().createDynamicInstance(template); world = new HSWorld(); world.setInstanceId(instanceId); @@ -394,7 +394,7 @@ public final class HallOfSuffering extends AbstractNpcAI private void calcRewardItemId(HSWorld world) { - Long finishDiff = System.currentTimeMillis() - world.startTime; + final Long finishDiff = System.currentTimeMillis() - world.startTime; if (finishDiff < 1260000) { world.rewardHtm = "32530-00.htm"; @@ -472,10 +472,10 @@ public final class HallOfSuffering extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof HSWorld) { - HSWorld world = (HSWorld) tmpworld; + final HSWorld world = (HSWorld) tmpworld; if (event.equalsIgnoreCase("spawnBossGuards")) { if (!world.klanikus.isInCombat() && !world.klodekus.isInCombat()) @@ -508,14 +508,14 @@ public final class HallOfSuffering extends AbstractNpcAI } else if (event.equalsIgnoreCase("ressurectTwin")) { - Skill skill = SkillData.getInstance().getSkill(5824, 1); - L2Npc aliveTwin = (world.klanikus == npc ? world.klodekus : world.klanikus); + final Skill skill = SkillData.getInstance().getSkill(5824, 1); + final L2Npc aliveTwin = (world.klanikus == npc ? world.klodekus : world.klanikus); npc.doRevive(); npc.doCast(skill); npc.setCurrentHp(aliveTwin.getCurrentHp()); // get most hated of other boss - L2Character hated = ((L2MonsterInstance) aliveTwin).getMostHated(); + final L2Character hated = ((L2MonsterInstance) aliveTwin).getMostHated(); if (hated != null) { npc.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, hated, 1000); @@ -542,16 +542,16 @@ public final class HallOfSuffering extends AbstractNpcAI if (!world.isBossesAttacked) { world.isBossesAttacked = true; - Calendar reenter = Calendar.getInstance(); + final Calendar reenter = Calendar.getInstance(); reenter.add(Calendar.HOUR, INSTANCE_PENALTY); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); sm.addInstanceName(tmpworld.getTemplateId()); // set instance reenter time for all allowed players for (int objectId : tmpworld.getAllowed()) { - L2PcInstance player = L2World.getInstance().getPlayer(objectId); + final L2PcInstance player = L2World.getInstance().getPlayer(objectId); if ((player != null) && player.isOnline()) { InstanceManager.getInstance().setInstanceTime(objectId, tmpworld.getTemplateId(), reenter.getTimeInMillis()); @@ -588,10 +588,10 @@ public final class HallOfSuffering extends AbstractNpcAI @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof HSWorld) { - HSWorld world = (HSWorld) tmpworld; + final HSWorld world = (HSWorld) tmpworld; if (npc.getId() == TUMOR_ALIVE) { @@ -635,7 +635,7 @@ public final class HallOfSuffering extends AbstractNpcAI { if (npc.getId() == TEPIOS) { - InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); + final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if (((HSWorld) world).rewardItemId == -1) { _log.warning("Hall of Suffering: " + player.getName() + "(" + player.getObjectId() + ") is try to cheat!"); @@ -665,7 +665,7 @@ public final class HallOfSuffering extends AbstractNpcAI } else if (npc.getId() == TEPIOS) { - InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(talker); + final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(talker); if (((HSWorld) world).rewardItemId == -1) { _log.warning("Hall of Suffering: " + talker.getName() + "(" + talker.getObjectId() + ") is try to cheat!"); diff --git a/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java b/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java index eb048948c1..867ba9d96c 100644 --- a/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java +++ b/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java @@ -140,7 +140,7 @@ public abstract class AirShipController extends Quest player.sendPacket(SystemMessageId.AIRSHIP_SUMMON_LICENSE_REGISTRATION_CAN_ONLY_BE_DONE_BY_THE_CLAN_LEADER); return null; } - int ownerId = player.getClanId(); + final int ownerId = player.getClanId(); if (!AirShipManager.getInstance().hasAirShipLicense(ownerId)) { player.sendPacket(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_EITHER_YOU_HAVE_NOT_REGISTERED_YOUR_AIRSHIP_LICENSE_OR_THE_AIRSHIP_HAS_NOT_YET_BEEN_SUMMONED); @@ -349,7 +349,7 @@ public abstract class AirShipController extends Quest protected void validityCheck() { - L2ScriptZone zone = ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class); + final L2ScriptZone zone = ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class); if (zone == null) { _log.log(Level.WARNING, getName() + ": Invalid zone " + _dockZone + ", controller disabled"); diff --git a/trunk/dist/game/data/scripts/handlers/MasterHandler.java b/trunk/dist/game/data/scripts/handlers/MasterHandler.java index 651241c077..c194e1065f 100644 --- a/trunk/dist/game/data/scripts/handlers/MasterHandler.java +++ b/trunk/dist/game/data/scripts/handlers/MasterHandler.java @@ -598,7 +598,7 @@ public class MasterHandler { _log.log(Level.INFO, "Loading Handlers..."); - Map, Method> registerHandlerMethods = new HashMap<>(); + final Map, Method> registerHandlerMethods = new HashMap<>(); for (IHandler loadInstance : LOAD_INSTANCES) { registerHandlerMethods.put(loadInstance, null); @@ -627,7 +627,7 @@ public class MasterHandler try { - Object handler = c.newInstance(); + final Object handler = c.newInstance(); for (Entry, Method> entry : registerHandlerMethods.entrySet()) { if ((entry.getValue() != null) && entry.getValue().getParameterTypes()[0].isInstance(handler)) diff --git a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java index e0336034fa..1c7a3dccb5 100644 --- a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java +++ b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java @@ -42,7 +42,7 @@ public class L2DoorInstanceAction implements IActionHandler } else if (interact) { - L2DoorInstance door = (L2DoorInstance) target; + final L2DoorInstance door = (L2DoorInstance) target; // MyTargetSelected my = new MyTargetSelected(getObjectId(), activeChar.getLevel()); // activeChar.sendPacket(my); if (target.isAutoAttackable(activeChar)) diff --git a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java index c39171f395..6fa8ba9ea3 100644 --- a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java +++ b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java @@ -44,7 +44,7 @@ public class L2PetInstanceAction implements IActionHandler return false; } - boolean isOwner = activeChar.getObjectId() == ((L2PetInstance) target).getOwner().getObjectId(); + final boolean isOwner = activeChar.getObjectId() == ((L2PetInstance) target).getOwner().getObjectId(); if (isOwner && (activeChar != ((L2PetInstance) target).getOwner())) { diff --git a/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2DoorInstanceActionShift.java b/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2DoorInstanceActionShift.java index afb615a4fd..d8317d4eaf 100644 --- a/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2DoorInstanceActionShift.java +++ b/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2DoorInstanceActionShift.java @@ -34,7 +34,7 @@ public class L2DoorInstanceActionShift implements IActionShiftHandler if (activeChar.getAccessLevel().isGm()) { activeChar.setTarget(target); - L2DoorInstance door = (L2DoorInstance) target; + final L2DoorInstance door = (L2DoorInstance) target; activeChar.sendPacket(new StaticObject(door, activeChar.isGM())); final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java index dc256523cf..a39d496b93 100644 --- a/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java +++ b/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java @@ -102,7 +102,7 @@ public class L2NpcActionShift implements IActionShiftHandler html.replace("%collision_height%", String.valueOf(((L2Character) target).getTemplate().getfCollisionHeight())); html.replace("%dist%", String.valueOf((int) activeChar.calculateDistance(target, true, false))); - byte attackAttribute = ((L2Character) target).getAttackElement(); + final byte attackAttribute = ((L2Character) target).getAttackElement(); html.replace("%ele_atk%", Elementals.getElementName(attackAttribute)); html.replace("%ele_atk_value%", String.valueOf(((L2Character) target).getAttackElementValue(attackAttribute))); html.replace("%ele_dfire%", String.valueOf(((L2Character) target).getDefenseElementValue(Elementals.FIRE))); @@ -153,10 +153,10 @@ public class L2NpcActionShift implements IActionShiftHandler if (((L2Npc) target).hasAI()) { - Set clans = ((L2Npc) target).getTemplate().getClans(); - Set ignoreClanNpcIds = ((L2Npc) target).getTemplate().getIgnoreClanNpcIds(); - String clansString = clans != null ? Util.implode(clans.toArray(), ", ") : ""; - String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? Util.implode(ignoreClanNpcIds.toArray(), ", ") : ""; + final Set clans = ((L2Npc) target).getTemplate().getClans(); + final Set ignoreClanNpcIds = ((L2Npc) target).getTemplate().getIgnoreClanNpcIds(); + final String clansString = clans != null ? Util.implode(clans.toArray(), ", ") : ""; + final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? Util.implode(ignoreClanNpcIds.toArray(), ", ") : ""; html.replace("%ai_intention%", "
Intention:" + String.valueOf(((L2Npc) target).getAI().getIntention().name()) + "
"); html.replace("%ai%", "
AI" + ((L2Npc) target).getAI().getClass().getSimpleName() + "
"); diff --git a/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java b/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java index 5d2f57d77d..c27c7d31cc 100644 --- a/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java +++ b/trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java @@ -39,7 +39,7 @@ public class L2PcInstanceActionShift implements IActionShiftHandler activeChar.setTarget(target); } - IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info"); + final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info"); if (ach != null) { ach.useAdminCommand("admin_character_info " + target.getName(), activeChar); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index e56f27aa5c..5257cfea3b 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -164,7 +164,7 @@ public class AdminAdmin implements IAdminCommandHandler { try { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); st.nextToken(); if (st.nextToken().equalsIgnoreCase("on")) { @@ -200,7 +200,7 @@ public class AdminAdmin implements IAdminCommandHandler { try { - String mode = command.substring(15); + final String mode = command.substring(15); if (mode.equalsIgnoreCase("on")) { activeChar.setTradeRefusal(true); @@ -229,12 +229,12 @@ public class AdminAdmin implements IAdminCommandHandler } else if (command.startsWith("admin_setconfig")) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); st.nextToken(); try { - String pName = st.nextToken(); - String pValue = st.nextToken(); + final String pName = st.nextToken(); + final String pValue = st.nextToken(); if (Config.setParameterValue(pName, pValue)) { activeChar.sendMessage("Config parameter " + pName + " set to " + pValue); @@ -255,13 +255,13 @@ public class AdminAdmin implements IAdminCommandHandler } else if (command.startsWith("admin_set")) { - StringTokenizer st = new StringTokenizer(command); - String[] cmd = st.nextToken().split("_"); + final StringTokenizer st = new StringTokenizer(command); + final String[] cmd = st.nextToken().split("_"); try { - String[] parameter = st.nextToken().split("="); - String pName = parameter[0].trim(); - String pValue = parameter[1].trim(); + final String[] parameter = st.nextToken().split("="); + final String pName = parameter[0].trim(); + final String pValue = parameter[1].trim(); if (Config.setParameterValue(pName, pValue)) { activeChar.sendMessage("parameter " + pName + " succesfully set to " + pValue); @@ -427,7 +427,7 @@ public class AdminAdmin implements IAdminCommandHandler public void showConfigPage(L2PcInstance activeChar) { final NpcHtmlMessage adminReply = new NpcHtmlMessage(); - StringBuilder replyMSG = new StringBuilder("L2J :: Config"); + final StringBuilder replyMSG = new StringBuilder("L2J :: Config"); replyMSG.append("
Config Server Panel

"); replyMSG.append("
"); replyMSG.append(""); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java index 3530b7af1a..b0e8a70898 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java @@ -92,7 +92,7 @@ public class AdminAnnouncements implements IAdminCommandHandler { if (!st.hasMoreTokens()) { - String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/announces-add.htm"); + final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/announces-add.htm"); Util.sendCBHtml(activeChar, content); break; } @@ -104,26 +104,26 @@ public class AdminAnnouncements implements IAdminCommandHandler activeChar.sendMessage("Syntax: //announces add "); break; } - String annInitDelay = st.nextToken(); + final String annInitDelay = st.nextToken(); if (!Util.isDigit(annInitDelay)) { activeChar.sendMessage("Syntax: //announces add "); break; } - int initDelay = Integer.parseInt(annInitDelay) * 1000; + final int initDelay = Integer.parseInt(annInitDelay) * 1000; // ************************************ if (!st.hasMoreTokens()) { activeChar.sendMessage("Syntax: //announces add "); break; } - String annDelay = st.nextToken(); + final String annDelay = st.nextToken(); if (!Util.isDigit(annDelay)) { activeChar.sendMessage("Syntax: //announces add "); break; } - int delay = Integer.parseInt(annDelay) * 1000; + final int delay = Integer.parseInt(annDelay) * 1000; if ((delay < (10 * 1000)) && ((type == AnnouncementType.AUTO_NORMAL) || (type == AnnouncementType.AUTO_CRITICAL))) { activeChar.sendMessage("Delay cannot be less then 10 seconds!"); @@ -135,7 +135,7 @@ public class AdminAnnouncements implements IAdminCommandHandler activeChar.sendMessage("Syntax: //announces add "); break; } - String annRepeat = st.nextToken(); + final String annRepeat = st.nextToken(); if (!Util.isDigit(annRepeat)) { activeChar.sendMessage("Syntax: //announces add "); @@ -178,13 +178,13 @@ public class AdminAnnouncements implements IAdminCommandHandler activeChar.sendMessage("Syntax: //announces edit "); break; } - String annId = st.nextToken(); + final String annId = st.nextToken(); if (!Util.isDigit(annId)) { activeChar.sendMessage("Syntax: //announces edit "); break; } - int id = Integer.parseInt(annId); + final int id = Integer.parseInt(annId); final IAnnouncement announce = AnnouncementsTable.getInstance().getAnnounce(id); if (announce == null) { @@ -194,13 +194,13 @@ public class AdminAnnouncements implements IAdminCommandHandler if (!st.hasMoreTokens()) { String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/announces-edit.htm"); - String announcementId = "" + announce.getId(); - String announcementType = announce.getType().name(); + final String announcementId = "" + announce.getId(); + final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; String announcementRepeat = "0"; - String announcementAuthor = announce.getAuthor(); - String announcementContent = announce.getContent(); + final String announcementAuthor = announce.getAuthor(); + final String announcementContent = announce.getContent(); if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; @@ -265,26 +265,26 @@ public class AdminAnnouncements implements IAdminCommandHandler activeChar.sendMessage("Syntax: //announces add "); break; } - String annInitDelay = st.nextToken(); + final String annInitDelay = st.nextToken(); if (!Util.isDigit(annInitDelay)) { activeChar.sendMessage("Syntax: //announces add "); break; } - int initDelay = Integer.parseInt(annInitDelay); + final int initDelay = Integer.parseInt(annInitDelay); // ************************************ if (!st.hasMoreTokens()) { activeChar.sendMessage("Syntax: //announces add "); break; } - String annDelay = st.nextToken(); + final String annDelay = st.nextToken(); if (!Util.isDigit(annDelay)) { activeChar.sendMessage("Syntax: //announces add "); break; } - int delay = Integer.parseInt(annDelay); + final int delay = Integer.parseInt(annDelay); if ((delay < 10) && ((type == AnnouncementType.AUTO_NORMAL) || (type == AnnouncementType.AUTO_CRITICAL))) { activeChar.sendMessage("Delay cannot be less then 10 seconds!"); @@ -296,7 +296,7 @@ public class AdminAnnouncements implements IAdminCommandHandler activeChar.sendMessage("Syntax: //announces add "); break; } - String annRepeat = st.nextToken(); + final String annRepeat = st.nextToken(); if (!Util.isDigit(annRepeat)) { activeChar.sendMessage("Syntax: //announces add "); @@ -327,7 +327,7 @@ public class AdminAnnouncements implements IAdminCommandHandler announce.setAuthor(activeChar.getName()); if (announce instanceof AutoAnnouncement) { - AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; + final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; autoAnnounce.setInitial(initDelay * 1000); autoAnnounce.setDelay(delay * 1000); autoAnnounce.setRepeat(repeat); @@ -343,13 +343,13 @@ public class AdminAnnouncements implements IAdminCommandHandler activeChar.sendMessage("Syntax: //announces remove "); break; } - String token = st.nextToken(); + final String token = st.nextToken(); if (!Util.isDigit(token)) { activeChar.sendMessage("Syntax: //announces remove "); break; } - int id = Integer.parseInt(token); + final int id = Integer.parseInt(token); if (AnnouncementsTable.getInstance().deleteAnnouncement(id)) { activeChar.sendMessage("Announcement has been successfully removed!"); @@ -375,13 +375,13 @@ public class AdminAnnouncements implements IAdminCommandHandler activeChar.sendMessage("Auto announcements has been successfully restarted"); break; } - String token = st.nextToken(); + final String token = st.nextToken(); if (!Util.isDigit(token)) { activeChar.sendMessage("Syntax: //announces show "); break; } - int id = Integer.parseInt(token); + final int id = Integer.parseInt(token); final IAnnouncement announce = AnnouncementsTable.getInstance().getAnnounce(id); if (announce != null) { @@ -409,24 +409,24 @@ public class AdminAnnouncements implements IAdminCommandHandler activeChar.sendMessage("Syntax: //announces show "); break; } - String token = st.nextToken(); + final String token = st.nextToken(); if (!Util.isDigit(token)) { activeChar.sendMessage("Syntax: //announces show "); break; } - int id = Integer.parseInt(token); + final int id = Integer.parseInt(token); final IAnnouncement announce = AnnouncementsTable.getInstance().getAnnounce(id); if (announce != null) { String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/announces-show.htm"); - String announcementId = "" + announce.getId(); - String announcementType = announce.getType().name(); + final String announcementId = "" + announce.getId(); + final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; String announcementRepeat = "0"; - String announcementAuthor = announce.getAuthor(); - String announcementContent = announce.getContent(); + final String announcementAuthor = announce.getAuthor(); + final String announcementContent = announce.getContent(); if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index 8e4acf7468..861164a98a 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -68,7 +68,7 @@ public class AdminBuffs implements IAdminCommandHandler if (st.hasMoreTokens()) { final String playername = st.nextToken(); - L2PcInstance player = L2World.getInstance().getPlayer(playername); + final L2PcInstance player = L2World.getInstance().getPlayer(playername); if (player != null) { int page = 1; @@ -97,11 +97,11 @@ public class AdminBuffs implements IAdminCommandHandler { try { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); - int objectId = Integer.parseInt(st.nextToken()); - int skillId = Integer.parseInt(st.nextToken()); + final int objectId = Integer.parseInt(st.nextToken()); + final int skillId = Integer.parseInt(st.nextToken()); removeBuff(activeChar, objectId, skillId); return true; @@ -117,9 +117,9 @@ public class AdminBuffs implements IAdminCommandHandler { try { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); - int objectId = Integer.parseInt(st.nextToken()); + final int objectId = Integer.parseInt(st.nextToken()); removeAllBuffs(activeChar, objectId); return true; } @@ -132,12 +132,12 @@ public class AdminBuffs implements IAdminCommandHandler } else if (command.startsWith("admin_areacancel")) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); - String val = st.nextToken(); + final String val = st.nextToken(); try { - int radius = Integer.parseInt(val); + final int radius = Integer.parseInt(val); for (L2Character knownChar : activeChar.getKnownList().getKnownCharactersInRadius(radius)) { @@ -158,7 +158,7 @@ public class AdminBuffs implements IAdminCommandHandler } else if (command.startsWith("admin_removereuse")) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); command = st.nextToken(); L2Character creature = null; @@ -255,8 +255,8 @@ public class AdminBuffs implements IAdminCommandHandler } final StringBuilder html = StringUtil.startAppend(500 + (effects.size() * 200), "
Drop:
Effects of ", target.getName(), "

"); - int start = ((page - 1) * PAGE_LIMIT); - int end = Math.min(((page - 1) * PAGE_LIMIT) + PAGE_LIMIT, effects.size()); + final int start = ((page - 1) * PAGE_LIMIT); + final int end = Math.min(((page - 1) * PAGE_LIMIT) + PAGE_LIMIT, effects.size()); int count = 0; for (BuffInfo info : effects) { @@ -274,7 +274,7 @@ public class AdminBuffs implements IAdminCommandHandler html.append("
SkillRem. TimeAction
"); for (int x = 0; x < max; x++) { - int pagenr = x + 1; + final int pagenr = x + 1; if (page == pagenr) { html.append("" + "" + "" + "" + "" + ""); } else if (cw.isDropped()) @@ -175,7 +175,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler } else { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PcInstance) { ((L2PcInstance) target).addItem("AdminCursedWeaponAdd", id, 1, target, true); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java index cf74ab8475..8eac8a59dd 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java @@ -35,7 +35,7 @@ public class AdminDebug implements IAdminCommandHandler @Override public final boolean useAdminCommand(String command, L2PcInstance activeChar) { - String[] commandSplit = command.split(" "); + final String[] commandSplit = command.split(" "); if (ADMIN_COMMANDS[0].equalsIgnoreCase(commandSplit[0])) { L2Object target; diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java index ded6b92cdf..f0863570bf 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java @@ -56,13 +56,13 @@ public class AdminDelete implements IAdminCommandHandler // TODO: add possibility to delete any L2Object (except L2PcInstance) private void handleDelete(L2PcInstance activeChar) { - L2Object obj = activeChar.getTarget(); + final L2Object obj = activeChar.getTarget(); if (obj instanceof L2Npc) { - L2Npc target = (L2Npc) obj; + final L2Npc target = (L2Npc) obj; target.deleteMe(); - L2Spawn spawn = target.getSpawn(); + final L2Spawn spawn = target.getSpawn(); if (spawn != null) { spawn.stopRespawn(); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java index d7b0287414..0858e615ab 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java @@ -51,7 +51,7 @@ public class AdminDisconnect implements IAdminCommandHandler private void disconnectCharacter(L2PcInstance activeChar) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java index a8c5a69644..ba7d4ceea1 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java @@ -49,7 +49,7 @@ public class AdminDoorControl implements IAdminCommandHandler { if (command.startsWith("admin_open ")) { - int doorId = Integer.parseInt(command.substring(11)); + final int doorId = Integer.parseInt(command.substring(11)); if (_doorTable.getDoor(doorId) != null) { _doorTable.getDoor(doorId).openMe(); @@ -67,7 +67,7 @@ public class AdminDoorControl implements IAdminCommandHandler } else if (command.startsWith("admin_close ")) { - int doorId = Integer.parseInt(command.substring(12)); + final int doorId = Integer.parseInt(command.substring(12)); if (_doorTable.getDoor(doorId) != null) { _doorTable.getDoor(doorId).closeMe(); @@ -113,7 +113,7 @@ public class AdminDoorControl implements IAdminCommandHandler } if (command.equals("admin_open")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2DoorInstance) { ((L2DoorInstance) target).openMe(); @@ -126,7 +126,7 @@ public class AdminDoorControl implements IAdminCommandHandler if (command.equals("admin_close")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2DoorInstance) { ((L2DoorInstance) target).closeMe(); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index d273dc0bc8..99d404d1d2 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -118,7 +118,7 @@ public class AdminEditChar implements IAdminCommandHandler } else if (command.startsWith("admin_character_info")) { - String[] data = command.split(" "); + final String[] data = command.split(" "); if ((data.length > 1)) { showCharacterInfo(activeChar, L2World.getInstance().getPlayer(data[1])); @@ -140,8 +140,8 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(22); - int page = Integer.parseInt(val); + final String val = command.substring(22); + final int page = Integer.parseInt(val); listCharacters(activeChar, page); } catch (StringIndexOutOfBoundsException e) @@ -154,7 +154,7 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(21); + final String val = command.substring(21); findCharacter(activeChar, val); } catch (StringIndexOutOfBoundsException e) @@ -167,7 +167,7 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(14); + final String val = command.substring(14); findCharactersPerIp(activeChar, val); } catch (Exception e) @@ -180,7 +180,7 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(19); + final String val = command.substring(19); findCharactersPerAccount(activeChar, val); } catch (Exception e) @@ -191,7 +191,7 @@ public class AdminEditChar implements IAdminCommandHandler } else if (command.startsWith("admin_edit_character")) { - String[] data = command.split(" "); + final String[] data = command.split(" "); if ((data.length > 1)) { editCharacter(activeChar, data[1]); @@ -214,8 +214,8 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(15); - int karma = Integer.parseInt(val); + final String val = command.substring(15); + final int karma = Integer.parseInt(val); setTargetKarma(activeChar, karma); } catch (Exception e) @@ -231,12 +231,12 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(12); - int pk = Integer.parseInt(val); - L2Object target = activeChar.getTarget(); + final String val = command.substring(12); + final int pk = Integer.parseInt(val); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) target; + final L2PcInstance player = (L2PcInstance) target; player.setPkKills(pk); player.broadcastUserInfo(); player.sendPacket(new UserInfo(player)); @@ -261,12 +261,12 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(13); - int pvp = Integer.parseInt(val); - L2Object target = activeChar.getTarget(); + final String val = command.substring(13); + final int pvp = Integer.parseInt(val); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) target; + final L2PcInstance player = (L2PcInstance) target; player.setPvpKills(pvp); player.broadcastUserInfo(); player.sendPacket(new UserInfo(player)); @@ -291,12 +291,12 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(14); - int fame = Integer.parseInt(val); - L2Object target = activeChar.getTarget(); + final String val = command.substring(14); + final int fame = Integer.parseInt(val); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) target; + final L2PcInstance player = (L2PcInstance) target; player.setFame(fame); player.broadcastUserInfo(); player.sendPacket(new UserInfo(player)); @@ -321,12 +321,12 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(10); - int recVal = Integer.parseInt(val); - L2Object target = activeChar.getTarget(); + final String val = command.substring(10); + final int recVal = Integer.parseInt(val); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) target; + final L2PcInstance player = (L2PcInstance) target; player.setRecomHave(recVal); player.broadcastUserInfo(); player.sendPacket(new UserInfo(player)); @@ -348,9 +348,9 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(15).trim(); - int classidval = Integer.parseInt(val); - L2Object target = activeChar.getTarget(); + final String val = command.substring(15).trim(); + final int classidval = Integer.parseInt(val); + final L2Object target = activeChar.getTarget(); if ((target == null) || !target.isPlayer()) { return false; @@ -408,8 +408,8 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(15); - L2Object target = activeChar.getTarget(); + final String val = command.substring(15); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -432,8 +432,8 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(17); - L2Object target = activeChar.getTarget(); + final String val = command.substring(17); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -480,7 +480,7 @@ public class AdminEditChar implements IAdminCommandHandler } else if (command.startsWith("admin_setsex")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -498,8 +498,8 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(15); - L2Object target = activeChar.getTarget(); + final String val = command.substring(15); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -522,8 +522,8 @@ public class AdminEditChar implements IAdminCommandHandler { try { - String val = command.substring(16); - L2Object target = activeChar.getTarget(); + final String val = command.substring(16); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -544,10 +544,10 @@ public class AdminEditChar implements IAdminCommandHandler } else if (command.startsWith("admin_fullfood")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PetInstance) { - L2PetInstance targetPet = (L2PetInstance) target; + final L2PetInstance targetPet = (L2PetInstance) target; targetPet.setCurrentFed(targetPet.getMaxFed()); targetPet.broadcastStatusUpdate(); } @@ -560,7 +560,7 @@ public class AdminEditChar implements IAdminCommandHandler { try { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); if (st.countTokens() != 3) { activeChar.sendMessage("Usage: //remove_clan_penalty join|create charname"); @@ -569,9 +569,9 @@ public class AdminEditChar implements IAdminCommandHandler st.nextToken(); - boolean changeCreateExpiryTime = st.nextToken().equalsIgnoreCase("create"); + final boolean changeCreateExpiryTime = st.nextToken().equalsIgnoreCase("create"); - String playerName = st.nextToken(); + final String playerName = st.nextToken(); L2PcInstance player = null; player = L2World.getInstance().getPlayer(playerName); @@ -610,7 +610,7 @@ public class AdminEditChar implements IAdminCommandHandler int multibox = 2; try { - String val = command.substring(19); + final String val = command.substring(19); multibox = Integer.parseInt(val); if (multibox < 1) { @@ -628,7 +628,7 @@ public class AdminEditChar implements IAdminCommandHandler int multibox = 2; try { - String val = command.substring(26); + final String val = command.substring(26); multibox = Integer.parseInt(val); if (multibox < 1) { @@ -643,7 +643,7 @@ public class AdminEditChar implements IAdminCommandHandler } else if (command.startsWith("admin_tracert")) { - String[] data = command.split(" "); + final String[] data = command.split(" "); L2PcInstance pl = null; if ((data.length > 1)) { @@ -651,7 +651,7 @@ public class AdminEditChar implements IAdminCommandHandler } else { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PcInstance) { pl = (L2PcInstance) target; @@ -678,7 +678,7 @@ public class AdminEditChar implements IAdminCommandHandler } String ip; - int[][] trace = client.getTrace(); + final int[][] trace = client.getTrace(); for (int i = 0; i < trace.length; i++) { ip = ""; @@ -695,7 +695,7 @@ public class AdminEditChar implements IAdminCommandHandler } else if (command.startsWith("admin_summon_info")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2Summon) { gatherSummonInfo((L2Summon) target, activeChar); @@ -707,7 +707,7 @@ public class AdminEditChar implements IAdminCommandHandler } else if (command.startsWith("admin_unsummon")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2Summon) { ((L2Summon) target).unSummon(((L2Summon) target).getOwner()); @@ -719,14 +719,14 @@ public class AdminEditChar implements IAdminCommandHandler } else if (command.startsWith("admin_summon_setlvl")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PetInstance) { - L2PetInstance pet = (L2PetInstance) target; + final L2PetInstance pet = (L2PetInstance) target; try { - String val = command.substring(20); - int level = Integer.parseInt(val); + final String val = command.substring(20); + final int level = Integer.parseInt(val); long newexp, oldexp = 0; oldexp = pet.getStat().getExp(); newexp = pet.getStat().getExpForLevel(level); @@ -753,8 +753,8 @@ public class AdminEditChar implements IAdminCommandHandler L2Object target; try { - String val = command.substring(19); - int objId = Integer.parseInt(val); + final String val = command.substring(19); + final int objId = Integer.parseInt(val); target = L2World.getInstance().getPet(objId); } catch (Exception e) @@ -777,7 +777,7 @@ public class AdminEditChar implements IAdminCommandHandler L2Object target; try { - String val = command.substring(16); + final String val = command.substring(16); target = L2World.getInstance().getPlayer(val); if (target == null) { @@ -921,7 +921,7 @@ public class AdminEditChar implements IAdminCommandHandler return ""; }, player -> { - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append(""); sb.append(""); sb.append(""); @@ -946,7 +946,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (player == null) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PcInstance) { player = (L2PcInstance) target; @@ -1042,7 +1042,7 @@ public class AdminEditChar implements IAdminCommandHandler private void setTargetKarma(L2PcInstance activeChar, int newKarma) { // function to change karma of selected char - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -1054,11 +1054,11 @@ public class AdminEditChar implements IAdminCommandHandler } // for display - int oldKarma = player.getReputation(); + final int oldKarma = player.getReputation(); // update reputation player.setKarma(newKarma); // Common character information - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_REPUTATION_HAS_BEEN_CHANGED_TO_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_REPUTATION_HAS_BEEN_CHANGED_TO_S1); sm.addInt(newKarma); player.sendPacket(sm); // Admin information @@ -1083,7 +1083,7 @@ public class AdminEditChar implements IAdminCommandHandler if (target instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) target; + final L2PcInstance player = (L2PcInstance) target; gatherCharacterInfo(activeChar, player, "charedit.htm"); } } @@ -1240,7 +1240,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharactersPerAccount(L2PcInstance activeChar, String characterName) throws IllegalArgumentException { - L2PcInstance player = L2World.getInstance().getPlayer(characterName); + final L2PcInstance player = L2World.getInstance().getPlayer(characterName); if (player == null) { throw new IllegalArgumentException("Player doesn't exist"); @@ -1264,7 +1264,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findDualbox(L2PcInstance activeChar, int multibox) { - Map> ipMap = new HashMap<>(); + final Map> ipMap = new HashMap<>(); String ip = "0.0.0.0"; L2GameClient client; final Map dualboxIPs = new HashMap<>(); @@ -1286,7 +1286,7 @@ public class AdminEditChar implements IAdminCommandHandler if (ipMap.get(ip).size() >= multibox) { - Integer count = dualboxIPs.get(ip); + final Integer count = dualboxIPs.get(ip); if (count == null) { dualboxIPs.put(ip, multibox); @@ -1298,7 +1298,7 @@ public class AdminEditChar implements IAdminCommandHandler } } - List keys = new ArrayList<>(dualboxIPs.keySet()); + final List keys = new ArrayList<>(dualboxIPs.keySet()); keys.sort(Comparator.comparing(s -> dualboxIPs.get(s)).reversed()); final StringBuilder results = new StringBuilder(); @@ -1317,7 +1317,7 @@ public class AdminEditChar implements IAdminCommandHandler private void findDualboxStrict(L2PcInstance activeChar, int multibox) { - Map> ipMap = new HashMap<>(); + final Map> ipMap = new HashMap<>(); L2GameClient client; final Map dualboxIPs = new HashMap<>(); @@ -1329,7 +1329,7 @@ public class AdminEditChar implements IAdminCommandHandler continue; } - IpPack pack = new IpPack(client.getConnection().getInetAddress().getHostAddress(), client.getTrace()); + final IpPack pack = new IpPack(client.getConnection().getInetAddress().getHostAddress(), client.getTrace()); if (ipMap.get(pack) == null) { ipMap.put(pack, new ArrayList()); @@ -1338,7 +1338,7 @@ public class AdminEditChar implements IAdminCommandHandler if (ipMap.get(pack).size() >= multibox) { - Integer count = dualboxIPs.get(pack); + final Integer count = dualboxIPs.get(pack); if (count == null) { dualboxIPs.put(pack, multibox); @@ -1350,7 +1350,7 @@ public class AdminEditChar implements IAdminCommandHandler } } - List keys = new ArrayList<>(dualboxIPs.keySet()); + final List keys = new ArrayList<>(dualboxIPs.keySet()); keys.sort(Comparator.comparing(s -> dualboxIPs.get(s)).reversed()); final StringBuilder results = new StringBuilder(); @@ -1406,7 +1406,7 @@ public class AdminEditChar implements IAdminCommandHandler { return false; } - IpPack other = (IpPack) obj; + final IpPack other = (IpPack) obj; if (!getOuterType().equals(other.getOuterType())) { return false; @@ -1445,11 +1445,11 @@ public class AdminEditChar implements IAdminCommandHandler { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(activeChar.getHtmlPrefix(), "html/admin/petinfo.htm"); - String name = target.getName(); + final String name = target.getName(); html.replace("%name%", name == null ? "N/A" : name); html.replace("%level%", Integer.toString(target.getLevel())); html.replace("%exp%", Long.toString(target.getStat().getExp())); - String owner = target.getActingPlayer().getName(); + final String owner = target.getActingPlayer().getName(); html.replace("%owner%", " " + owner + ""); html.replace("%class%", target.getClass().getSimpleName()); html.replace("%ai%", target.hasAI() ? String.valueOf(target.getAI().getIntention().name()) : "NULL"); @@ -1459,7 +1459,7 @@ public class AdminEditChar implements IAdminCommandHandler html.replace("%race%", target.getTemplate().getRace().toString()); if (target instanceof L2PetInstance) { - int objId = target.getActingPlayer().getObjectId(); + final int objId = target.getActingPlayer().getObjectId(); html.replace("%inv%", " view"); } else @@ -1484,7 +1484,7 @@ public class AdminEditChar implements IAdminCommandHandler boolean color = true; final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(activeChar.getHtmlPrefix(), "html/admin/partyinfo.htm"); - StringBuilder text = new StringBuilder(400); + final StringBuilder text = new StringBuilder(400); for (L2PcInstance member : target.getParty().getMembers()) { if (color) diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index 0671e1f4a5..9c80953ae7 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -101,7 +101,7 @@ public class AdminEffects implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); st.nextToken(); if (command.equals("admin_invis_menu")) @@ -162,11 +162,11 @@ public class AdminEffects implements IAdminCommandHandler { try { - String val1 = st.nextToken(); - int intensity = Integer.parseInt(val1); - String val2 = st.nextToken(); - int duration = Integer.parseInt(val2); - Earthquake eq = new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration); + final String val1 = st.nextToken(); + final int intensity = Integer.parseInt(val1); + final String val2 = st.nextToken(); + final int duration = Integer.parseInt(val2); + final Earthquake eq = new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration); activeChar.broadcastPacket(eq); } catch (Exception e) @@ -178,9 +178,9 @@ public class AdminEffects implements IAdminCommandHandler { try { - String type = st.nextToken(); - String state = st.nextToken(); - int duration = Integer.parseInt(st.nextToken()); + final String type = st.nextToken(); + final String state = st.nextToken(); + final int duration = Integer.parseInt(st.nextToken()); adminAtmosphere(type, state, duration, activeChar); } catch (Exception ex) @@ -218,7 +218,7 @@ public class AdminEffects implements IAdminCommandHandler { try { - Collection plrs = activeChar.getKnownList().getKnownPlayers().values(); + final Collection plrs = activeChar.getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if (!player.isGM()) @@ -237,7 +237,7 @@ public class AdminEffects implements IAdminCommandHandler { try { - Collection plrs = activeChar.getKnownList().getKnownPlayers().values(); + final Collection plrs = activeChar.getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { player.stopAbnormalVisualEffect(AbnormalVisualEffect.PARALYZE); @@ -260,7 +260,7 @@ public class AdminEffects implements IAdminCommandHandler } try { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2Character player = null; if (target instanceof L2Character) { @@ -293,7 +293,7 @@ public class AdminEffects implements IAdminCommandHandler } try { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2Character player = null; if (target instanceof L2Character) { @@ -317,7 +317,7 @@ public class AdminEffects implements IAdminCommandHandler { try { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2Character player = null; if (target instanceof L2Character) { @@ -333,7 +333,7 @@ public class AdminEffects implements IAdminCommandHandler { try { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2Character player = null; if (target instanceof L2Character) { @@ -349,12 +349,12 @@ public class AdminEffects implements IAdminCommandHandler { try { - int val = Integer.parseInt(st.nextToken()); - boolean sendMessage = activeChar.isAffectedBySkill(7029); + final int val = Integer.parseInt(st.nextToken()); + final boolean sendMessage = activeChar.isAffectedBySkill(7029); activeChar.stopSkillEffects((val == 0) && sendMessage, 7029); if ((val >= 1) && (val <= 4)) { - Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val); + final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val); activeChar.doSimultaneousCast(gmSpeedSkill); } } @@ -372,12 +372,12 @@ public class AdminEffects implements IAdminCommandHandler { try { - String id = st.nextToken(); + final String id = st.nextToken(); activeChar.getPoly().setPolyInfo("npc", id); activeChar.teleToLocation(activeChar.getLocation()); - CharInfo info1 = new CharInfo(activeChar); + final CharInfo info1 = new CharInfo(activeChar); activeChar.broadcastPacket(info1); - UserInfo info2 = new UserInfo(activeChar); + final UserInfo info2 = new UserInfo(activeChar); activeChar.sendPacket(info2); } catch (Exception e) @@ -390,16 +390,16 @@ public class AdminEffects implements IAdminCommandHandler activeChar.getPoly().setPolyInfo(null, "1"); activeChar.decayMe(); activeChar.spawnMe(activeChar.getX(), activeChar.getY(), activeChar.getZ()); - CharInfo info1 = new CharInfo(activeChar); + final CharInfo info1 = new CharInfo(activeChar); activeChar.broadcastPacket(info1); - UserInfo info2 = new UserInfo(activeChar); + final UserInfo info2 = new UserInfo(activeChar); activeChar.sendPacket(info2); } else if (command.equals("admin_clearteams")) { try { - Collection plrs = activeChar.getKnownList().getKnownPlayers().values(); + final Collection plrs = activeChar.getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { player.setTeam(Team.NONE); @@ -414,14 +414,14 @@ public class AdminEffects implements IAdminCommandHandler { try { - String val = st.nextToken(); + final String val = st.nextToken(); int radius = 400; if (st.hasMoreTokens()) { radius = Integer.parseInt(st.nextToken()); } - Team team = Team.valueOf(val.toUpperCase()); - Collection plrs = activeChar.getKnownList().getKnownCharactersInRadius(radius); + final Team team = Team.valueOf(val.toUpperCase()); + final Collection plrs = activeChar.getKnownList().getKnownCharactersInRadius(radius); for (L2Character player : plrs) { @@ -437,7 +437,7 @@ public class AdminEffects implements IAdminCommandHandler { try { - Team team = Team.valueOf(st.nextToken().toUpperCase()); + final Team team = Team.valueOf(st.nextToken().toUpperCase()); L2Character target = null; if (activeChar.getTarget() instanceof L2Character) { @@ -462,11 +462,11 @@ public class AdminEffects implements IAdminCommandHandler L2Object obj = activeChar.getTarget(); if (st.countTokens() == 2) { - int social = Integer.parseInt(st.nextToken()); + final int social = Integer.parseInt(st.nextToken()); target = st.nextToken(); if (target != null) { - L2PcInstance player = L2World.getInstance().getPlayer(target); + final L2PcInstance player = L2World.getInstance().getPlayer(target); if (player != null) { if (performSocial(social, player, activeChar)) @@ -478,8 +478,8 @@ public class AdminEffects implements IAdminCommandHandler { try { - int radius = Integer.parseInt(target); - Collection objs = activeChar.getKnownList().getKnownObjects().values(); + final int radius = Integer.parseInt(target); + final Collection objs = activeChar.getKnownList().getKnownObjects().values(); for (L2Object object : objs) { if (activeChar.isInsideRadius(object, radius, false, false)) @@ -498,7 +498,7 @@ public class AdminEffects implements IAdminCommandHandler } else if (st.countTokens() == 1) { - int social = Integer.parseInt(st.nextToken()); + final int social = Integer.parseInt(st.nextToken()); if (obj == null) { obj = activeChar; @@ -600,7 +600,7 @@ public class AdminEffects implements IAdminCommandHandler { L2Object obj = activeChar.getTarget(); int level = 1, hittime = 1; - int skill = Integer.parseInt(st.nextToken()); + final int skill = Integer.parseInt(st.nextToken()); if (st.hasMoreTokens()) { level = Integer.parseInt(st.nextToken()); @@ -619,7 +619,7 @@ public class AdminEffects implements IAdminCommandHandler } else { - L2Character target = (L2Character) obj; + final L2Character target = (L2Character) obj; target.broadcastPacket(new MagicSkillUse(target, activeChar, skill, level, hittime, 0)); activeChar.sendMessage(obj.getName() + " performs MSU " + skill + "/" + level + " by your request."); } @@ -632,17 +632,17 @@ public class AdminEffects implements IAdminCommandHandler } else if (command.startsWith("admin_set_displayeffect")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (!(target instanceof L2Npc)) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; } - L2Npc npc = (L2Npc) target; + final L2Npc npc = (L2Npc) target; try { - String type = st.nextToken(); - int diplayeffect = Integer.parseInt(type); + final String type = st.nextToken(); + final int diplayeffect = Integer.parseInt(type); npc.setDisplayEffect(diplayeffect); } catch (Exception e) @@ -702,7 +702,7 @@ public class AdminEffects implements IAdminCommandHandler activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED); return false; } - L2Character character = (L2Character) target; + final L2Character character = (L2Character) target; character.broadcastPacket(new SocialAction(character.getObjectId(), action)); } else @@ -760,7 +760,7 @@ public class AdminEffects implements IAdminCommandHandler private void playAdminSound(L2PcInstance activeChar, String sound) { - PlaySound _snd = new PlaySound(1, sound, 0, 0, 0, 0, 0); + final PlaySound _snd = new PlaySound(1, sound, 0, 0, 0, 0, 0); activeChar.sendPacket(_snd); activeChar.broadcastPacket(_snd); activeChar.sendMessage("Playing " + sound + "."); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 1887afe953..bd4fbef3c4 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -82,10 +82,10 @@ public class AdminElement implements IAdminCommandHandler { try { - String[] args = command.split(" "); + final String[] args = command.split(" "); - byte element = Elementals.getElementId(args[1]); - int value = Integer.parseInt(args[2]); + final byte element = Elementals.getElementId(args[1]); + final int value = Integer.parseInt(args[2]); if ((element < -1) || (element > 5) || (value < 0) || (value > 450)) { activeChar.sendMessage("Usage: //setlh/setlc/setlg/setlb/setll/setlw/setls [0-450]"); @@ -132,7 +132,7 @@ public class AdminElement implements IAdminCommandHandler L2ItemInstance itemInstance = null; // only attempt to enchant if there is a weapon equipped - L2ItemInstance parmorInstance = player.getInventory().getPaperdollItem(armorType); + final L2ItemInstance parmorInstance = player.getInventory().getPaperdollItem(armorType); if ((parmorInstance != null) && (parmorInstance.getLocationSlot() == armorType)) { itemInstance = parmorInstance; @@ -141,7 +141,7 @@ public class AdminElement implements IAdminCommandHandler if (itemInstance != null) { String old, current; - Elementals element = itemInstance.getElemental(type); + final Elementals element = itemInstance.getElemental(type); if (element == null) { old = "None"; @@ -173,7 +173,7 @@ public class AdminElement implements IAdminCommandHandler } // send packets - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(itemInstance); player.sendPacket(iu); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 4c3ff50683..e2eaeab8f1 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -135,7 +135,7 @@ public class AdminEnchant implements IAdminCommandHandler { try { - int ench = Integer.parseInt(command.substring(12)); + final int ench = Integer.parseInt(command.substring(12)); // check value if ((ench < 0) || (ench > 127)) @@ -196,7 +196,7 @@ public class AdminEnchant implements IAdminCommandHandler L2ItemInstance itemInstance = null; // only attempt to enchant if there is a weapon equipped - L2ItemInstance parmorInstance = player.getInventory().getPaperdollItem(armorType); + final L2ItemInstance parmorInstance = player.getInventory().getPaperdollItem(armorType); if ((parmorInstance != null) && (parmorInstance.getLocationSlot() == armorType)) { itemInstance = parmorInstance; @@ -212,7 +212,7 @@ public class AdminEnchant implements IAdminCommandHandler player.getInventory().equipItem(itemInstance); // send packets - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(itemInstance); player.sendPacket(iu); player.broadcastPacket(new CharInfo(player)); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java index 6afdc0c4a3..4890ed4cdf 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java @@ -87,7 +87,7 @@ public class AdminEventEngine implements IAdminCommandHandler public boolean useAdminCommand(String command, L2PcInstance activeChar) { StringTokenizer st = new StringTokenizer(command); - String actualCommand = st.nextToken(); + final String actualCommand = st.nextToken(); try { if (actualCommand.equals("admin_event")) @@ -116,7 +116,7 @@ public class AdminEventEngine implements IAdminCommandHandler else if (actualCommand.startsWith("admin_event_see")) { // There is an exception here for not using the ST. We use spaces (ST delim) for the event name. - String eventName = command.substring(16); + final String eventName = command.substring(16); try { final NpcHtmlMessage adminReply = new NpcHtmlMessage(); @@ -145,8 +145,8 @@ public class AdminEventEngine implements IAdminCommandHandler else if (actualCommand.startsWith("admin_event_del")) { // There is an exception here for not using the ST. We use spaces (ST delim) for the event name. - String eventName = command.substring(16); - File file = new File(Config.DATAPACK_ROOT + "events/" + eventName); + final String eventName = command.substring(16); + final File file = new File(Config.DATAPACK_ROOT + "events/" + eventName); file.delete(); showMainPage(activeChar); } @@ -222,7 +222,7 @@ public class AdminEventEngine implements IAdminCommandHandler activeChar.sendMessage(L2Event.startEventParticipation()); Broadcast.toAllOnlinePlayers(activeChar.getName() + " has started an event. You will find a participation NPC somewhere around you."); - PlaySound _snd = new PlaySound(1, "B03_F", 0, 0, 0, 0, 0); + final PlaySound _snd = new PlaySound(1, "B03_F", 0, 0, 0, 0, 0); activeChar.sendPacket(_snd); activeChar.broadcastPacket(_snd); @@ -247,7 +247,7 @@ public class AdminEventEngine implements IAdminCommandHandler { while (st.hasMoreElements()) // Every next ST should be a team number { - int teamId = Integer.parseInt(st.nextToken()); + final int teamId = Integer.parseInt(st.nextToken()); for (L2PcInstance player : L2Event._teams.get(teamId)) { @@ -314,8 +314,8 @@ public class AdminEventEngine implements IAdminCommandHandler } else if (actualCommand.startsWith("admin_event_control_poly")) { - int teamId = Integer.parseInt(st.nextToken()); - String[] polyIds = new String[st.countTokens()]; + final int teamId = Integer.parseInt(st.nextToken()); + final String[] polyIds = new String[st.countTokens()]; int i = 0; while (st.hasMoreElements()) // Every next ST should be a polymorph ID { @@ -326,9 +326,9 @@ public class AdminEventEngine implements IAdminCommandHandler { player.getPoly().setPolyInfo("npc", polyIds[Rnd.get(polyIds.length)]); player.teleToLocation(player.getLocation(), true); - CharInfo info1 = new CharInfo(player); + final CharInfo info1 = new CharInfo(player); player.broadcastPacket(info1); - UserInfo info2 = new UserInfo(player); + final UserInfo info2 = new UserInfo(player); player.sendPacket(info2); } showEventControl(activeChar); @@ -342,9 +342,9 @@ public class AdminEventEngine implements IAdminCommandHandler player.getPoly().setPolyInfo(null, "1"); player.decayMe(); player.spawnMe(player.getX(), player.getY(), player.getZ()); - CharInfo info1 = new CharInfo(player); + final CharInfo info1 = new CharInfo(player); player.broadcastPacket(info1); - UserInfo info2 = new UserInfo(player); + final UserInfo info2 = new UserInfo(player); player.sendPacket(info2); } } @@ -352,8 +352,8 @@ public class AdminEventEngine implements IAdminCommandHandler } else if (actualCommand.startsWith("admin_event_control_transform")) { - int teamId = Integer.parseInt(st.nextToken()); - int[] transIds = new int[st.countTokens()]; + final int teamId = Integer.parseInt(st.nextToken()); + final int[] transIds = new int[st.countTokens()]; int i = 0; while (st.hasMoreElements()) // Every next ST should be a transform ID { @@ -362,7 +362,7 @@ public class AdminEventEngine implements IAdminCommandHandler for (L2PcInstance player : L2Event._teams.get(teamId)) { - int transId = transIds[Rnd.get(transIds.length)]; + final int transId = transIds[Rnd.get(transIds.length)]; if (!TransformData.getInstance().transformPlayer(transId, player)) { AdminData.getInstance().broadcastMessageToGMs("EventEngine: Unknow transformation id: " + transId); @@ -387,7 +387,7 @@ public class AdminEventEngine implements IAdminCommandHandler { while (st.hasMoreElements()) { - L2PcInstance player = L2World.getInstance().getPlayer(st.nextToken()); + final L2PcInstance player = L2World.getInstance().getPlayer(st.nextToken()); if (player != null) { L2Event.removeAndResetPlayer(player); @@ -405,15 +405,15 @@ public class AdminEventEngine implements IAdminCommandHandler } else if (actualCommand.startsWith("admin_event_control_prize")) { - int[] teamIds = new int[st.countTokens() - 2]; + final int[] teamIds = new int[st.countTokens() - 2]; int i = 0; while ((st.countTokens() - 2) > 0) // The last 2 tokens are used for "n" and "item id" { teamIds[i++] = Integer.parseInt(st.nextToken()); } - String[] n = st.nextToken().split("\\*"); - int itemId = Integer.parseInt(st.nextToken()); + final String[] n = st.nextToken().split("\\*"); + final int itemId = Integer.parseInt(st.nextToken()); for (int teamId : teamIds) { @@ -525,7 +525,7 @@ public class AdminEventEngine implements IAdminCommandHandler public void showEventParameters(L2PcInstance activeChar, int teamnumbers) { final NpcHtmlMessage adminReply = new NpcHtmlMessage(); - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append("[ L2J EVENT ENGINE ]
Current event: "); sb.append(L2Event._eventName); @@ -563,7 +563,7 @@ public class AdminEventEngine implements IAdminCommandHandler { final NpcHtmlMessage adminReply = new NpcHtmlMessage(); - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append("[ L2J EVENT ENGINE ]
Current event: "); sb.append(L2Event._eventName); sb.append("

Page "); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java index 23234b3418..7330e7def6 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java @@ -90,7 +90,7 @@ public final class AdminCHSiege implements IAdminCommandHandler } else { - L2Clan owner = ClanTable.getInstance().getClan(hall.getOwnerId()); + final L2Clan owner = ClanTable.getInstance().getClan(hall.getOwnerId()); if (owner != null) { hall.free(); @@ -123,26 +123,26 @@ public final class AdminCHSiege implements IAdminCommandHandler } else { - String[] rawDate = split[2].split(";"); + final String[] rawDate = split[2].split(";"); if (rawDate.length < 2) { activeChar.sendMessage("You have to specify this format DD-MM-YYYY;HH:MM"); } else { - String[] day = rawDate[0].split("-"); - String[] hour = rawDate[1].split(":"); + final String[] day = rawDate[0].split("-"); + final String[] hour = rawDate[1].split(":"); if ((day.length < 3) || (hour.length < 2)) { activeChar.sendMessage("Incomplete day, hour or both!"); } else { - int d = parseInt(day[0]); - int month = parseInt(day[1]) - 1; - int year = parseInt(day[2]); - int h = parseInt(hour[0]); - int min = parseInt(hour[1]); + final int d = parseInt(day[0]); + final int month = parseInt(day[1]) - 1; + final int year = parseInt(day[2]); + final int h = parseInt(hour[0]); + final int min = parseInt(hour[1]); if (((month == 2) && (d > 28)) || (d > 31) || (d <= 0) || (month <= 0) || (month > 12) || (year < Calendar.getInstance().get(Calendar.YEAR))) { activeChar.sendMessage("Wrong day/month/year gave!"); @@ -153,7 +153,7 @@ public final class AdminCHSiege implements IAdminCommandHandler } else { - Calendar c = Calendar.getInstance(); + final Calendar c = Calendar.getInstance(); c.set(Calendar.YEAR, year); c.set(Calendar.MONTH, month); c.set(Calendar.DAY_OF_MONTH, d); @@ -189,7 +189,7 @@ public final class AdminCHSiege implements IAdminCommandHandler L2Clan attacker = null; if (split.length < 3) { - L2Object rawTarget = activeChar.getTarget(); + final L2Object rawTarget = activeChar.getTarget(); L2PcInstance target = null; if (rawTarget == null) { @@ -214,7 +214,7 @@ public final class AdminCHSiege implements IAdminCommandHandler } else { - L2Clan rawClan = ClanTable.getInstance().getClanByName(split[2]); + final L2Clan rawClan = ClanTable.getInstance().getClanByName(split[2]); if (rawClan == null) { activeChar.sendMessage("The given clan does not exist!"); @@ -244,7 +244,7 @@ public final class AdminCHSiege implements IAdminCommandHandler if (split.length < 3) { - L2Object rawTarget = activeChar.getTarget(); + final L2Object rawTarget = activeChar.getTarget(); L2PcInstance target = null; if (rawTarget == null) { @@ -269,7 +269,7 @@ public final class AdminCHSiege implements IAdminCommandHandler } else { - L2Clan rawClan = ClanTable.getInstance().getClanByName(split[2]); + final L2Clan rawClan = ClanTable.getInstance().getClanByName(split[2]); if (rawClan == null) { activeChar.sendMessage("The given clan does not exist!"); @@ -301,7 +301,7 @@ public final class AdminCHSiege implements IAdminCommandHandler } else if (split[0].equals(COMMANDS[8])) { - ClanHallSiegeEngine siegable = hall.getSiege(); + final ClanHallSiegeEngine siegable = hall.getSiege(); siegable.cancelSiegeTask(); switch (hall.getSiegeStatus()) { @@ -323,14 +323,14 @@ public final class AdminCHSiege implements IAdminCommandHandler private SiegableHall getHall(String id, L2PcInstance gm) { - int ch = parseInt(id); + final int ch = parseInt(id); if (ch == 0) { gm.sendMessage("Wrong clan hall id, unparseable id!"); return null; } - SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(ch); + final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(ch); if (hall == null) { @@ -362,7 +362,7 @@ public final class AdminCHSiege implements IAdminCommandHandler msg.replace("%clanhallName%", hall.getName()); if (hall.getOwnerId() > 0) { - L2Clan owner = ClanTable.getInstance().getClan(hall.getOwnerId()); + final L2Clan owner = ClanTable.getInstance().getClan(hall.getOwnerId()); if (owner != null) { msg.replace("%clanhallOwner%", owner.getName()); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index 6b8b46da64..7ab44b4401 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -44,12 +44,12 @@ public final class AdminChangeAccessLevel implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - String[] parts = command.split(" "); + final String[] parts = command.split(" "); if (parts.length == 2) { try { - int lvl = Integer.parseInt(parts[1]); + final int lvl = Integer.parseInt(parts[1]); if (activeChar.getTarget() instanceof L2PcInstance) { onlineChange(activeChar, (L2PcInstance) activeChar.getTarget(), lvl); @@ -66,9 +66,9 @@ public final class AdminChangeAccessLevel implements IAdminCommandHandler } else if (parts.length == 3) { - String name = parts[1]; - int lvl = Integer.parseInt(parts[2]); - L2PcInstance player = L2World.getInstance().getPlayer(name); + final String name = parts[1]; + final int lvl = Integer.parseInt(parts[2]); + final L2PcInstance player = L2World.getInstance().getPlayer(name); if (player != null) { onlineChange(activeChar, player, lvl); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java index ca3c2f24ad..3ea0bca0c4 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java @@ -119,7 +119,7 @@ public class AdminClan implements IAdminCommandHandler { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/clanchanges.htm")); - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); for (L2Clan clan : ClanTable.getInstance().getClans()) { if (clan.getNewLeaderId() != 0) @@ -139,12 +139,12 @@ public class AdminClan implements IAdminCommandHandler { if (st.hasMoreElements()) { - String token = st.nextToken(); + final String token = st.nextToken(); if (!Util.isDigit(token)) { break; } - int clanId = Integer.parseInt(token); + final int clanId = Integer.parseInt(token); final L2Clan clan = ClanTable.getInstance().getClan(clanId); if (clan == null) @@ -201,7 +201,7 @@ public class AdminClan implements IAdminCommandHandler } else { - L2Object targetObj = activeChar.getTarget(); + final L2Object targetObj = activeChar.getTarget(); if (targetObj instanceof L2PcInstance) { player = targetObj.getActingPlayer(); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java index 91bd88bd4a..9fc68a85aa 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java @@ -66,7 +66,7 @@ public class AdminClanHall implements IAdminCommandHandler player = activeChar.getTarget().getActingPlayer(); } - String val = st.nextToken(); + final String val = st.nextToken(); if (command.startsWith("admin_clanhall")) { if (Util.isDigit(val)) diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 8114d1e362..a2ff012c74 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -53,20 +53,20 @@ public class AdminCreateItem implements IAdminCommandHandler { try { - String val = command.substring(17); - StringTokenizer st = new StringTokenizer(val); + final String val = command.substring(17); + final StringTokenizer st = new StringTokenizer(val); if (st.countTokens() == 2) { - String id = st.nextToken(); - int idval = Integer.parseInt(id); - String num = st.nextToken(); - long numval = Long.parseLong(num); + final String id = st.nextToken(); + final int idval = Integer.parseInt(id); + final String num = st.nextToken(); + final long numval = Long.parseLong(num); createItem(activeChar, activeChar, idval, numval); } else if (st.countTokens() == 1) { - String id = st.nextToken(); - int idval = Integer.parseInt(id); + final String id = st.nextToken(); + final int idval = Integer.parseInt(id); createItem(activeChar, activeChar, idval, 1); } } @@ -84,23 +84,23 @@ public class AdminCreateItem implements IAdminCommandHandler { try { - String val = command.substring(17); - StringTokenizer st = new StringTokenizer(val); + final String val = command.substring(17); + final StringTokenizer st = new StringTokenizer(val); if (st.countTokens() == 2) { - String name = st.nextToken(); - int idval = getCoinId(name); + final String name = st.nextToken(); + final int idval = getCoinId(name); if (idval > 0) { - String num = st.nextToken(); - long numval = Long.parseLong(num); + final String num = st.nextToken(); + final long numval = Long.parseLong(num); createItem(activeChar, activeChar, idval, numval); } } else if (st.countTokens() == 1) { - String name = st.nextToken(); - int idval = getCoinId(name); + final String name = st.nextToken(); + final int idval = getCoinId(name); createItem(activeChar, activeChar, idval, 1); } } @@ -129,20 +129,20 @@ public class AdminCreateItem implements IAdminCommandHandler return false; } - String val = command.substring(22); - StringTokenizer st = new StringTokenizer(val); + final String val = command.substring(22); + final StringTokenizer st = new StringTokenizer(val); if (st.countTokens() == 2) { - String id = st.nextToken(); - int idval = Integer.parseInt(id); - String num = st.nextToken(); - long numval = Long.parseLong(num); + final String id = st.nextToken(); + final int idval = Integer.parseInt(id); + final String num = st.nextToken(); + final long numval = Long.parseLong(num); createItem(activeChar, target, idval, numval); } else if (st.countTokens() == 1) { - String id = st.nextToken(); - int idval = Integer.parseInt(id); + final String id = st.nextToken(); + final int idval = Integer.parseInt(id); createItem(activeChar, target, idval, 1); } } @@ -158,25 +158,25 @@ public class AdminCreateItem implements IAdminCommandHandler } else if (command.startsWith("admin_give_item_to_all")) { - String val = command.substring(22); - StringTokenizer st = new StringTokenizer(val); + final String val = command.substring(22); + final StringTokenizer st = new StringTokenizer(val); int idval = 0; long numval = 0; if (st.countTokens() == 2) { - String id = st.nextToken(); + final String id = st.nextToken(); idval = Integer.parseInt(id); - String num = st.nextToken(); + final String num = st.nextToken(); numval = Long.parseLong(num); } else if (st.countTokens() == 1) { - String id = st.nextToken(); + final String id = st.nextToken(); idval = Integer.parseInt(id); numval = 1; } int counter = 0; - L2Item template = ItemTable.getInstance().getTemplate(idval); + final L2Item template = ItemTable.getInstance().getTemplate(idval); if (template == null) { activeChar.sendMessage("This item doesn't exist."); @@ -209,7 +209,7 @@ public class AdminCreateItem implements IAdminCommandHandler private void createItem(L2PcInstance activeChar, L2PcInstance target, int id, long num) { - L2Item template = ItemTable.getInstance().getTemplate(id); + final L2Item template = ItemTable.getInstance().getTemplate(id); if (template == null) { activeChar.sendMessage("This item doesn't exist."); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index eb957c37d5..fcb138e158 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -53,10 +53,10 @@ public class AdminCursedWeapons implements IAdminCommandHandler public boolean useAdminCommand(String command, L2PcInstance activeChar) { - CursedWeaponsManager cwm = CursedWeaponsManager.getInstance(); + final CursedWeaponsManager cwm = CursedWeaponsManager.getInstance(); int id = 0; - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); st.nextToken(); if (command.startsWith("admin_cw_info")) @@ -69,7 +69,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler activeChar.sendMessage("> " + cw.getName() + " (" + cw.getItemId() + ")"); if (cw.isActivated()) { - L2PcInstance pl = cw.getPlayer(); + final L2PcInstance pl = cw.getPlayer(); activeChar.sendMessage(" Player holding: " + (pl == null ? "null" : pl.getName())); activeChar.sendMessage(" Player karma: " + cw.getPlayerKarma()); activeChar.sendMessage(" Time Remaining: " + (cw.getTimeLeft() / 60000) + " min."); @@ -102,7 +102,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler if (cw.isActivated()) { - L2PcInstance pl = cw.getPlayer(); + final L2PcInstance pl = cw.getPlayer(); StringUtil.append(replyMSG, "
Weilder:", (pl == null ? "null" : pl.getName()), "
Karma:", String.valueOf(cw.getPlayerKarma()), "
Kills:", String.valueOf(cw.getPlayerPkKills()), "/", String.valueOf(cw.getNbKills()), "
Time remaining:", String.valueOf(cw.getTimeLeft() / 60000), " min.
Page " + (i + 1) + "
" + player.getName() + "" + ClassListData.getInstance().getClass(player.getClassId()).getClientCode() + "" + player.getLevel() + "
"); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java index c9c9c4c4f2..0e399c9cc4 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java @@ -56,7 +56,7 @@ public class AdminEvents implements IAdminCommandHandler String event_name = ""; String _event_bypass = ""; - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); if (st.hasMoreTokens()) { @@ -78,7 +78,7 @@ public class AdminEvents implements IAdminCommandHandler { if (event_name != null) { - Event event = (Event) QuestManager.getInstance().getQuest(event_name); + final Event event = (Event) QuestManager.getInstance().getQuest(event_name); if (event != null) { if (event.eventStart(activeChar)) @@ -105,7 +105,7 @@ public class AdminEvents implements IAdminCommandHandler { if (event_name != null) { - Event event = (Event) QuestManager.getInstance().getQuest(event_name); + final Event event = (Event) QuestManager.getInstance().getQuest(event_name); if (event != null) { if (event.eventStop()) @@ -132,7 +132,7 @@ public class AdminEvents implements IAdminCommandHandler { if (event_name != null) { - Event event = (Event) QuestManager.getInstance().getQuest(event_name); + final Event event = (Event) QuestManager.getInstance().getQuest(event_name); if (event != null) { event.eventBypass(activeChar, _event_bypass); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java index 50be807870..05c6ad073b 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java @@ -52,7 +52,7 @@ public class AdminExpSp implements IAdminCommandHandler { try { - String val = command.substring(16); + final String val = command.substring(16); if (!adminAddExpSp(activeChar, val)) { activeChar.sendMessage("Usage: //add_exp_sp exp sp"); @@ -67,7 +67,7 @@ public class AdminExpSp implements IAdminCommandHandler { try { - String val = command.substring(19); + final String val = command.substring(19); if (!adminRemoveExpSP(activeChar, val)) { activeChar.sendMessage("Usage: //remove_exp_sp exp sp"); @@ -90,7 +90,7 @@ public class AdminExpSp implements IAdminCommandHandler private void addExpSp(L2PcInstance activeChar) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -113,7 +113,7 @@ public class AdminExpSp implements IAdminCommandHandler private boolean adminAddExpSp(L2PcInstance activeChar, String ExpSp) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -124,14 +124,14 @@ public class AdminExpSp implements IAdminCommandHandler activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; } - StringTokenizer st = new StringTokenizer(ExpSp); + final StringTokenizer st = new StringTokenizer(ExpSp); if (st.countTokens() != 2) { return false; } - String exp = st.nextToken(); - String sp = st.nextToken(); + final String exp = st.nextToken(); + final String sp = st.nextToken(); long expval = 0; long spval = 0; try @@ -160,7 +160,7 @@ public class AdminExpSp implements IAdminCommandHandler private boolean adminRemoveExpSP(L2PcInstance activeChar, String ExpSp) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -171,14 +171,14 @@ public class AdminExpSp implements IAdminCommandHandler activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; } - StringTokenizer st = new StringTokenizer(ExpSp); + final StringTokenizer st = new StringTokenizer(ExpSp); if (st.countTokens() != 2) { return false; } - String exp = st.nextToken(); - String sp = st.nextToken(); + final String exp = st.nextToken(); + final String sp = st.nextToken(); long expval = 0; int spval = 0; try diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java index 039a4c3a3c..adf14aa2be 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java @@ -78,14 +78,14 @@ public class AdminFightCalculator implements IAdminCommandHandler private void handleStart(String params, L2PcInstance activeChar) { - StringTokenizer st = new StringTokenizer(params); + final StringTokenizer st = new StringTokenizer(params); int lvl1 = 0; int lvl2 = 0; int mid1 = 0; int mid2 = 0; while (st.hasMoreTokens()) { - String s = st.nextToken(); + final String s = st.nextToken(); if (s.equals("lvl1")) { lvl1 = Integer.parseInt(st.nextToken()); @@ -182,7 +182,7 @@ public class AdminFightCalculator implements IAdminCommandHandler { int mid1 = 0; int mid2 = 0; - StringTokenizer st = new StringTokenizer(params); + final StringTokenizer st = new StringTokenizer(params); mid1 = Integer.parseInt(st.nextToken()); mid2 = Integer.parseInt(st.nextToken()); @@ -212,17 +212,17 @@ public class AdminFightCalculator implements IAdminCommandHandler for (int i = 0; i < 10000; i++) { - boolean _miss1 = Formulas.calcHitMiss(npc1, npc2); + final boolean _miss1 = Formulas.calcHitMiss(npc1, npc2); if (_miss1) { miss1++; } - byte _shld1 = Formulas.calcShldUse(npc1, npc2, null, false); + final byte _shld1 = Formulas.calcShldUse(npc1, npc2, null, false); if (_shld1 > 0) { shld1++; } - boolean _crit1 = Formulas.calcCrit(npc1, npc2); + final boolean _crit1 = Formulas.calcCrit(npc1, npc2); if (_crit1) { crit1++; @@ -232,12 +232,12 @@ public class AdminFightCalculator implements IAdminCommandHandler _patk1 += npc1.getRandomDamageMultiplier(); patk1 += _patk1; - double _pdef1 = npc1.getPDef(npc2); + final double _pdef1 = npc1.getPDef(npc2); pdef1 += _pdef1; if (!_miss1) { - double _dmg1 = Formulas.calcPhysDam(npc1, npc2, null, _shld1, _crit1, false); + final double _dmg1 = Formulas.calcPhysDam(npc1, npc2, null, _shld1, _crit1, false); dmg1 += _dmg1; npc1.abortAttack(); } @@ -245,17 +245,17 @@ public class AdminFightCalculator implements IAdminCommandHandler for (int i = 0; i < 10000; i++) { - boolean _miss2 = Formulas.calcHitMiss(npc2, npc1); + final boolean _miss2 = Formulas.calcHitMiss(npc2, npc1); if (_miss2) { miss2++; } - byte _shld2 = Formulas.calcShldUse(npc2, npc1, null, false); + final byte _shld2 = Formulas.calcShldUse(npc2, npc1, null, false); if (_shld2 > 0) { shld2++; } - boolean _crit2 = Formulas.calcCrit(npc2, npc1); + final boolean _crit2 = Formulas.calcCrit(npc2, npc1); if (_crit2) { crit2++; @@ -265,12 +265,12 @@ public class AdminFightCalculator implements IAdminCommandHandler _patk2 *= npc2.getRandomDamageMultiplier(); patk2 += _patk2; - double _pdef2 = npc2.getPDef(npc1); + final double _pdef2 = npc2.getPDef(npc1); pdef2 += _pdef2; if (!_miss2) { - double _dmg2 = Formulas.calcPhysDam(npc2, npc1, null, _shld2, _crit2, false); + final double _dmg2 = Formulas.calcPhysDam(npc2, npc1, null, _shld2, _crit2, false); dmg2 += _dmg2; npc2.abortAttack(); } @@ -290,14 +290,14 @@ public class AdminFightCalculator implements IAdminCommandHandler dmg2 /= 10000; // total damage per 100 seconds - int tdmg1 = (int) (sAtk1 * dmg1); - int tdmg2 = (int) (sAtk2 * dmg2); + final int tdmg1 = (int) (sAtk1 * dmg1); + final int tdmg2 = (int) (sAtk2 * dmg2); // HP restored per 100 seconds - double maxHp1 = npc1.getMaxHp(); - int hp1 = (int) ((Formulas.calcHpRegen(npc1) * 100000) / Formulas.getRegeneratePeriod(npc1)); + final double maxHp1 = npc1.getMaxHp(); + final int hp1 = (int) ((Formulas.calcHpRegen(npc1) * 100000) / Formulas.getRegeneratePeriod(npc1)); - double maxHp2 = npc2.getMaxHp(); - int hp2 = (int) ((Formulas.calcHpRegen(npc2) * 100000) / Formulas.getRegeneratePeriod(npc2)); + final double maxHp2 = npc2.getMaxHp(); + final int hp2 = (int) ((Formulas.calcHpRegen(npc2) * 100000) / Formulas.getRegeneratePeriod(npc2)); final NpcHtmlMessage adminReply = new NpcHtmlMessage(); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java index 186c2adc14..6873dd992b 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java @@ -55,7 +55,7 @@ public class AdminFortSiege implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); command = st.nextToken(); // Get actual command // Get fort @@ -74,7 +74,7 @@ public class AdminFortSiege implements IAdminCommandHandler } else { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -126,7 +126,7 @@ public class AdminFortSiege implements IAdminCommandHandler } else if (command.equalsIgnoreCase("admin_removefort")) { - L2Clan clan = fort.getOwnerClan(); + final L2Clan clan = fort.getOwnerClan(); if (clan != null) { fort.removeOwner(true); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index dbea70165d..b837cce80c 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -85,7 +85,7 @@ public class AdminGmChat implements IAdminCommandHandler activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return; } - L2PcInstance player = (L2PcInstance) target; + final L2PcInstance player = (L2PcInstance) target; player.addSnooper(activeChar); activeChar.addSnooped(player); } @@ -115,7 +115,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index f6d841ee23..34ba268d99 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -38,8 +38,8 @@ public class AdminGraciaSeeds implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - StringTokenizer st = new StringTokenizer(command, " "); - String actualCommand = st.nextToken(); // Get actual command + final StringTokenizer st = new StringTokenizer(command, " "); + final String actualCommand = st.nextToken(); // Get actual command String val = ""; if (st.countTokens() >= 1) @@ -68,7 +68,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler html.replace("%sodtiatkill%", String.valueOf(GraciaSeedsManager.getInstance().getSoDTiatKilled())); if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { - Calendar nextChangeDate = Calendar.getInstance(); + final Calendar nextChangeDate = Calendar.getInstance(); nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 2428073b73..a4ed1bfd0b 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -75,7 +75,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } else { - NpcHtmlMessage html = new NpcHtmlMessage(0, 1); + final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/grandboss.htm")); activeChar.sendPacket(html); } @@ -303,7 +303,7 @@ public class AdminGrandBoss implements IAdminCommandHandler final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); - NpcHtmlMessage html = new NpcHtmlMessage(0, 1); + final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), htmlPatch)); html.replace("%bossStatus%", text); html.replace("%bossColor%", textColor); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index 2f4056a8c1..81a8d6fd91 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -52,7 +52,7 @@ public class AdminHeal implements IAdminCommandHandler { try { - String healTarget = command.substring(11); + final String healTarget = command.substring(11); handleHeal(activeChar, healTarget); } catch (StringIndexOutOfBoundsException e) @@ -84,7 +84,7 @@ public class AdminHeal implements IAdminCommandHandler L2Object obj = activeChar.getTarget(); if (player != null) { - L2PcInstance plyr = L2World.getInstance().getPlayer(player); + final L2PcInstance plyr = L2World.getInstance().getPlayer(player); if (plyr != null) { @@ -94,13 +94,13 @@ public class AdminHeal implements IAdminCommandHandler { try { - int radius = Integer.parseInt(player); - Collection objs = activeChar.getKnownList().getKnownObjects().values(); + final int radius = Integer.parseInt(player); + final Collection objs = activeChar.getKnownList().getKnownObjects().values(); for (L2Object object : objs) { if (object instanceof L2Character) { - L2Character character = (L2Character) object; + final L2Character character = (L2Character) object; character.setCurrentHpMp(character.getMaxHp(), character.getMaxMp()); if (object instanceof L2PcInstance) { @@ -123,7 +123,7 @@ public class AdminHeal implements IAdminCommandHandler } if (obj instanceof L2Character) { - L2Character target = (L2Character) obj; + final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); if (target instanceof L2PcInstance) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java index d98ffd1028..2384025ea3 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java @@ -98,7 +98,7 @@ public class AdminHtml implements IAdminCommandHandler } else { - File file = new File(Config.DATAPACK_ROOT, path); + final File file = new File(Config.DATAPACK_ROOT, path); content = HtmCache.getInstance().loadFile(file); } final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java index a3e81995f6..ecfc7f6b38 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java @@ -45,13 +45,13 @@ public class AdminInstance implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); st.nextToken(); // create new instance if (command.startsWith("admin_createinstance")) { - String[] parts = command.split(" "); + final String[] parts = command.split(" "); if (parts.length != 3) { activeChar.sendMessage("Example: //createinstance - ids => 300000 are reserved for dynamic instances"); @@ -89,14 +89,14 @@ public class AdminInstance implements IAdminCommandHandler { try { - int val = Integer.parseInt(st.nextToken()); + final int val = Integer.parseInt(st.nextToken()); if (InstanceManager.getInstance().getInstance(val) == null) { activeChar.sendMessage("Instance " + val + " doesnt exist."); return false; } - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if ((target == null) || (target instanceof L2Summon)) // Don't separate summons from masters { activeChar.sendMessage("Incorrect target."); @@ -105,7 +105,7 @@ public class AdminInstance implements IAdminCommandHandler target.setInstanceId(val); if (target instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) target; + final L2PcInstance player = (L2PcInstance) target; player.sendMessage("Admin set your instance to:" + val); player.teleToLocation(player.getLocation()); } @@ -121,7 +121,7 @@ public class AdminInstance implements IAdminCommandHandler { try { - int val = Integer.parseInt(st.nextToken()); + final int val = Integer.parseInt(st.nextToken()); InstanceManager.getInstance().destroyInstance(val); activeChar.sendMessage("Instance destroyed"); } diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index dc329bfe6a..3da73e18db 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -40,14 +40,14 @@ public class AdminInstanceZone implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target"; + final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target"; GMAudit.auditGMAction(activeChar.getName(), command, target, ""); if (command.startsWith("admin_instancezone_clear")) { try { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); final L2PcInstance player = L2World.getInstance().getPlayer(st.nextToken()); @@ -68,13 +68,13 @@ public class AdminInstanceZone implements IAdminCommandHandler } else if (command.startsWith("admin_instancezone")) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); command = st.nextToken(); if (st.hasMoreTokens()) { L2PcInstance player = null; - String playername = st.nextToken(); + final String playername = st.nextToken(); try { @@ -118,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler private void display(L2PcInstance player, L2PcInstance activeChar) { - Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player.getObjectId()); + final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player.getObjectId()); final StringBuilder html = StringUtil.startAppend(500 + (instanceTimes.size() * 200), "
Type the team ID(s) that will be affected by the commands. Commands with '*' work with only 1 team ID in the field, while '!' - none.
" + "" + "" + "" + "
Character Instances

Instances for ", player.getName(), "

" + "" + ""); @@ -126,7 +126,7 @@ public class AdminInstanceZone implements IAdminCommandHandler { int hours = 0; int minutes = 0; - long remainingTime = (instanceTimes.get(id) - System.currentTimeMillis()) / 1000; + final long remainingTime = (instanceTimes.get(id) - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index 5e73469893..a58f3d7466 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -49,7 +49,7 @@ public class AdminInvul implements IAdminCommandHandler } if (command.equals("admin_setinvul")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (target instanceof L2PcInstance) { handleInvul((L2PcInstance) target); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java index 7d2696dba6..1ada57db5f 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminKick.java @@ -37,12 +37,12 @@ public class AdminKick implements IAdminCommandHandler { if (command.startsWith("admin_kick")) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); if (st.countTokens() > 1) { st.nextToken(); - String player = st.nextToken(); - L2PcInstance plyr = L2World.getInstance().getPlayer(player); + final String player = st.nextToken(); + final L2PcInstance plyr = L2World.getInstance().getPlayer(player); if (plyr != null) { plyr.logout(); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 19ee05a37f..4aa8c15d1c 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -49,20 +49,20 @@ public class AdminKill implements IAdminCommandHandler { if (command.startsWith("admin_kill")) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); // skip command if (st.hasMoreTokens()) { - String firstParam = st.nextToken(); - L2PcInstance plyr = L2World.getInstance().getPlayer(firstParam); + final String firstParam = st.nextToken(); + final L2PcInstance plyr = L2World.getInstance().getPlayer(firstParam); if (plyr != null) { if (st.hasMoreTokens()) { try { - int radius = Integer.parseInt(st.nextToken()); + final int radius = Integer.parseInt(st.nextToken()); for (L2Character knownChar : plyr.getKnownList().getKnownCharactersInRadius(radius)) { if ((knownChar instanceof L2ControllableMobInstance) || (knownChar == activeChar)) @@ -88,7 +88,7 @@ public class AdminKill implements IAdminCommandHandler { try { - int radius = Integer.parseInt(firstParam); + final int radius = Integer.parseInt(firstParam); for (L2Character knownChar : activeChar.getKnownList().getKnownCharactersInRadius(radius)) { @@ -111,7 +111,7 @@ public class AdminKill implements IAdminCommandHandler } else { - L2Object obj = activeChar.getTarget(); + final L2Object obj = activeChar.getTarget(); if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index a9491dfa59..1d14a3607f 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -38,9 +38,9 @@ public class AdminLevel implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - L2Object targetChar = activeChar.getTarget(); - StringTokenizer st = new StringTokenizer(command, " "); - String actualCommand = st.nextToken(); // Get actual command + final L2Object targetChar = activeChar.getTarget(); + final StringTokenizer st = new StringTokenizer(command, " "); + final String actualCommand = st.nextToken(); // Get actual command String val = ""; if (st.countTokens() >= 1) @@ -72,9 +72,9 @@ public class AdminLevel implements IAdminCommandHandler activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); // incorrect target! return false; } - L2PcInstance targetPlayer = (L2PcInstance) targetChar; + final L2PcInstance targetPlayer = (L2PcInstance) targetChar; - byte lvl = Byte.parseByte(val); + final byte lvl = Byte.parseByte(val); if ((lvl >= 1) && (lvl <= maxLevel)) { targetPlayer.setExp(ExperienceData.getInstance().getExpForLevel(lvl)); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java index ddf1c33b21..4705faa0b9 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java @@ -60,11 +60,11 @@ public class AdminLogin implements IAdminCommandHandler } else if (command.startsWith("admin_server_max_player")) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); if (st.countTokens() > 1) { st.nextToken(); - String number = st.nextToken(); + final String number = st.nextToken(); try { LoginServerThread.getInstance().setMaxPlayer(Integer.parseInt(number)); @@ -83,12 +83,12 @@ public class AdminLogin implements IAdminCommandHandler } else if (command.startsWith("admin_server_list_type")) { - StringTokenizer st = new StringTokenizer(command); - int tokens = st.countTokens(); + final StringTokenizer st = new StringTokenizer(command); + final int tokens = st.countTokens(); if (tokens > 1) { st.nextToken(); - String[] modes = new String[tokens - 1]; + final String[] modes = new String[tokens - 1]; for (int i = 0; i < (tokens - 1); i++) { @@ -123,11 +123,11 @@ public class AdminLogin implements IAdminCommandHandler } else if (command.startsWith("admin_server_list_age")) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); if (st.countTokens() > 1) { st.nextToken(); - String mode = st.nextToken(); + final String mode = st.nextToken(); int age = 0; try { @@ -182,7 +182,7 @@ public class AdminLogin implements IAdminCommandHandler String nameType = ""; for (int i = 0; i < 7; i++) { - int currentType = serverType & (int) Math.pow(2, i); + final int currentType = serverType & (int) Math.pow(2, i); if (currentType > 0) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index 966e8e6de4..9b7de274f6 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -65,11 +65,11 @@ public class AdminMenu implements IAdminCommandHandler } else if (command.startsWith("admin_teleport_character_to_menu")) { - String[] data = command.split(" "); + final String[] data = command.split(" "); if (data.length == 5) { - String playerName = data[1]; - L2PcInstance player = L2World.getInstance().getPlayer(playerName); + final String playerName = data[1]; + final L2PcInstance player = L2World.getInstance().getPlayer(playerName); if (player != null) { teleportCharacter(player, new Location(Integer.parseInt(data[2]), Integer.parseInt(data[3]), Integer.parseInt(data[4])), activeChar, "Admin is teleporting you."); @@ -81,8 +81,8 @@ public class AdminMenu implements IAdminCommandHandler { try { - String targetName = command.substring(23); - L2PcInstance player = L2World.getInstance().getPlayer(targetName); + final String targetName = command.substring(23); + final L2PcInstance player = L2World.getInstance().getPlayer(targetName); teleportCharacter(player, activeChar.getLocation(), activeChar, "Admin is teleporting you."); } catch (StringIndexOutOfBoundsException e) @@ -93,8 +93,8 @@ public class AdminMenu implements IAdminCommandHandler { try { - String targetName = command.substring(24); - L2PcInstance player = L2World.getInstance().getPlayer(targetName); + final String targetName = command.substring(24); + final L2PcInstance player = L2World.getInstance().getPlayer(targetName); if (player == null) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); @@ -120,14 +120,14 @@ public class AdminMenu implements IAdminCommandHandler { try { - String targetName = command.substring(23); - L2PcInstance player = L2World.getInstance().getPlayer(targetName); + final String targetName = command.substring(23); + final L2PcInstance player = L2World.getInstance().getPlayer(targetName); if (player == null) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return true; } - L2Clan clan = player.getClan(); + final L2Clan clan = player.getClan(); if (clan == null) { activeChar.sendMessage("Player is not in a clan."); @@ -149,8 +149,8 @@ public class AdminMenu implements IAdminCommandHandler { try { - String targetName = command.substring(21); - L2PcInstance player = L2World.getInstance().getPlayer(targetName); + final String targetName = command.substring(21); + final L2PcInstance player = L2World.getInstance().getPlayer(targetName); activeChar.setInstanceId(player.getInstanceId()); teleportToCharacter(activeChar, player); } @@ -164,12 +164,12 @@ public class AdminMenu implements IAdminCommandHandler } else if (command.startsWith("admin_kick_menu")) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); if (st.countTokens() > 1) { st.nextToken(); - String player = st.nextToken(); - L2PcInstance plyr = L2World.getInstance().getPlayer(player); + final String player = st.nextToken(); + final L2PcInstance plyr = L2World.getInstance().getPlayer(player); String text; if (plyr != null) { @@ -186,34 +186,34 @@ public class AdminMenu implements IAdminCommandHandler } else if (command.startsWith("admin_ban_menu")) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); if (st.countTokens() > 1) { - String subCommand = "admin_ban_char"; + final String subCommand = "admin_ban_char"; if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } - IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); + final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); ach.useAdminCommand(subCommand + command.substring(14), activeChar); } showMainPage(activeChar); } else if (command.startsWith("admin_unban_menu")) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); if (st.countTokens() > 1) { - String subCommand = "admin_unban_char"; + final String subCommand = "admin_unban_char"; if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } - IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); + final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); ach.useAdminCommand(subCommand + command.substring(16), activeChar); } showMainPage(activeChar); @@ -234,12 +234,12 @@ public class AdminMenu implements IAdminCommandHandler private void handleKill(L2PcInstance activeChar, String player) { - L2Object obj = activeChar.getTarget(); + final L2Object obj = activeChar.getTarget(); L2Character target = (L2Character) obj; String filename = "main_menu.htm"; if (player != null) { - L2PcInstance plyr = L2World.getInstance().getPlayer(player); + final L2PcInstance plyr = L2World.getInstance().getPlayer(player); if (plyr != null) { target = plyr; diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMessages.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMessages.java index c2e8978ad1..a1801727ae 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMessages.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMessages.java @@ -54,14 +54,14 @@ public class AdminMessages implements IAdminCommandHandler } else if (command.startsWith("admin_msgx ")) { - String[] tokens = command.split(" "); + final String[] tokens = command.split(" "); if ((tokens.length <= 2) || !Util.isDigit(tokens[1])) { activeChar.sendMessage("Command format: //msgx [item:Id] [skill:Id] [npc:Id] [zone:x,y,x] [castle:Id] [str:'text']"); return false; } - SystemMessage sm = SystemMessage.getSystemMessage(Integer.parseInt(tokens[1])); + final SystemMessage sm = SystemMessage.getSystemMessage(Integer.parseInt(tokens[1])); String val; int lastPos = 0; for (int i = 2; i < tokens.length; i++) @@ -83,9 +83,9 @@ public class AdminMessages implements IAdminCommandHandler } else if (val.startsWith("zone:")) { - int x = Integer.parseInt(val.substring(5, val.indexOf(","))); - int y = Integer.parseInt(val.substring(val.indexOf(",") + 1, val.lastIndexOf(","))); - int z = Integer.parseInt(val.substring(val.lastIndexOf(",") + 1, val.length())); + final int x = Integer.parseInt(val.substring(5, val.indexOf(","))); + final int y = Integer.parseInt(val.substring(val.indexOf(",") + 1, val.lastIndexOf(","))); + final int z = Integer.parseInt(val.substring(val.lastIndexOf(",") + 1, val.length())); sm.addZoneName(x, y, z); } else if (val.startsWith("castle:")) diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 632ba356de..51f4564bca 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -97,7 +97,7 @@ public class AdminMobGroup implements IAdminCommandHandler { if (activeChar.getTarget() instanceof L2Character) { - L2Character target = (L2Character) activeChar.getTarget(); + final L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); } } @@ -143,7 +143,7 @@ public class AdminMobGroup implements IAdminCommandHandler */ private void showMainPage(L2PcInstance activeChar, String command) { - String filename = "mobgroup.htm"; + final String filename = "mobgroup.htm"; AdminHtml.showAdminHtml(activeChar, filename); } @@ -159,7 +159,7 @@ public class AdminMobGroup implements IAdminCommandHandler activeChar.sendMessage("Incorrect command arguments."); return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { activeChar.sendMessage("Invalid group specified."); @@ -181,7 +181,7 @@ public class AdminMobGroup implements IAdminCommandHandler activeChar.sendMessage("Incorrect command arguments."); return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { activeChar.sendMessage("Invalid group specified."); @@ -202,7 +202,7 @@ public class AdminMobGroup implements IAdminCommandHandler activeChar.sendMessage("Incorrect command arguments."); return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { activeChar.sendMessage("Invalid group specified."); @@ -223,7 +223,7 @@ public class AdminMobGroup implements IAdminCommandHandler activeChar.sendMessage("Incorrect command arguments."); return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { activeChar.sendMessage("Invalid group specified."); @@ -244,7 +244,7 @@ public class AdminMobGroup implements IAdminCommandHandler activeChar.sendMessage("Incorrect command arguments."); return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { activeChar.sendMessage("Invalid group specified."); @@ -261,7 +261,7 @@ public class AdminMobGroup implements IAdminCommandHandler try { - String[] cmdParams = command.split(" "); + final String[] cmdParams = command.split(" "); groupId = Integer.parseInt(cmdParams[1]); templateId = Integer.parseInt(cmdParams[2]); @@ -279,7 +279,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - L2NpcTemplate template = NpcData.getInstance().getTemplate(templateId); + final L2NpcTemplate template = NpcData.getInstance().getTemplate(templateId); if (template == null) { @@ -287,7 +287,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = new MobGroup(groupId, template, mobCount); + final MobGroup group = new MobGroup(groupId, template, mobCount); MobGroupTable.getInstance().addGroup(groupId, group); activeChar.sendMessage("Mob group " + groupId + " created."); @@ -307,7 +307,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { @@ -334,7 +334,7 @@ public class AdminMobGroup implements IAdminCommandHandler try { - String[] cmdParams = command.split(" "); + final String[] cmdParams = command.split(" "); groupId = Integer.parseInt(cmdParams[1]); try @@ -355,7 +355,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { @@ -391,7 +391,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { @@ -419,7 +419,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { @@ -445,7 +445,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { @@ -472,7 +472,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { @@ -516,7 +516,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { @@ -524,7 +524,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup othGroup = MobGroupTable.getInstance().getGroup(othGroupId); + final MobGroup othGroup = MobGroupTable.getInstance().getGroup(othGroupId); if (othGroup == null) { @@ -551,7 +551,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { @@ -600,7 +600,7 @@ public class AdminMobGroup implements IAdminCommandHandler return; } - MobGroup group = MobGroupTable.getInstance().getGroup(groupId); + final MobGroup group = MobGroupTable.getInstance().getGroup(groupId); if (group == null) { @@ -613,7 +613,7 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(L2PcInstance activeChar) { - MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); + final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); activeChar.sendMessage("======= ======="); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java index f4c155a891..b5df7bd77c 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java @@ -65,7 +65,7 @@ public class AdminMonsterRace implements IAdminCommandHandler * -1 0 to initialize the race 0 15322 to start race 13765 -1 in middle of race -1 0 to end the race 8003 to 8027 */ - int[][] codes = + final int[][] codes = { { -1, @@ -84,30 +84,30 @@ public class AdminMonsterRace implements IAdminCommandHandler 0 } }; - MonsterRace race = MonsterRace.getInstance(); + final MonsterRace race = MonsterRace.getInstance(); if (state == -1) { state++; race.newRace(); race.newSpeeds(); - MonRaceInfo spk = new MonRaceInfo(codes[state][0], codes[state][1], race.getMonsters(), race.getSpeeds()); + final MonRaceInfo spk = new MonRaceInfo(codes[state][0], codes[state][1], race.getMonsters(), race.getSpeeds()); activeChar.sendPacket(spk); activeChar.broadcastPacket(spk); } else if (state == 0) { state++; - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THEY_RE_OFF); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THEY_RE_OFF); sm.addInt(0); activeChar.sendPacket(sm); - PlaySound SRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0); + final PlaySound SRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0); activeChar.sendPacket(SRace); activeChar.broadcastPacket(SRace); - PlaySound SRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559); + final PlaySound SRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559); activeChar.sendPacket(SRace2); activeChar.broadcastPacket(SRace2); - MonRaceInfo spk = new MonRaceInfo(codes[state][0], codes[state][1], race.getMonsters(), race.getSpeeds()); + final MonRaceInfo spk = new MonRaceInfo(codes[state][0], codes[state][1], race.getMonsters(), race.getSpeeds()); activeChar.sendPacket(spk); activeChar.broadcastPacket(spk); @@ -138,7 +138,7 @@ public class AdminMonsterRace implements IAdminCommandHandler * int[] speed = new int[8]; for (int i=0; i<8; i++) { for (int j=0; j<20; j++) { //_log.info("Adding "+speeds1[i][j] +" and "+ speeds2[i][j]); speed[i] += (speeds1[i][j]*1);// + (speeds2[i][j]*1); } _log.info("Total speed for "+(i+1)+" = "+speed[i]); } */ - MonRaceInfo spk = new MonRaceInfo(codes[2][0], codes[2][1], MonsterRace.getInstance().getMonsters(), MonsterRace.getInstance().getSpeeds()); + final MonRaceInfo spk = new MonRaceInfo(codes[2][0], codes[2][1], MonsterRace.getInstance().getMonsters(), MonsterRace.getInstance().getSpeeds()); activeChar.sendPacket(spk); activeChar.broadcastPacket(spk); ThreadPoolManager.getInstance().scheduleGeneral(new RunEnd(activeChar), 30000); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index e884051a6b..38b8e92ba5 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -56,7 +56,7 @@ public final class AdminPForge implements IAdminCommandHandler Collection opCodes = null; while (st.hasMoreTokens()) { - String token = st.nextToken(); + final String token = st.nextToken(); if (";".equals(token)) { break; @@ -239,16 +239,16 @@ public final class AdminPForge implements IAdminCommandHandler valuesHtml = valuesHtml.replace("%format%", format); sendBypass += " " + format; - String editorTemplate = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/pforge/inc/editor.htm"); + final String editorTemplate = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/pforge/inc/editor.htm"); if (editorTemplate != null) { - StringBuilder singleCharSequence = new StringBuilder(1); + final StringBuilder singleCharSequence = new StringBuilder(1); singleCharSequence.append(' '); for (int chIdx = 0; chIdx < format.length(); ++chIdx) { - char ch = format.charAt(chIdx); + final char ch = format.charAt(chIdx); singleCharSequence.setCharAt(0, ch); editorsHtml += editorTemplate.replace("%format%", singleCharSequence).replace("%editor_index%", String.valueOf(chIdx)); sendBypass += " $v" + chIdx; @@ -276,7 +276,7 @@ public final class AdminPForge implements IAdminCommandHandler { try { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); st.nextToken(); // skip command token if (!st.hasMoreTokens()) @@ -285,7 +285,7 @@ public final class AdminPForge implements IAdminCommandHandler return false; } - String[] opCodes = getOpCodes(st); + final String[] opCodes = getOpCodes(st); if (!validateOpCodes(opCodes)) { activeChar.sendMessage("Invalid op codes!"); @@ -318,7 +318,7 @@ public final class AdminPForge implements IAdminCommandHandler { try { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); st.nextToken(); // skip command token if (!st.hasMoreTokens()) @@ -327,7 +327,7 @@ public final class AdminPForge implements IAdminCommandHandler return false; } - String method = st.nextToken(); + final String method = st.nextToken(); if (!validateMethod(method)) { activeChar.sendMessage("Invalid method!"); @@ -335,7 +335,7 @@ public final class AdminPForge implements IAdminCommandHandler return false; } - String[] opCodes = st.nextToken().split(";"); + final String[] opCodes = st.nextToken().split(";"); if (!validateOpCodes(opCodes)) { activeChar.sendMessage("Invalid op codes!"); @@ -549,7 +549,7 @@ public final class AdminPForge implements IAdminCommandHandler else if (bb != null) { bb.flip(); - L2GameClientPacket p = (L2GameClientPacket) GameServer.gameServer.getL2GamePacketHandler().handlePacket(bb, activeChar.getClient()); + final L2GameClientPacket p = (L2GameClientPacket) GameServer.gameServer.getL2GamePacketHandler().handlePacket(bb, activeChar.getClient()); if (p != null) { p.setBuffers(bb, activeChar.getClient(), new NioNetStringBuffer(2000)); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java index c6c3dd2cdf..c282690c45 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java @@ -76,7 +76,7 @@ public class AdminPathNode implements IAdminCommandHandler } if (activeChar.getTarget() != null) { - List path = PathFinding.getInstance().findPath(activeChar.getX(), activeChar.getY(), (short) activeChar.getZ(), activeChar.getTarget().getX(), activeChar.getTarget().getY(), (short) activeChar.getTarget().getZ(), activeChar.getInstanceId(), true); + final List path = PathFinding.getInstance().findPath(activeChar.getX(), activeChar.getY(), (short) activeChar.getZ(), activeChar.getTarget().getX(), activeChar.getTarget().getY(), (short) activeChar.getTarget().getZ(), activeChar.getInstanceId(), true); if (path == null) { activeChar.sendMessage("No Route!"); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java index ba06977f6a..346f22f31a 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java @@ -41,7 +41,7 @@ public class AdminPcCondOverride implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); if (st.hasMoreTokens()) { switch (st.nextToken()) @@ -51,7 +51,7 @@ public class AdminPcCondOverride implements IAdminCommandHandler { final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1); msg.setFile(activeChar.getHtmlPrefix(), "html/admin/cond_override.htm"); - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); for (PcCondOverride ex : PcCondOverride.values()) { sb.append(""); @@ -64,10 +64,10 @@ public class AdminPcCondOverride implements IAdminCommandHandler { if (st.hasMoreTokens()) { - String token = st.nextToken(); + final String token = st.nextToken(); if (Util.isDigit(token)) { - PcCondOverride ex = PcCondOverride.getCondOverride(Integer.valueOf(token)); + final PcCondOverride ex = PcCondOverride.getCondOverride(Integer.valueOf(token)); if (ex != null) { if (activeChar.canOverrideCond(ex)) diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java index 9e0369404f..4d06269cc0 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java @@ -102,15 +102,15 @@ public class AdminPetition implements IAdminCommandHandler { try { - L2Object targetChar = activeChar.getTarget(); + final L2Object targetChar = activeChar.getTarget(); if ((targetChar == null) || !(targetChar instanceof L2PcInstance)) { activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); return false; } - L2PcInstance targetPlayer = (L2PcInstance) targetChar; + final L2PcInstance targetPlayer = (L2PcInstance) targetChar; - String val = command.substring(15); + final String val = command.substring(15); petitionId = PetitionManager.getInstance().submitPetition(targetPlayer, val, 9); PetitionManager.getInstance().acceptPetition(activeChar, petitionId); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java index da57c668af..e63e213cec 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java @@ -111,7 +111,7 @@ public class AdminPledge implements IAdminCommandHandler if (!targetPlayer.isClanLeader()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER); sm.addCharName(targetPlayer); activeChar.sendPacket(sm); showMainPage(activeChar); @@ -154,7 +154,7 @@ public class AdminPledge implements IAdminCommandHandler break; } - int level = Integer.parseInt(param); + final int level = Integer.parseInt(param); if ((level >= 0) && (level < 12)) { clan.changeLevel(level); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java index 6e6460d9be..0e90f50f71 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java @@ -53,7 +53,7 @@ public class AdminPolymorph implements IAdminCommandHandler } else if (command.startsWith("admin_untransform")) { - L2Object obj = activeChar.getTarget(); + final L2Object obj = activeChar.getTarget(); if (obj instanceof L2Character) { ((L2Character) obj).stopTransformation(true); @@ -163,10 +163,10 @@ public class AdminPolymorph implements IAdminCommandHandler // animation if (obj instanceof L2Character) { - L2Character Char = (L2Character) obj; - MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); + final L2Character Char = (L2Character) obj; + final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); Char.broadcastPacket(msk); - SetupGauge sg = new SetupGauge(0, 4000); + final SetupGauge sg = new SetupGauge(0, 4000); Char.sendPacket(sg); } // end of animation diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPremium.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPremium.java index f365185121..7509370fb4 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPremium.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPremium.java @@ -53,7 +53,7 @@ public class AdminPremium implements IAdminCommandHandler { try { - String val = command.substring(19); + final String val = command.substring(19); addPremiumStatus(activeChar, 1, val); } catch (StringIndexOutOfBoundsException e) @@ -65,7 +65,7 @@ public class AdminPremium implements IAdminCommandHandler { try { - String val = command.substring(19); + final String val = command.substring(19); addPremiumStatus(activeChar, 2, val); } catch (StringIndexOutOfBoundsException e) @@ -77,7 +77,7 @@ public class AdminPremium implements IAdminCommandHandler { try { - String val = command.substring(19); + final String val = command.substring(19); addPremiumStatus(activeChar, 3, val); } catch (StringIndexOutOfBoundsException e) @@ -89,7 +89,7 @@ public class AdminPremium implements IAdminCommandHandler { try { - String val = command.substring(19); + final String val = command.substring(19); viewPremiumInfo(activeChar, val); } catch (StringIndexOutOfBoundsException e) @@ -101,7 +101,7 @@ public class AdminPremium implements IAdminCommandHandler { try { - String val = command.substring(21); + final String val = command.substring(21); removePremium(activeChar, val); } catch (StringIndexOutOfBoundsException e) diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index d8216546ec..45f8147cce 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -99,8 +99,8 @@ public class AdminPunishment implements IAdminCommandHandler case "info": { String key = st.hasMoreTokens() ? st.nextToken() : null; - String af = st.hasMoreTokens() ? st.nextToken() : null; - String name = key; + final String af = st.hasMoreTokens() ? st.nextToken() : null; + final String name = key; if ((key == null) || (af == null)) { @@ -123,12 +123,12 @@ public class AdminPunishment implements IAdminCommandHandler String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/punishment-info.htm"); if (content != null) { - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); for (PunishmentType type : PunishmentType.values()) { if (PunishmentManager.getInstance().hasPunishment(key, affect, type)) { - long expiration = PunishmentManager.getInstance().getPunishmentExpiration(key, affect, type); + final long expiration = PunishmentManager.getInstance().getPunishmentExpiration(key, affect, type); String expire = "never"; if (expiration > 0) @@ -200,9 +200,9 @@ public class AdminPunishment implements IAdminCommandHandler { // Add new punishment String key = st.hasMoreTokens() ? st.nextToken() : null; - String af = st.hasMoreTokens() ? st.nextToken() : null; - String t = st.hasMoreTokens() ? st.nextToken() : null; - String exp = st.hasMoreTokens() ? st.nextToken() : null; + final String af = st.hasMoreTokens() ? st.nextToken() : null; + final String t = st.hasMoreTokens() ? st.nextToken() : null; + final String exp = st.hasMoreTokens() ? st.nextToken() : null; String reason = st.hasMoreTokens() ? st.nextToken() : null; // Let's grab the other part of the reason if there is.. @@ -221,7 +221,7 @@ public class AdminPunishment implements IAdminCommandHandler } } - String name = key; + final String name = key; if ((key == null) || (af == null) || (t == null) || (exp == null) || (reason == null)) { @@ -257,7 +257,7 @@ public class AdminPunishment implements IAdminCommandHandler { try { - InetAddress addr = InetAddress.getByName(key); + final InetAddress addr = InetAddress.getByName(key); if (addr.isLoopbackAddress()) { throw new UnknownHostException("You cannot ban any local address!"); @@ -292,9 +292,9 @@ public class AdminPunishment implements IAdminCommandHandler { // Remove punishment. String key = st.hasMoreTokens() ? st.nextToken() : null; - String af = st.hasMoreTokens() ? st.nextToken() : null; - String t = st.hasMoreTokens() ? st.nextToken() : null; - String name = key; + final String af = st.hasMoreTokens() ? st.nextToken() : null; + final String t = st.hasMoreTokens() ? st.nextToken() : null; + final String name = key; if ((key == null) || (af == null) || (t == null)) { @@ -389,7 +389,7 @@ public class AdminPunishment implements IAdminCommandHandler private static final String findCharId(String key) { - int charId = CharNameTable.getInstance().getIdByName(key); + final int charId = CharNameTable.getInstance().getIdByName(key); if (charId > 0) // Yeah its a char name! { return Integer.toString(charId); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java index f2d8aeec76..f8a2f4aa52 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java @@ -68,7 +68,7 @@ public class AdminQuest implements IAdminCommandHandler // Example: //quest_reload 12 if (command.startsWith("admin_quest_reload")) { - String[] parts = command.split(" "); + final String[] parts = command.split(" "); if (parts.length < 2) { activeChar.sendMessage("Usage: //quest_reload ..questName> or //quest_reload "); @@ -78,7 +78,7 @@ public class AdminQuest implements IAdminCommandHandler // try the first param as id try { - int questId = Integer.parseInt(parts[1]); + final int questId = Integer.parseInt(parts[1]); if (QuestManager.getInstance().reload(questId)) { activeChar.sendMessage("Quest Reloaded Successfully."); @@ -109,7 +109,7 @@ public class AdminQuest implements IAdminCommandHandler // This provides a way to load new scripts without having to reboot the server. else if (command.startsWith("admin_script_load")) { - String[] parts = command.split(" "); + final String[] parts = command.split(" "); if (parts.length < 2) { // activeChar.sendMessage("Example: //script_load //. "); @@ -121,7 +121,7 @@ public class AdminQuest implements IAdminCommandHandler // Trying to reload by script name. if (!file.exists()) { - Quest quest = QuestManager.getInstance().getQuest(parts[1]); + final Quest quest = QuestManager.getInstance().getQuest(parts[1]); if (quest != null) { file = new File(L2ScriptEngineManager.SCRIPT_FOLDER, quest.getClass().getName().replaceAll("\\.", "/") + ".java"); @@ -157,14 +157,14 @@ public class AdminQuest implements IAdminCommandHandler } else if (command.startsWith("admin_script_unload")) { - String[] parts = command.split(" "); + final String[] parts = command.split(" "); if (parts.length < 2) { activeChar.sendMessage("Example: //script_unload questName/questId"); } else { - Quest q = Util.isDigit(parts[1]) ? QuestManager.getInstance().getQuest(Integer.parseInt(parts[1])) : QuestManager.getInstance().getQuest(parts[1]); + final Quest q = Util.isDigit(parts[1]) ? QuestManager.getInstance().getQuest(Integer.parseInt(parts[1])) : QuestManager.getInstance().getQuest(parts[1]); if (q != null) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java index 4d5681a25d..5afca51d68 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java @@ -102,7 +102,7 @@ public class AdminReload implements IAdminCommandHandler { if (st.hasMoreElements()) { - String value = st.nextToken(); + final String value = st.nextToken(); if (!Util.isDigit(value)) { QuestManager.getInstance().reload(value); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java index 1e1daa74d4..2c1264eddf 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java @@ -57,14 +57,14 @@ public class AdminRepairChar implements IAdminCommandHandler private void handleRepair(String command) { - String[] parts = command.split(" "); + final String[] parts = command.split(" "); if (parts.length != 2) { return; } final String playerName = parts[1]; - String cmd = "UPDATE characters SET x=-84318, y=244579, z=-3730 WHERE char_name=?"; + final String cmd = "UPDATE characters SET x=-84318, y=244579, z=-3730 WHERE char_name=?"; try (Connection con = ConnectionFactory.getInstance().getConnection()) { try (PreparedStatement ps = con.prepareStatement(cmd)) diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java index b2924ef2c2..aa4def62a7 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java @@ -84,7 +84,7 @@ public class AdminRes implements IAdminCommandHandler if (resParam != null) { // Check if a player name was specified as a param. - L2PcInstance plyr = L2World.getInstance().getPlayer(resParam); + final L2PcInstance plyr = L2World.getInstance().getPlayer(resParam); if (plyr != null) { @@ -95,7 +95,7 @@ public class AdminRes implements IAdminCommandHandler // Otherwise, check if the param was a radius. try { - int radius = Integer.parseInt(resParam); + final int radius = Integer.parseInt(resParam); for (L2PcInstance knownPlayer : activeChar.getKnownList().getKnownPlayersInRadius(radius)) { @@ -139,7 +139,7 @@ public class AdminRes implements IAdminCommandHandler private void handleNonPlayerRes(L2PcInstance activeChar, String radiusStr) { - L2Object obj = activeChar.getTarget(); + final L2Object obj = activeChar.getTarget(); try { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java index d7e8e947d6..7f5b972a75 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java @@ -48,7 +48,7 @@ public class AdminRide implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - L2PcInstance player = getRideTarget(activeChar); + final L2PcInstance player = getRideTarget(activeChar); if (player == null) { return false; diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminScan.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminScan.java index d7d60a3b90..37c98c524d 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminScan.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminScan.java @@ -80,7 +80,7 @@ public class AdminScan implements IAdminCommandHandler try { - int objectId = Integer.parseInt(st.nextToken()); + final int objectId = Integer.parseInt(st.nextToken()); final L2Object target = L2World.getInstance().findObject(objectId); final L2Npc npc = target instanceof L2Npc ? (L2Npc) target : null; diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index a058ec311b..3bc7e705ca 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -151,7 +151,7 @@ public class AdminServerInfo implements IAdminCommandHandler } case "ALL_REAL": { - Set realPlayers = new HashSet<>(); + final Set realPlayers = new HashSet<>(); for (L2PcInstance onlinePlayer : L2World.getInstance().getPlayers()) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java index 5d6e66d32f..da95e96891 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java @@ -84,7 +84,7 @@ public class AdminShop implements IAdminCommandHandler _log.warning("admin buylist failed:" + command); } - L2BuyList buyList = BuyListData.getInstance().getBuyList(val); + final L2BuyList buyList = BuyListData.getInstance().getBuyList(val); if (buyList != null) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 7adff94214..c73ddb41bc 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -61,10 +61,10 @@ public class AdminShowQuests implements IAdminCommandHandler @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) { - String[] cmdParams = command.split(" "); + final String[] cmdParams = command.split(" "); L2PcInstance target = null; L2Object targetObject = null; - String[] val = new String[4]; + final String[] val = new String[4]; val[0] = null; if (cmdParams.length > 1) @@ -156,9 +156,9 @@ public class AdminShowQuests implements IAdminCommandHandler private static void showFirstQuestMenu(L2PcInstance target, L2PcInstance actor) { - StringBuilder replyMSG = new StringBuilder("
NameTimeAction
" + ex.getDescription() + ":" + (activeChar.canOverrideCond(ex) ? "Disable" : "Enable") + "
Player: " + target.getName() + "
"); + final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(); - int ID = target.getObjectId(); + final int ID = target.getObjectId(); replyMSG.append("Quest Menu for " + target.getName() + " (ID:" + ID + ")
"); replyMSG.append(""); @@ -179,9 +179,9 @@ public class AdminShowQuests implements IAdminCommandHandler { ResultSet rs; PreparedStatement req; - int ID = target.getObjectId(); + final int ID = target.getObjectId(); - StringBuilder replyMSG = new StringBuilder(""); + final StringBuilder replyMSG = new StringBuilder(""); final NpcHtmlMessage adminReply = new NpcHtmlMessage(); switch (val[0]) @@ -201,8 +201,8 @@ public class AdminShowQuests implements IAdminCommandHandler } case "name": { - QuestState qs = target.getQuestState(val[1]); - String state = (qs != null) ? _states[qs.getState()] : "CREATED"; + final QuestState qs = target.getQuestState(val[1]); + final String state = (qs != null) ? _states[qs.getState()] : "CREATED"; replyMSG.append("Character: " + target.getName() + "
Quest: " + val[1] + "
State: " + state + "

"); replyMSG.append("
"); req = con.prepareStatement("SELECT var,value FROM character_quests WHERE charId='" + ID + "' and name='" + val[1] + "'"); @@ -210,7 +210,7 @@ public class AdminShowQuests implements IAdminCommandHandler rs = req.getResultSet(); while (rs.next()) { - String var_name = rs.getString(1); + final String var_name = rs.getString(1); if (var_name.equals("")) { continue; @@ -242,12 +242,12 @@ public class AdminShowQuests implements IAdminCommandHandler { boolean exqdb = true; boolean exqch = true; - int qnumber = Integer.parseInt(val[1]); + final int qnumber = Integer.parseInt(val[1]); String state = null; String qname = null; QuestState qs = null; - Quest quest = QuestManager.getInstance().getQuest(qnumber); + final Quest quest = QuestManager.getInstance().getQuest(qnumber); if (quest != null) { qname = quest.getName(); @@ -279,7 +279,7 @@ public class AdminShowQuests implements IAdminCommandHandler rs = req.getResultSet(); while (rs.next()) { - String var_name = rs.getString(1); + final String var_name = rs.getString(1); if (var_name.equals("")) { continue; @@ -322,7 +322,7 @@ public class AdminShowQuests implements IAdminCommandHandler private static void setQuestVar(L2PcInstance target, L2PcInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); - String[] outval = new String[3]; + final String[] outval = new String[3]; if ("state".equals(val[1])) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java index ba41dc27ad..e02660257b 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java @@ -104,11 +104,11 @@ public class AdminShutdown implements IAdminCommandHandler private void sendHtmlForm(L2PcInstance activeChar) { final NpcHtmlMessage adminReply = new NpcHtmlMessage(); - int t = GameTimeController.getInstance().getGameTime(); - int h = t / 60; - int m = t % 60; - SimpleDateFormat format = new SimpleDateFormat("h:mm a"); - Calendar cal = Calendar.getInstance(); + final int t = GameTimeController.getInstance().getGameTime(); + final int h = t / 60; + final int m = t % 60; + final SimpleDateFormat format = new SimpleDateFormat("h:mm a"); + final Calendar cal = Calendar.getInstance(); cal.set(Calendar.HOUR_OF_DAY, h); cal.set(Calendar.MINUTE, m); adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/shutdown.htm"); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java index 737beed888..c9019091a3 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java @@ -96,7 +96,7 @@ public class AdminSkill implements IAdminCommandHandler { try { - String val = command.substring(20); + final String val = command.substring(20); removeSkillsPage(activeChar, Integer.parseInt(val)); } catch (StringIndexOutOfBoundsException e) @@ -111,7 +111,7 @@ public class AdminSkill implements IAdminCommandHandler { try { - String val = command.substring(18); + final String val = command.substring(18); AdminHtml.showAdminHtml(activeChar, "skills/" + val + ".htm"); } catch (StringIndexOutOfBoundsException e) @@ -122,7 +122,7 @@ public class AdminSkill implements IAdminCommandHandler { try { - String val = command.substring(15); + final String val = command.substring(15); adminAddSkill(activeChar, val); } catch (Exception e) @@ -134,8 +134,8 @@ public class AdminSkill implements IAdminCommandHandler { try { - String id = command.substring(19); - int idval = Integer.parseInt(id); + final String id = command.substring(19); + final int idval = Integer.parseInt(id); adminRemoveSkill(activeChar, idval); } catch (Exception e) @@ -190,7 +190,7 @@ public class AdminSkill implements IAdminCommandHandler { try { - String[] val = command.split(" "); + final String[] val = command.split(" "); adminAddClanSkill(activeChar, Integer.parseInt(val[1]), Integer.parseInt(val[2])); } catch (Exception e) @@ -200,10 +200,10 @@ public class AdminSkill implements IAdminCommandHandler } else if (command.startsWith("admin_setskill")) { - String[] split = command.split(" "); - int id = Integer.parseInt(split[1]); - int lvl = Integer.parseInt(split[2]); - Skill skill = SkillData.getInstance().getSkill(id, lvl); + final String[] split = command.split(" "); + final int id = Integer.parseInt(split[1]); + final int lvl = Integer.parseInt(split[2]); + final Skill skill = SkillData.getInstance().getSkill(id, lvl); activeChar.addSkill(skill); activeChar.sendSkillList(); activeChar.sendMessage("You added yourself skill " + skill.getName() + "(" + id + ") level " + lvl); @@ -297,7 +297,7 @@ public class AdminSkill implements IAdminCommandHandler final L2PcInstance player = target.getActingPlayer(); final Skill[] skills = player.getAllSkills().toArray(new Skill[player.getAllSkills().size()]); - int maxSkillsPerPage = 10; + final int maxSkillsPerPage = 10; int maxPages = skills.length / maxSkillsPerPage; if (skills.length > (maxSkillsPerPage * maxPages)) { @@ -309,7 +309,7 @@ public class AdminSkill implements IAdminCommandHandler page = maxPages; } - int skillsStart = maxSkillsPerPage * page; + final int skillsStart = maxSkillsPerPage * page; int skillsEnd = skills.length; if ((skillsEnd - skillsStart) > maxSkillsPerPage) { @@ -321,7 +321,7 @@ public class AdminSkill implements IAdminCommandHandler for (int x = 0; x < maxPages; x++) { - int pagenr = x + 1; + final int pagenr = x + 1; StringUtil.append(replyMSG, ""); } @@ -375,7 +375,7 @@ public class AdminSkill implements IAdminCommandHandler } else { - Skill[] skills = player.getAllSkills().toArray(new Skill[player.getAllSkills().size()]); + final Skill[] skills = player.getAllSkills().toArray(new Skill[player.getAllSkills().size()]); adminSkills = activeChar.getAllSkills().toArray(new Skill[activeChar.getAllSkills().size()]); for (Skill skill : adminSkills) { @@ -409,7 +409,7 @@ public class AdminSkill implements IAdminCommandHandler } else { - Skill[] skills = player.getAllSkills().toArray(new Skill[player.getAllSkills().size()]); + final Skill[] skills = player.getAllSkills().toArray(new Skill[player.getAllSkills().size()]); for (Skill skill : skills) { player.removeSkill(skill); @@ -459,10 +459,10 @@ public class AdminSkill implements IAdminCommandHandler Skill skill = null; try { - String id = st.nextToken(); - String level = st.nextToken(); - int idval = Integer.parseInt(id); - int levelval = Integer.parseInt(level); + final String id = st.nextToken(); + final String level = st.nextToken(); + final int idval = Integer.parseInt(id); + final int levelval = Integer.parseInt(level); skill = SkillData.getInstance().getSkill(idval, levelval); } catch (Exception e) @@ -471,7 +471,7 @@ public class AdminSkill implements IAdminCommandHandler } if (skill != null) { - String name = skill.getName(); + final String name = skill.getName(); // Player's info. player.sendMessage("Admin gave you the skill " + name + "."); player.addSkill(skill, true); @@ -505,10 +505,10 @@ public class AdminSkill implements IAdminCommandHandler return; } final L2PcInstance player = target.getActingPlayer(); - Skill skill = SkillData.getInstance().getSkill(idval, player.getSkillLevel(idval)); + final Skill skill = SkillData.getInstance().getSkill(idval, player.getSkillLevel(idval)); if (skill != null) { - String skillname = skill.getName(); + final String skillname = skill.getName(); player.sendMessage("Admin removed the skill " + skillname + " from your skills list."); player.removeSkill(skill); // Admin information @@ -563,8 +563,8 @@ public class AdminSkill implements IAdminCommandHandler return; } - String skillname = skill.getName(); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); + final String skillname = skill.getName(); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); sm.addSkillName(skill); player.sendPacket(sm); final L2Clan clan = player.getClan(); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index cd3305da8a..2f0456c39f 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -91,14 +91,14 @@ public class AdminSpawn implements IAdminCommandHandler } else if (command.startsWith("admin_spawn_debug_print")) { - StringTokenizer st = new StringTokenizer(command, " "); - L2Object target = activeChar.getTarget(); + final StringTokenizer st = new StringTokenizer(command, " "); + final L2Object target = activeChar.getTarget(); if (target instanceof L2Npc) { try { st.nextToken(); - int type = Integer.parseInt(st.nextToken()); + final int type = Integer.parseInt(st.nextToken()); printSpawn((L2Npc) target, type); if (command.contains("_menu")) { @@ -116,11 +116,11 @@ public class AdminSpawn implements IAdminCommandHandler } else if (command.startsWith("admin_spawn_index")) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); try { st.nextToken(); - int level = Integer.parseInt(st.nextToken()); + final int level = Integer.parseInt(st.nextToken()); int from = 0; try { @@ -142,11 +142,11 @@ public class AdminSpawn implements IAdminCommandHandler } else if (command.startsWith("admin_npc_index")) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); try { st.nextToken(); - String letter = st.nextToken(); + final String letter = st.nextToken(); int from = 0; try { @@ -164,17 +164,17 @@ public class AdminSpawn implements IAdminCommandHandler } else if (command.startsWith("admin_instance_spawns")) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); try { st.nextToken(); - int instance = Integer.parseInt(st.nextToken()); + final int instance = Integer.parseInt(st.nextToken()); if (instance >= 300000) { final StringBuilder html = StringUtil.startAppend(500 + 1000, "
VarValueNew Value 
Page ", String.valueOf(pagenr), "
", "Spawns for " + String.valueOf(instance) + "", "

", ""); int counter = 0; int skiped = 0; - Instance inst = InstanceManager.getInstance().getInstance(instance); + final Instance inst = InstanceManager.getInstance().getInstance(instance); if (inst != null) { for (L2Npc npc : inst.getNpcs()) @@ -245,11 +245,11 @@ public class AdminSpawn implements IAdminCommandHandler } else if (command.startsWith("admin_spawn_monster") || command.startsWith("admin_spawn")) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); try { - String cmd = st.nextToken(); - String id = st.nextToken(); + final String cmd = st.nextToken(); + final String id = st.nextToken(); int respawnTime = 60; // default is set to 60 seconds int mobCount = 1; if (st.hasMoreTokens()) @@ -280,9 +280,9 @@ public class AdminSpawn implements IAdminCommandHandler int teleportIndex = -1; try { // admin_list_spawns x[xxxx] x[xx] - String[] params = command.split(" "); - Pattern pattern = Pattern.compile("[0-9]*"); - Matcher regexp = pattern.matcher(params[1]); + final String[] params = command.split(" "); + final Pattern pattern = Pattern.compile("[0-9]*"); + final Matcher regexp = pattern.matcher(params[1]); if (regexp.matches()) { npcId = Integer.parseInt(params[1]); @@ -332,7 +332,7 @@ public class AdminSpawn implements IAdminCommandHandler for (L2Spawn spawn : SpawnTable.getInstance().getSpawns(npcId)) { index++; - L2Npc npc = spawn.getLastSpawn(); + final L2Npc npc = spawn.getLastSpawn(); if (teleportIndex > -1) { if (teleportIndex == index) @@ -368,11 +368,11 @@ public class AdminSpawn implements IAdminCommandHandler private void printSpawn(L2Npc target, int type) { - int i = target.getId(); - int x = target.getSpawn().getX(); - int y = target.getSpawn().getY(); - int z = target.getSpawn().getZ(); - int h = target.getSpawn().getHeading(); + final int i = target.getId(); + final int x = target.getSpawn().getX(); + final int y = target.getSpawn().getY(); + final int z = target.getSpawn().getZ(); + final int h = target.getSpawn().getHeading(); switch (type) { default: diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java index 44c4891edf..163552b62e 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java @@ -49,7 +49,7 @@ public class AdminSummon implements IAdminCommandHandler { int id; int count = 1; - String[] data = command.split(" "); + final String[] data = command.split(" "); try { id = Integer.parseInt(data[1]); @@ -74,7 +74,7 @@ public class AdminSummon implements IAdminCommandHandler _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } - IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); + final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar); } else @@ -86,7 +86,7 @@ public class AdminSummon implements IAdminCommandHandler _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } - IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); + final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); activeChar.sendMessage("This is only a temporary spawn. The mob(s) will NOT respawn."); id -= 1000000; diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java index 6191932609..fd508c5dfb 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java @@ -53,8 +53,8 @@ public class AdminTarget implements IAdminCommandHandler { try { - String targetName = command.substring(13); - L2PcInstance player = L2World.getInstance().getPlayer(targetName); + final String targetName = command.substring(13); + final L2PcInstance player = L2World.getInstance().getPlayer(targetName); if (player != null) { player.onAction(activeChar); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index fc0a4801cf..27634c91ff 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -123,11 +123,11 @@ public class AdminTeleport implements IAdminCommandHandler { try { - String val = command.substring(11); - StringTokenizer st = new StringTokenizer(val); - int x = Integer.parseInt(st.nextToken()); - int y = Integer.parseInt(st.nextToken()); - int z = Integer.parseInt(st.nextToken()); + final String val = command.substring(11); + final StringTokenizer st = new StringTokenizer(val); + final int x = Integer.parseInt(st.nextToken()); + final int y = Integer.parseInt(st.nextToken()); + final int z = Integer.parseInt(st.nextToken()); activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(x, y, z, 0)); } catch (Exception e) @@ -142,7 +142,7 @@ public class AdminTeleport implements IAdminCommandHandler { try { - String val = command.substring(14); + final String val = command.substring(14); teleportTo(activeChar, val); } catch (StringIndexOutOfBoundsException e) @@ -160,7 +160,7 @@ public class AdminTeleport implements IAdminCommandHandler { try { - String val = command.substring(25); + final String val = command.substring(25); teleportCharacter(activeChar, val); } @@ -175,8 +175,8 @@ public class AdminTeleport implements IAdminCommandHandler { try { - String targetName = command.substring(17); - L2PcInstance player = L2World.getInstance().getPlayer(targetName); + final String targetName = command.substring(17); + final L2PcInstance player = L2World.getInstance().getPlayer(targetName); teleportToCharacter(activeChar, player); } catch (StringIndexOutOfBoundsException e) @@ -204,14 +204,14 @@ public class AdminTeleport implements IAdminCommandHandler { try { - String[] param = command.split(" "); + final String[] param = command.split(" "); if (param.length != 2) { activeChar.sendMessage("Usage: //recall "); return false; } - String targetName = param[1]; - L2PcInstance player = L2World.getInstance().getPlayer(targetName); + final String targetName = param[1]; + final L2PcInstance player = L2World.getInstance().getPlayer(targetName); if (player != null) { teleportCharacter(player, activeChar.getLocation(), activeChar); @@ -235,9 +235,9 @@ public class AdminTeleport implements IAdminCommandHandler int x = activeChar.getX(), y = activeChar.getY(), z = activeChar.getZ(); try { - String val = command.substring(8); - StringTokenizer st = new StringTokenizer(val); - String dir = st.nextToken(); + final String val = command.substring(8); + final StringTokenizer st = new StringTokenizer(val); + final String dir = st.nextToken(); if (st.hasMoreTokens()) { intVal = Integer.parseInt(st.nextToken()); @@ -276,7 +276,7 @@ public class AdminTeleport implements IAdminCommandHandler } else if (command.startsWith("admin_sendhome")) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); // Skip command. if (st.countTokens() > 1) { @@ -352,13 +352,13 @@ public class AdminTeleport implements IAdminCommandHandler { try { - StringTokenizer st = new StringTokenizer(Coords); - String x1 = st.nextToken(); - int x = Integer.parseInt(x1); - String y1 = st.nextToken(); - int y = Integer.parseInt(y1); - String z1 = st.nextToken(); - int z = Integer.parseInt(z1); + final StringTokenizer st = new StringTokenizer(Coords); + final String x1 = st.nextToken(); + final int x = Integer.parseInt(x1); + final String y1 = st.nextToken(); + final int y = Integer.parseInt(y1); + final String z1 = st.nextToken(); + final int z = Integer.parseInt(z1); activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); activeChar.teleToLocation(x, y, z); @@ -378,7 +378,7 @@ public class AdminTeleport implements IAdminCommandHandler private void showTeleportCharWindow(L2PcInstance activeChar) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -398,7 +398,7 @@ public class AdminTeleport implements IAdminCommandHandler private void teleportCharacter(L2PcInstance activeChar, String Cords) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); L2PcInstance player = null; if (target instanceof L2PcInstance) { @@ -418,13 +418,13 @@ public class AdminTeleport implements IAdminCommandHandler { try { - StringTokenizer st = new StringTokenizer(Cords); - String x1 = st.nextToken(); - int x = Integer.parseInt(x1); - String y1 = st.nextToken(); - int y = Integer.parseInt(y1); - String z1 = st.nextToken(); - int z = Integer.parseInt(z1); + final StringTokenizer st = new StringTokenizer(Cords); + final String x1 = st.nextToken(); + final int x = Integer.parseInt(x1); + final String y1 = st.nextToken(); + final int y = Integer.parseInt(y1); + final String z1 = st.nextToken(); + final int z = Integer.parseInt(z1); teleportCharacter(player, new Location(x, y, z), null); } catch (NoSuchElementException nsee) @@ -494,9 +494,9 @@ public class AdminTeleport implements IAdminCommandHandler // move to targets instance activeChar.setInstanceId(target.getInstanceId()); - int x = player.getX(); - int y = player.getY(); - int z = player.getZ(); + final int x = player.getX(); + final int y = player.getY(); + final int z = player.getZ(); activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); activeChar.teleToLocation(new Location(x, y, z), true); @@ -518,7 +518,7 @@ public class AdminTeleport implements IAdminCommandHandler ps.setInt(3, z); ps.setString(4, name); ps.execute(); - int count = ps.getUpdateCount(); + final int count = ps.getUpdateCount(); if (count == 0) { @@ -537,10 +537,10 @@ public class AdminTeleport implements IAdminCommandHandler private void recallNPC(L2PcInstance activeChar) { - L2Object obj = activeChar.getTarget(); + final L2Object obj = activeChar.getTarget(); if ((obj instanceof L2Npc) && !((L2Npc) obj).isMinion() && !(obj instanceof L2RaidBossInstance) && !(obj instanceof L2GrandBossInstance)) { - L2Npc target = (L2Npc) obj; + final L2Npc target = (L2Npc) obj; L2Spawn spawn = target.getSpawn(); if (spawn == null) { @@ -548,7 +548,7 @@ public class AdminTeleport implements IAdminCommandHandler _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); return; } - int respawnTime = spawn.getRespawnDelay() / 1000; + final int respawnTime = spawn.getRespawnDelay() / 1000; target.deleteMe(); spawn.stopRespawn(); @@ -594,10 +594,10 @@ public class AdminTeleport implements IAdminCommandHandler } else if (obj instanceof L2RaidBossInstance) { - L2RaidBossInstance target = (L2RaidBossInstance) obj; - L2Spawn spawn = target.getSpawn(); - double curHP = target.getCurrentHp(); - double curMP = target.getCurrentMp(); + final L2RaidBossInstance target = (L2RaidBossInstance) obj; + final L2Spawn spawn = target.getSpawn(); + final double curHP = target.getCurrentHp(); + final double curMP = target.getCurrentMp(); if (spawn == null) { activeChar.sendMessage("Incorrect raid spawn."); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java index 121d0f463e..64ad6a7270 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java @@ -57,9 +57,9 @@ public class AdminTest implements IAdminCommandHandler { try { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); st.nextToken(); - int id = Integer.parseInt(st.nextToken()); + final int id = Integer.parseInt(st.nextToken()); if (command.startsWith("admin_skill_test")) { adminTestSkill(activeChar, id, true); @@ -97,7 +97,7 @@ public class AdminTest implements IAdminCommandHandler private void adminTestSkill(L2PcInstance activeChar, int id, boolean msu) { L2Character caster; - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (!(target instanceof L2Character)) { caster = activeChar; @@ -107,7 +107,7 @@ public class AdminTest implements IAdminCommandHandler caster = (L2Character) target; } - Skill _skill = SkillData.getInstance().getSkill(id, 1); + final Skill _skill = SkillData.getInstance().getSkill(id, 1); if (_skill != null) { caster.setTarget(activeChar); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java index a9789b00ca..8b327ad385 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java @@ -43,7 +43,7 @@ public class AdminTvTEvent implements IAdminCommandHandler { if (command.equals("admin_tvt_add")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (!(target instanceof L2PcInstance)) { @@ -55,7 +55,7 @@ public class AdminTvTEvent implements IAdminCommandHandler } else if (command.equals("admin_tvt_remove")) { - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (!(target instanceof L2PcInstance)) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java index 1c7ce5d8f3..5e7baf0e45 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java @@ -47,7 +47,7 @@ public class AdminUnblockIp implements IAdminCommandHandler { try { - String ipAddress = command.substring(16); + final String ipAddress = command.substring(16); if (unblockIp(ipAddress, activeChar)) { activeChar.sendMessage("Removed IP " + ipAddress + " from blocklist!"); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java index fd31122370..dad07ec1ce 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java @@ -55,8 +55,8 @@ public class AdminVitality implements IAdminCommandHandler int vitality = 0; - StringTokenizer st = new StringTokenizer(command, " "); - String cmd = st.nextToken(); + final StringTokenizer st = new StringTokenizer(command, " "); + final String cmd = st.nextToken(); if (activeChar.getTarget() instanceof L2PcInstance) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index a267072304..e579274fae 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -55,8 +55,8 @@ public class AdminZone implements IAdminCommandHandler return false; } - StringTokenizer st = new StringTokenizer(command, " "); - String actualCommand = st.nextToken(); // Get actual command + final StringTokenizer st = new StringTokenizer(command, " "); + final String actualCommand = st.nextToken(); // Get actual command // String val = ""; // if (st.countTokens() >= 1) {val = st.nextToken();} @@ -84,7 +84,7 @@ public class AdminZone implements IAdminCommandHandler } else if (actualCommand.equalsIgnoreCase("admin_zone_visual")) { - String next = st.nextToken(); + final String next = st.nextToken(); if (next.equalsIgnoreCase("all")) { for (L2ZoneType zone : ZoneManager.getInstance().getZones(activeChar)) @@ -99,7 +99,7 @@ public class AdminZone implements IAdminCommandHandler } else { - int zoneId = Integer.parseInt(next); + final int zoneId = Integer.parseInt(next); ZoneManager.getInstance().getZoneById(zoneId).visualizeZone(activeChar.getZ()); } } @@ -133,8 +133,8 @@ public class AdminZone implements IAdminCommandHandler adminReply.replace("%DANGER%", (activeChar.isInsideZone(ZoneId.DANGER_AREA) ? "YES" : "NO")); adminReply.replace("%NOSTORE%", (activeChar.isInsideZone(ZoneId.NO_STORE) ? "YES" : "NO")); adminReply.replace("%SCRIPT%", (activeChar.isInsideZone(ZoneId.SCRIPT) ? "YES" : "NO")); - StringBuilder zones = new StringBuilder(100); - L2WorldRegion region = L2World.getInstance().getRegion(activeChar.getX(), activeChar.getY()); + final StringBuilder zones = new StringBuilder(100); + final L2WorldRegion region = L2World.getInstance().getRegion(activeChar.getX(), activeChar.getY()); for (L2ZoneType zone : region.getZones()) { if (zone.isCharacterInZone(activeChar)) @@ -164,10 +164,10 @@ public class AdminZone implements IAdminCommandHandler private static void getGeoRegionXY(L2PcInstance activeChar) { - int worldX = activeChar.getX(); - int worldY = activeChar.getY(); - int geoX = ((((worldX - (-327680)) >> 4) >> 11) + 10); - int geoY = ((((worldY - (-262144)) >> 4) >> 11) + 10); + final int worldX = activeChar.getX(); + final int worldY = activeChar.getY(); + final int geoX = ((((worldX - (-327680)) >> 4) >> 11) + 10); + final int geoY = ((((worldY - (-262144)) >> 4) >> 11) + 10); activeChar.sendMessage("GeoRegion: " + geoX + "_" + geoY + ""); } diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Buy.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Buy.java index e3399d211d..57eaff682b 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Buy.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Buy.java @@ -43,7 +43,7 @@ public class Buy implements IBypassHandler try { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); if (st.countTokens() < 1) diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index ef1f2dd26e..b70e7350d4 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -48,7 +48,7 @@ public class Freight implements IBypassHandler if (command.equalsIgnoreCase(COMMANDS[0])) { - PcFreight freight = activeChar.getFreight(); + final PcFreight freight = activeChar.getFreight(); if (freight != null) { if (freight.getSize() > 0) diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index e69ab44d2a..20b40b20f5 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -64,14 +64,14 @@ public class ItemAuctionLink implements IBypassHandler try { - StringTokenizer st = new StringTokenizer(command); + final StringTokenizer st = new StringTokenizer(command); st.nextToken(); // bypass "ItemAuction" if (!st.hasMoreTokens()) { return false; } - String cmd = st.nextToken(); + final String cmd = st.nextToken(); if ("show".equalsIgnoreCase(cmd)) { if (!activeChar.getFloodProtectors().getItemAuction().tryPerformAction("RequestInfoItemAuction")) @@ -104,7 +104,7 @@ public class ItemAuctionLink implements IBypassHandler { final ItemAuction[] auctions = au.getAuctionsByBidder(activeChar.getObjectId()); boolean returned = false; - for (final ItemAuction auction : auctions) + for (ItemAuction auction : auctions) { if (auction.cancelBid(activeChar)) { diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Link.java index c37678deeb..b5f0e32caf 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -33,7 +33,7 @@ public class Link implements IBypassHandler @Override public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) { - String htmlPath = command.substring(4).trim(); + final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { _log.warning("Player " + activeChar.getName() + " sent empty link html!"); @@ -46,7 +46,7 @@ public class Link implements IBypassHandler return false; } - String filename = "html/" + htmlPath; + final String filename = "html/" + htmlPath; final NpcHtmlMessage html = new NpcHtmlMessage(target != null ? target.getObjectId() : 0); html.setFile(activeChar.getHtmlPrefix(), filename); html.replace("%objectId%", String.valueOf(target != null ? target.getObjectId() : 0)); diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java index e2ebf9106f..0a400caf9a 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java @@ -93,7 +93,7 @@ public class Loto implements IBypassHandler // >24 - check lottery ticket by item object id public static final void showLotoWindow(L2PcInstance player, L2Npc npc, int val) { - int npcId = npc.getTemplate().getId(); + final int npcId = npc.getTemplate().getId(); String filename; SystemMessage sm; final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); @@ -163,16 +163,16 @@ public class Loto implements IBypassHandler { button = "0" + button; } - String search = "fore=\"L2UI.lottoNum" + button + "\" back=\"L2UI.lottoNum" + button + "a_check\""; - String replace = "fore=\"L2UI.lottoNum" + button + "a_check\" back=\"L2UI.lottoNum" + button + "\""; + final String search = "fore=\"L2UI.lottoNum" + button + "\" back=\"L2UI.lottoNum" + button + "a_check\""; + final String replace = "fore=\"L2UI.lottoNum" + button + "a_check\" back=\"L2UI.lottoNum" + button + "\""; html.replace(search, replace); } } if (count == 5) { - String search = "0\">Return"; - String replace = "22\">Your lucky numbers have been selected above."; + final String search = "0\">Return"; + final String replace = "22\">Your lucky numbers have been selected above."; html.replace(search, replace); } } @@ -191,8 +191,8 @@ public class Loto implements IBypassHandler return; } - long price = Config.ALT_LOTTERY_TICKET_PRICE; - int lotonumber = Lottery.getInstance().getId(); + final long price = Config.ALT_LOTTERY_TICKET_PRICE; + final int lotonumber = Lottery.getInstance().getId(); int enchant = 0; int type2 = 0; @@ -228,16 +228,16 @@ public class Loto implements IBypassHandler sm.addItemName(4442); player.sendPacket(sm); - L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), 4442); + final L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), 4442); item.setCount(1); item.setCustomType1(lotonumber); item.setEnchantLevel(enchant); item.setCustomType2(type2); player.getInventory().addItem("Loto", item, player, npc); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(item); - L2ItemInstance adenaupdate = player.getInventory().getItemByItemId(57); + final L2ItemInstance adenaupdate = player.getInventory().getItemByItemId(57); iu.addModifiedItem(adenaupdate); player.sendPacket(iu); @@ -254,7 +254,7 @@ public class Loto implements IBypassHandler filename = (npc.getHtmlPath(npcId, 4)); html.setFile(player.getHtmlPrefix(), filename); - int lotonumber = Lottery.getInstance().getId(); + final int lotonumber = Lottery.getInstance().getId(); String message = ""; for (L2ItemInstance item : player.getInventory().getItems()) { @@ -265,12 +265,12 @@ public class Loto implements IBypassHandler if ((item.getId() == 4442) && (item.getCustomType1() < lotonumber)) { message = message + "" + item.getCustomType1() + " Event Number "; - int[] numbers = Lottery.getInstance().decodeNumbers(item.getEnchantLevel(), item.getCustomType2()); + final int[] numbers = Lottery.getInstance().decodeNumbers(item.getEnchantLevel(), item.getCustomType2()); for (int i = 0; i < 5; i++) { message += numbers[i] + " "; } - long[] check = Lottery.getInstance().checkTicket(item); + final long[] check = Lottery.getInstance().checkTicket(item); if (check[0] > 0) { switch ((int) check[0]) @@ -306,19 +306,19 @@ public class Loto implements IBypassHandler } else if (val > 25) // >25 - check lottery ticket by item object id { - int lotonumber = Lottery.getInstance().getId(); - L2ItemInstance item = player.getInventory().getItemByObjectId(val); + final int lotonumber = Lottery.getInstance().getId(); + final L2ItemInstance item = player.getInventory().getItemByObjectId(val); if ((item == null) || (item.getId() != 4442) || (item.getCustomType1() >= lotonumber)) { return; } - long[] check = Lottery.getInstance().checkTicket(item); + final long[] check = Lottery.getInstance().checkTicket(item); sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(4442); player.sendPacket(sm); - long adena = check[1]; + final long adena = check[1]; if (adena > 0) { player.addAdena("Loto", adena, npc, true); diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index dbb0eb9133..074d1b8773 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -302,7 +302,7 @@ public class NpcViewMod implements IBypassHandler } else { - GroupedGeneralDropItem normalized = generalGroupedDropItem.normalizeMe(npc, activeChar); + final GroupedGeneralDropItem normalized = generalGroupedDropItem.normalizeMe(npc, activeChar); sb.append("
NpcNameAction
"); sb.append(""); sb.append("
One from group"); @@ -327,7 +327,7 @@ public class NpcViewMod implements IBypassHandler sb.append(item.getName()); sb.append("
"); sb.append("
Amount:"); - MinMax minMax = getPreciseMinMax(normalized.getChance(), generalDropItem.getMin(npc, activeChar), generalDropItem.getMax(npc, activeChar), generalDropItem.isPreciseCalculated()); + final MinMax minMax = getPreciseMinMax(normalized.getChance(), generalDropItem.getMin(npc, activeChar), generalDropItem.getMax(npc, activeChar), generalDropItem.isPreciseCalculated()); final long min = minMax.min; final long max = minMax.max; if (min == max) @@ -406,7 +406,7 @@ public class NpcViewMod implements IBypassHandler sb.append("
"); sb.append(""); sb.append("" + "" + ""; } - String filename = "html/auction/AgitBidderList.htm"; + final String filename = "html/auction/AgitBidderList.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); @@ -413,11 +413,11 @@ public final class L2AuctioneerInstance extends L2Npc { if ((player.getClan() != null) && (player.getClan().getHideoutId() == 0) && (player.getClan().getAuctionBiddedAt() > 0)) { - SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); - String filename = "html/auction/AgitBidInfo.htm"; + final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + final String filename = "html/auction/AgitBidInfo.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); - Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt()); + final Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt()); if (a != null) { html.replace("%AGIT_NAME%", a.getItemName()); @@ -444,11 +444,11 @@ public final class L2AuctioneerInstance extends L2Npc } else if ((player.getClan() != null) && (ClanHallAuctionManager.getInstance().getAuction(player.getClan().getHideoutId()) != null)) { - SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); - String filename = "html/auction/AgitSaleInfo.htm"; + final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + final String filename = "html/auction/AgitSaleInfo.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); - Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getHideoutId()); + final Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getHideoutId()); if (a != null) { html.replace("%AGIT_NAME%", a.getItemName()); @@ -476,8 +476,8 @@ public final class L2AuctioneerInstance extends L2Npc } else if ((player.getClan() != null) && (player.getClan().getHideoutId() != 0)) { - int ItemId = player.getClan().getHideoutId(); - String filename = "html/auction/AgitInfo.htm"; + final int ItemId = player.getClan().getHideoutId(); + final String filename = "html/auction/AgitInfo.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); if (ClanHallManager.getInstance().getAuctionableHallById(ItemId) != null) @@ -512,8 +512,8 @@ public final class L2AuctioneerInstance extends L2Npc } else if (actualCommand.equalsIgnoreCase("cancelBid")) { - long bid = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt()).getBidders().get(player.getClanId()).getBid(); - String filename = "html/auction/AgitBidCancel.htm"; + final long bid = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt()).getBidders().get(player.getClanId()).getBid(); + final String filename = "html/auction/AgitBidCancel.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%AGIT_BID%", String.valueOf(bid)); @@ -536,14 +536,14 @@ public final class L2AuctioneerInstance extends L2Npc { if (!player.hasClanPrivilege(ClanPrivilege.CH_AUCTION)) { - String filename = "html/auction/not_authorized.htm"; + final String filename = "html/auction/not_authorized.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%objectId%", String.valueOf(getObjectId())); player.sendPacket(html); return; } - String filename = "html/auction/AgitSaleCancel.htm"; + final String filename = "html/auction/AgitSaleCancel.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%AGIT_DEPOSIT%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease())); @@ -563,7 +563,7 @@ public final class L2AuctioneerInstance extends L2Npc } else if (actualCommand.equalsIgnoreCase("sale2")) { - String filename = "html/auction/AgitSale2.htm"; + final String filename = "html/auction/AgitSale2.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%AGIT_LAST_PRICE%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease())); @@ -576,14 +576,14 @@ public final class L2AuctioneerInstance extends L2Npc { if (!player.hasClanPrivilege(ClanPrivilege.CH_AUCTION)) { - String filename = "html/auction/not_authorized.htm"; + final String filename = "html/auction/not_authorized.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%objectId%", String.valueOf(getObjectId())); player.sendPacket(html); return; } - String filename = "html/auction/AgitSale1.htm"; + final String filename = "html/auction/AgitSale1.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%AGIT_DEPOSIT%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease())); @@ -595,10 +595,10 @@ public final class L2AuctioneerInstance extends L2Npc } else if (actualCommand.equalsIgnoreCase("rebid")) { - SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); if (!player.hasClanPrivilege(ClanPrivilege.CH_AUCTION)) { - String filename = "html/auction/not_authorized.htm"; + final String filename = "html/auction/not_authorized.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%objectId%", String.valueOf(getObjectId())); @@ -607,10 +607,10 @@ public final class L2AuctioneerInstance extends L2Npc } try { - String filename = "html/auction/AgitBid2.htm"; + final String filename = "html/auction/AgitBid2.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); - Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt()); + final Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt()); if (a != null) { html.replace("%AGIT_AUCTION_BID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid())); @@ -657,7 +657,7 @@ public final class L2AuctioneerInstance extends L2Npc { String filename = "html/auction/auction-no.htm"; - int condition = validateCondition(player); + final int condition = validateCondition(player); if (condition == COND_BUSY_BECAUSE_OF_SIEGE) { filename = "html/auction/auction-busy.htm"; // Busy because of siege @@ -691,7 +691,7 @@ public final class L2AuctioneerInstance extends L2Npc private String getPictureName(L2PcInstance plyr) { - int nearestTownId = MapRegionManager.getInstance().getMapRegionLocId(plyr); + final int nearestTownId = MapRegionManager.getInstance().getMapRegionLocId(plyr); String nearestTown; switch (nearestTownId) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BabyPetInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BabyPetInstance.java index 2c6638cd6c..138691a7f4 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BabyPetInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BabyPetInstance.java @@ -87,8 +87,8 @@ public final class L2BabyPetInstance extends L2PetInstance double healPower = 0; for (L2PetSkillLearn psl : PetDataTable.getInstance().getPetData(getId()).getAvailableSkills()) { - int id = psl.getSkillId(); - int lvl = PetDataTable.getInstance().getPetData(getId()).getAvailableLevel(id, getLevel()); + final int id = psl.getSkillId(); + final int lvl = PetDataTable.getInstance().getPetData(getId()).getAvailableLevel(id, getLevel()); if (lvl == 0) { continue; @@ -232,7 +232,7 @@ public final class L2BabyPetInstance extends L2PetInstance setTarget(getOwner()); useMagic(skill, false, false); - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_USES_S1); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_USES_S1); msg.addSkillName(skill); sendPacket(msg); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java index e721c4411e..87889ebfb2 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java @@ -75,7 +75,7 @@ public class L2BlockInstance extends L2MonsterInstance increaseTeamPointsAndSend(attacker, team, event); } // 30% chance to drop the event items - int random = Rnd.get(100); + final int random = Rnd.get(100); // Bond if ((random > 69) && (random <= 84)) { @@ -147,11 +147,11 @@ public class L2BlockInstance extends L2MonsterInstance { eng.increasePlayerPoints(player, team); - int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); - boolean isRed = eng.getHolder().getRedPlayers().contains(player); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); + final boolean isRed = eng.getHolder().getRedPlayers().contains(player); - ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); - ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); + final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); + final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); eng.getHolder().broadCastPacketToTeam(changePoints); eng.getHolder().broadCastPacketToTeam(secretPoints); @@ -159,10 +159,10 @@ public class L2BlockInstance extends L2MonsterInstance private void dropItem(int id, BlockCheckerEngine eng, L2PcInstance player) { - L2ItemInstance drop = ItemTable.getInstance().createItem("Loot", id, 1, player, this); - int x = getX() + Rnd.get(50); - int y = getY() + Rnd.get(50); - int z = getZ(); + final L2ItemInstance drop = ItemTable.getInstance().createItem("Loot", id, 1, player, this); + final int x = getX() + Rnd.get(50); + final int y = getY() + Rnd.get(50); + final int z = getZ(); drop.dropMe(this, x, y, z); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CastleDoormenInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CastleDoormenInstance.java index 3b453f1514..234806a369 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CastleDoormenInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CastleDoormenInstance.java @@ -36,7 +36,7 @@ public class L2CastleDoormenInstance extends L2DoormenInstance @Override protected final void openDoors(L2PcInstance player, String command) { - StringTokenizer st = new StringTokenizer(command.substring(10), ", "); + final StringTokenizer st = new StringTokenizer(command.substring(10), ", "); st.nextToken(); while (st.hasMoreTokens()) @@ -55,7 +55,7 @@ public class L2CastleDoormenInstance extends L2DoormenInstance @Override protected final void closeDoors(L2PcInstance player, String command) { - StringTokenizer st = new StringTokenizer(command.substring(11), ", "); + final StringTokenizer st = new StringTokenizer(command.substring(11), ", "); st.nextToken(); while (st.hasMoreTokens()) @@ -76,7 +76,7 @@ public class L2CastleDoormenInstance extends L2DoormenInstance { if ((player.getClan() != null) && player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) { - SiegableHall hall = getConquerableHall(); + final SiegableHall hall = getConquerableHall(); // save in variable because it's a costly call if (hall != null) { @@ -99,7 +99,7 @@ public class L2CastleDoormenInstance extends L2DoormenInstance @Override protected final boolean isUnderSiege() { - SiegableHall hall = getConquerableHall(); + final SiegableHall hall = getConquerableHall(); if (hall != null) { return hall.isInSiege(); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java index ed0341721b..08f859bc80 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java @@ -72,7 +72,7 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance { if (isOwnerClan(player)) { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); if (st.countTokens() < 2) { return; @@ -123,7 +123,7 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance if (getClanHall() != null) { - L2Clan owner = ClanTable.getInstance().getClan(getClanHall().getOwnerId()); + final L2Clan owner = ClanTable.getInstance().getClan(getClanHall().getOwnerId()); if (isOwnerClan(player)) { if (_hasEvolve) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java index b7b46010ca..05d54b9a2d 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java @@ -74,17 +74,17 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance return; } - int condition = validateCondition(player); + final int condition = validateCondition(player); if (condition <= COND_ALL_FALSE) { return; } - SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); if (condition == COND_OWNER) { - StringTokenizer st = new StringTokenizer(command, " "); - String actualCommand = st.nextToken(); // Get actual command + final StringTokenizer st = new StringTokenizer(command, " "); + final String actualCommand = st.nextToken(); // Get actual command String val = ""; if (st.countTokens() >= 1) { @@ -193,7 +193,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { return; } - int valbuy = Integer.parseInt(st.nextToken()) + (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() * 100000); + final int valbuy = Integer.parseInt(st.nextToken()) + (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() * 100000); showBuyWindow(player, valbuy); } else if (val.equalsIgnoreCase("support")) @@ -291,7 +291,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm"); html.replace("%name%", "Fireplace (HP Recovery Device)"); - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); int cost; switch (percent) { @@ -348,7 +348,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm"); html.replace("%name%", "Carpet (MP Recovery)"); - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); int cost; switch (percent) { @@ -380,7 +380,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm"); html.replace("%name%", "Chandelier (EXP Recovery Device)"); - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); int cost; switch (percent) { @@ -434,7 +434,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance return; } } - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); switch (percent) { case 0: @@ -516,7 +516,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance return; } } - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); switch (percent) { case 0: @@ -574,7 +574,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance return; } } - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); switch (percent) { case 0: @@ -619,23 +619,23 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/edit_recovery.htm"); - String hp_grade0 = "[20%][40%][220%]"; - String hp_grade1 = "[40%][100%][160%]"; - String hp_grade2 = "[80%][140%][200%][260%]"; - String hp_grade3 = "[80%][120%][180%][240%][300%]"; - String exp_grade0 = "[5%][10%][25%]"; - String exp_grade1 = "[5%][15%][30%]"; - String exp_grade2 = "[5%][15%][25%][40%]"; - String exp_grade3 = "[15%][25%][35%][50%]"; - String mp_grade0 = "[5%][10%][25%]"; - String mp_grade1 = "[5%][15%][25%]"; - String mp_grade2 = "[5%][15%][30%]"; - String mp_grade3 = "[5%][15%][30%][40%]"; + final String hp_grade0 = "[20%][40%][220%]"; + final String hp_grade1 = "[40%][100%][160%]"; + final String hp_grade2 = "[80%][140%][200%][260%]"; + final String hp_grade3 = "[80%][120%][180%][240%][300%]"; + final String exp_grade0 = "[5%][10%][25%]"; + final String exp_grade1 = "[5%][15%][30%]"; + final String exp_grade2 = "[5%][15%][25%][40%]"; + final String exp_grade3 = "[15%][25%][35%][50%]"; + final String mp_grade0 = "[5%][10%][25%]"; + final String mp_grade1 = "[5%][15%][25%]"; + final String mp_grade2 = "[5%][15%][30%]"; + final String mp_grade3 = "[5%][15%][30%][40%]"; if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null) { html.replace("%hp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl()) + "% (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease()) + "Adena /" + String.valueOf(Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTime())); - int grade = getClanHall().getGrade(); + final int grade = getClanHall().getGrade(); switch (grade) { case 0: @@ -656,7 +656,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { html.replace("%hp_recovery%", "none"); html.replace("%hp_period%", "none"); - int grade = getClanHall().getGrade(); + final int grade = getClanHall().getGrade(); switch (grade) { case 0: @@ -677,7 +677,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { html.replace("%exp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl()) + "% (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease()) + "Adena /" + String.valueOf(Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndTime())); - int grade = getClanHall().getGrade(); + final int grade = getClanHall().getGrade(); switch (grade) { case 0: @@ -698,7 +698,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { html.replace("%exp_recovery%", "none"); html.replace("%exp_period%", "none"); - int grade = getClanHall().getGrade(); + final int grade = getClanHall().getGrade(); switch (grade) { case 0: @@ -719,7 +719,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { html.replace("%mp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl()) + "% (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease()) + "Adena /" + String.valueOf(Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTime())); - int grade = getClanHall().getGrade(); + final int grade = getClanHall().getGrade(); switch (grade) { case 0: @@ -740,7 +740,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { html.replace("%mp_recovery%", "none"); html.replace("%mp_period%", "none"); - int grade = getClanHall().getGrade(); + final int grade = getClanHall().getGrade(); switch (grade) { case 0: @@ -799,7 +799,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm"); html.replace("%name%", "Magic Equipment (Item Production Facilities)"); - int stage = Integer.parseInt(val); + final int stage = Integer.parseInt(val); int cost; switch (stage) { @@ -825,7 +825,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm"); html.replace("%name%", "Insignia (Supplementary Magic)"); - int stage = Integer.parseInt(val); + final int stage = Integer.parseInt(val); int cost; switch (stage) { @@ -866,7 +866,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm"); html.replace("%name%", "Mirror (Teleportation Device)"); - int stage = Integer.parseInt(val); + final int stage = Integer.parseInt(val); int cost; switch (stage) { @@ -910,7 +910,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } } int fee; - int lvl = Integer.parseInt(val); + final int lvl = Integer.parseInt(val); switch (lvl) { case 0: @@ -962,7 +962,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance return; } } - int lvl = Integer.parseInt(val); + final int lvl = Integer.parseInt(val); switch (lvl) { case 0: @@ -1011,7 +1011,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance return; } } - int lvl = Integer.parseInt(val); + final int lvl = Integer.parseInt(val); switch (lvl) { case 0: @@ -1059,12 +1059,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/edit_other.htm"); - String tele = "[Level 1][Level 2]"; - String support_grade0 = "[Level 1][Level 2]"; - String support_grade1 = "[Level 1][Level 2][Level 4]"; - String support_grade2 = "[Level 3][Level 4][Level 5]"; - String support_grade3 = "[Level 3][Level 5][Level 7][Level 8]"; - String item = "[Level 1][Level 2][Level 3]"; + final String tele = "[Level 1][Level 2]"; + final String support_grade0 = "[Level 1][Level 2]"; + final String support_grade1 = "[Level 1][Level 2][Level 4]"; + final String support_grade2 = "[Level 3][Level 4][Level 5]"; + final String support_grade3 = "[Level 3][Level 5][Level 7][Level 8]"; + final String item = "[Level 1][Level 2][Level 3]"; if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null) { html.replace("%tele%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl()) + " (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease()) + "Adena /" + String.valueOf(Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); @@ -1081,7 +1081,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { html.replace("%support%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl()) + " (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease()) + "Adena /" + String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime())); - int grade = getClanHall().getGrade(); + final int grade = getClanHall().getGrade(); switch (grade) { case 0: @@ -1102,7 +1102,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { html.replace("%support%", "none"); html.replace("%support_period%", "none"); - int grade = getClanHall().getGrade(); + final int grade = getClanHall().getGrade(); switch (grade) { case 0: @@ -1165,7 +1165,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm"); html.replace("%name%", "Curtains (Decoration)"); - int stage = Integer.parseInt(val); + final int stage = Integer.parseInt(val); int cost; switch (stage) { @@ -1188,7 +1188,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm"); html.replace("%name%", "Front Platform (Decoration)"); - int stage = Integer.parseInt(val); + final int stage = Integer.parseInt(val); int cost; switch (stage) { @@ -1227,7 +1227,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance return; } } - int lvl = Integer.parseInt(val); + final int lvl = Integer.parseInt(val); switch (lvl) { case 0: @@ -1276,7 +1276,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance return; } } - int lvl = Integer.parseInt(val); + final int lvl = Integer.parseInt(val); switch (lvl) { case 0: @@ -1306,8 +1306,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/clanHallManager/deco.htm"); - String curtains = "[Level 1][Level 2]"; - String fixtures = "[Level 1][Level 2]"; + final String curtains = "[Level 1][Level 2]"; + final String fixtures = "[Level 1][Level 2]"; if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null) { html.replace("%curtain%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl()) + " (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease()) + "Adena /" + String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); @@ -1370,7 +1370,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance try { - int skill_id = Integer.parseInt(val); + final int skill_id = Integer.parseInt(val); try { int skill_lvl = 0; @@ -1452,7 +1452,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } else if (actualCommand.equalsIgnoreCase("goto")) { - int whereTo = Integer.parseInt(val); + final int whereTo = Integer.parseInt(val); doTeleport(player, whereTo); return; } @@ -1473,7 +1473,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance player.sendPacket(ActionFailed.STATIC_PACKET); String filename = "html/clanHallManager/chamberlain-no.htm"; - int condition = validateCondition(player); + final int condition = validateCondition(player); if (condition == COND_OWNER) { filename = "html/clanHallManager/chamberlain-" + getId() + ".htm"; @@ -1546,7 +1546,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { _log.warning("doTeleport(L2PcInstance player, int val) is called"); } - L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val); + final L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val); if (list != null) { if (player.isCombatFlagEquipped()) @@ -1572,12 +1572,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance private void revalidateDeco(L2PcInstance player) { - AuctionableHall ch = ClanHallManager.getInstance().getClanHallByOwner(player.getClan()); + final AuctionableHall ch = ClanHallManager.getInstance().getClanHallByOwner(player.getClan()); if (ch == null) { return; } - AgitDecoInfo bl = new AgitDecoInfo(ch); + final AgitDecoInfo bl = new AgitDecoInfo(ch); player.sendPacket(bl); } } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClassMasterInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClassMasterInstance.java index 19de9fb848..e700e63540 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClassMasterInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClassMasterInstance.java @@ -157,7 +157,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance try { - int val = Integer.parseInt(request.substring(21)); + final int val = Integer.parseInt(request.substring(21)); checkAndChangeClass(player, val); } catch (NumberFormatException e) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java index f53151d7b2..cff953df60 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java @@ -315,7 +315,7 @@ public final class L2CubicInstance implements IIdentifiable try { _target = null; - L2Object ownerTarget = _owner.getTarget(); + final L2Object ownerTarget = _owner.getTarget(); if (ownerTarget == null) { return; @@ -323,11 +323,11 @@ public final class L2CubicInstance implements IIdentifiable // TvT event targeting if (TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_owner.getObjectId())) { - TvTEventTeam enemyTeam = TvTEvent.getParticipantEnemyTeam(_owner.getObjectId()); + final TvTEventTeam enemyTeam = TvTEvent.getParticipantEnemyTeam(_owner.getObjectId()); if (ownerTarget.getActingPlayer() != null) { - L2PcInstance target = ownerTarget.getActingPlayer(); + final L2PcInstance target = ownerTarget.getActingPlayer(); if (enemyTeam.containsPlayer(target.getObjectId()) && !(target.isDead())) { _target = (L2Character) ownerTarget; @@ -338,13 +338,13 @@ public final class L2CubicInstance implements IIdentifiable // Duel targeting if (_owner.isInDuel()) { - L2PcInstance PlayerA = DuelManager.getInstance().getDuel(_owner.getDuelId()).getTeamLeaderA(); - L2PcInstance PlayerB = DuelManager.getInstance().getDuel(_owner.getDuelId()).getTeamLeaderB(); + final L2PcInstance PlayerA = DuelManager.getInstance().getDuel(_owner.getDuelId()).getTeamLeaderA(); + final L2PcInstance PlayerB = DuelManager.getInstance().getDuel(_owner.getDuelId()).getTeamLeaderB(); if (DuelManager.getInstance().getDuel(_owner.getDuelId()).isPartyDuel()) { - L2Party partyA = PlayerA.getParty(); - L2Party partyB = PlayerB.getParty(); + final L2Party partyA = PlayerA.getParty(); + final L2Party partyB = PlayerB.getParty(); L2Party partyEnemy = null; if (partyA != null) @@ -544,8 +544,8 @@ public final class L2CubicInstance implements IIdentifiable if (skill.isBad()) { - byte shld = Formulas.calcShldUse(_owner, target, skill); - boolean acted = Formulas.calcCubicSkillSuccess(this, target, skill, shld); + final byte shld = Formulas.calcShldUse(_owner, target, skill); + final boolean acted = Formulas.calcCubicSkillSuccess(this, target, skill, shld); if (!acted) { _owner.sendPacket(SystemMessageId.YOUR_ATTACK_HAS_FAILED); @@ -590,8 +590,8 @@ public final class L2CubicInstance implements IIdentifiable } } - boolean mcrit = Formulas.calcMCrit(_owner.getMCriticalHit(target, skill)); - byte shld = Formulas.calcShldUse(_owner, target, skill); + final boolean mcrit = Formulas.calcMCrit(_owner.getMCriticalHit(target, skill)); + final byte shld = Formulas.calcShldUse(_owner, target, skill); int damage = (int) Formulas.calcMagicDam(this, target, skill, mcrit, shld); if (Config.DEBUG) @@ -636,19 +636,19 @@ public final class L2CubicInstance implements IIdentifiable continue; } - boolean mcrit = Formulas.calcMCrit(_owner.getMCriticalHit(target, skill)); - byte shld = Formulas.calcShldUse(_owner, target, skill); + final boolean mcrit = Formulas.calcMCrit(_owner.getMCriticalHit(target, skill)); + final byte shld = Formulas.calcShldUse(_owner, target, skill); - int damage = (int) Formulas.calcMagicDam(this, target, skill, mcrit, shld); + final int damage = (int) Formulas.calcMagicDam(this, target, skill, mcrit, shld); if (Config.DEBUG) { _log.info("L2SkillDrain: useCubicSkill() -> damage = " + damage); } // TODO: Unhardcode fixed value - double hpAdd = (0.4 * damage); - L2PcInstance owner = _owner; - double hp = ((owner.getCurrentHp() + hpAdd) > owner.getMaxHp() ? owner.getMaxHp() : (owner.getCurrentHp() + hpAdd)); + final double hpAdd = (0.4 * damage); + final L2PcInstance owner = _owner; + final double hp = ((owner.getCurrentHp() + hpAdd) > owner.getMaxHp() ? owner.getMaxHp() : (owner.getCurrentHp() + hpAdd)); owner.setCurrentHp(hp); @@ -682,7 +682,7 @@ public final class L2CubicInstance implements IIdentifiable continue; } - byte shld = Formulas.calcShldUse(_owner, target, skill); + final byte shld = Formulas.calcShldUse(_owner, target, skill); if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.PARALYZE, L2EffectType.ROOT)) { @@ -753,7 +753,7 @@ public final class L2CubicInstance implements IIdentifiable int x, y, z; // temporary range check until real behavior of cubics is known/coded - int range = MAX_MAGIC_RANGE; + final int range = MAX_MAGIC_RANGE; x = (owner.getX() - target.getX()); y = (owner.getY() - target.getY()); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java index ece56e42a9..ca873747e6 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java @@ -50,7 +50,7 @@ public class L2DecoyInstance extends L2Decoy setInstanceType(InstanceType.L2DecoyInstance); _totalLifeTime = totalLifeTime; _timeRemaining = _totalLifeTime; - int skilllevel = getTemplate().getDisplayId() - 13070; + final int skilllevel = getTemplate().getDisplayId() - 13070; _DecoyLifeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000); _HateSpam = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); } @@ -102,7 +102,7 @@ public class L2DecoyInstance extends L2Decoy try { _Decoy.decTimeRemaining(1000); - double newTimeRemaining = _Decoy.getTimeRemaining(); + final double newTimeRemaining = _Decoy.getTimeRemaining(); if (newTimeRemaining < 0) { _Decoy.unSummon(_activeChar); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java index 8df97dcefa..0338d08193 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java @@ -92,12 +92,12 @@ public class L2DefenderInstance extends L2Attackable return false; } - L2PcInstance player = attacker.getActingPlayer(); + final L2PcInstance player = attacker.getActingPlayer(); // Check if siege is in progress if (((_fort != null) && _fort.getZone().isActive()) || ((_castle != null) && _castle.getZone().isActive()) || ((_hall != null) && _hall.getSiegeZone().isActive())) { - int activeSiegeId = (_fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0))); + final int activeSiegeId = (_fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0))); // Check if player is an enemy of this defender npc if ((player != null) && (((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) || ((player.getSiegeState() == 1)) || (player.getSiegeState() == 0))) @@ -215,11 +215,11 @@ public class L2DefenderInstance extends L2Attackable { if ((damage == 0) && (aggro <= 1) && (attacker instanceof L2Playable)) { - L2PcInstance player = attacker.getActingPlayer(); + final L2PcInstance player = attacker.getActingPlayer(); // Check if siege is in progress if (((_fort != null) && _fort.getZone().isActive()) || ((_castle != null) && _castle.getZone().isActive()) || ((_hall != null) && _hall.getSiegeZone().isActive())) { - int activeSiegeId = (_fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0))); + final int activeSiegeId = (_fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0))); if ((player != null) && (((player.getSiegeState() == 2) && player.isRegisteredOnThisSiegeField(activeSiegeId)) || ((player.getSiegeState() == 1)))) { return; diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java index ffcc52e17a..78a81940ff 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java @@ -103,10 +103,10 @@ public class L2DoorInstance extends L2Character startTimerOpen(); } - int clanhallId = template.getClanHallId(); + final int clanhallId = template.getClanHallId(); if (clanhallId > 0) { - ClanHall hall = ClanHallManager.getAllClanHalls().get(clanhallId); + final ClanHall hall = ClanHallManager.getAllClanHalls().get(clanhallId); if (hall != null) { setClanHall(hall); @@ -246,7 +246,7 @@ public class L2DoorInstance extends L2Character _open = open; if (getChildId() > 0) { - L2DoorInstance sibling = getSiblingDoor(getChildId()); + final L2DoorInstance sibling = getSiblingDoor(getChildId()); if (sibling != null) { sibling.notifyChildEvent(open); @@ -275,7 +275,7 @@ public class L2DoorInstance extends L2Character public int getDamage() { - int dmg = 6 - (int) Math.ceil((getCurrentHp() / getMaxHp()) * 6); + final int dmg = 6 - (int) Math.ceil((getCurrentHp() / getMaxHp()) * 6); if (dmg > 6) { return 6; @@ -360,11 +360,11 @@ public class L2DoorInstance extends L2Character return false; } - L2PcInstance actingPlayer = attacker.getActingPlayer(); + final L2PcInstance actingPlayer = attacker.getActingPlayer(); if (getClanHall() != null) { - SiegableHall hall = (SiegableHall) getClanHall(); + final SiegableHall hall = (SiegableHall) getClanHall(); if (!hall.isSiegableHall()) { return false; @@ -372,12 +372,12 @@ public class L2DoorInstance extends L2Character return hall.isInSiege() && hall.getSiege().doorIsAutoAttackable() && hall.getSiege().checkIsAttacker(actingPlayer.getClan()); } // Attackable only during siege by everyone (not owner) - boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive()); - boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getZone().isActive()); + final boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive()); + final boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getZone().isActive()); if (isFort) { - L2Clan clan = actingPlayer.getClan(); + final L2Clan clan = actingPlayer.getClan(); if ((clan != null) && (clan == getFort().getOwnerClan())) { return false; @@ -385,7 +385,7 @@ public class L2DoorInstance extends L2Character } else if (isCastle) { - L2Clan clan = actingPlayer.getClan(); + final L2Clan clan = actingPlayer.getClan(); if ((clan != null) && (clan.getId() == getCastle().getOwnerId())) { return false; @@ -429,15 +429,15 @@ public class L2DoorInstance extends L2Character @Override public void broadcastStatusUpdate() { - Collection knownPlayers = getKnownList().getKnownPlayers().values(); + final Collection knownPlayers = getKnownList().getKnownPlayers().values(); if ((knownPlayers == null) || knownPlayers.isEmpty()) { return; } - StaticObject su = new StaticObject(this, false); - StaticObject targetableSu = new StaticObject(this, true); - DoorStatusUpdate dsu = new DoorStatusUpdate(this); + final StaticObject su = new StaticObject(this, false); + final StaticObject targetableSu = new StaticObject(this, true); + final DoorStatusUpdate dsu = new DoorStatusUpdate(this); OnEventTrigger oe = null; if (getEmitter() > 0) { @@ -483,7 +483,7 @@ public class L2DoorInstance extends L2Character public final void closeMe() { // remove close task - Future oldTask = _autoCloseTask; + final Future oldTask = _autoCloseTask; if (oldTask != null) { _autoCloseTask = null; @@ -500,11 +500,11 @@ public class L2DoorInstance extends L2Character private void manageGroupOpen(boolean open, String groupName) { - Set set = DoorData.getDoorsByGroup(groupName); + final Set set = DoorData.getDoorsByGroup(groupName); L2DoorInstance first = null; for (Integer id : set) { - L2DoorInstance door = getSiblingDoor(id); + final L2DoorInstance door = getSiblingDoor(id); if (first == null) { first = door; @@ -528,7 +528,7 @@ public class L2DoorInstance extends L2Character */ private void notifyChildEvent(boolean open) { - byte openThis = open ? getTemplate().getMasterDoorOpen() : getTemplate().getMasterDoorClose(); + final byte openThis = open ? getTemplate().getMasterDoorOpen() : getTemplate().getMasterDoorClose(); if (openThis == 0) { @@ -652,9 +652,9 @@ public class L2DoorInstance extends L2Character return false; } - boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress()); - boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress()); - boolean isHall = ((getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).isInSiege()); + final boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress()); + final boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress()); + final boolean isHall = ((getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).isInSiege()); if (isFort || isCastle || isHall) { @@ -726,7 +726,7 @@ public class L2DoorInstance extends L2Character return DoorData.getInstance().getDoor(doorId); } - Instance inst = InstanceManager.getInstance().getInstance(getInstanceId()); + final Instance inst = InstanceManager.getInstance().getInstance(getInstanceId()); if (inst != null) { return inst.getDoor(doorId); @@ -741,7 +741,7 @@ public class L2DoorInstance extends L2Character { return; } - Future oldTask = _autoCloseTask; + final Future oldTask = _autoCloseTask; if (oldTask != null) { _autoCloseTask = null; @@ -767,7 +767,7 @@ public class L2DoorInstance extends L2Character @Override public void run() { - boolean open = getOpen(); + final boolean open = getOpen(); if (open) { closeMe(); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java index 19dc93941c..91b8498b3d 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java @@ -111,7 +111,7 @@ public class L2DoormenInstance extends L2NpcInstance protected void openDoors(L2PcInstance player, String command) { - StringTokenizer st = new StringTokenizer(command.substring(10), ", "); + final StringTokenizer st = new StringTokenizer(command.substring(10), ", "); st.nextToken(); while (st.hasMoreTokens()) @@ -122,7 +122,7 @@ public class L2DoormenInstance extends L2NpcInstance protected void closeDoors(L2PcInstance player, String command) { - StringTokenizer st = new StringTokenizer(command.substring(11), ", "); + final StringTokenizer st = new StringTokenizer(command.substring(11), ", "); st.nextToken(); while (st.hasMoreTokens()) @@ -143,7 +143,7 @@ public class L2DoormenInstance extends L2NpcInstance protected void doTeleport(L2PcInstance player, String command) { final int whereTo = Integer.parseInt(command.substring(5).trim()); - L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(whereTo); + final L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(whereTo); if (list != null) { if (!player.isAlikeDead()) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java index e7962a1f76..35eb7d067a 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java @@ -113,7 +113,7 @@ public final class L2FishermanInstance extends L2MerchantInstance final int minlLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getFishingSkillTree()); if (minlLevel > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); sm.addInt(minlLevel); player.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java index 79e2428636..3cedff7d4d 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -62,7 +62,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance return false; } - boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress() && !getFort().getSiege().checkIsDefender(((L2PcInstance) attacker).getClan())); + final boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress() && !getFort().getSiege().checkIsDefender(((L2PcInstance) attacker).getClan())); // Attackable during siege by all except defenders return (isFort); @@ -124,10 +124,10 @@ public class L2FortCommanderInstance extends L2DefenderInstance @Override public final void addDamage(L2Character attacker, int damage, Skill skill) { - L2Spawn spawn = getSpawn(); + final L2Spawn spawn = getSpawn(); if ((spawn != null) && canTalk()) { - List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId()); + final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId()); for (FortSiegeSpawn spawn2 : commanders) { if (spawn2.getId() == spawn.getId()) @@ -151,7 +151,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance } if (npcString != null) { - NpcSay ns = new NpcSay(getObjectId(), ChatType.NPC_SHOUT, getId(), npcString); + final NpcSay ns = new NpcSay(getObjectId(), ChatType.NPC_SHOUT, getId(), npcString); if (npcString.getParamCount() == 1) { ns.addStringParameter(attacker.getName()); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java index 022255528e..3c793f5926 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java @@ -64,7 +64,7 @@ public class L2FortDoormenInstance extends L2DoormenInstance @Override protected final void openDoors(L2PcInstance player, String command) { - StringTokenizer st = new StringTokenizer(command.substring(10), ", "); + final StringTokenizer st = new StringTokenizer(command.substring(10), ", "); st.nextToken(); while (st.hasMoreTokens()) @@ -76,7 +76,7 @@ public class L2FortDoormenInstance extends L2DoormenInstance @Override protected final void closeDoors(L2PcInstance player, String command) { - StringTokenizer st = new StringTokenizer(command.substring(11), ", "); + final StringTokenizer st = new StringTokenizer(command.substring(11), ", "); st.nextToken(); while (st.hasMoreTokens()) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java index c1cf0d3d92..d8c5f975cf 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java @@ -74,8 +74,8 @@ public class L2FortLogisticsInstance extends L2MerchantInstance return; } - StringTokenizer st = new StringTokenizer(command, " "); - String actualCommand = st.nextToken(); // Get actual command + final StringTokenizer st = new StringTokenizer(command, " "); + final String actualCommand = st.nextToken(); // Get actual command final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); if (actualCommand.equalsIgnoreCase("rewards")) @@ -150,8 +150,8 @@ public class L2FortLogisticsInstance extends L2MerchantInstance if (level > 0) { // spawn box - L2NpcTemplate boxTemplate = NpcData.getInstance().getTemplate(SUPPLY_BOX_IDS[level - 1]); - L2MonsterInstance box = new L2MonsterInstance(boxTemplate); + final L2NpcTemplate boxTemplate = NpcData.getInstance().getTemplate(SUPPLY_BOX_IDS[level - 1]); + final L2MonsterInstance box = new L2MonsterInstance(boxTemplate); box.setCurrentHp(box.getMaxHp()); box.setCurrentMp(box.getMaxMp()); box.setHeading(0); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java index 61baa84483..3f56bdba30 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -79,8 +79,8 @@ public class L2FortManagerInstance extends L2MerchantInstance { return; } - SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); - int condition = validateCondition(player); + final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + final int condition = validateCondition(player); if (condition <= COND_ALL_FALSE) { return; @@ -91,8 +91,8 @@ public class L2FortManagerInstance extends L2MerchantInstance } else if (condition == COND_OWNER) { - StringTokenizer st = new StringTokenizer(command, " "); - String actualCommand = st.nextToken(); // Get actual command + final StringTokenizer st = new StringTokenizer(command, " "); + final String actualCommand = st.nextToken(); // Get actual command String val = ""; if (st.countTokens() >= 1) @@ -145,15 +145,15 @@ public class L2FortManagerInstance extends L2MerchantInstance html.replace("%objectId%", String.valueOf(getObjectId())); if (Config.FS_MAX_OWN_TIME > 0) { - int hour = (int) Math.floor(getFort().getTimeTillRebelArmy() / 3600); - int minutes = (int) (Math.floor(getFort().getTimeTillRebelArmy() - (hour * 3600)) / 60); + final int hour = (int) Math.floor(getFort().getTimeTillRebelArmy() / 3600); + final int minutes = (int) (Math.floor(getFort().getTimeTillRebelArmy() - (hour * 3600)) / 60); html.replace("%hr%", String.valueOf(hour)); html.replace("%min%", String.valueOf(minutes)); } else { - int hour = (int) Math.floor(getFort().getOwnedTime() / 3600); - int minutes = (int) (Math.floor(getFort().getOwnedTime() - (hour * 3600)) / 60); + final int hour = (int) Math.floor(getFort().getOwnedTime() / 3600); + final int minutes = (int) (Math.floor(getFort().getOwnedTime() - (hour * 3600)) / 60); html.replace("%hr%", String.valueOf(hour)); html.replace("%min%", String.valueOf(minutes)); } @@ -195,7 +195,7 @@ public class L2FortManagerInstance extends L2MerchantInstance { if (!val.isEmpty()) { - boolean open = (Integer.parseInt(val) == 1); + final boolean open = (Integer.parseInt(val) == 1); while (st.hasMoreTokens()) { getFort().openCloseDoor(player, Integer.parseInt(st.nextToken()), open); @@ -246,8 +246,8 @@ public class L2FortManagerInstance extends L2MerchantInstance { if (Config.L2JMOD_ENABLE_WAREHOUSESORTING_CLAN) { - String htmFile = "html/mods/WhSortedC.htm"; - String htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmFile); + final String htmFile = "html/mods/WhSortedC.htm"; + final String htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmFile); if (htmContent != null) { final NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage(getObjectId()); @@ -280,7 +280,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } else if (actualCommand.startsWith("WithdrawSortedC")) { - String param[] = command.split("_"); + final String param[] = command.split("_"); if (param.length > 2) { showVaultWindowWithdraw(player, WarehouseListType.valueOf(param[1]), SortedWareHouseWithdrawalList.getOrder(param[2])); @@ -404,7 +404,7 @@ public class L2FortManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply.htm"); html.replace("%name%", "(HP Recovery Device)"); - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); int cost; switch (percent) { @@ -428,7 +428,7 @@ public class L2FortManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply.htm"); html.replace("%name%", "(MP Recovery)"); - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); int cost; switch (percent) { @@ -451,7 +451,7 @@ public class L2FortManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply.htm"); html.replace("%name%", "(EXP Recovery Device)"); - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); int cost; switch (percent) { @@ -490,7 +490,7 @@ public class L2FortManagerInstance extends L2MerchantInstance return; } } - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); switch (percent) { case 0: @@ -535,7 +535,7 @@ public class L2FortManagerInstance extends L2MerchantInstance return; } } - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); switch (percent) { case 0: @@ -580,7 +580,7 @@ public class L2FortManagerInstance extends L2MerchantInstance return; } } - int percent = Integer.parseInt(val); + final int percent = Integer.parseInt(val); switch (percent) { case 0: @@ -606,9 +606,9 @@ public class L2FortManagerInstance extends L2MerchantInstance } final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/edit_recovery.htm"); - String hp = "[300%][400%]"; - String exp = "[45%][50%]"; - String mp = "[40%][50%]"; + final String hp = "[300%][400%]"; + final String exp = "[45%][50%]"; + final String mp = "[40%][50%]"; if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null) { html.replace("%hp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl()) + "% (" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease()) + "Adena /" + String.valueOf(Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); @@ -679,7 +679,7 @@ public class L2FortManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply.htm"); html.replace("%name%", "Insignia (Supplementary Magic)"); - int stage = Integer.parseInt(val); + final int stage = Integer.parseInt(val); int cost; switch (stage) { @@ -702,7 +702,7 @@ public class L2FortManagerInstance extends L2MerchantInstance final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply.htm"); html.replace("%name%", "Mirror (Teleportation Device)"); - int stage = Integer.parseInt(val); + final int stage = Integer.parseInt(val); int cost; switch (stage) { @@ -741,7 +741,7 @@ public class L2FortManagerInstance extends L2MerchantInstance return; } } - int lvl = Integer.parseInt(val); + final int lvl = Integer.parseInt(val); switch (lvl) { case 0: @@ -786,7 +786,7 @@ public class L2FortManagerInstance extends L2MerchantInstance return; } } - int lvl = Integer.parseInt(val); + final int lvl = Integer.parseInt(val); switch (lvl) { case 0: @@ -815,8 +815,8 @@ public class L2FortManagerInstance extends L2MerchantInstance } final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/edit_other.htm"); - String tele = "[Level 1][Level 2]"; - String support = "[Level 1][Level 2]"; + final String tele = "[Level 1][Level 2]"; + final String support = "[Level 1][Level 2]"; if (getFort().getFunction(Fort.FUNC_TELEPORT) != null) { html.replace("%tele%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLvl()) + " (" + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLease()) + "Adena /" + String.valueOf(Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); @@ -873,7 +873,7 @@ public class L2FortManagerInstance extends L2MerchantInstance try { - int skill_id = Integer.parseInt(val); + final int skill_id = Integer.parseInt(val); try { if (getFort().getFunction(Fort.FUNC_SUPPORT) == null) @@ -938,7 +938,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } else if (actualCommand.equalsIgnoreCase("goto")) { - int whereTo = Integer.parseInt(val); + final int whereTo = Integer.parseInt(val); doTeleport(player, whereTo); return; } @@ -952,7 +952,7 @@ public class L2FortManagerInstance extends L2MerchantInstance player.sendPacket(ActionFailed.STATIC_PACKET); String filename = "html/fortress/foreman-no.htm"; - int condition = validateCondition(player); + final int condition = validateCondition(player); if (condition > COND_ALL_FALSE) { if (condition == COND_BUSY_BECAUSE_OF_SIEGE) @@ -978,7 +978,7 @@ public class L2FortManagerInstance extends L2MerchantInstance { _log.warning("doTeleport(L2PcInstance player, int val) is called"); } - L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val); + final L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val); if (list != null) { if (player.destroyItemByItemId("Teleport", list.getItemId(), list.getPrice(), this, true)) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java index b36d69a466..1e0fcaea81 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java @@ -88,7 +88,7 @@ public class L2GuardInstance extends L2Attackable super.onSpawn(); // check the region where this mob is, do not activate the AI if region is inactive. - L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY()); + final L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY()); if ((region != null) && (!region.isActive())) { getAI().stopAITask(); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java index 1a399e965b..d6f1758bbd 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java @@ -89,7 +89,7 @@ public class L2NpcInstance extends L2Npc final int minLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getCollectSkillTree()); if (minLevel > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); sm.addInt(minLevel); player.sendPacket(sm); } @@ -130,7 +130,7 @@ public class L2NpcInstance extends L2Npc final int minLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, skillTree); if (minLevel > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); sm.addInt(minLevel); player.sendPacket(sm); } @@ -138,7 +138,7 @@ public class L2NpcInstance extends L2Npc { if (player.getClassId().level() == 1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN_PLEASE_COME_BACK_AFTER_S1ND_CLASS_CHANGE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN_PLEASE_COME_BACK_AFTER_S1ND_CLASS_CHANGE); sm.addInt(2); player.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java index 2042f35fd9..7b0ca85d6f 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java @@ -947,7 +947,7 @@ public final class L2PcInstance extends L2Playable public static L2PcInstance create(L2PcTemplate template, String accountName, String name, PcAppearance app) { // Create a new L2PcInstance with an account name - L2PcInstance player = new L2PcInstance(template, accountName, app); + final L2PcInstance player = new L2PcInstance(template, accountName, app); // Set the name of the L2PcInstance player.setName(name); // Set Character's create time @@ -1072,7 +1072,7 @@ public final class L2PcInstance extends L2Playable if (getBlockCheckerArena() != -1) { result |= RelationChanged.RELATION_INSIEGE; - ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena()); + final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena()); if (holder.getPlayerTeam(this) == 0) { result |= RelationChanged.RELATION_ENEMY; @@ -1225,7 +1225,7 @@ public final class L2PcInstance extends L2Playable { if (isTransformed()) { - double levelMod = getTransformation().getLevelMod(this); + final double levelMod = getTransformation().getLevelMod(this); if (levelMod > -1) { return levelMod; @@ -1736,7 +1736,7 @@ public final class L2PcInstance extends L2Playable } setPvpFlag(value); - UserInfo ui = new UserInfo(this, false); + final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); sendPacket(ui); @@ -1826,7 +1826,7 @@ public final class L2PcInstance extends L2Playable return; } _lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE; - ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE); + final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE); sendPacket(cz); } else if (isInsideZone(ZoneId.SIEGE)) @@ -1836,7 +1836,7 @@ public final class L2PcInstance extends L2Playable return; } _lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2; - ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2); + final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2); sendPacket(cz); } else if (isInsideZone(ZoneId.PVP)) @@ -1846,7 +1846,7 @@ public final class L2PcInstance extends L2Playable return; } _lastCompassZone = ExSetCompassZoneCode.PVPZONE; - ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE); + final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE); sendPacket(cz); } else if (isInsideZone(ZoneId.PEACE)) @@ -1856,7 +1856,7 @@ public final class L2PcInstance extends L2Playable return; } _lastCompassZone = ExSetCompassZoneCode.PEACEZONE; - ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE); + final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE); sendPacket(cz); } else @@ -1870,7 +1870,7 @@ public final class L2PcInstance extends L2Playable updatePvPStatus(); } _lastCompassZone = ExSetCompassZoneCode.GENERALZONE; - ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE); + final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE); sendPacket(cz); } } @@ -2023,7 +2023,7 @@ public final class L2PcInstance extends L2Playable if ((getReputation() < 0) && (karma < 0)) { - Collection objs = getKnownList().getKnownObjects().values(); + final Collection objs = getKnownList().getKnownObjects().values(); for (L2Object object : objs) { @@ -2101,10 +2101,10 @@ public final class L2PcInstance extends L2Playable */ public void refreshOverloaded() { - int maxLoad = getMaxLoad(); + final int maxLoad = getMaxLoad(); if (maxLoad > 0) { - long weightproc = (((getCurrentLoad() - getBonusWeightPenalty()) * 1000) / getMaxLoad()); + final long weightproc = (((getCurrentLoad() - getBonusWeightPenalty()) * 1000) / getMaxLoad()); int newWeightPenalty; if ((weightproc < 500) || _dietMode) { @@ -2246,7 +2246,7 @@ public final class L2PcInstance extends L2Playable } sendPacket(sm); - int slot = getInventory().getSlotFromItem(item); + final int slot = getInventory().getSlotFromItem(item); // we can't unequip talisman by body slot if ((slot == L2Item.SLOT_DECO) || (slot == L2Item.SLOT_BROOCH_JEWEL)) { @@ -2293,7 +2293,7 @@ public final class L2PcInstance extends L2Playable broadcastUserInfo(); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItems(Arrays.asList(items)); sendPacket(iu); @@ -2402,7 +2402,7 @@ public final class L2PcInstance extends L2Playable } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); msg.addPcName(this); _clan.broadcastToOnlineMembers(msg); _clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(getName())); @@ -2523,55 +2523,55 @@ public final class L2PcInstance extends L2Playable if ((classId >= 0x00) && (classId <= 0x09)) { // human fighter fists - L2Item temp = ItemTable.getInstance().getTemplate(246); + final L2Item temp = ItemTable.getInstance().getTemplate(246); weaponItem = (L2Weapon) temp; } else if ((classId >= 0x0a) && (classId <= 0x11)) { // human mage fists - L2Item temp = ItemTable.getInstance().getTemplate(251); + final L2Item temp = ItemTable.getInstance().getTemplate(251); weaponItem = (L2Weapon) temp; } else if ((classId >= 0x12) && (classId <= 0x18)) { // elven fighter fists - L2Item temp = ItemTable.getInstance().getTemplate(244); + final L2Item temp = ItemTable.getInstance().getTemplate(244); weaponItem = (L2Weapon) temp; } else if ((classId >= 0x19) && (classId <= 0x1e)) { // elven mage fists - L2Item temp = ItemTable.getInstance().getTemplate(249); + final L2Item temp = ItemTable.getInstance().getTemplate(249); weaponItem = (L2Weapon) temp; } else if ((classId >= 0x1f) && (classId <= 0x25)) { // dark elven fighter fists - L2Item temp = ItemTable.getInstance().getTemplate(245); + final L2Item temp = ItemTable.getInstance().getTemplate(245); weaponItem = (L2Weapon) temp; } else if ((classId >= 0x26) && (classId <= 0x2b)) { // dark elven mage fists - L2Item temp = ItemTable.getInstance().getTemplate(250); + final L2Item temp = ItemTable.getInstance().getTemplate(250); weaponItem = (L2Weapon) temp; } else if ((classId >= 0x2c) && (classId <= 0x30)) { // orc fighter fists - L2Item temp = ItemTable.getInstance().getTemplate(248); + final L2Item temp = ItemTable.getInstance().getTemplate(248); weaponItem = (L2Weapon) temp; } else if ((classId >= 0x31) && (classId <= 0x34)) { // orc mage fists - L2Item temp = ItemTable.getInstance().getTemplate(252); + final L2Item temp = ItemTable.getInstance().getTemplate(252); weaponItem = (L2Weapon) temp; } else if ((classId >= 0x35) && (classId <= 0x39)) { // dwarven fists - L2Item temp = ItemTable.getInstance().getTemplate(247); + final L2Item temp = ItemTable.getInstance().getTemplate(247); weaponItem = (L2Weapon) temp; } @@ -2620,7 +2620,7 @@ public final class L2PcInstance extends L2Playable // Add clan skills if (getClan() != null) { - L2Clan clan = getClan(); + final L2Clan clan = getClan(); clan.addSkillEffects(this); if ((clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) @@ -2651,8 +2651,8 @@ public final class L2PcInstance extends L2Playable { int skillCounter = 0; // Get available skills. - Collection skills = SkillTreesData.getInstance().getAllAvailableSkills(this, getClassId(), includedByFs, includeAutoGet); - List skillsForStore = new ArrayList<>(); + final Collection skills = SkillTreesData.getInstance().getAllAvailableSkills(this, getClassId(), includedByFs, includeAutoGet); + final List skillsForStore = new ArrayList<>(); for (Skill sk : skills) { @@ -2802,13 +2802,13 @@ public final class L2PcInstance extends L2Playable */ public boolean isCastleLord(int castleId) { - L2Clan clan = getClan(); + final L2Clan clan = getClan(); // player has clan and is the clan leader, check the castle info if ((clan != null) && (clan.getLeader().getPlayerInstance() == this)) { // if the clan has a castle and it is actually the queried castle, return true - Castle castle = CastleManager.getInstance().getCastleByOwner(clan); + final Castle castle = CastleManager.getInstance().getCastleByOwner(clan); if ((castle != null) && (castle == CastleManager.getInstance().getCastleById(castleId))) { return true; @@ -3067,7 +3067,7 @@ public final class L2PcInstance extends L2Playable { if (sendMessage) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA); sm.addLong(count); sendPacket(sm); } @@ -3079,7 +3079,7 @@ public final class L2PcInstance extends L2Playable // Send update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(_inventory.getAdenaInstance()); sendPacket(iu); } @@ -3111,7 +3111,7 @@ public final class L2PcInstance extends L2Playable if (count > 0) { - L2ItemInstance adenaItem = _inventory.getAdenaInstance(); + final L2ItemInstance adenaItem = _inventory.getAdenaInstance(); if (!_inventory.reduceAdena(process, count, this, reference)) { return false; @@ -3120,7 +3120,7 @@ public final class L2PcInstance extends L2Playable // Send update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(adenaItem); sendPacket(iu); } @@ -3133,7 +3133,7 @@ public final class L2PcInstance extends L2Playable if (sendMessage) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ADENA_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ADENA_DISAPPEARED); sm.addLong(count); sendPacket(sm); } @@ -3163,7 +3163,7 @@ public final class L2PcInstance extends L2Playable if (count > 0) { - L2ItemInstance beautyTickets = _inventory.getAdenaInstance(); + final L2ItemInstance beautyTickets = _inventory.getAdenaInstance(); if (!_inventory.reduceBeautyTickets(process, count, this, reference)) { return false; @@ -3172,7 +3172,7 @@ public final class L2PcInstance extends L2Playable // Send update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(beautyTickets); sendPacket(iu); } @@ -3185,14 +3185,14 @@ public final class L2PcInstance extends L2Playable { if (count > 1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); sm.addItemName(Inventory.BEAUTY_TICKET_ID); sm.addLong(count); sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(Inventory.BEAUTY_TICKET_ID); sendPacket(sm); } @@ -3213,7 +3213,7 @@ public final class L2PcInstance extends L2Playable { if (sendMessage) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addItemName(Inventory.ANCIENT_ADENA_ID); sm.addLong(count); sendPacket(sm); @@ -3225,7 +3225,7 @@ public final class L2PcInstance extends L2Playable if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(_inventory.getAncientAdenaInstance()); sendPacket(iu); } @@ -3258,7 +3258,7 @@ public final class L2PcInstance extends L2Playable if (count > 0) { - L2ItemInstance ancientAdenaItem = _inventory.getAncientAdenaInstance(); + final L2ItemInstance ancientAdenaItem = _inventory.getAncientAdenaInstance(); if (!_inventory.reduceAncientAdena(process, count, this, reference)) { return false; @@ -3266,7 +3266,7 @@ public final class L2PcInstance extends L2Playable if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(ancientAdenaItem); sendPacket(iu); } @@ -3279,14 +3279,14 @@ public final class L2PcInstance extends L2Playable { if (count > 1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); sm.addItemName(Inventory.ANCIENT_ADENA_ID); sm.addLong(count); sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(Inventory.ANCIENT_ADENA_ID); sendPacket(sm); } @@ -3312,28 +3312,28 @@ public final class L2PcInstance extends L2Playable { if (item.getCount() > 1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); sm.addItemName(item); sm.addLong(item.getCount()); sendPacket(sm); } else if (item.getEnchantLevel() > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1); sm.addItemName(item); sendPacket(sm); } } // Add the item to inventory - L2ItemInstance newitem = _inventory.addItem(process, item, this, reference); + final L2ItemInstance newitem = _inventory.addItem(process, item, this, reference); // Update current load as well sendPacket(new ExUserInfoInvenWeight(this)); @@ -3353,7 +3353,7 @@ public final class L2PcInstance extends L2Playable { if (FortSiegeManager.getInstance().activateCombatFlag(this, item)) { - Fort fort = FortManager.getInstance().getFort(this); + final Fort fort = FortManager.getInstance().getFort(this); fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ACQUIRED_THE_FLAG), getName()); } } @@ -3386,14 +3386,14 @@ public final class L2PcInstance extends L2Playable { if (process.equalsIgnoreCase("Sweeper") || process.equalsIgnoreCase("Quest")) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addItemName(itemId); sm.addLong(count); sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); sm.addItemName(itemId); sm.addLong(count); sendPacket(sm); @@ -3403,13 +3403,13 @@ public final class L2PcInstance extends L2Playable { if (process.equalsIgnoreCase("Sweeper") || process.equalsIgnoreCase("Quest")) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1); sm.addItemName(itemId); sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1); sm.addItemName(itemId); sendPacket(sm); } @@ -3432,7 +3432,7 @@ public final class L2PcInstance extends L2Playable else { // Add the item to inventory - L2ItemInstance createdItem = _inventory.addItem(process, itemId, count, this, reference); + final L2ItemInstance createdItem = _inventory.addItem(process, itemId, count, this, reference); // If over capacity, drop the item if (!canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && !_inventory.validateCapacity(0, item.isQuestItem()) && createdItem.isDropable() && (!createdItem.isStackable() || (createdItem.getLastChange() != L2ItemInstance.MODIFIED))) @@ -3498,7 +3498,7 @@ public final class L2PcInstance extends L2Playable // Send inventory update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); playerIU.addItem(item); sendPacket(playerIU); } @@ -3516,14 +3516,14 @@ public final class L2PcInstance extends L2Playable { if (count > 1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); sm.addItemName(item); sm.addLong(count); sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(item); sendPacket(sm); } @@ -3544,7 +3544,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean destroyItem(String process, int objectId, long count, L2Object reference, boolean sendMessage) { - L2ItemInstance item = _inventory.getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if (item == null) { @@ -3569,7 +3569,7 @@ public final class L2PcInstance extends L2Playable */ public boolean destroyItemWithoutTrace(String process, int objectId, long count, L2Object reference, boolean sendMessage) { - L2ItemInstance item = _inventory.getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getCount() < count)) { @@ -3601,7 +3601,7 @@ public final class L2PcInstance extends L2Playable return reduceAdena(process, count, reference, sendMessage); } - L2ItemInstance item = _inventory.getItemByItemId(itemId); + final L2ItemInstance item = _inventory.getItemByItemId(itemId); if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null)) { @@ -3616,7 +3616,7 @@ public final class L2PcInstance extends L2Playable // Send inventory update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); playerIU.addItem(item); sendPacket(playerIU); } @@ -3634,14 +3634,14 @@ public final class L2PcInstance extends L2Playable { if (count > 1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); sm.addItemName(itemId); sm.addLong(count); sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(itemId); sendPacket(sm); } @@ -3661,12 +3661,12 @@ public final class L2PcInstance extends L2Playable */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2Object reference) { - L2ItemInstance oldItem = checkItemManipulation(objectId, count, "transfer"); + final L2ItemInstance oldItem = checkItemManipulation(objectId, count, "transfer"); if (oldItem == null) { return null; } - L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference); + final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference); if (newItem == null) { return null; @@ -3675,7 +3675,7 @@ public final class L2PcInstance extends L2Playable // Send inventory update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); if ((oldItem.getCount() > 0) && (oldItem != newItem)) { @@ -3700,11 +3700,11 @@ public final class L2PcInstance extends L2Playable // Send target update packet if (target instanceof PcInventory) { - L2PcInstance targetPlayer = ((PcInventory) target).getOwner(); + final L2PcInstance targetPlayer = ((PcInventory) target).getOwner(); if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); if (newItem.getCount() > count) { @@ -3728,7 +3728,7 @@ public final class L2PcInstance extends L2Playable } else if (target instanceof PetInventory) { - PetInventoryUpdate petIU = new PetInventoryUpdate(); + final PetInventoryUpdate petIU = new PetInventoryUpdate(); if (newItem.getCount() > count) { @@ -3844,7 +3844,7 @@ public final class L2PcInstance extends L2Playable // Send inventory update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); playerIU.addItem(item); sendPacket(playerIU); } @@ -3860,7 +3860,7 @@ public final class L2PcInstance extends L2Playable // Sends message to client if requested if (sendMessage) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1); sm.addItemName(item); sendPacket(sm); } @@ -3888,8 +3888,8 @@ public final class L2PcInstance extends L2Playable */ public L2ItemInstance dropItem(String process, int objectId, long count, int x, int y, int z, L2Object reference, boolean sendMessage, boolean protectItem) { - L2ItemInstance invitem = _inventory.getItemByObjectId(objectId); - L2ItemInstance item = _inventory.dropItem(process, objectId, count, this, reference); + final L2ItemInstance invitem = _inventory.getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.dropItem(process, objectId, count, this, reference); if (item == null) { @@ -3935,7 +3935,7 @@ public final class L2PcInstance extends L2Playable // Send inventory update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); playerIU.addItem(invitem); sendPacket(playerIU); } @@ -3951,7 +3951,7 @@ public final class L2PcInstance extends L2Playable // Sends message to client if requested if (sendMessage) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1); sm.addItemName(item); sendPacket(sm); } @@ -3968,7 +3968,7 @@ public final class L2PcInstance extends L2Playable return null; } - L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = getInventory().getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -4101,7 +4101,7 @@ public final class L2PcInstance extends L2Playable */ private void closeNetConnection(boolean closeClient) { - L2GameClient client = _client; + final L2GameClient client = _client; if (client != null) { if (client.isDetached()) @@ -4164,7 +4164,7 @@ public final class L2PcInstance extends L2Playable // Check if the spell using charges or not in AirShip if (((getCharges() < skill.getChargeConsume())) || (isInAirShip() && !skill.hasEffectType(L2EffectType.REFUEL_AIRSHIP))) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); sm.addSkillName(skill); sendPacket(sm); return false; @@ -4178,7 +4178,7 @@ public final class L2PcInstance extends L2Playable */ private boolean needCpUpdate() { - double currentCp = getCurrentCp(); + final double currentCp = getCurrentCp(); if ((currentCp <= 1.0) || (getMaxCp() < MAX_HP_BAR_PX)) { @@ -4194,7 +4194,7 @@ public final class L2PcInstance extends L2Playable } else { - double doubleMulti = currentCp / _cpUpdateInterval; + final double doubleMulti = currentCp / _cpUpdateInterval; int intMulti = (int) doubleMulti; _cpUpdateDecCheck = _cpUpdateInterval * (doubleMulti < intMulti ? intMulti-- : intMulti); @@ -4213,7 +4213,7 @@ public final class L2PcInstance extends L2Playable */ private boolean needMpUpdate() { - double currentMp = getCurrentMp(); + final double currentMp = getCurrentMp(); if ((currentMp <= 1.0) || (getMaxMp() < MAX_HP_BAR_PX)) { @@ -4229,7 +4229,7 @@ public final class L2PcInstance extends L2Playable } else { - double doubleMulti = currentMp / _mpUpdateInterval; + final double doubleMulti = currentMp / _mpUpdateInterval; int intMulti = (int) doubleMulti; _mpUpdateDecCheck = _mpUpdateInterval * (doubleMulti < intMulti ? intMulti-- : intMulti); @@ -4254,7 +4254,7 @@ public final class L2PcInstance extends L2Playable // super.broadcastStatusUpdate(); // Send the Server->Client packet StatusUpdate with current HP, MP and CP to this L2PcInstance - StatusUpdate su = new StatusUpdate(this); + final StatusUpdate su = new StatusUpdate(this); su.addAttribute(StatusUpdate.MAX_HP, getMaxHp()); su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp()); su.addAttribute(StatusUpdate.MAX_MP, getMaxMp()); @@ -4322,7 +4322,7 @@ public final class L2PcInstance extends L2Playable public final void broadcastUserInfo(UserInfoType... types) { // Send a Server->Client packet UserInfo to this L2PcInstance - UserInfo ui = new UserInfo(this, false); + final UserInfo ui = new UserInfo(this, false); ui.addComponentType(types); sendPacket(ui); @@ -4333,7 +4333,7 @@ public final class L2PcInstance extends L2Playable public final void broadcastTitleInfo() { // Send a Server->Client packet UserInfo to this L2PcInstance - UserInfo ui = new UserInfo(this, false); + final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.CLAN); sendPacket(ui); @@ -4343,7 +4343,7 @@ public final class L2PcInstance extends L2Playable public final void broadcastPacket(SocialAction sa) { - Collection objs = getKnownList().getKnownObjects().values(); + final Collection objs = getKnownList().getKnownObjects().values(); for (L2Object npc : objs) { if ((npc != null) && npc.isNpc()) @@ -4377,7 +4377,7 @@ public final class L2PcInstance extends L2Playable } player.sendPacket(mov); final int relation = getRelation(player); - Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId()); + final Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId()); if ((oldrelation == null) || (oldrelation != relation)) { final RelationChanged rc = new RelationChanged(); @@ -4421,7 +4421,7 @@ public final class L2PcInstance extends L2Playable if (mov instanceof CharInfo) { final int relation = getRelation(player); - Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId()); + final Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId()); if ((oldrelation == null) || (oldrelation != relation)) { final RelationChanged rc = new RelationChanged(); @@ -4515,7 +4515,7 @@ public final class L2PcInstance extends L2Playable { if (target instanceof L2PcInstance) { - L2PcInstance temp = (L2PcInstance) target; + final L2PcInstance temp = (L2PcInstance) target; sendPacket(ActionFailed.STATIC_PACKET); if ((temp.getPrivateStoreType() == PrivateStoreType.SELL) || (temp.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) @@ -4606,7 +4606,7 @@ public final class L2PcInstance extends L2Playable return; } - L2ItemInstance target = (L2ItemInstance) object; + final L2ItemInstance target = (L2ItemInstance) object; sendPacket(new StopMove(this)); @@ -4690,7 +4690,7 @@ public final class L2PcInstance extends L2Playable // Auto use herbs - pick up if (target.getItem().hasExImmediateEffect()) { - IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); + final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { _log.warning("No item handler registered for item ID: " + target.getId() + "."); @@ -4911,7 +4911,7 @@ public final class L2PcInstance extends L2Playable if (_transformation != null) { // You already polymorphed and cannot polymorph again. - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN); sendPacket(msg); return; } @@ -4987,7 +4987,7 @@ public final class L2PcInstance extends L2Playable { if (newTarget != null) { - boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); + final boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); // Prevents /target exploiting if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) @@ -5009,7 +5009,7 @@ public final class L2PcInstance extends L2Playable } // Get the current target - L2Object oldTarget = getTarget(); + final L2Object oldTarget = getTarget(); if (oldTarget != null) { @@ -5081,7 +5081,7 @@ public final class L2PcInstance extends L2Playable @Override public L2Weapon getActiveWeaponItem() { - L2ItemInstance weapon = getActiveWeaponInstance(); + final L2ItemInstance weapon = getActiveWeaponInstance(); if (weapon == null) { @@ -5103,7 +5103,7 @@ public final class L2PcInstance extends L2Playable public L2Armor getActiveChestArmorItem() { - L2ItemInstance armor = getChestArmorInstance(); + final L2ItemInstance armor = getChestArmorInstance(); if (armor == null) { @@ -5115,7 +5115,7 @@ public final class L2PcInstance extends L2Playable public L2Armor getActiveLegsArmorItem() { - L2ItemInstance legs = getLegsArmorInstance(); + final L2ItemInstance legs = getLegsArmorInstance(); if (legs == null) { @@ -5127,8 +5127,8 @@ public final class L2PcInstance extends L2Playable public boolean isWearingHeavyArmor() { - L2ItemInstance legs = getLegsArmorInstance(); - L2ItemInstance armor = getChestArmorInstance(); + final L2ItemInstance legs = getLegsArmorInstance(); + final L2ItemInstance armor = getChestArmorInstance(); if ((armor != null) && (legs != null)) { @@ -5149,8 +5149,8 @@ public final class L2PcInstance extends L2Playable public boolean isWearingLightArmor() { - L2ItemInstance legs = getLegsArmorInstance(); - L2ItemInstance armor = getChestArmorInstance(); + final L2ItemInstance legs = getLegsArmorInstance(); + final L2ItemInstance armor = getChestArmorInstance(); if ((armor != null) && (legs != null)) { @@ -5171,8 +5171,8 @@ public final class L2PcInstance extends L2Playable public boolean isWearingMagicArmor() { - L2ItemInstance legs = getLegsArmorInstance(); - L2ItemInstance armor = getChestArmorInstance(); + final L2ItemInstance legs = getLegsArmorInstance(); + final L2ItemInstance armor = getChestArmorInstance(); if ((armor != null) && (legs != null)) { @@ -5269,7 +5269,7 @@ public final class L2PcInstance extends L2Playable } else { - L2PcInstance ptarget = L2World.getInstance().getPlayer(_engageid); + final L2PcInstance ptarget = L2World.getInstance().getPlayer(_engageid); setEngageRequest(false, 0); if (ptarget != null) { @@ -5302,7 +5302,7 @@ public final class L2PcInstance extends L2Playable @Override public L2Item getSecondaryWeaponItem() { - L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { return item.getItem(); @@ -5347,7 +5347,7 @@ public final class L2PcInstance extends L2Playable msg = Config.ANNOUNCE_PK_MSG.replace("$killer", pk.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13); sm.addString(msg); Broadcast.toAllOnlinePlayers(sm); } @@ -5361,7 +5361,7 @@ public final class L2PcInstance extends L2Playable msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", pk.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13); sm.addString(msg); Broadcast.toAllOnlinePlayers(sm); } @@ -5493,7 +5493,7 @@ public final class L2PcInstance extends L2Playable return; } - L2PcInstance pk = killer.getActingPlayer(); + final L2PcInstance pk = killer.getActingPlayer(); if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(getClanId()) // || getClan().isAtWarWith(((L2PcInstance)killer).getClanId()) )) @@ -5504,8 +5504,8 @@ public final class L2PcInstance extends L2Playable if ((!isInsideZone(ZoneId.PVP) || (pk == null)) && (!isGM() || Config.KARMA_DROP_GM)) { boolean isKarmaDrop = false; - boolean isKillerNpc = (killer instanceof L2Npc); - int pkLimit = Config.KARMA_PK_LIMIT; + final boolean isKillerNpc = (killer instanceof L2Npc); + final int pkLimit = Config.KARMA_PK_LIMIT; int dropEquip = 0; int dropEquipWeapon = 0; @@ -5596,7 +5596,7 @@ public final class L2PcInstance extends L2Playable return; } - L2PcInstance targetPlayer = target.getActingPlayer(); + final L2PcInstance targetPlayer = target.getActingPlayer(); if ((targetPlayer == null) || (targetPlayer == this)) { return; @@ -5693,7 +5693,7 @@ public final class L2PcInstance extends L2Playable setPvpKills(getPvpKills() + 1); // Send a Server->Client UserInfo packet to attacker with its Karma and PK Counter - UserInfo ui = new UserInfo(this, false); + final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); sendPacket(ui); } @@ -5732,7 +5732,7 @@ public final class L2PcInstance extends L2Playable } // Update player's UI. - UserInfo ui = new UserInfo(this, false); + final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); sendPacket(ui); } @@ -5753,7 +5753,7 @@ public final class L2PcInstance extends L2Playable public void updatePvPStatus(L2Character target) { - L2PcInstance player_target = target.getActingPlayer(); + final L2PcInstance player_target = target.getActingPlayer(); if (player_target == null) { @@ -6026,7 +6026,7 @@ public final class L2PcInstance extends L2Playable */ public L2PcInstance getActiveRequester() { - L2PcInstance requester = _activeRequester; + final L2PcInstance requester = _activeRequester; if (requester != null) { if (requester.isRequestExpired() && (_activeTradeList == null)) @@ -6119,7 +6119,7 @@ public final class L2PcInstance extends L2Playable _activeTradeList = new TradeList(this); _activeTradeList.setPartner(partner); - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_BEGIN_TRADING_WITH_C1); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_BEGIN_TRADING_WITH_C1); msg.addPcName(partner); sendPacket(msg); sendPacket(new TradeStart(this)); @@ -6127,7 +6127,7 @@ public final class L2PcInstance extends L2Playable public void onTradeConfirm(L2PcInstance partner) { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_CONFIRMED_THE_TRADE); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_CONFIRMED_THE_TRADE); msg.addPcName(partner); sendPacket(msg); sendPacket(TradeOtherDone.STATIC_PACKET); @@ -6144,7 +6144,7 @@ public final class L2PcInstance extends L2Playable _activeTradeList = null; sendPacket(new TradeDone(0)); - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_CANCELLED_THE_TRADE); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_CANCELLED_THE_TRADE); msg.addPcName(partner); sendPacket(msg); } @@ -6172,7 +6172,7 @@ public final class L2PcInstance extends L2Playable return; } - L2PcInstance partner = _activeTradeList.getPartner(); + final L2PcInstance partner = _activeTradeList.getPartner(); if (partner != null) { partner.onTradeCancel(this); @@ -6394,7 +6394,7 @@ public final class L2PcInstance extends L2Playable if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(arrows); sendPacket(iu); } @@ -6421,7 +6421,7 @@ public final class L2PcInstance extends L2Playable getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, _arrowItem); // Send a Server->Client packet ItemList to this L2PcINstance to update left hand equipement - ItemList il = new ItemList(this, false); + final ItemList il = new ItemList(this, false); sendPacket(il); } } @@ -6450,7 +6450,7 @@ public final class L2PcInstance extends L2Playable getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, _boltItem); // Send a Server->Client packet ItemList to this L2PcINstance to update left hand equipement - ItemList il = new ItemList(this, false); + final ItemList il = new ItemList(this, false); sendPacket(il); } } @@ -6530,11 +6530,11 @@ public final class L2PcInstance extends L2Playable */ public boolean disarmShield() { - L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); - InventoryUpdate iu = new InventoryUpdate(); + final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { iu.addModifiedItem(itm); @@ -6716,10 +6716,10 @@ public final class L2PcInstance extends L2Playable public boolean dismount() { - boolean wasFlying = isFlying(); + final boolean wasFlying = isFlying(); sendPacket(new SetupGauge(3, 0, 0)); - int petId = _mountNpcId; + final int petId = _mountNpcId; setMount(0, 0); stopFeed(); if (wasFlying) @@ -6902,7 +6902,7 @@ public final class L2PcInstance extends L2Playable */ public void setKarmaFlag(int flag) { - StatusUpdate su = new StatusUpdate(this); + final StatusUpdate su = new StatusUpdate(this); su.addAttribute(StatusUpdate.PVP_FLAG, getReputation()); sendPacket(su); @@ -6915,7 +6915,7 @@ public final class L2PcInstance extends L2Playable } final int relation = getRelation(player); - Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId()); + final Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId()); if ((oldrelation == null) || (oldrelation != relation)) { final RelationChanged rc = new RelationChanged(); @@ -6943,7 +6943,7 @@ public final class L2PcInstance extends L2Playable */ public void broadcastKarma() { - StatusUpdate su = new StatusUpdate(this); + final StatusUpdate su = new StatusUpdate(this); su.addAttribute(StatusUpdate.KARMA, getReputation()); sendPacket(su); @@ -6955,7 +6955,7 @@ public final class L2PcInstance extends L2Playable } final int relation = getRelation(player); - Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId()); + final Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId()); if ((oldrelation == null) || (oldrelation != relation)) { final RelationChanged rc = new RelationChanged(); @@ -7097,7 +7097,7 @@ public final class L2PcInstance extends L2Playable final int activeClassId = rset.getInt("classid"); final boolean female = rset.getInt("sex") != Sex.MALE.ordinal(); final L2PcTemplate template = PlayerTemplateData.getInstance().getTemplate(activeClassId); - PcAppearance app = new PcAppearance(rset.getByte("face"), rset.getByte("hairColor"), rset.getByte("hairStyle"), female); + final PcAppearance app = new PcAppearance(rset.getByte("face"), rset.getByte("hairColor"), rset.getByte("hairStyle"), female); player = new L2PcInstance(objectId, template, rset.getString("account_name"), app); player.setName(rset.getString("char_name")); @@ -7149,7 +7149,7 @@ public final class L2PcInstance extends L2Playable player.setDeleteTimer(rset.getLong("deletetime")); player.setTitle(rset.getString("title")); player.setAccessLevel(rset.getInt("accesslevel"), false); - int titleColor = rset.getInt("title_color"); + final int titleColor = rset.getInt("title_color"); if (titleColor != PcAppearance.DEFAULT_TITLE_COLOR) { player.getAppearance().setTitleColor(titleColor); @@ -7224,7 +7224,7 @@ public final class L2PcInstance extends L2Playable // Set Hero status if it applies player.setHero(Hero.getInstance().isHero(objectId)); - int clanId = rset.getInt("clanid"); + final int clanId = rset.getInt("clanid"); if (clanId > 0) { player.setClan(ClanTable.getInstance().getClan(clanId)); @@ -7427,7 +7427,7 @@ public final class L2PcInstance extends L2Playable { while (rs.next()) { - SubClass subClass = new SubClass(); + final SubClass subClass = new SubClass(); subClass.setClassId(rs.getInt("class_id")); subClass.setIsDualClass(rs.getBoolean("dual_class")); subClass.setLevel(rs.getByte("level")); @@ -7516,7 +7516,7 @@ public final class L2PcInstance extends L2Playable _dwarvenRecipeBook.clear(); L2RecipeList recipe; - RecipeData rd = RecipeData.getInstance(); + final RecipeData rd = RecipeData.getInstance(); while (rs.next()) { recipe = rd.getRecipeList(rs.getInt("id")); @@ -7563,10 +7563,10 @@ public final class L2PcInstance extends L2Playable { while (rs.next()) { - int itemNum = rs.getInt("itemNum"); - int itemId = rs.getInt("itemId"); - long itemCount = rs.getLong("itemCount"); - String itemSender = rs.getString("itemSender"); + final int itemNum = rs.getInt("itemNum"); + final int itemId = rs.getInt("itemId"); + final long itemCount = rs.getLong("itemCount"); + final String itemSender = rs.getString("itemSender"); _premiumItems.put(itemNum, new L2PremiumItem(itemId, itemCount, itemSender)); } } @@ -7651,9 +7651,9 @@ public final class L2PcInstance extends L2Playable private void storeCharBase() { // Get the exp, level, and sp of base class to store in base table - long exp = getStat().getBaseExp(); - int level = getStat().getBaseLevel(); - long sp = getStat().getBaseSp(); + final long exp = getStat().getBaseExp(); + final int level = getStat().getBaseLevel(); + final long sp = getStat().getBaseSp(); try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(UPDATE_CHARACTER)) { @@ -8082,7 +8082,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { con.setAutoCommit(false); - for (final Skill addSkill : newSkills) + for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -8165,10 +8165,10 @@ public final class L2PcInstance extends L2Playable { while (rs.next()) { - int remainingTime = rs.getInt("remaining_time"); - long reuseDelay = rs.getLong("reuse_delay"); - long systime = rs.getLong("systime"); - int restoreType = rs.getInt("restore_type"); + final int remainingTime = rs.getInt("remaining_time"); + final long reuseDelay = rs.getLong("reuse_delay"); + final long systime = rs.getLong("systime"); + final int restoreType = rs.getInt("restore_type"); final Skill skill = SkillData.getInstance().getSkill(rs.getInt("skill_id"), rs.getInt("skill_level")); if (skill == null) @@ -8364,7 +8364,7 @@ public final class L2PcInstance extends L2Playable slot--; - L2Henna henna = _henna[slot]; + final L2Henna henna = _henna[slot]; if (henna == null) { return false; @@ -8401,7 +8401,7 @@ public final class L2PcInstance extends L2Playable sendPacket(new HennaInfo(this)); // Send Server->Client UserInfo packet to this L2PcInstance - UserInfo ui = new UserInfo(this, false); + final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); sendPacket(ui); sendSkillList(); @@ -8464,7 +8464,7 @@ public final class L2PcInstance extends L2Playable sendPacket(new HennaInfo(this)); // Send Server->Client UserInfo packet to this L2PcInstance - UserInfo ui = new UserInfo(this, false); + final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); sendPacket(ui); sendSkillList(); @@ -8669,7 +8669,7 @@ public final class L2PcInstance extends L2Playable // is AutoAttackable if both players are in the same duel and the duel is still going on if (attacker.isPlayable() && (getDuelState() == DuelState.DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) { - Duel duel = DuelManager.getInstance().getDuel(getDuelId()); + final Duel duel = DuelManager.getInstance().getDuel(getDuelId()); if (duel.getTeamA().contains(this) && duel.getTeamA().contains(attacker)) { return false; @@ -8712,11 +8712,11 @@ public final class L2PcInstance extends L2Playable } // Get L2PcInstance - L2PcInstance attackerPlayer = attacker.getActingPlayer(); + final L2PcInstance attackerPlayer = attacker.getActingPlayer(); if (getClan() != null) { - Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ()); + final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ()); if (siege != null) { // Check if a siege is in progress and if attacker and the L2PcInstance aren't in the Defender clan @@ -8773,7 +8773,7 @@ public final class L2PcInstance extends L2Playable { if (getClan() != null) { - Siege siege = SiegeManager.getInstance().getSiege(this); + final Siege siege = SiegeManager.getInstance().getSiege(this); return ((siege != null) && siege.checkIsAttacker(getClan())); } } @@ -8823,7 +8823,7 @@ public final class L2PcInstance extends L2Playable // If a skill is currently being used, queue this one if this is not the same if (isCastingNow()) { - SkillUseHolder currentSkill = getCurrentSkill(); + final SkillUseHolder currentSkill = getCurrentSkill(); // Check if new skill different from current skill in progress if ((currentSkill != null) && (skill.getId() == currentSkill.getSkillId())) { @@ -8943,8 +8943,8 @@ public final class L2PcInstance extends L2Playable // ************************************* Check Target ******************************************* // Create and set a L2Object containing the target of the skill L2Object target = null; - L2TargetType sklTargetType = skill.getTargetType(); - Location worldPosition = getCurrentSkillWorldPosition(); + final L2TargetType sklTargetType = skill.getTargetType(); + final Location worldPosition = getCurrentSkillWorldPosition(); if ((sklTargetType == L2TargetType.GROUND) && (worldPosition == null)) { @@ -9042,10 +9042,10 @@ public final class L2PcInstance extends L2Playable final SystemMessage sm; if (hasSkillReuse(skill.getReuseHashCode())) { - int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000); - int hours = remainingTime / 3600; - int minutes = (remainingTime % 3600) / 60; - int seconds = (remainingTime % 60); + final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000); + final int hours = remainingTime / 3600; + final int minutes = (remainingTime % 3600) / 60; + final int seconds = (remainingTime % 60); if (hours > 0) { sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME); @@ -9244,7 +9244,7 @@ public final class L2PcInstance extends L2Playable public boolean isInLooterParty(int LooterId) { - L2PcInstance looter = L2World.getInstance().getPlayer(LooterId); + final L2PcInstance looter = L2World.getInstance().getPlayer(LooterId); // if L2PcInstance is in a CommandChannel if (isInParty() && getParty().isInCommandChannel() && (looter != null)) @@ -9627,7 +9627,7 @@ public final class L2PcInstance extends L2Playable */ public int getEnchantEffect() { - L2ItemInstance wpn = getActiveWeaponInstance(); + final L2ItemInstance wpn = getActiveWeaponInstance(); if (wpn == null) { @@ -9746,7 +9746,7 @@ public final class L2PcInstance extends L2Playable } } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED); sm.addItemName(itemId); sendPacket(sm); return true; @@ -9788,7 +9788,7 @@ public final class L2PcInstance extends L2Playable } } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED); sm.addItemName(itemId); sendPacket(sm); } @@ -10347,7 +10347,7 @@ public final class L2PcInstance extends L2Playable public void sendSkillList(int lastLearnedSkillId) { boolean isDisabled = false; - SkillList sl = new SkillList(); + final SkillList sl = new SkillList(); for (Skill s : getAllSkills()) { @@ -10368,7 +10368,7 @@ public final class L2PcInstance extends L2Playable boolean isEnchantable = SkillData.getInstance().isEnchantable(s.getId()); if (isEnchantable) { - L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(s.getId()); + final L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(s.getId()); if ((esl == null) || (s.getLevel() < esl.getBaseLevel())) { isEnchantable = false; @@ -10379,7 +10379,7 @@ public final class L2PcInstance extends L2Playable } if (_transformation != null) { - Map ts = new TreeMap<>(); + final Map ts = new TreeMap<>(); for (SkillHolder holder : _transformation.getTemplate(this).getSkills()) { @@ -10414,7 +10414,7 @@ public final class L2PcInstance extends L2Playable for (Entry transformSkill : ts.entrySet()) { - Skill sk = SkillData.getInstance().getSkill(transformSkill.getKey(), transformSkill.getValue()); + final Skill sk = SkillData.getInstance().getSkill(transformSkill.getKey(), transformSkill.getValue()); addTransformSkill(sk); sl.addSkill(transformSkill.getKey(), transformSkill.getValue(), false, false, false); } @@ -10902,7 +10902,7 @@ public final class L2PcInstance extends L2Playable { if (!isDead() && (_taskWater == null)) { - int timeinwater = (int) calcStat(Stats.BREATH, 60000, this, null); + final int timeinwater = (int) calcStat(Stats.BREATH, 60000, this, null); sendPacket(new SetupGauge(2, timeinwater)); _taskWater = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new WaterTask(this), timeinwater, 1000); @@ -11089,7 +11089,7 @@ public final class L2PcInstance extends L2Playable } final long restoreExp = Math.round(((getExpBeforeDeath() - getExp()) * _revivePower) / 100); - ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); + final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); dlg.addPcName(reviver); dlg.addLong(restoreExp); dlg.addInt(power); @@ -11471,7 +11471,7 @@ public final class L2PcInstance extends L2Playable */ public boolean validateItemManipulation(int objectId, String action) { - L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = getInventory().getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -11623,7 +11623,7 @@ public final class L2PcInstance extends L2Playable for (Friend friend : _friendList.values()) { - L2PcInstance player = friend.getFriend(); + final L2PcInstance player = friend.getFriend(); if (player == null) { continue; @@ -11687,14 +11687,14 @@ public final class L2PcInstance extends L2Playable { if (getInventory().getItemByItemId(9819) != null) { - Fort fort = FortManager.getInstance().getFort(this); + final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) { FortSiegeManager.getInstance().dropCombatFlag(this, fort.getResidenceId()); } else { - int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); + final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); getInventory().unEquipItemInBodySlot(slot); destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); } @@ -11710,7 +11710,7 @@ public final class L2PcInstance extends L2Playable PartyMatchWaitingList.getInstance().removePlayer(this); if (_partyroom != 0) { - PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(_partyroom); + final PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(_partyroom); if (room != null) { room.deleteMember(this); @@ -11860,7 +11860,7 @@ public final class L2PcInstance extends L2Playable // set the status for pledge member list to OFFLINE try { - L2ClanMember clanMember = getClan().getClanMember(getObjectId()); + final L2ClanMember clanMember = getClan().getClanMember(getObjectId()); if (clanMember != null) { clanMember.setPlayerInstance(null); @@ -12078,10 +12078,10 @@ public final class L2PcInstance extends L2Playable _fishz = _z; // broadcastUserInfo(); // Starts fishing - int lvl = getRandomFishLvl(); - int grade = getRandomFishGrade(); - int group = getRandomFishGroup(grade); - List fish = FishData.getInstance().getFish(lvl, group, grade); + final int lvl = getRandomFishLvl(); + final int grade = getRandomFishGrade(); + final int group = getRandomFishGroup(grade); + final List fish = FishData.getInstance().getFish(lvl, group, grade); if ((fish == null) || fish.isEmpty()) { sendMessage("Error - Fish are not defined"); @@ -12121,7 +12121,7 @@ public final class L2PcInstance extends L2Playable if (_lure != null) { - int lureid = _lure.getId(); + final int lureid = _lure.getId(); isNoob = _fish.getFishGrade() == 0; isUpperGrade = _fish.getFishGrade() == 2; if ((lureid == 6519) || (lureid == 6522) || (lureid == 6525) || (lureid == 8505) || (lureid == 8508) || (lureid == 8511)) @@ -12164,7 +12164,7 @@ public final class L2PcInstance extends L2Playable private int getRandomFishGroup(int group) { - int check = Rnd.get(100); + final int check = Rnd.get(100); int type = 1; switch (group) { @@ -12397,7 +12397,7 @@ public final class L2PcInstance extends L2Playable return 1; } int randomlvl; - int check = Rnd.get(100); + final int check = Rnd.get(100); if (check <= 50) { @@ -12758,7 +12758,7 @@ public final class L2PcInstance extends L2Playable public void increaseSouls(int count) { _souls += count; - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SOUL_COUNT_HAS_INCREASED_BY_S1_IT_IS_NOW_AT_S2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SOUL_COUNT_HAS_INCREASED_BY_S1_IT_IS_NOW_AT_S2); sm.addInt(count); sm.addInt(_souls); sendPacket(sm); @@ -12927,12 +12927,12 @@ public final class L2PcInstance extends L2Playable { if (target.isPlayer()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK); sm.addPcName(target.getActingPlayer()); sm.addCharName(this); target.sendPacket(sm); } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY); sm.addPcName(this); sendPacket(sm); sendPacket(new ExMagicAttackInfo(getObjectId(), target.getObjectId(), ExMagicAttackInfo.EVADED)); @@ -12942,7 +12942,7 @@ public final class L2PcInstance extends L2Playable // Check if hit is critical if (pcrit) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LANDED_A_CRITICAL_HIT); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LANDED_A_CRITICAL_HIT); sm.addPcName(this); sendPacket(sm); sendPacket(new ExMagicAttackInfo(getObjectId(), target.getObjectId(), ExMagicAttackInfo.CRITICAL)); @@ -13010,12 +13010,12 @@ public final class L2PcInstance extends L2Playable { for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) { - L2ItemInstance equippedItem = getInventory().getPaperdollItem(i); + final L2ItemInstance equippedItem = getInventory().getPaperdollItem(i); if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false)) { getInventory().unEquipItemInSlot(i); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(equippedItem); sendPacket(iu); @@ -13105,7 +13105,7 @@ public final class L2PcInstance extends L2Playable else if (_canFeed) { setCurrentFeed(getMaxFeed()); - SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); if (!isDead()) { @@ -13149,9 +13149,9 @@ public final class L2PcInstance extends L2Playable public void setCurrentFeed(int num) { - boolean lastHungryState = isHungry(); + final boolean lastHungryState = isHungry(); _curFeed = num > getMaxFeed() ? getMaxFeed() : num; - SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); // broadcast move speed change when strider becomes hungry / full if (lastHungryState != isHungry()) @@ -13267,7 +13267,7 @@ public final class L2PcInstance extends L2Playable } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_LEVEL_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_LEVEL_S1); sm.addInt(_charges.get()); sendPacket(sm); } @@ -13391,7 +13391,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM); return; } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(13016); sendPacket(sm); @@ -13503,7 +13503,7 @@ public final class L2PcInstance extends L2Playable destroyItem("Consume", getInventory().getItemByItemId(20033).getObjectId(), 1, null, false); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(20033); sendPacket(sm); @@ -13568,8 +13568,8 @@ public final class L2PcInstance extends L2Playable activeChar.sendPacket(new CharInfo(this)); } - int relation1 = getRelation(activeChar); - int relation2 = activeChar.getRelation(this); + final int relation1 = getRelation(activeChar); + final int relation2 = activeChar.getRelation(this); Integer oldrelation = getKnownList().getKnownRelations().get(activeChar.getObjectId()); if ((oldrelation != null) && (oldrelation != relation1)) { @@ -13691,7 +13691,7 @@ public final class L2PcInstance extends L2Playable */ public int checkBirthDay() { - Calendar now = Calendar.getInstance(); + final Calendar now = Calendar.getInstance(); // "Characters with a February 29 creation date will receive a gift on February 28." if ((_createDate.get(Calendar.DAY_OF_MONTH) == 29) && (_createDate.get(Calendar.MONTH) == 1)) @@ -13758,7 +13758,7 @@ public final class L2PcInstance extends L2Playable { try (PreparedStatement ps = con.prepareStatement(sqlQuery)) { - Friend friend = _friendList.get(target); + final Friend friend = _friendList.get(target); ps.setString(1, friend.getMemo()); ps.setInt(2, getObjectId()); ps.setInt(3, target); @@ -13792,12 +13792,12 @@ public final class L2PcInstance extends L2Playable { while (rs.next()) { - int friendId = rs.getInt("friendId"); + final int friendId = rs.getInt("friendId"); if (friendId == getObjectId()) { continue; } - String memo = rs.getString("memo"); + final String memo = rs.getString("memo"); _friendList.put(friendId, new Friend(0, friendId, memo)); putFriendDetailInfo(friendId); } @@ -13811,7 +13811,7 @@ public final class L2PcInstance extends L2Playable public void putFriendDetailInfo(L2PcInstance player) { - Friend friend = _friendList.get(player.getObjectId()); + final Friend friend = _friendList.get(player.getObjectId()); friend.setLevel(player.getLevel()); friend.setClassId(player.getClassId().getId()); if (player.getClan() != null) @@ -13829,14 +13829,14 @@ public final class L2PcInstance extends L2Playable public void putFriendDetailInfo(int friendId) { - Friend friend = _friendList.get(friendId); + final Friend friend = _friendList.get(friendId); int bClassId = 0; try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM characters WHERE charId=?");) { ps.setInt(1, friendId); - ResultSet rs = ps.executeQuery(); + final ResultSet rs = ps.executeQuery(); while (rs.next()) { friend.setLevel(rs.getByte("level")); @@ -13862,7 +13862,7 @@ public final class L2PcInstance extends L2Playable { ps.setInt(1, friendId); ps.setInt(2, friend.getClassId()); - ResultSet rs = ps.executeQuery(); + final ResultSet rs = ps.executeQuery(); while (rs.next()) { @@ -13884,7 +13884,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement ps = con.prepareStatement("SELECT * FROM clan_data WHERE clan_id=?");) { ps.setInt(1, friend.getClanId()); - ResultSet rs = ps.executeQuery(); + final ResultSet rs = ps.executeQuery(); while (rs.next()) { friend.setClanName(rs.getString("clan_name")); @@ -13906,10 +13906,10 @@ public final class L2PcInstance extends L2Playable public void notifyFriends(int type) { - L2FriendStatus pkt = new L2FriendStatus(this, type); + final L2FriendStatus pkt = new L2FriendStatus(this, type); for (int id : _friendList.keySet()) { - L2PcInstance friend = L2World.getInstance().getPlayer(id); + final L2PcInstance friend = L2World.getInstance().getPlayer(id); if (friend != null) { friend.sendPacket(pkt); @@ -13981,7 +13981,7 @@ public final class L2PcInstance extends L2Playable try (PreparedStatement st = con.prepareStatement(INSERT_CHAR_RECIPE_SHOP)) { - AtomicInteger slot = new AtomicInteger(1); + final AtomicInteger slot = new AtomicInteger(1); con.setAutoCommit(false); for (L2ManufactureItem item : _manufactureItems.values()) { @@ -14125,7 +14125,7 @@ public final class L2PcInstance extends L2Playable if (damage > 0) { reduceCurrentHp(Math.min(damage, getCurrentHp() - 1), null, false, true, null); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_RECEIVED_S1_FALLING_DAMAGE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_RECEIVED_S1_FALLING_DAMAGE); sm.addInt(damage); sendPacket(sm); } @@ -14302,7 +14302,7 @@ public final class L2PcInstance extends L2Playable final L2SkillLearn learn = SkillTreesData.getInstance().getClassSkill(e.getKey(), e.getValue().getLevel() % 100, getClassId()); if (learn != null) { - int lvlDiff = e.getKey() == CommonSkill.EXPERTISE.getId() ? 0 : 9; + final int lvlDiff = e.getKey() == CommonSkill.EXPERTISE.getId() ? 0 : 9; if (getLevel() < (learn.getGetLevel() - lvlDiff)) { deacreaseSkillLevel(e.getValue(), lvlDiff); @@ -14589,9 +14589,9 @@ public final class L2PcInstance extends L2Playable boolean success = false; try (Connection con = ConnectionFactory.getInstance().getConnection()) { - PreparedStatement ps = con.prepareStatement(RESTORE_PREMIUMSERVICE); + final PreparedStatement ps = con.prepareStatement(RESTORE_PREMIUMSERVICE); ps.setString(1, account); - ResultSet rs = ps.executeQuery(); + final ResultSet rs = ps.executeQuery(); while (rs.next()) { success = true; diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java index 4264f6d8d4..02b51551e0 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java @@ -124,7 +124,7 @@ public class L2PetInstance extends L2Summon _inventory = new PetInventory(this); _inventory.restore(); - int npcId = template.getId(); + final int npcId = template.getId(); _mountable = PetDataTable.isMountable(npcId); getPetData(); getPetLevelData(); @@ -185,7 +185,7 @@ public class L2PetInstance extends L2Summon broadcastStatusUpdate(); - List foodIds = getPetData().getFood(); + final List foodIds = getPetData().getFood(); if (foodIds.isEmpty()) { if (isUncontrollable()) @@ -220,7 +220,7 @@ public class L2PetInstance extends L2Summon final IItemHandler handler = ItemHandler.getInstance().getHandler(food.getEtcItem()); if (handler != null) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_WAS_HUNGRY_SO_IT_ATE_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_WAS_HUNGRY_SO_IT_ATE_S1); sm.addItemName(food.getId()); sendPacket(sm); handler.useItem(L2PetInstance.this, food, false); @@ -257,7 +257,7 @@ public class L2PetInstance extends L2Summon } final L2PetData data = PetDataTable.getInstance().getPetData(template.getId()); - L2PetInstance pet = restore(control, template, owner); + final L2PetInstance pet = restore(control, template, owner); // add the pet instance to world if (pet != null) { @@ -347,7 +347,7 @@ public class L2PetInstance extends L2Summon @Override public L2Weapon getActiveWeaponItem() { - L2ItemInstance weapon = getActiveWeaponInstance(); + final L2ItemInstance weapon = getActiveWeaponInstance(); if (weapon == null) { @@ -389,7 +389,7 @@ public class L2PetInstance extends L2Summon @Override public boolean destroyItem(String process, int objectId, long count, L2Object reference, boolean sendMessage) { - L2ItemInstance item = _inventory.destroyItem(process, objectId, count, getOwner(), reference); + final L2ItemInstance item = _inventory.destroyItem(process, objectId, count, getOwner(), reference); if (item == null) { @@ -402,7 +402,7 @@ public class L2PetInstance extends L2Summon } // Send Pet inventory update packet - PetInventoryUpdate petIU = new PetInventoryUpdate(); + final PetInventoryUpdate petIU = new PetInventoryUpdate(); petIU.addItem(item); sendPacket(petIU); @@ -410,14 +410,14 @@ public class L2PetInstance extends L2Summon { if (count > 1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); sm.addItemName(item.getId()); sm.addLong(count); sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(item.getId()); sendPacket(sm); } @@ -437,7 +437,7 @@ public class L2PetInstance extends L2Summon @Override public boolean destroyItemByItemId(String process, int itemId, long count, L2Object reference, boolean sendMessage) { - L2ItemInstance item = _inventory.destroyItemByItemId(process, itemId, count, getOwner(), reference); + final L2ItemInstance item = _inventory.destroyItemByItemId(process, itemId, count, getOwner(), reference); if (item == null) { @@ -449,7 +449,7 @@ public class L2PetInstance extends L2Summon } // Send Pet inventory update packet - PetInventoryUpdate petIU = new PetInventoryUpdate(); + final PetInventoryUpdate petIU = new PetInventoryUpdate(); petIU.addItem(item); sendPacket(petIU); @@ -457,14 +457,14 @@ public class L2PetInstance extends L2Summon { if (count > 1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); sm.addItemName(item.getId()); sm.addLong(count); sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(item.getId()); sendPacket(sm); } @@ -492,13 +492,13 @@ public class L2PetInstance extends L2Summon return; } - boolean follow = getFollowStatus(); + final boolean follow = getFollowStatus(); final L2ItemInstance target = (L2ItemInstance) object; // Cursed weapons if (CursedWeaponsManager.getInstance().isCursed(target.getId())) { - SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1); + final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1); smsg.addItemName(target.getId()); sendPacket(smsg); return; @@ -575,7 +575,7 @@ public class L2PetInstance extends L2Summon // Herbs if (target.getItem().hasExImmediateEffect()) { - IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); + final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { _log.warning("No item handler registered for item ID: " + target.getId() + "."); @@ -650,7 +650,7 @@ public class L2PetInstance extends L2Summon @Override public boolean doDie(L2Character killer) { - L2PcInstance owner = getOwner(); + final L2PcInstance owner = getOwner(); if ((owner != null) && !owner.isInDuel() && (!isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE))) { deathPenalty(); @@ -704,9 +704,9 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) { - L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); - L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); - L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); + final L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); + final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -714,7 +714,7 @@ public class L2PetInstance extends L2Summon } // Send inventory update packet - PetInventoryUpdate petIU = new PetInventoryUpdate(); + final PetInventoryUpdate petIU = new PetInventoryUpdate(); if ((oldItem.getCount() > 0) && (oldItem != newItem)) { petIU.addModifiedItem(oldItem); @@ -728,13 +728,13 @@ public class L2PetInstance extends L2Summon // Send target update packet if (!newItem.isStackable()) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addNewItem(newItem); sendPacket(iu); } else if ((playerOldItem != null) && newItem.isStackable()) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(newItem); sendPacket(iu); } @@ -765,7 +765,7 @@ public class L2PetInstance extends L2Summon removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this); if (removedItem != null) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(removedItem); owner.sendPacket(sm); } @@ -777,7 +777,7 @@ public class L2PetInstance extends L2Summon } else { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addRemovedItem(removedItem); owner.sendPacket(iu); @@ -886,7 +886,7 @@ public class L2PetInstance extends L2Summon pet.setName(rs.getString("name")); long exp = rs.getLong("exp"); - L2PetLevelData info = PetDataTable.getInstance().getPetLevelData(pet.getId(), pet.getLevel()); + final L2PetLevelData info = PetDataTable.getInstance().getPetLevelData(pet.getId(), pet.getLevel()); // DS: update experience based by level // Avoiding pet delevels due to exp per level values changed. if ((info != null) && (exp < info.getPetMaxExp())) @@ -985,7 +985,7 @@ public class L2PetInstance extends L2Summon _logPet.log(Level.SEVERE, "Failed to store Pet [ObjectId: " + getObjectId() + "] data", e); } - L2ItemInstance itemInst = getControlItem(); + final L2ItemInstance itemInst = getControlItem(); if ((itemInst != null) && (itemInst.getEnchantLevel() != getStat().getLevel())) { itemInst.setEnchantLevel(getStat().getLevel()); @@ -1082,7 +1082,7 @@ public class L2PetInstance extends L2Summon { while (rs.next()) { - int effectCurTime = rs.getInt("remaining_time"); + final int effectCurTime = rs.getInt("remaining_time"); final Skill skill = SkillData.getInstance().getSkill(rs.getInt("skill_id"), rs.getInt("skill_level")); if (skill == null) @@ -1167,11 +1167,11 @@ public class L2PetInstance extends L2Summon { // TODO: Need Correct Penalty - int lvl = getStat().getLevel(); - double percentLost = (-0.07 * lvl) + 6.5; + final int lvl = getStat().getLevel(); + final double percentLost = (-0.07 * lvl) + 6.5; // Calculate the Experience loss - long lostExp = Math.round(((getStat().getExpForLevel(lvl + 1) - getStat().getExpForLevel(lvl)) * percentLost) / 100); + final long lostExp = Math.round(((getStat().getExpForLevel(lvl + 1) - getStat().getExpForLevel(lvl)) * percentLost) / 100); // Get the Experience before applying penalty _expBeforeDeath = getStat().getExp(); @@ -1236,7 +1236,7 @@ public class L2PetInstance extends L2Summon public void updateRefOwner(L2PcInstance owner) { - int oldOwnerId = getOwner().getObjectId(); + final int oldOwnerId = getOwner().getObjectId(); setOwner(owner); L2World.getInstance().removePet(oldOwnerId); @@ -1250,10 +1250,10 @@ public class L2PetInstance extends L2Summon public void refreshOverloaded() { - int maxLoad = getMaxLoad(); + final int maxLoad = getMaxLoad(); if (maxLoad > 0) { - long weightproc = (((getCurrentLoad() - getBonusWeightPenalty()) * 1000) / maxLoad); + final long weightproc = (((getCurrentLoad() - getBonusWeightPenalty()) * 1000) / maxLoad); int newWeightPenalty; if ((weightproc < 500) || getOwner().getDietMode()) { @@ -1319,7 +1319,7 @@ public class L2PetInstance extends L2Summon @Override public final int getWeapon() { - L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { return weapon.getId(); @@ -1330,7 +1330,7 @@ public class L2PetInstance extends L2Summon @Override public final int getArmor() { - L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (weapon != null) { return weapon.getId(); @@ -1340,7 +1340,7 @@ public class L2PetInstance extends L2Summon public final int getJewel() { - L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); + final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); if (weapon != null) { return weapon.getId(); @@ -1371,7 +1371,7 @@ public class L2PetInstance extends L2Summon // name not set yet controlItem.setCustomType2(name != null ? 1 : 0); controlItem.updateDatabase(); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(controlItem); sendPacket(iu); } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java index 88776b9a5e..79ed26b631 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -78,8 +78,8 @@ public class L2PetManagerInstance extends L2MerchantInstance { if (command.startsWith("exchange")) { - String[] params = command.split(" "); - int val = Integer.parseInt(params[1]); + final String[] params = command.split(" "); + final int val = Integer.parseInt(params[1]); switch (val) { case 1: @@ -96,8 +96,8 @@ public class L2PetManagerInstance extends L2MerchantInstance } else if (command.startsWith("evolve")) { - String[] params = command.split(" "); - int val = Integer.parseInt(params[1]); + final String[] params = command.split(" "); + final int val = Integer.parseInt(params[1]); boolean ok = false; switch (val) { @@ -129,8 +129,8 @@ public class L2PetManagerInstance extends L2MerchantInstance } else if (command.startsWith("restore")) { - String[] params = command.split(" "); - int val = Integer.parseInt(params[1]); + final String[] params = command.split(" "); + final int val = Integer.parseInt(params[1]); boolean ok = false; switch (val) { diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java index 6ac34008a5..688326c136 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java @@ -105,7 +105,7 @@ public class L2RaceManagerInstance extends L2Npc _managers = new ArrayList<>(); - ThreadPoolManager s = ThreadPoolManager.getInstance(); + final ThreadPoolManager s = ThreadPoolManager.getInstance(); s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1), 0, 10 * MINUTE); s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.NOW_SELLING_TICKETS_FOR_MONSTER_RACE_S1), 30 * SECOND, 10 * MINUTE); s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1), MINUTE, 10 * MINUTE); @@ -160,7 +160,7 @@ public class L2RaceManagerInstance extends L2Npc public void makeAnnouncement(SystemMessageId type) { - SystemMessage sm = SystemMessage.getSystemMessage(type); + final SystemMessage sm = SystemMessage.getSystemMessage(type); switch (type.getId()) { case 816: // SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1 @@ -233,13 +233,13 @@ public class L2RaceManagerInstance extends L2Npc private void startRace() { - MonsterRace race = MonsterRace.getInstance(); + final MonsterRace race = MonsterRace.getInstance(); if (_state == STARTING_RACE) { // state++; - PlaySound SRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0); + final PlaySound SRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0); broadcast(SRace); - PlaySound SRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559); + final PlaySound SRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559); broadcast(SRace2); _packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds()); sendMonsterInfo(); @@ -314,14 +314,14 @@ public class L2RaceManagerInstance extends L2Npc { return; } - int npcId = getTemplate().getId(); + final int npcId = getTemplate().getId(); String filename, search; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); filename = getHtmlPath(npcId, 5); html.setFile(player.getHtmlPrefix(), filename); for (int i = 0; i < 8; i++) { - int n = i + 1; + final int n = i + 1; search = "Mob" + n; html.replace(search, MonsterRace.getInstance().getMonsters()[i].getTemplate().getName()); } @@ -333,14 +333,14 @@ public class L2RaceManagerInstance extends L2Npc public void showMonsterInfo(L2PcInstance player) { - int npcId = getTemplate().getId(); + final int npcId = getTemplate().getId(); String filename, search; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); filename = getHtmlPath(npcId, 6); html.setFile(player.getHtmlPrefix(), filename); for (int i = 0; i < 8; i++) { - int n = i + 1; + final int n = i + 1; search = "Mob" + n; html.replace(search, MonsterRace.getInstance().getMonsters()[i].getTemplate().getName()); } @@ -355,7 +355,7 @@ public class L2RaceManagerInstance extends L2Npc { return; } - int npcId = getTemplate().getId(); + final int npcId = getTemplate().getId(); SystemMessage sm; String filename, search, replace; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); @@ -365,7 +365,7 @@ public class L2RaceManagerInstance extends L2Npc html.setFile(player.getHtmlPrefix(), filename); for (int i = 0; i < 8; i++) { - int n = i + 1; + final int n = i + 1; search = "Mob" + n; html.replace(search, MonsterRace.getInstance().getMonsters()[i].getTemplate().getName()); } @@ -416,13 +416,13 @@ public class L2RaceManagerInstance extends L2Npc replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); search = "0adena"; - int price = _cost[player.getRace(1) - 1]; + final int price = _cost[player.getRace(1) - 1]; html.replace(search, "" + price); search = "0tax"; - int tax = 0; + final int tax = 0; html.replace(search, "" + tax); search = "0total"; - int total = price + tax; + final int total = price + tax; html.replace(search, "" + total); } else @@ -431,8 +431,8 @@ public class L2RaceManagerInstance extends L2Npc { return; } - int ticket = player.getRace(0); - int priceId = player.getRace(1); + final int ticket = player.getRace(0); + final int priceId = player.getRace(1); if (!player.reduceAdena("Race", _cost[priceId - 1], this, true)) { return; @@ -443,15 +443,15 @@ public class L2RaceManagerInstance extends L2Npc sm.addInt(_raceNumber); sm.addItemName(4443); player.sendPacket(sm); - L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), 4443); + final L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), 4443); item.setCount(1); item.setEnchantLevel(_raceNumber); item.setCustomType1(ticket); item.setCustomType2(_cost[priceId - 1] / 100); player.getInventory().addItem("Race", item, player, this); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(item); - L2ItemInstance adenaupdate = player.getInventory().getItemByItemId(Inventory.ADENA_ID); + final L2ItemInstance adenaupdate = player.getInventory().getItemByItemId(Inventory.ADENA_ID); iu.addModifiedItem(adenaupdate); player.sendPacket(iu); return; diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java index 6d3a9c8ab8..5e5493ae4b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java @@ -293,9 +293,9 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance private void giveCup(L2Character killer) { - String questId = "620_FourGoblets"; + final String questId = "620_FourGoblets"; int cupId = 0; - int oldBrooch = 7262; + final int oldBrooch = 7262; switch (getId()) { @@ -313,7 +313,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance break; } - L2PcInstance player = killer.getActingPlayer(); + final L2PcInstance player = killer.getActingPlayer(); if (player == null) { @@ -324,7 +324,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance { for (L2PcInstance mem : player.getParty().getMembers()) { - QuestState qs = mem.getQuestState(questId); + final QuestState qs = mem.getQuestState(questId); if ((qs != null) && (qs.isStarted() || qs.isCompleted()) && (mem.getInventory().getItemByItemId(oldBrooch) == null)) { mem.addItem("Quest", cupId, 1, mem, true); @@ -333,7 +333,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance } else { - QuestState qs = player.getQuestState(questId); + final QuestState qs = player.getQuestState(questId); if ((qs != null) && (qs.isStarted() || qs.isCompleted()) && (player.getInventory().getItemByItemId(oldBrooch) == null)) { player.addItem("Quest", cupId, 1, player, true); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java index fc6c9f21b9..dc1d2ede7e 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java @@ -165,7 +165,7 @@ public class L2SepulcherNpcInstance extends L2Npc // L2PcInstance on the _knownPlayer of the L2NpcInstance // to display a social action of the L2NpcInstance on their // client - SocialAction sa = new SocialAction(getObjectId(), Rnd.get(8)); + final SocialAction sa = new SocialAction(getObjectId(), Rnd.get(8)); broadcastPacket(sa); doAction(player); @@ -277,7 +277,7 @@ public class L2SepulcherNpcInstance extends L2Npc @Override public void showChatWindow(L2PcInstance player, int val) { - String filename = getHtmlPath(getId(), val); + final String filename = getHtmlPath(getId(), val); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%objectId%", String.valueOf(getObjectId())); @@ -314,7 +314,7 @@ public class L2SepulcherNpcInstance extends L2Npc } else if (command.startsWith("open_gate")) { - L2ItemInstance hallsKey = player.getInventory().getItemByItemId(HALLS_KEY); + final L2ItemInstance hallsKey = player.getInventory().getItemByItemId(HALLS_KEY); if (hallsKey == null) { showHtmlFile(player, "Gatekeeper-no.htm"); @@ -357,8 +357,8 @@ public class L2SepulcherNpcInstance extends L2Npc public void openNextDoor(int npcId) { - int doorId = FourSepulchersManager.getInstance().getHallGateKeepers().get(npcId); - DoorData _doorTable = DoorData.getInstance(); + final int doorId = FourSepulchersManager.getInstance().getHallGateKeepers().get(npcId); + final DoorData _doorTable = DoorData.getInstance(); _doorTable.getDoor(doorId).openMe(); if (_closeTask != null) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java index 097a527cbe..855ad31be2 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java @@ -318,7 +318,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { while (rs.next()) { - int effectCurTime = rs.getInt("remaining_time"); + final int effectCurTime = rs.getInt("remaining_time"); final Skill skill = SkillData.getInstance().getSkill(rs.getInt("skill_id"), rs.getInt("skill_level")); if (skill == null) @@ -420,7 +420,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable @Override public void run() { - int usedtime = 5000; + final int usedtime = 5000; _lifeTimeRemaining -= usedtime; if (isDead() || !isVisible()) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java index 53ae5fd0e1..755899bae5 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java @@ -71,7 +71,7 @@ public class L2SiegeFlagInstance extends L2Npc throw new NullPointerException(getClass().getSimpleName() + ": Initialization failed."); } - L2SiegeClan sc = _siege.getAttackerClan(_clan); + final L2SiegeClan sc = _siege.getAttackerClan(_clan); if (sc == null) { throw new NullPointerException(getClass().getSimpleName() + ": Cannot find siege clan."); @@ -104,7 +104,7 @@ public class L2SiegeFlagInstance extends L2Npc } if ((_siege != null) && (_clan != null)) { - L2SiegeClan sc = _siege.getAttackerClan(_clan); + final L2SiegeClan sc = _siege.getAttackerClan(_clan); if (sc != null) { sc.removeFlag(this); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java index 1583927d79..b4b7a35380 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java @@ -353,7 +353,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance return; } - float HPRatio = ((float) _owner.getCurrentHp()) / _owner.getMaxHp(); + final float HPRatio = ((float) _owner.getCurrentHp()) / _owner.getMaxHp(); // if the owner has a lot of HP, then debuff the enemy with a random debuff among the available skills // use of more than one debuff at this moment is acceptable @@ -421,8 +421,8 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance @Override public void run() { - int foodTypeSkillId = _tamedBeast.getFoodType(); - L2PcInstance owner = _tamedBeast.getOwner(); + final int foodTypeSkillId = _tamedBeast.getFoodType(); + final L2PcInstance owner = _tamedBeast.getOwner(); L2ItemInstance item = null; if (_tamedBeast._isFreyaBeast) @@ -456,9 +456,9 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance // if the owner has enough food, call the item handler (use the food and triffer all necessary actions) if ((item != null) && (item.getCount() >= 1)) { - L2Object oldTarget = owner.getTarget(); + final L2Object oldTarget = owner.getTarget(); owner.setTarget(_tamedBeast); - L2Object[] targets = + final L2Object[] targets = { _tamedBeast }; @@ -503,7 +503,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance @Override public void run() { - L2PcInstance owner = _tamedBeast.getOwner(); + final L2PcInstance owner = _tamedBeast.getOwner(); // check if the owner is no longer around...if so, despawn if ((owner == null) || !owner.isOnline()) @@ -530,7 +530,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance int totalBuffsOnOwner = 0; int i = 0; - int rand = Rnd.get(_numBuffs); + final int rand = Rnd.get(_numBuffs); Skill buffToGive = null; // get this npc's skills: getSkills() diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java index 829d715f85..d1b8169250 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java @@ -315,16 +315,16 @@ public final class L2TeleporterInstance extends L2Npc { player.sendPacket(ActionFailed.STATIC_PACKET); - int condition = validateCondition(player); + final int condition = validateCondition(player); - StringTokenizer st = new StringTokenizer(command, " "); - String actualCommand = st.nextToken(); // Get actual command + final StringTokenizer st = new StringTokenizer(command, " "); + final String actualCommand = st.nextToken(); // Get actual command if (player.isAffectedBySkill(6201) || player.isAffectedBySkill(6202) || player.isAffectedBySkill(6203)) { final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); - String filename = "html/teleporter/epictransformed.htm"; + final String filename = "html/teleporter/epictransformed.htm"; html.setFile(player.getHtmlPrefix(), filename); html.replace("%objectId%", String.valueOf(getObjectId())); @@ -334,7 +334,7 @@ public final class L2TeleporterInstance extends L2Npc } else if (actualCommand.equalsIgnoreCase("goto")) { - int npcId = getId(); + final int npcId = getId(); switch (npcId) { @@ -353,7 +353,7 @@ public final class L2TeleporterInstance extends L2Npc return; } - int whereTo = Integer.parseInt(st.nextToken()); + final int whereTo = Integer.parseInt(st.nextToken()); if (condition == COND_REGULAR) { doTeleport(player, whereTo); @@ -382,7 +382,7 @@ public final class L2TeleporterInstance extends L2Npc } else if (command.startsWith("Chat")) { - Calendar cal = Calendar.getInstance(); + final Calendar cal = Calendar.getInstance(); int val = 0; try { @@ -473,7 +473,7 @@ public final class L2TeleporterInstance extends L2Npc { String filename = "html/teleporter/castleteleporter-no.htm"; - int condition = validateCondition(player); + final int condition = validateCondition(player); if (condition == COND_REGULAR) { super.showChatWindow(player); @@ -500,7 +500,7 @@ public final class L2TeleporterInstance extends L2Npc private void doTeleport(L2PcInstance player, int val) { - L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val); + final L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val); if (list != null) { // you cannot teleport to village that is in siege @@ -526,7 +526,7 @@ public final class L2TeleporterInstance extends L2Npc } else if (list.getIsForNoble() && !player.isNoble()) { - String filename = "html/teleporter/nobleteleporter-no.htm"; + final String filename = "html/teleporter/nobleteleporter-no.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%objectId%", String.valueOf(getObjectId())); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java index 10bd9913fa..092c4de05b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -89,8 +89,8 @@ public class L2VillageMasterInstance extends L2NpcInstance @Override public void onBypassFeedback(L2PcInstance player, String command) { - String[] commandStr = command.split(" "); - String actualCommand = commandStr[0]; // Get actual command + final String[] commandStr = command.split(" "); + final String actualCommand = commandStr[0]; // Get actual command String cmdParams = ""; String cmdParams2 = ""; @@ -210,7 +210,7 @@ public class L2VillageMasterInstance extends L2NpcInstance final L2ClanMember member = clan.getClanMember(cmdParams); if (member == null) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_EXIST); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_EXIST); sm.addString(cmdParams); player.sendPacket(sm); return; @@ -435,7 +435,7 @@ public class L2VillageMasterInstance extends L2NpcInstance { if (pledgeType == L2Clan.SUBUNIT_ACADEMY) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); sm.addString(clanName); player.sendPacket(sm); } @@ -591,7 +591,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } clan.broadcastClanStatus(); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_SELECTED_AS_THE_CAPTAIN_OF_S2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_SELECTED_AS_THE_CAPTAIN_OF_S2); sm.addString(leaderName); sm.addString(clanName); clan.broadcastToOnlineMembers(sm); @@ -618,7 +618,7 @@ public class L2VillageMasterInstance extends L2NpcInstance { if (player.getClan().getLevel() < 8) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); if (player.getClan().getLevel() < 5) { sm.addInt(5); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/AttackableKnownList.java b/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/AttackableKnownList.java index 87eb2c1eda..f9b5b554b5 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/AttackableKnownList.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/AttackableKnownList.java @@ -83,7 +83,7 @@ public class AttackableKnownList extends NpcKnownList return object.getKnownList().getDistanceToWatchObject(getActiveObject()); } - int max = Math.max(300, Math.max(getActiveChar().getAggroRange(), getActiveChar().getTemplate().getClanHelpRange())); + final int max = Math.max(300, Math.max(getActiveChar().getAggroRange(), getActiveChar().getTemplate().getClanHelpRange())); return max; } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java b/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java index 8e5993ef8e..9377ee2268 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java @@ -128,7 +128,7 @@ public class CharKnownList extends ObjectKnownList final Iterator pIter = getKnownPlayers().values().iterator(); while (pIter.hasNext()) { - L2PcInstance player = pIter.next(); + final L2PcInstance player = pIter.next(); if (player == null) { pIter.remove(); @@ -145,7 +145,7 @@ public class CharKnownList extends ObjectKnownList final Iterator sIter = getKnownSummons().values().iterator(); while (sIter.hasNext()) { - L2Summon summon = sIter.next(); + final L2Summon summon = sIter.next(); if (summon == null) { sIter.remove(); @@ -168,7 +168,7 @@ public class CharKnownList extends ObjectKnownList final Iterator oIter = getKnownObjects().values().iterator(); while (oIter.hasNext()) { - L2Object object = oIter.next(); + final L2Object object = oIter.next(); if (object == null) { oIter.remove(); @@ -198,7 +198,7 @@ public class CharKnownList extends ObjectKnownList public List getKnownCharacters() { - List result = new LinkedList<>(); + final List result = new LinkedList<>(); for (L2Object obj : getKnownObjects().values()) { if (obj instanceof L2Character) @@ -211,7 +211,7 @@ public class CharKnownList extends ObjectKnownList public List getKnownCharactersInRadius(long radius) { - List result = new LinkedList<>(); + final List result = new LinkedList<>(); for (L2Object obj : getKnownObjects().values()) { if (obj instanceof L2Character) @@ -227,7 +227,7 @@ public class CharKnownList extends ObjectKnownList public final List getKnownPlayersInRadius(long radius) { - List result = new LinkedList<>(); + final List result = new LinkedList<>(); for (L2PcInstance player : getKnownPlayers().values()) { if (Util.checkIfInRange((int) radius, getActiveChar(), player, true)) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/DefenderKnownList.java b/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/DefenderKnownList.java index 4857d146e5..9f468f21d3 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/DefenderKnownList.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/knownlist/DefenderKnownList.java @@ -41,9 +41,9 @@ public class DefenderKnownList extends AttackableKnownList return false; } - Castle castle = getActiveChar().getCastle(); - Fort fortress = getActiveChar().getFort(); - SiegableHall hall = getActiveChar().getConquerableHall(); + final Castle castle = getActiveChar().getCastle(); + final Fort fortress = getActiveChar().getFort(); + final SiegableHall hall = getActiveChar().getConquerableHall(); // Check if siege is in progress if (((fortress != null) && fortress.getZone().isActive()) || ((castle != null) && castle.getZone().isActive()) || ((hall != null) && hall.getSiegeZone().isActive())) { @@ -52,7 +52,7 @@ public class DefenderKnownList extends AttackableKnownList { player = object.getActingPlayer(); } - int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : hall != null ? hall.getId() : 0)); + final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : hall != null ? hall.getId() : 0)); // Check if player is an enemy of this defender npc if ((player != null) && (((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) || ((player.getSiegeState() == 1)) || (player.getSiegeState() == 0))) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java b/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java index bbc1ef1d8b..fa604bf67d 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java @@ -95,7 +95,7 @@ public class CharStat // Apply transformation stats. if (getActiveChar().isPlayer() && getActiveChar().isTransformed()) { - double val = getActiveChar().getTransformation().getStat(getActiveChar().getActingPlayer(), stat); + final double val = getActiveChar().getTransformation().getStat(getActiveChar().getActingPlayer(), stat); if (val > 0) { value = val; @@ -193,7 +193,7 @@ public class CharStat { double val = (int) calcStat(Stats.CRITICAL_RATE, _activeChar.getTemplate().getBaseCritRate(), target, skill); - int maxCrit = (int) _activeChar.getStat().calcStat(Stats.MAX_PHYS_CRIT_RATE, 0, null, null); + final int maxCrit = (int) _activeChar.getStat().calcStat(Stats.MAX_PHYS_CRIT_RATE, 0, null, null); if (!_activeChar.canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) { @@ -663,7 +663,7 @@ public class CharStat return 1; } double mpConsume = skill.getMpConsume(); - double nextDanceMpCost = Math.ceil(skill.getMpConsume() / 2.); + final double nextDanceMpCost = Math.ceil(skill.getMpConsume() / 2.); if (skill.isDance()) { if (Config.DANCE_CONSUME_ADDITIONAL_MP && (_activeChar != null) && (_activeChar.getDanceCount() > 0)) @@ -704,7 +704,7 @@ public class CharStat public byte getAttackElement() { - L2ItemInstance weaponInstance = _activeChar.getActiveWeaponInstance(); + final L2ItemInstance weaponInstance = _activeChar.getActiveWeaponInstance(); // 1st order - weapon element if ((weaponInstance != null) && (weaponInstance.getAttackElementType() >= 0)) { @@ -712,7 +712,8 @@ public class CharStat } // temp fix starts - int tempVal = 0, stats[] = + int tempVal = 0; + final int stats[] = { 0, 0, @@ -749,7 +750,7 @@ public class CharStat public int getAttackElementValue(byte attackAttribute) { - double additionalPower = _activeChar.getStat().calcStat(Stats.WEAPON_ELEMENT_POWER, 0, null, null); + final double additionalPower = _activeChar.getStat().calcStat(Stats.WEAPON_ELEMENT_POWER, 0, null, null); switch (attackAttribute) { case Elementals.FIRE: diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java b/trunk/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java index 63946c989d..d0e7ab3c29 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java @@ -109,7 +109,7 @@ public class PcStat extends PlayableStat public boolean addExpAndSp(long addToExp, long addToSp, boolean useBonuses) { - L2PcInstance activeChar = getActiveChar(); + final L2PcInstance activeChar = getActiveChar(); // Allowed to gain exp/sp? if (!activeChar.getAccessLevel().canGainExp()) @@ -117,8 +117,8 @@ public class PcStat extends PlayableStat return false; } - long baseExp = addToExp; - long baseSp = addToSp; + final long baseExp = addToExp; + final long baseSp = addToSp; double bonusExp = 1.; double bonusSp = 1.; @@ -144,7 +144,7 @@ public class PcStat extends PlayableStat final L2Summon sPet = activeChar.getPet(); if ((sPet != null) && Util.checkIfInShortRadius(Config.ALT_PARTY_RANGE, activeChar, sPet, false)) { - L2PetInstance pet = (L2PetInstance) sPet; + final L2PetInstance pet = (L2PetInstance) sPet; ratioTakenByPlayer = pet.getPetLevelData().getOwnerExpTaken() / 100f; // only give exp/sp to the pet by taking from the owner if the pet has a non-zero, positive ratio @@ -253,7 +253,7 @@ public class PcStat extends PlayableStat // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel(), getLevel() + value), getActiveChar()); - boolean levelIncreased = super.addLevel(value); + final boolean levelIncreased = super.addLevel(value); if (levelIncreased) { getActiveChar().setCurrentCp(getMaxCp()); @@ -298,7 +298,7 @@ public class PcStat extends PlayableStat } } - StatusUpdate su = new StatusUpdate(getActiveChar()); + final StatusUpdate su = new StatusUpdate(getActiveChar()); su.addAttribute(StatusUpdate.LEVEL, getLevel()); su.addAttribute(StatusUpdate.MAX_CP, getMaxCp()); su.addAttribute(StatusUpdate.MAX_HP, getMaxHp()); @@ -335,7 +335,7 @@ public class PcStat extends PlayableStat { return false; } - UserInfo ui = new UserInfo(getActiveChar(), false); + final UserInfo ui = new UserInfo(getActiveChar(), false); ui.addComponentType(UserInfoType.CURRENT_HPMPCP_EXP_SP); getActiveChar().sendPacket(ui); @@ -476,7 +476,7 @@ public class PcStat extends PlayableStat public final int getMaxCp() { // Get the Max CP (base+modifier) of the L2PcInstance - int val = (getActiveChar() == null) ? 1 : (int) calcStat(Stats.MAX_CP, getActiveChar().getTemplate().getBaseCpMax(getActiveChar().getLevel())); + final int val = (getActiveChar() == null) ? 1 : (int) calcStat(Stats.MAX_CP, getActiveChar().getTemplate().getBaseCpMax(getActiveChar().getLevel())); if (val != _oldMaxCp) { _oldMaxCp = val; @@ -494,7 +494,7 @@ public class PcStat extends PlayableStat public final int getMaxHp() { // Get the Max HP (base+modifier) of the L2PcInstance - int val = (getActiveChar() == null) ? 1 : (int) calcStat(Stats.MAX_HP, getActiveChar().getTemplate().getBaseHpMax(getActiveChar().getLevel())); + final int val = (getActiveChar() == null) ? 1 : (int) calcStat(Stats.MAX_HP, getActiveChar().getTemplate().getBaseHpMax(getActiveChar().getLevel())); if (val != _oldMaxHp) { _oldMaxHp = val; @@ -513,7 +513,7 @@ public class PcStat extends PlayableStat public final int getMaxMp() { // Get the Max MP (base+modifier) of the L2PcInstance - int val = (getActiveChar() == null) ? 1 : (int) calcStat(Stats.MAX_MP, getActiveChar().getTemplate().getBaseMpMax(getActiveChar().getLevel())); + final int val = (getActiveChar() == null) ? 1 : (int) calcStat(Stats.MAX_MP, getActiveChar().getTemplate().getBaseMpMax(getActiveChar().getLevel())); if (val != _oldMaxMp) { @@ -645,7 +645,7 @@ public class PcStat extends PlayableStat @Override public double getPAtkSpd() { - double val = super.getPAtkSpd(); + final double val = super.getPAtkSpd(); if ((val > Config.MAX_PATK_SPEED) && !getActiveChar().canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) { @@ -712,7 +712,7 @@ public class PcStat extends PlayableStat if (points < 0) // vitality consumed { - int stat = (int) calcStat(Stats.VITALITY_CONSUME_RATE, 1, getActiveChar(), null); + final int stat = (int) calcStat(Stats.VITALITY_CONSUME_RATE, 1, getActiveChar(), null); if (stat == 0) { diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java b/trunk/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java index 7b5f7a6460..0fa9b99866 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java @@ -57,7 +57,7 @@ public class PetStat extends SummonStat return false; } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_GAINED_S1_XP); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_GAINED_S1_XP); sm.addLong(addToExp); getActiveChar().updateAndBroadcastStatus(1); getActiveChar().sendPacket(sm); @@ -72,12 +72,12 @@ public class PetStat extends SummonStat return false; } - boolean levelIncreased = super.addLevel(value); + final boolean levelIncreased = super.addLevel(value); // Sync up exp with current level // if (getExp() > getExpForLevel(getLevel() + 1) || getExp() < getExpForLevel(getLevel())) setExp(Experience.LEVEL[getLevel()]); - StatusUpdate su = new StatusUpdate(getActiveChar()); + final StatusUpdate su = new StatusUpdate(getActiveChar()); su.addAttribute(StatusUpdate.LEVEL, getLevel()); su.addAttribute(StatusUpdate.MAX_HP, getMaxHp()); su.addAttribute(StatusUpdate.MAX_MP, getMaxMp()); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java b/trunk/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java index 47c470a059..8e85f166c6 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java @@ -169,7 +169,7 @@ public class PlayableStat extends CharStat } } - boolean levelIncreased = ((getLevel() + value) > getLevel()); + final boolean levelIncreased = ((getLevel() + value) > getLevel()); value += getLevel(); setLevel(value); @@ -202,7 +202,7 @@ public class PlayableStat extends CharStat _log.warning("wrong usage"); return false; } - long currentSp = getSp(); + final long currentSp = getSp(); if (currentSp == Long.MAX_VALUE) { return false; @@ -219,7 +219,7 @@ public class PlayableStat extends CharStat public boolean removeSp(long value) { - long currentSp = getSp(); + final long currentSp = getSp(); if (currentSp < value) { value = currentSp; diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java b/trunk/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java index 7ad39518eb..8e501418c0 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java @@ -205,7 +205,7 @@ public class CharStatus } // Get the Regeneration period - int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(getActiveChar()); // Create the HP/MP/CP Regeneration task _regTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new RegenTask(), period, period); @@ -268,7 +268,7 @@ public class CharStatus public boolean setCurrentHp(double newHp, boolean broadcastPacket) { // Get the Max HP of the L2Character - int currentHp = (int) getCurrentHp(); + final int currentHp = (int) getCurrentHp(); final double maxHp = getActiveChar().getMaxHp(); synchronized (this) @@ -301,7 +301,7 @@ public class CharStatus } } - boolean hpWasChanged = currentHp != _currentHp; + final boolean hpWasChanged = currentHp != _currentHp; // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (hpWasChanged && broadcastPacket) @@ -341,7 +341,7 @@ public class CharStatus public final boolean setCurrentMp(double newMp, boolean broadcastPacket) { // Get the Max MP of the L2Character - int currentMp = (int) getCurrentMp(); + final int currentMp = (int) getCurrentMp(); final int maxMp = getActiveChar().getMaxMp(); synchronized (this) @@ -374,7 +374,7 @@ public class CharStatus } } - boolean mpWasChanged = currentMp != _currentMp; + final boolean mpWasChanged = currentMp != _currentMp; // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (mpWasChanged && broadcastPacket) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java b/trunk/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java index 3da5f2bcf8..4465bf4b26 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java @@ -177,7 +177,7 @@ public class PcStatus extends PlayableStatus else { getActiveChar().reduceCurrentMp(mpDam); - SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.ARCANE_SHIELD_DECREASED_YOUR_MP_BY_S1_INSTEAD_OF_HP); + final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.ARCANE_SHIELD_DECREASED_YOUR_MP_BY_S1_INSTEAD_OF_HP); smsg.addInt(mpDam); getActiveChar().sendPacket(smsg); return; @@ -346,8 +346,8 @@ public class PcStatus extends PlayableStatus public final void setCurrentCp(double newCp, boolean broadcastPacket) { // Get the Max CP of the L2Character - int currentCp = (int) getCurrentCp(); - int maxCp = getActiveChar().getStat().getMaxCp(); + final int currentCp = (int) getCurrentCp(); + final int maxCp = getActiveChar().getStat().getMaxCp(); synchronized (this) { diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/status/PetStatus.java b/trunk/java/com/l2jserver/gameserver/model/actor/status/PetStatus.java index bf5c28e889..8b3b07db74 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/status/PetStatus.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/status/PetStatus.java @@ -53,7 +53,7 @@ public class PetStatus extends SummonStatus { if (!isDOT && (getActiveChar().getOwner() != null)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1); sm.addCharName(attacker); sm.addInt((int) value); getActiveChar().sendPacket(sm); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicAction.java b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicAction.java index f6ad27b54c..ed30543c37 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicAction.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicAction.java @@ -115,14 +115,14 @@ public final class CubicAction implements Runnable // Smart Cubic debuff cancel is needed, no other skill is used in this activation period if ((_cubic.getId() >= L2CubicInstance.SMART_CUBIC_EVATEMPLAR) && (_cubic.getId() <= L2CubicInstance.SMART_CUBIC_SPECTRALMASTER)) { - MagicSkillUse msu = new MagicSkillUse(_cubic.getOwner(), _cubic.getOwner(), L2CubicInstance.SKILL_CUBIC_CURE, 1, 0, 0); + final MagicSkillUse msu = new MagicSkillUse(_cubic.getOwner(), _cubic.getOwner(), L2CubicInstance.SKILL_CUBIC_CURE, 1, 0, 0); _cubic.getOwner().broadcastPacket(msu); // The cubic has done an action, increase the current count _currentCount.incrementAndGet(); } else { - MagicSkillUse msu = new MagicSkillUse(_cubic.getOwner(), _cubic.getOwner(), L2CubicInstance.SKILL_AVENGING_CUBIC_CLEANCE, 1, 0, 0); + final MagicSkillUse msu = new MagicSkillUse(_cubic.getOwner(), _cubic.getOwner(), L2CubicInstance.SKILL_AVENGING_CUBIC_CLEANCE, 1, 0, 0); _cubic.getOwner().broadcastPacket(msu); // The cubic has done an action, increase the current count _currentCount.incrementAndGet(); @@ -150,7 +150,7 @@ public final class CubicAction implements Runnable _cubic.setTarget(null); } } - L2Character target = _cubic.getTarget(); + final L2Character target = _cubic.getTarget(); if ((target != null) && !target.isDead()) { if (Config.DEBUG) @@ -161,7 +161,7 @@ public final class CubicAction implements Runnable _cubic.getOwner().broadcastPacket(new MagicSkillUse(_cubic.getOwner(), target, skill.getId(), skill.getLevel(), 0, 0)); - L2Character[] targets = + final L2Character[] targets = { target }; diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicHeal.java b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicHeal.java index 2b043b1425..f14b7fc5da 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicHeal.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicHeal.java @@ -71,7 +71,7 @@ public class CubicHeal implements Runnable { Skill skill = null; // Base chance 10% to use great skill - double chance = Rnd.get(); + final double chance = Rnd.get(); for (Skill sk : _cubic.getSkills()) { switch (sk.getId()) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/FameTask.java b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/FameTask.java index c0817a46b6..22e4a86ea3 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/FameTask.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/FameTask.java @@ -51,7 +51,7 @@ public class FameTask implements Runnable return; } _player.setFame(_player.getFame() + _value); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_FAME); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_FAME); sm.addInt(_value); _player.sendPacket(sm); _player.sendPacket(new UserInfo(_player)); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/GameGuardCheckTask.java index bcdeb130ab..a8cd5f8042 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/GameGuardCheckTask.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/GameGuardCheckTask.java @@ -45,7 +45,7 @@ public class GameGuardCheckTask implements Runnable { if ((_player != null)) { - L2GameClient client = _player.getClient(); + final L2GameClient client = _player.getClient(); if ((client != null) && !client.isAuthedGG() && _player.isOnline()) { AdminData.getInstance().broadcastMessageToGMs("Client " + client + " failed to reply GameGuard query and is being kicked!"); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 1a32be7986..cb2f7ad9a9 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -77,7 +77,7 @@ public final class IllegalPlayerActionTask implements Runnable @Override public void run() { - LogRecord record = new LogRecord(Level.INFO, "AUDIT:" + _message); + final LogRecord record = new LogRecord(Level.INFO, "AUDIT:" + _message); record.setLoggerName("audit"); //@formatter:off record.setParameters(new Object[] { _actor, _punishment }); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/LookingForFishTask.java b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/LookingForFishTask.java index e46837299d..689005f3bb 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/LookingForFishTask.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/LookingForFishTask.java @@ -57,7 +57,7 @@ public class LookingForFishTask implements Runnable { return; } - int check = Rnd.get(100); + final int check = Rnd.get(100); if (_fishGutsCheck > check) { _player.stopLookingForFishTask(); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/PetFeedTask.java b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/PetFeedTask.java index 2654bb45bb..4189aa1154 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -90,11 +90,11 @@ public class PetFeedTask implements Runnable if ((food != null) && _player.isHungry()) { - IItemHandler handler = ItemHandler.getInstance().getHandler(food.getEtcItem()); + final IItemHandler handler = ItemHandler.getInstance().getHandler(food.getEtcItem()); if (handler != null) { handler.useItem(_player, food, false); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_WAS_HUNGRY_SO_IT_ATE_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_WAS_HUNGRY_SO_IT_ATE_S1); sm.addItemName(food.getId()); _player.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/WaterTask.java b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/WaterTask.java index 7600aa0b68..d43a86e418 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/WaterTask.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/WaterTask.java @@ -49,7 +49,7 @@ public class WaterTask implements Runnable _player.reduceCurrentHp(reduceHp, _player, false, false, null); // reduced hp, becouse not rest - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_TAKEN_S1_DAMAGE_BECAUSE_YOU_WERE_UNABLE_TO_BREATHE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_TAKEN_S1_DAMAGE_BECAUSE_YOU_WERE_UNABLE_TO_BREATHE); sm.addInt((int) reduceHp); _player.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java b/trunk/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java index efe1e69bb6..7f092bc4c9 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java @@ -66,7 +66,7 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable _name = set.getString("name"); // position - String[] pos = set.getString("pos").split(";"); + final String[] pos = set.getString("pos").split(";"); _posX = Integer.parseInt(pos[0]); _posY = Integer.parseInt(pos[1]); _posZ = Integer.parseInt(pos[2]); @@ -76,7 +76,7 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable _nodeY = new int[4]; // 4 * y for (int i = 0; i < 4; i++) { - String split[] = set.getString("node" + (i + 1)).split(","); + final String split[] = set.getString("node" + (i + 1)).split(","); _nodeX[i] = Integer.parseInt(split[0]); _nodeY[i] = Integer.parseInt(split[1]); } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java b/trunk/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java index 37a519e29d..c16bdc3572 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java @@ -473,7 +473,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable return false; } - int clanId = NpcData.getInstance().getClanId("ALL"); + final int clanId = NpcData.getInstance().getClanId("ALL"); if (clanSet.contains(clanId)) { return true; @@ -514,13 +514,13 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable public List getDropList(DropListScope dropListScope) { - Map> dropLists = _dropLists; + final Map> dropLists = _dropLists; return dropLists != null ? dropLists.get(dropListScope) : null; } public Collection calculateDrops(DropListScope dropListScope, L2Character victim, L2Character killer) { - List dropList = getDropList(dropListScope); + final List dropList = getDropList(dropListScope); if (dropList == null) { return null; @@ -562,7 +562,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable if (clazz.isInterface()) { // check if obj implements the clazz interface - Class[] interfaces = sub.getInterfaces(); + final Class[] interfaces = sub.getInterfaces(); for (Class interface1 : interfaces) { if (clazz.getName().equals(interface1.getName())) diff --git a/trunk/java/com/l2jserver/gameserver/model/base/PlayerClass.java b/trunk/java/com/l2jserver/gameserver/model/base/PlayerClass.java index 632f603dbb..c95dbe353d 100644 --- a/trunk/java/com/l2jserver/gameserver/model/base/PlayerClass.java +++ b/trunk/java/com/l2jserver/gameserver/model/base/PlayerClass.java @@ -261,7 +261,7 @@ public enum PlayerClass public static final EnumSet getSet(Race race, ClassLevel level) { - EnumSet allOf = EnumSet.noneOf(PlayerClass.class); + final EnumSet allOf = EnumSet.noneOf(PlayerClass.class); for (PlayerClass playerClass : EnumSet.allOf(PlayerClass.class)) { diff --git a/trunk/java/com/l2jserver/gameserver/model/beautyshop/BeautyItem.java b/trunk/java/com/l2jserver/gameserver/model/beautyshop/BeautyItem.java index 4501d6ea00..e7ee3e5743 100644 --- a/trunk/java/com/l2jserver/gameserver/model/beautyshop/BeautyItem.java +++ b/trunk/java/com/l2jserver/gameserver/model/beautyshop/BeautyItem.java @@ -64,7 +64,7 @@ public class BeautyItem public void addColor(StatsSet set) { - BeautyItem color = new BeautyItem(set); + final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); } diff --git a/trunk/java/com/l2jserver/gameserver/model/buylist/Product.java b/trunk/java/com/l2jserver/gameserver/model/buylist/Product.java index 2362d7d50b..10d4381af1 100644 --- a/trunk/java/com/l2jserver/gameserver/model/buylist/Product.java +++ b/trunk/java/com/l2jserver/gameserver/model/buylist/Product.java @@ -98,7 +98,7 @@ public final class Product { return 0; } - long count = _count.get(); + final long count = _count.get(); return count > 0 ? count : 0; } @@ -121,7 +121,7 @@ public final class Product { _restockTask = ThreadPoolManager.getInstance().scheduleGeneral(new RestockTask(), getRestockDelay()); } - boolean result = _count.addAndGet(-val) >= 0; + final boolean result = _count.addAndGet(-val) >= 0; save(); return result; } @@ -133,7 +133,7 @@ public final class Product public void restartRestockTask(long nextRestockTime) { - long remainTime = nextRestockTime - System.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { _restockTask = ThreadPoolManager.getInstance().scheduleGeneral(new RestockTask(), remainTime); @@ -170,7 +170,7 @@ public final class Product ps.setLong(5, getCount()); if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) { - long nextRestockTime = System.currentTimeMillis() + _restockTask.getDelay(TimeUnit.MILLISECONDS); + final long nextRestockTime = System.currentTimeMillis() + _restockTask.getDelay(TimeUnit.MILLISECONDS); ps.setLong(4, nextRestockTime); ps.setLong(6, nextRestockTime); } diff --git a/trunk/java/com/l2jserver/gameserver/model/conditions/Condition.java b/trunk/java/com/l2jserver/gameserver/model/conditions/Condition.java index 520d1b4b6d..6a7fb92b74 100644 --- a/trunk/java/com/l2jserver/gameserver/model/conditions/Condition.java +++ b/trunk/java/com/l2jserver/gameserver/model/conditions/Condition.java @@ -118,7 +118,7 @@ public abstract class Condition implements ConditionListener public final boolean test(L2Character caster, L2Character target, Skill skill, L2Item item) { - boolean res = testImpl(caster, target, skill, item); + final boolean res = testImpl(caster, target, skill, item); if ((_listener != null) && (res != _result)) { _result = res; diff --git a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2f1f7627ad..3955ffd695 100644 --- a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -49,7 +49,7 @@ public class ConditionPlayerCanTakeCastle extends Condition return false; } - Castle castle = CastleManager.getInstance().getCastle(player); + final Castle castle = CastleManager.getInstance().getCastle(player); SystemMessage sm; if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(player.getClan()) == null)) { diff --git a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerWeight.java b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerWeight.java index b60f8d8796..ba7f7bc091 100644 --- a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerWeight.java @@ -47,7 +47,7 @@ public class ConditionPlayerWeight extends Condition final L2PcInstance player = effector.getActingPlayer(); if ((player != null) && (player.getMaxLoad() > 0)) { - int weightproc = (((player.getCurrentLoad() - player.getBonusWeightPenalty()) * 100) / player.getMaxLoad()); + final int weightproc = (((player.getCurrentLoad() - player.getBonusWeightPenalty()) * 100) / player.getMaxLoad()); return (weightproc < _weight) || player.getDietMode(); } return true; diff --git a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java index a508c82342..872323ca0a 100644 --- a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java @@ -59,9 +59,9 @@ public final class ConditionSiegeZone extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - L2Character target = _self ? effector : effected; - Castle castle = CastleManager.getInstance().getCastle(target); - Fort fort = FortManager.getInstance().getFort(target); + final L2Character target = _self ? effector : effected; + final Castle castle = CastleManager.getInstance().getCastle(target); + final Fort fort = FortManager.getInstance().getFort(target); if ((castle == null) && (fort == null)) { @@ -88,7 +88,7 @@ public final class ConditionSiegeZone extends Condition return false; } - L2PcInstance player = (L2PcInstance) activeChar; + final L2PcInstance player = (L2PcInstance) activeChar; if (((castle == null) || (castle.getResidenceId() <= 0))) { @@ -134,7 +134,7 @@ public final class ConditionSiegeZone extends Condition return false; } - L2PcInstance player = (L2PcInstance) activeChar; + final L2PcInstance player = (L2PcInstance) activeChar; if (((fort == null) || (fort.getResidenceId() <= 0))) { diff --git a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index 06681eefdf..75379f28b7 100644 --- a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -48,7 +48,7 @@ public class ConditionTargetUsesWeaponKind extends Condition return false; } - L2Weapon weapon = effected.getActiveWeaponItem(); + final L2Weapon weapon = effected.getActiveWeaponItem(); if (weapon == null) { return false; diff --git a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionTargetWeight.java b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionTargetWeight.java index 27170b6f96..8b15e94a42 100644 --- a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionTargetWeight.java +++ b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionTargetWeight.java @@ -48,7 +48,7 @@ public class ConditionTargetWeight extends Condition final L2PcInstance target = effected.getActingPlayer(); if (!target.getDietMode() && (target.getMaxLoad() > 0)) { - int weightproc = (((target.getCurrentLoad() - target.getBonusWeightPenalty()) * 100) / target.getMaxLoad()); + final int weightproc = (((target.getCurrentLoad() - target.getBonusWeightPenalty()) * 100) / target.getMaxLoad()); return (weightproc < _weight); } } diff --git a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionUsingItemType.java b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionUsingItemType.java index ce0c6baaa5..679bb28c6c 100644 --- a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionUsingItemType.java +++ b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionUsingItemType.java @@ -57,12 +57,12 @@ public final class ConditionUsingItemType extends Condition if (_armor) { // Get the itemMask of the weared chest (if exists) - L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (chest == null) { return false; } - int chestMask = chest.getItem().getItemMask(); + final int chestMask = chest.getItem().getItemMask(); // If chest armor is different from the condition one return false if ((_mask & chestMask) == 0) @@ -72,19 +72,19 @@ public final class ConditionUsingItemType extends Condition // So from here, chest armor matches conditions - int chestBodyPart = chest.getItem().getBodyPart(); + final int chestBodyPart = chest.getItem().getBodyPart(); // return True if chest armor is a Full Armor if (chestBodyPart == L2Item.SLOT_FULL_ARMOR) { return true; } // check legs armor - L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); + final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); if (legs == null) { return false; } - int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getItem().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/trunk/java/com/l2jserver/gameserver/model/drops/GroupedGeneralDropItem.java b/trunk/java/com/l2jserver/gameserver/model/drops/GroupedGeneralDropItem.java index 74b63982d6..fa4a6fb7b3 100644 --- a/trunk/java/com/l2jserver/gameserver/model/drops/GroupedGeneralDropItem.java +++ b/trunk/java/com/l2jserver/gameserver/model/drops/GroupedGeneralDropItem.java @@ -121,8 +121,8 @@ public final class GroupedGeneralDropItem implements IDropItem */ public final List extractMe() { - List items = new ArrayList<>(); - for (final GeneralDropItem item : getItems()) + final List items = new ArrayList<>(); + for (GeneralDropItem item : getItems()) { // precise and killer strategies of the group items.add(new GeneralDropItem(item.getItemId(), item.getMin(), item.getMax(), (item.getChance() * getChance()) / 100, item.getAmountStrategy(), item.getChanceStrategy(), getPreciseStrategy(), getKillerChanceModifierStrategy(), item.getDropCalculationStrategy())); @@ -142,9 +142,9 @@ public final class GroupedGeneralDropItem implements IDropItem sumchance += (item.getChance() * getChance()) / 100; } final double sumchance1 = sumchance; - GroupedGeneralDropItem group = new GroupedGeneralDropItem(sumchance1, getDropCalculationStrategy(), IKillerChanceModifierStrategy.NO_RULES, getPreciseStrategy()); - List items = new ArrayList<>(); - for (final GeneralDropItem item : getItems()) + final GroupedGeneralDropItem group = new GroupedGeneralDropItem(sumchance1, getDropCalculationStrategy(), IKillerChanceModifierStrategy.NO_RULES, getPreciseStrategy()); + final List items = new ArrayList<>(); + for (GeneralDropItem item : getItems()) { // modify only the chance, leave all other rules intact items.add(new GeneralDropItem(item.getItemId(), item.getMin(), item.getMax(), (item.getChance() * getChance()) / sumchance1, item.getAmountStrategy(), item.getChanceStrategy(), item.getPreciseStrategy(), item.getKillerChanceModifierStrategy(), item.getDropCalculationStrategy())); @@ -216,8 +216,8 @@ public final class GroupedGeneralDropItem implements IDropItem { sumchance += (item.getChance(victim, killer) * getChance() * chanceModifier) / 100; } - GroupedGeneralDropItem group = new GroupedGeneralDropItem(sumchance, getDropCalculationStrategy(), IKillerChanceModifierStrategy.NO_RULES, getPreciseStrategy()); // to discard further deep blue calculations - List items = new ArrayList<>(); + final GroupedGeneralDropItem group = new GroupedGeneralDropItem(sumchance, getDropCalculationStrategy(), IKillerChanceModifierStrategy.NO_RULES, getPreciseStrategy()); // to discard further deep blue calculations + final List items = new ArrayList<>(); for (GeneralDropItem item : getItems()) { // the item is made almost "static" diff --git a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java index d04b556133..a9bc93cbc4 100644 --- a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java +++ b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java @@ -42,7 +42,7 @@ public interface IAmountMultiplierStrategy { multiplier *= item.getItemId() != Inventory.ADENA_ID ? Config.L2JMOD_CHAMPION_REWARDS_AMOUNT : Config.L2JMOD_CHAMPION_ADENAS_REWARDS_AMOUNT; } - Float dropAmountMultiplier = Config.RATE_DROP_AMOUNT_MULTIPLIER.get(item.getItemId()); + final Float dropAmountMultiplier = Config.RATE_DROP_AMOUNT_MULTIPLIER.get(item.getItemId()); if (dropAmountMultiplier != null) { multiplier *= dropAmountMultiplier; diff --git a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java index 7a1bbd7228..a3d96e8314 100644 --- a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java +++ b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java @@ -57,7 +57,7 @@ public interface IChanceMultiplierStrategy { multiplier *= item.getItemId() != Inventory.ADENA_ID ? Config.L2JMOD_CHAMPION_REWARDS_CHANCE : Config.L2JMOD_CHAMPION_ADENAS_REWARDS_CHANCE; } - Float dropChanceMultiplier = Config.RATE_DROP_CHANCE_MULTIPLIER.get(item.getItemId()); + final Float dropChanceMultiplier = Config.RATE_DROP_CHANCE_MULTIPLIER.get(item.getItemId()); if (dropChanceMultiplier != null) { multiplier *= dropChanceMultiplier; diff --git a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategy.java b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategy.java index 4edb8d5987..9b74b7190a 100644 --- a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategy.java +++ b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategy.java @@ -33,7 +33,7 @@ public interface IDropCalculationStrategy { public static final IDropCalculationStrategy DEFAULT_STRATEGY = (item, victim, killer) -> { - double chance = item.getChance(victim, killer); + final double chance = item.getChance(victim, killer); if (chance > (Rnd.nextDouble() * 100)) { int amountMultiply = 1; diff --git a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java index 0f56d4b7ff..64d45696ee 100644 --- a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java +++ b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java @@ -58,7 +58,7 @@ public interface IGroupedItemDropCalculationStrategy return getSingleItem(dropItem).calculateDrops(victim, killer); } - GroupedGeneralDropItem normalized = dropItem.normalizeMe(victim, killer); + final GroupedGeneralDropItem normalized = dropItem.normalizeMe(victim, killer); if (normalized.getChance() > (Rnd.nextDouble() * 100)) { final double random = (Rnd.nextDouble() * 100); @@ -92,7 +92,7 @@ public interface IGroupedItemDropCalculationStrategy */ public static final IGroupedItemDropCalculationStrategy DISBAND_GROUP = (item, victim, killer) -> { - List dropped = new ArrayList<>(); + final List dropped = new ArrayList<>(); for (IDropItem dropItem : item.extractMe()) { dropped.addAll(dropItem.calculateDrops(victim, killer)); @@ -110,16 +110,16 @@ public interface IGroupedItemDropCalculationStrategy // if item hasn't precise calculation there's no change from DEFAULT_STRATEGY return DEFAULT_STRATEGY.calculateDrops(item, victim, victim); } - GroupedGeneralDropItem newItem = new GroupedGeneralDropItem(item.getChance(), DEFAULT_STRATEGY, item.getKillerChanceModifierStrategy(), IPreciseDeterminationStrategy.NEVER); + final GroupedGeneralDropItem newItem = new GroupedGeneralDropItem(item.getChance(), DEFAULT_STRATEGY, item.getKillerChanceModifierStrategy(), IPreciseDeterminationStrategy.NEVER); newItem.setItems(item.getItems()); - GroupedGeneralDropItem normalized = newItem.normalizeMe(victim, killer); + final GroupedGeneralDropItem normalized = newItem.normalizeMe(victim, killer); // Let's determine the number of rolls. int rolls = (int) (normalized.getChance() / 100); if ((Rnd.nextDouble() * 100) < (normalized.getChance() % 100)) { rolls++; } - List dropped = new ArrayList<>(rolls); + final List dropped = new ArrayList<>(rolls); for (int i = 0; i < rolls; i++) { // As further normalizing on already normalized drop group does nothing, we can just pass the calculation to DEFAULT_STRATEGY with precise calculation disabled as we handle it. diff --git a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java index b035bfdee4..5cf5e137ff 100644 --- a/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java +++ b/trunk/java/com/l2jserver/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java @@ -32,7 +32,7 @@ public interface IKillerChanceModifierStrategy extends INonGroupedKillerChanceMo { public static final IKillerChanceModifierStrategy DEFAULT_STRATEGY = (item, victim, killer) -> { - int levelDifference = victim.getLevel() - killer.getLevel(); + final int levelDifference = victim.getLevel() - killer.getLevel(); if ((victim.isRaid()) && Config.DEEPBLUE_DROP_RULES_RAID) { // FIXME: Config? @@ -49,7 +49,7 @@ public interface IKillerChanceModifierStrategy extends INonGroupedKillerChanceMo { if (((!(victim.isRaid())) && Config.DEEPBLUE_DROP_RULES) || ((victim.isRaid()) && Config.DEEPBLUE_DROP_RULES_RAID)) { - int levelDifference = victim.getLevel() - killer.getLevel(); + final int levelDifference = victim.getLevel() - killer.getLevel(); if (item.getItemId() == Inventory.ADENA_ID) { diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Auction.java b/trunk/java/com/l2jserver/gameserver/model/entity/Auction.java index 32d8b645fa..a178c0e4f1 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Auction.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Auction.java @@ -226,7 +226,7 @@ public class Auction /** Task Manage */ private void startAutoTask() { - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long taskDelay = 0; if (_endDate <= currentTime) { @@ -463,7 +463,7 @@ public class Auction /** * If seller haven't sell ClanHall, auction removed, THIS MUST BE CONFIRMED */ - int aucId = ClanHallAuctionManager.getInstance().getAuctionIndex(_id); + final int aucId = ClanHallAuctionManager.getInstance().getAuctionIndex(_id); ClanHallAuctionManager.getInstance().getAuctions().remove(aucId); return; } @@ -473,7 +473,7 @@ public class Auction returnItem(_sellerClanName, ClanHallManager.getInstance().getAuctionableHallById(_itemId).getLease(), false); } deleteAuctionFromDB(); - L2Clan Clan = ClanTable.getInstance().getClanByName(_bidders.get(_highestBidderId).getClanName()); + final L2Clan Clan = ClanTable.getInstance().getClanByName(_bidders.get(_highestBidderId).getClanName()); _bidders.remove(_highestBidderId); Clan.setAuctionBiddedAt(0, true); removeBids(); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java b/trunk/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java index 5281e11818..2bb5a4c0c7 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java @@ -242,14 +242,14 @@ public final class BlockCheckerEngine if (team == 0) { - int points = _redTeamPoints.get(player) + 1; + final int points = _redTeamPoints.get(player) + 1; _redTeamPoints.put(player, points); _redPoints++; _bluePoints--; } else { - int points = _blueTeamPoints.get(player) + 1; + final int points = _blueTeamPoints.get(player) + 1; _blueTeamPoints.put(player, points); _bluePoints++; _redPoints--; @@ -361,7 +361,7 @@ public final class BlockCheckerEngine } // Send the secret client packet set up - boolean isRed = _holder.getRedPlayers().contains(player); + final boolean isRed = _holder.getRedPlayers().contains(player); clientSetUp = new ExCubeGameExtendedChangePoints(300, _bluePoints, _redPoints, isRed, player, 0); player.sendPacket(clientSetUp); @@ -371,10 +371,10 @@ public final class BlockCheckerEngine // Teleport Player - Array access // Team 0 * 2 = 0; 0 = 0, 0 + 1 = 1. // Team 1 * 2 = 2; 2 = 2, 2 + 1 = 3 - int tc = _holder.getPlayerTeam(player) * 2; + final int tc = _holder.getPlayerTeam(player) * 2; // Get x and y coordinates - int x = _arenaCoordinates[_arena][tc]; - int y = _arenaCoordinates[_arena][tc + 1]; + final int x = _arenaCoordinates[_arena][tc]; + final int y = _arenaCoordinates[_arena][tc + 1]; player.teleToLocation(x, y, _zCoord); // Set the player team if (isRed) @@ -493,7 +493,7 @@ public final class BlockCheckerEngine spawn.setRespawnDelay(1); SpawnTable.getInstance().addNewSpawn(spawn, false); spawn.init(); - L2BlockInstance block = (L2BlockInstance) spawn.getLastSpawn(); + final L2BlockInstance block = (L2BlockInstance) spawn.getLastSpawn(); // switch color if ((random % 2) == 0) { @@ -541,8 +541,8 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000); - ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); + final int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000); + final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); getHolder().broadCastPacketToTeam(changePoints); } } @@ -627,7 +627,7 @@ public final class BlockCheckerEngine { rewardAsWinner(true); rewardAsLooser(false); - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON); msg.addString("Red Team"); _holder.broadCastPacketToTeam(msg); } @@ -635,7 +635,7 @@ public final class BlockCheckerEngine { rewardAsWinner(false); rewardAsLooser(true); - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON); msg.addString("Blue Team"); _holder.broadCastPacketToTeam(msg); } @@ -652,7 +652,7 @@ public final class BlockCheckerEngine */ private void rewardAsWinner(boolean isRed) { - Map tempPoints = isRed ? _redTeamPoints : _blueTeamPoints; + final Map tempPoints = isRed ? _redTeamPoints : _blueTeamPoints; // Main give for (Entry points : tempPoints.entrySet()) @@ -676,8 +676,8 @@ public final class BlockCheckerEngine L2PcInstance winner1 = null, winner2 = null; for (Entry entry : tempPoints.entrySet()) { - L2PcInstance pc = entry.getKey(); - int pcPoints = entry.getValue(); + final L2PcInstance pc = entry.getKey(); + final int pcPoints = entry.getValue(); if (pcPoints > first) { // Move old data @@ -709,11 +709,11 @@ public final class BlockCheckerEngine */ private void rewardAsLooser(boolean isRed) { - Map tempPoints = isRed ? _redTeamPoints : _blueTeamPoints; + final Map tempPoints = isRed ? _redTeamPoints : _blueTeamPoints; for (Entry entry : tempPoints.entrySet()) { - L2PcInstance player = entry.getKey(); + final L2PcInstance player = entry.getKey(); if ((player != null) && (entry.getValue() >= 10)) { player.addItem("Block Checker", 13067, 2, player, true); @@ -741,15 +741,15 @@ public final class BlockCheckerEngine // Set default arena player.setBlockCheckerArena(DEFAULT_ARENA); // Remove the event items - PcInventory inv = player.getInventory(); + final PcInventory inv = player.getInventory(); if (inv.getItemByItemId(13787) != null) { - long count = inv.getInventoryItemCount(13787, 0); + final long count = inv.getInventoryItemCount(13787, 0); inv.destroyItemByItemId("Handys Block Checker", 13787, count, player, player); } if (inv.getItemByItemId(13788) != null) { - long count = inv.getInventoryItemCount(13788, 0); + final long count = inv.getInventoryItemCount(13788, 0); inv.destroyItemByItemId("Handys Block Checker", 13788, count, player, player); } broadcastRelationChanged(player); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Castle.java b/trunk/java/com/l2jserver/gameserver/model/entity/Castle.java index d962fc6575..ecbc4dfe75 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Castle.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Castle.java @@ -164,7 +164,7 @@ public final class Castle extends AbstractResidence { return; } - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), _endDate - currentTime); @@ -466,7 +466,7 @@ public final class Castle extends AbstractResidence return; } - L2DoorInstance door = getDoor(doorId); + final L2DoorInstance door = getDoor(doorId); if (door != null) { if (open) @@ -498,7 +498,7 @@ public final class Castle extends AbstractResidence // Remove old owner if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) { - L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance + final L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance if (oldOwner != null) { if (_formerOwner == null) @@ -511,7 +511,7 @@ public final class Castle extends AbstractResidence } try { - L2PcInstance oldleader = oldOwner.getLeader().getPlayerInstance(); + final L2PcInstance oldleader = oldOwner.getLeader().getPlayerInstance(); if (oldleader != null) { if (oldleader.getMountType() == MountType.WYVERN) @@ -734,7 +734,7 @@ public final class Castle extends AbstractResidence } else { - int diffLease = lease - _function.get(type).getLease(); + final int diffLease = lease - _function.get(type).getLease(); if (diffLease > 0) { _function.remove(type); @@ -997,9 +997,9 @@ public final class Castle extends AbstractResidence { if (_formerOwner != ClanTable.getInstance().getClan(getOwnerId())) { - int maxreward = Math.max(0, _formerOwner.getReputationScore()); + final int maxreward = Math.max(0, _formerOwner.getReputationScore()); _formerOwner.takeReputationScore(Config.LOOSE_CASTLE_POINTS, true); - L2Clan owner = ClanTable.getInstance().getClan(getOwnerId()); + final L2Clan owner = ClanTable.getInstance().getClan(getOwnerId()); if (owner != null) { owner.addReputationScore(Math.min(Config.TAKE_CASTLE_POINTS, maxreward), true); @@ -1012,7 +1012,7 @@ public final class Castle extends AbstractResidence } else { - L2Clan owner = ClanTable.getInstance().getClan(getOwnerId()); + final L2Clan owner = ClanTable.getInstance().getClan(getOwnerId()); if (owner != null) { owner.addReputationScore(Config.TAKE_CASTLE_POINTS, true); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/ClanHall.java b/trunk/java/com/l2jserver/gameserver/model/entity/ClanHall.java index e382482600..8d1da09f71 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/ClanHall.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/ClanHall.java @@ -130,7 +130,7 @@ public abstract class ClanHall { return; } - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), _endDate - currentTime); @@ -216,7 +216,7 @@ public abstract class ClanHall if (_ownerId > 0) { - L2Clan clan = ClanTable.getInstance().getClan(_ownerId); + final L2Clan clan = ClanTable.getInstance().getClan(_ownerId); if (clan != null) { clan.setHideoutId(getId()); @@ -509,7 +509,7 @@ public abstract class ClanHall } else { - int diffLease = lease - _functions.get(type).getLease(); + final int diffLease = lease - _functions.get(type).getLease(); if (diffLease > 0) { _functions.remove(type); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Couple.java b/trunk/java/com/l2jserver/gameserver/model/entity/Couple.java index 74aa1ae5c0..786ab041da 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Couple.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Couple.java @@ -75,8 +75,8 @@ public class Couple public Couple(L2PcInstance player1, L2PcInstance player2) { - int _tempPlayer1Id = player1.getObjectId(); - int _tempPlayer2Id = player2.getObjectId(); + final int _tempPlayer1Id = player1.getObjectId(); + final int _tempPlayer2Id = player2.getObjectId(); _player1Id = _tempPlayer1Id; _player2Id = _tempPlayer2Id; diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Duel.java b/trunk/java/com/l2jserver/gameserver/model/entity/Duel.java index ed0833d9c4..07e3674d89 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Duel.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Duel.java @@ -496,12 +496,12 @@ public class Duel _duelInstanceId = InstanceManager.getInstance().createDynamicInstance("PartyDuel.xml"); - Instance instance = InstanceManager.getInstance().getInstance(_duelInstanceId); + final Instance instance = InstanceManager.getInstance().getInstance(_duelInstanceId); int i = 0; for (L2PcInstance player : _teamA) { - Location loc = instance.getEnterLocs().get(i++); + final Location loc = instance.getEnterLocs().get(i++); player.teleToLocation(loc.getX(), loc.getY(), loc.getZ(), 0, _duelInstanceId, 0); } @@ -509,7 +509,7 @@ public class Duel i = 9; for (L2PcInstance player : _teamB) { - Location loc = instance.getEnterLocs().get(i++); + final Location loc = instance.getEnterLocs().get(i++); player.teleToLocation(loc.getX(), loc.getY(), loc.getZ(), 0, _duelInstanceId, 0); } } @@ -553,7 +553,7 @@ public class Duel */ private void playKneelAnimation() { - List looser = getLooser(); + final List looser = getLooser(); if (looser == null) { @@ -791,7 +791,7 @@ public class Duel } if (teamdefeated) { - List winners = (isInTeamA ? _teamB : _teamA); + final List winners = (isInTeamA ? _teamB : _teamA); for (L2PcInstance temp : winners) { temp.setDuelState(DuelState.WINNER); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Fort.java b/trunk/java/com/l2jserver/gameserver/model/entity/Fort.java index 9716900727..35c190ceee 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Fort.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Fort.java @@ -165,7 +165,7 @@ public final class Fort extends AbstractResidence { return; } - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), _endDate - currentTime); @@ -347,7 +347,7 @@ public final class Fort extends AbstractResidence return; } - L2DoorInstance door = getDoor(doorId); + final L2DoorInstance door = getDoor(doorId); if (door != null) { if (open) @@ -392,7 +392,7 @@ public final class Fort extends AbstractResidence updateClansReputation(oldowner, true); try { - L2PcInstance oldleader = oldowner.getLeader().getPlayerInstance(); + final L2PcInstance oldleader = oldowner.getLeader().getPlayerInstance(); if (oldleader != null) { if (oldleader.getMountType() == MountType.WYVERN) @@ -449,7 +449,7 @@ public final class Fort extends AbstractResidence public void removeOwner(boolean updateDB) { - L2Clan clan = getOwnerClan(); + final L2Clan clan = getOwnerClan(); if (clan != null) { for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -513,7 +513,7 @@ public final class Fort extends AbstractResidence */ public void setVisibleFlag(boolean val) { - L2StaticObjectInstance flagPole = getFlagPole(); + final L2StaticObjectInstance flagPole = getFlagPole(); if (flagPole != null) { flagPole.setMeshIndex(val ? 1 : 0); @@ -547,7 +547,7 @@ public final class Fort extends AbstractResidence // This method upgrade door public void upgradeDoor(int doorId, int hp, int pDef, int mDef) { - L2DoorInstance door = getDoor(doorId); + final L2DoorInstance door = getDoor(doorId); if (door != null) { door.setCurrentHp(door.getMaxHp() + hp); @@ -585,10 +585,10 @@ public final class Fort extends AbstractResidence } if (ownerId > 0) { - L2Clan clan = ClanTable.getInstance().getClan(ownerId); // Try to find clan instance + final L2Clan clan = ClanTable.getInstance().getClan(ownerId); // Try to find clan instance clan.setFortId(getResidenceId()); setOwnerClan(clan); - int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); + final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000L)) { @@ -697,7 +697,7 @@ public final class Fort extends AbstractResidence } else { - int diffLease = lease - _function.get(type).getLease(); + final int diffLease = lease - _function.get(type).getLease(); if (diffLease > 0) { _function.remove(type); @@ -801,7 +801,7 @@ public final class Fort extends AbstractResidence private void updateOwnerInDB() { - L2Clan clan = getOwnerClan(); + final L2Clan clan = getOwnerClan(); int clanId = 0; if (clan != null) { @@ -1166,7 +1166,7 @@ public final class Fort extends AbstractResidence { while (rs.next()) { - L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId")); + final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId")); spawnDat.setAmount(1); spawnDat.setX(rs.getInt("x")); spawnDat.setY(rs.getInt("y")); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/FortSiege.java b/trunk/java/com/l2jserver/gameserver/model/entity/FortSiege.java index 47ab3d456b..f08115fa32 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/FortSiege.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/FortSiege.java @@ -546,7 +546,7 @@ public class FortSiege implements Siegable final List players = new LinkedList<>(); for (L2SiegeClan siegeclan : getAttackerClans()) { - L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); + final L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance player : clan.getOnlineMembers(0)) { if (player.isInSiege()) @@ -574,7 +574,7 @@ public class FortSiege implements Siegable final List players = new LinkedList<>(); if (getFort().getOwnerClan() != null) { - L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); + final L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); if (clan != getFort().getOwnerClan()) { return null; @@ -600,10 +600,10 @@ public class FortSiege implements Siegable { if (!_commanders.isEmpty() && (getFort() != null)) { - L2Spawn spawn = instance.getSpawn(); + final L2Spawn spawn = instance.getSpawn(); if (spawn != null) { - List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId()); + final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId()); for (FortSiegeSpawn spawn2 : commanders) { if (spawn2.getId() == spawn.getId()) @@ -953,7 +953,7 @@ public class FortSiege implements Siegable private void setSiegeDateTime(boolean merchant) { - Calendar newDate = Calendar.getInstance(); + final Calendar newDate = Calendar.getInstance(); if (merchant) { newDate.add(Calendar.MINUTE, FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay()); @@ -1179,7 +1179,7 @@ public class FortSiege implements Siegable { if (clan != null) { - L2SiegeClan sc = getAttackerClan(clan); + final L2SiegeClan sc = getAttackerClan(clan); if (sc != null) { return sc.getFlag(); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Hero.java b/trunk/java/com/l2jserver/gameserver/model/entity/Hero.java index d35c3d605e..d41ddb305b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Hero.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Hero.java @@ -119,8 +119,8 @@ public class Hero { while (rset.next()) { - StatsSet hero = new StatsSet(); - int charId = rset.getInt(Olympiad.CHAR_ID); + final StatsSet hero = new StatsSet(); + final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); hero.set(COUNT, rset.getInt(COUNT)); @@ -138,8 +138,8 @@ public class Hero while (rset2.next()) { - StatsSet hero = new StatsSet(); - int charId = rset2.getInt(Olympiad.CHAR_ID); + final StatsSet hero = new StatsSet(); + final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); hero.set(COUNT, rset2.getInt(COUNT)); @@ -167,8 +167,8 @@ public class Hero { if (rs.next()) { - int clanId = rs.getInt("clanid"); - int allyId = rs.getInt("allyId"); + final int clanId = rs.getInt("clanid"); + final int allyId = rs.getInt("allyId"); String clanName = ""; String allyName = ""; int clanCrest = 0; @@ -194,11 +194,11 @@ public class Hero private String calcFightTime(long FightTime) { - String format = String.format("%%0%dd", 2); + final String format = String.format("%%0%dd", 2); FightTime = FightTime / 1000; - String seconds = String.format(format, FightTime % 60); - String minutes = String.format(format, (FightTime % 3600) / 60); - String time = minutes + ":" + seconds; + final String seconds = String.format(format, FightTime % 60); + final String minutes = String.format(format, (FightTime % 3600) / 60); + final String time = minutes + ":" + seconds; return time; } @@ -238,18 +238,18 @@ public class Hero { while (rset.next()) { - StatsSet _diaryentry = new StatsSet(); + final StatsSet _diaryentry = new StatsSet(); - long time = rset.getLong("time"); - int action = rset.getInt("action"); - int param = rset.getInt("param"); + final long time = rset.getLong("time"); + final int action = rset.getInt("action"); + final int param = rset.getInt("param"); - String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(time)); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(time)); _diaryentry.set("date", date); if (action == ACTION_RAID_KILLED) { - L2NpcTemplate template = NpcData.getInstance().getTemplate(param); + final L2NpcTemplate template = NpcData.getInstance().getTemplate(param); if (template != null) { _diaryentry.set("action", template.getName() + " was defeated"); @@ -261,7 +261,7 @@ public class Hero } else if (action == ACTION_CASTLE_TAKEN) { - Castle castle = CastleManager.getInstance().getCastleById(param); + final Castle castle = CastleManager.getInstance().getCastleById(param); if (castle != null) { _diaryentry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -284,14 +284,14 @@ public class Hero public void loadFights(int charId) { final List fights = new ArrayList<>(); - StatsSet heroCountData = new StatsSet(); - Calendar data = Calendar.getInstance(); + final StatsSet heroCountData = new StatsSet(); + final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); data.set(Calendar.MINUTE, 0); data.set(Calendar.MILLISECOND, 0); - long from = data.getTimeInMillis(); + final long from = data.getTimeInMillis(); int numberoffights = 0; int _victorys = 0; int _losses = 0; @@ -326,16 +326,16 @@ public class Hero if (charId == charOneId) { - String name = CharNameTable.getInstance().getNameById(charTwoId); - String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); + final String name = CharNameTable.getInstance().getNameById(charTwoId); + final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - StatsSet fight = new StatsSet(); + final StatsSet fight = new StatsSet(); fight.set("oponent", name); fight.set("oponentclass", cls); fight.set("time", calcFightTime(time)); - String date = (new SimpleDateFormat("yyyy-MM-dd HH:mm")).format(new Date(start)); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH:mm")).format(new Date(start)); fight.set("start", date); fight.set("classed", classed); @@ -362,16 +362,16 @@ public class Hero } else if (charId == charTwoId) { - String name = CharNameTable.getInstance().getNameById(charOneId); - String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); + final String name = CharNameTable.getInstance().getNameById(charOneId); + final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - StatsSet fight = new StatsSet(); + final StatsSet fight = new StatsSet(); fight.set("oponent", name); fight.set("oponentclass", cls); fight.set("time", calcFightTime(time)); - String date = (new SimpleDateFormat("yyyy-MM-dd HH:mm")).format(new Date(start)); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH:mm")).format(new Date(start)); fight.set("start", date); fight.set("classed", classed); @@ -468,7 +468,7 @@ public class Hero for (int i = ((page - 1) * perpage); i < list.size(); i++) { breakat = i; - StatsSet diaryEntry = list.get(i); + final StatsSet diaryEntry = list.get(i); StringUtil.append(fList, "
Amount:"); - MinMax minMax = getPreciseMinMax(dropItem.getChance(npc, activeChar), dropItem.getMin(npc, activeChar), dropItem.getMax(npc, activeChar), dropItem.isPreciseCalculated()); + final MinMax minMax = getPreciseMinMax(dropItem.getChance(npc, activeChar), dropItem.getMin(npc, activeChar), dropItem.getMax(npc, activeChar), dropItem.isPreciseCalculated()); final long min = minMax.min; final long max = minMax.max; @@ -447,7 +447,7 @@ public class NpcViewMod implements IBypassHandler return new MinMax(min, max); } - int mult = (int) (chance) / 100; + final int mult = (int) (chance) / 100; return new MinMax(mult * min, (chance % 100) > 0 ? (mult + 1) * max : mult * max); } } diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 3293268911..38c1f18b54 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -108,7 +108,7 @@ public class Observation implements IBypassHandler return false; } - String _command = command.split(" ")[0].toLowerCase(); + final String _command = command.split(" ")[0].toLowerCase(); final int param; try { @@ -126,7 +126,7 @@ public class Observation implements IBypassHandler } final int[] locCost = LOCATIONS[param]; - Location loc = new Location(locCost[0], locCost[1], locCost[2]); + final Location loc = new Location(locCost[0], locCost[1], locCost[2]); final long cost = locCost[3]; switch (_command) diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java index d10505f745..43e5f5026b 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java @@ -89,8 +89,8 @@ public class OlympiadManagerLink implements IBypassHandler { if (command.toLowerCase().startsWith("olympiaddesc")) { - int val = Integer.parseInt(command.substring(13, 14)); - String suffix = command.substring(14); + final int val = Integer.parseInt(command.substring(13, 14)); + final String suffix = command.substring(14); ((L2OlympiadManagerInstance) target).showChatWindow(activeChar, val, suffix); } else if (command.toLowerCase().startsWith("olympiadnoble")) @@ -118,7 +118,7 @@ public class OlympiadManagerLink implements IBypassHandler } int passes; - int val = Integer.parseInt(command.substring(14)); + final int val = Integer.parseInt(command.substring(14)); switch (val) { case 0: // H5 match selection @@ -173,7 +173,7 @@ public class OlympiadManagerLink implements IBypassHandler activeChar.sendPacket(html); break; case 3: // There are %points% Grand Olympiad points granted for this event. | TODO: cleanup (not used anymore) - int points = Olympiad.getInstance().getNoblePoints(activeChar.getObjectId()); + final int points = Olympiad.getInstance().getNoblePoints(activeChar.getObjectId()); html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points1.htm"); html.replace("%points%", String.valueOf(points)); html.replace("%objectId%", String.valueOf(target.getObjectId())); @@ -207,7 +207,7 @@ public class OlympiadManagerLink implements IBypassHandler MultisellData.getInstance().separateAndSend(103, activeChar, (L2Npc) target, false); break; case 9: // Your Grand Olympiad Score from the previous period is %points% point(s) | TODO: cleanup (not used anymore) - int point = Olympiad.getInstance().getLastNobleOlympiadPoints(activeChar.getObjectId()); + final int point = Olympiad.getInstance().getLastNobleOlympiadPoints(activeChar.getObjectId()); html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points2.htm"); html.replace("%points%", String.valueOf(point)); html.replace("%objectId%", String.valueOf(target.getObjectId())); @@ -217,9 +217,9 @@ public class OlympiadManagerLink implements IBypassHandler passes = Olympiad.getInstance().getNoblessePasses(activeChar, true); if (passes > 0) { - L2ItemInstance item = activeChar.getInventory().addItem("Olympiad", GATE_PASS, passes, activeChar, target); + final L2ItemInstance item = activeChar.getInventory().addItem("Olympiad", GATE_PASS, passes, activeChar, target); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(item); activeChar.sendPacket(iu); @@ -246,7 +246,7 @@ public class OlympiadManagerLink implements IBypassHandler } final NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId()); - String[] params = command.split(" "); + final String[] params = command.split(" "); if (!Util.isDigit(params[1])) { @@ -309,7 +309,7 @@ public class OlympiadManagerLink implements IBypassHandler } else if (command.toLowerCase().startsWith("olympiad")) { - int val = Integer.parseInt(command.substring(9, 10)); + final int val = Integer.parseInt(command.substring(9, 10)); final NpcHtmlMessage reply = new NpcHtmlMessage(target.getObjectId()); @@ -317,10 +317,10 @@ public class OlympiadManagerLink implements IBypassHandler { case 2: // show rank for a specific class // for example >> Olympiad 1_88 - int classId = Integer.parseInt(command.substring(11)); + final int classId = Integer.parseInt(command.substring(11)); if (((classId >= 88) && (classId <= 118)) || ((classId >= 131) && (classId <= 134)) || (classId == 136)) { - List names = Olympiad.getInstance().getClassLeaderBoard(classId); + final List names = Olympiad.getInstance().getClassLeaderBoard(classId); reply.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "olympiad_ranking.htm"); int index = 1; diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 429333204b..fedaaf3c5a 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -61,7 +61,7 @@ public class QuestLink implements IBypassHandler } else { - int questNameEnd = quest.indexOf(" "); + final int questNameEnd = quest.indexOf(" "); if (questNameEnd == -1) { showQuestWindow(activeChar, (L2Npc) target, quest); diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java index 40f1c8e002..60e2105592 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java @@ -56,7 +56,7 @@ public class RentPet implements IBypassHandler try { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); if (st.countTokens() < 1) @@ -93,14 +93,14 @@ public class RentPet implements IBypassHandler int petId; double price = 1; - int cost[] = + final int cost[] = { 1800, 7200, 720000, 6480000 }; - int ridetime[] = + final int ridetime[] = { 30, 60, @@ -125,7 +125,7 @@ public class RentPet implements IBypassHandler } price *= cost[val - 1]; - int time = ridetime[val - 1]; + final int time = ridetime[val - 1]; if (!player.reduceAdena("Rent", (long) price, player.getLastFolkNPC(), true)) { @@ -133,7 +133,7 @@ public class RentPet implements IBypassHandler } player.mount(petId, 0, false); - SetupGauge sg = new SetupGauge(3, time * 1000); + final SetupGauge sg = new SetupGauge(3, time * 1000); player.sendPacket(sg); player.startRentPet(time); } diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 321446fea6..abed16ecf3 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -51,7 +51,7 @@ public class SkillList implements IBypassHandler { try { - String id = command.substring(9).trim(); + final String id = command.substring(9).trim(); if (id.length() != 0) { L2NpcInstance.showSkillList(activeChar, (L2Npc) target, ClassId.getClassId(Integer.parseInt(id))); @@ -74,7 +74,7 @@ public class SkillList implements IBypassHandler if (!own_class) { - String charType = activeChar.getClassId().isMage() ? "fighter" : "mage"; + final String charType = activeChar.getClassId().isMage() ? "fighter" : "mage"; text += "Skills of your class are the easiest to learn.
" + "Skills of another class of your race are a little harder.
" + "Skills for classes of another race are extremely difficult.
" + "But the hardest of all to learn are the " + charType + "skills!
"; } diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java index f674c06bd3..abea713db7 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java @@ -47,7 +47,7 @@ public class TerritoryStatus implements IBypassHandler if (npc.getCastle().getOwnerId() > 0) { html.setFile(activeChar.getHtmlPrefix(), "html/territorystatus.htm"); - L2Clan clan = ClanTable.getInstance().getClan(npc.getCastle().getOwnerId()); + final L2Clan clan = ClanTable.getInstance().getClan(npc.getCastle().getOwnerId()); html.replace("%clanname%", clan.getName()); html.replace("%clanleadername%", clan.getLeaderName()); } diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/VoiceCommand.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/VoiceCommand.java index 0c9351ea38..fed32f379c 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/VoiceCommand.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/VoiceCommand.java @@ -41,7 +41,7 @@ public class VoiceCommand implements IBypassHandler if ((command.length() > 7) && (command.charAt(6) == '.')) { final String vc, vparams; - int endOfCommand = command.indexOf(" ", 7); + final int endOfCommand = command.indexOf(" ", 7); if (endOfCommand > 0) { vc = command.substring(7, endOfCommand).trim(); @@ -55,7 +55,7 @@ public class VoiceCommand implements IBypassHandler if (vc.length() > 0) { - IVoicedCommandHandler vch = VoicedCommandHandler.getInstance().getHandler(vc); + final IVoicedCommandHandler vch = VoicedCommandHandler.getInstance().getHandler(vc); if (vch != null) { return vch.useVoicedCommand(vc, activeChar, vparams); diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 024bb511a6..667f863926 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -52,7 +52,7 @@ public class Wear implements IBypassHandler try { - StringTokenizer st = new StringTokenizer(command, " "); + final StringTokenizer st = new StringTokenizer(command, " "); st.nextToken(); if (st.countTokens() < 1) diff --git a/trunk/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/trunk/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 2f281549d2..1031457d56 100644 --- a/trunk/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/trunk/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -59,7 +59,7 @@ public final class ChatTrade implements IChatHandler final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PcCondOverride.CHAT_CONDITIONS))) { - int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); + final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); for (L2PcInstance player : L2World.getInstance().getPlayers()) { if ((region == MapRegionManager.getInstance().getMapRegionLocId(player)) && !BlockList.isBlocked(player, activeChar) && (player.getInstanceId() == activeChar.getInstanceId())) diff --git a/trunk/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/trunk/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 2e7460034d..7bd0a0432c 100644 --- a/trunk/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/trunk/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -255,7 +255,7 @@ public class ClanBoard implements IWriteBoardHandler private void clanHome(L2PcInstance activeChar, int clanId) { - L2Clan cl = ClanTable.getInstance().getClan(clanId); + final L2Clan cl = ClanTable.getInstance().getClan(clanId); if (cl != null) { if (cl.getLevel() < 2) diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 9f0055a0ae..bc0df916d3 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -66,11 +66,11 @@ public final class Backstab extends AbstractEffect return; } - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); - Skill skill = info.getSkill(); - boolean ss = skill.useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS); - byte shld = Formulas.calcShldUse(activeChar, target, skill); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); + final Skill skill = info.getSkill(); + final boolean ss = skill.useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS); + final byte shld = Formulas.calcShldUse(activeChar, target, skill); double damage = Formulas.calcBackstabDamage(activeChar, target, skill, shld, ss); // Crit rate base crit rate for skill, modified with STR bonus @@ -91,7 +91,7 @@ public final class Backstab extends AbstractEffect if (activeChar.isPlayer()) { - L2PcInstance activePlayer = activeChar.getActingPlayer(); + final L2PcInstance activePlayer = activeChar.getActingPlayer(); activePlayer.sendDamageMessage(target, (int) damage, false, true, false); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 40c32a246c..01add3ae48 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -68,9 +68,9 @@ public final class Blink extends AbstractEffect final int x1 = (int) (Math.cos(Math.PI + radian + course) * radius); final int y1 = (int) (Math.sin(Math.PI + radian + course) * radius); - int x = effected.getX() + x1; - int y = effected.getY() + y1; - int z = effected.getZ(); + final int x = effected.getX() + x1; + final int y = effected.getY() + y1; + final int z = effected.getZ(); final Location destination = GeoData.getInstance().moveCheck(effected.getX(), effected.getY(), effected.getZ(), x, y, z, effected.getInstanceId()); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java index 4af16901aa..3bc03e9452 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java @@ -40,7 +40,7 @@ public final class BlockBuffSlot extends AbstractEffect { super(attachCond, applyCond, set, params); - String blockBuffSlots = params.getString("slot", null); + final String blockBuffSlots = params.getString("slot", null); if ((blockBuffSlots != null) && !blockBuffSlots.isEmpty()) { _blockBuffSlots = new HashSet<>(); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 65655ad6e1..3eeec3aa03 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -65,21 +65,21 @@ public final class CallPc extends AbstractEffect return; } - L2PcInstance target = info.getEffected().getActingPlayer(); - L2PcInstance activeChar = info.getEffector().getActingPlayer(); + final L2PcInstance target = info.getEffected().getActingPlayer(); + final L2PcInstance activeChar = info.getEffector().getActingPlayer(); if (checkSummonTargetStatus(target, activeChar)) { if ((_itemId != 0) && (_itemCount != 0)) { if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING); sm.addItemName(_itemId); target.sendPacket(sm); return; } target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, activeChar, target); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(_itemId); target.sendPacket(sm); } @@ -103,7 +103,7 @@ public final class CallPc extends AbstractEffect if (target.isAlikeDead()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_DEAD_AT_THE_MOMENT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_DEAD_AT_THE_MOMENT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED); sm.addPcName(target); activeChar.sendPacket(sm); return false; @@ -111,7 +111,7 @@ public final class CallPc extends AbstractEffect if (target.isInStoreMode()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED); sm.addPcName(target); activeChar.sendPacket(sm); return false; @@ -119,7 +119,7 @@ public final class CallPc extends AbstractEffect if (target.isRooted() || target.isInCombat()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ENGAGED_IN_COMBAT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ENGAGED_IN_COMBAT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED); sm.addPcName(target); activeChar.sendPacket(sm); return false; @@ -139,7 +139,7 @@ public final class CallPc extends AbstractEffect if (target.inObserverMode()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING); sm.addCharName(target); activeChar.sendPacket(sm); return false; @@ -147,7 +147,7 @@ public final class CallPc extends AbstractEffect if (target.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || target.isInsideZone(ZoneId.JAIL)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING); sm.addString(target.getName()); activeChar.sendPacket(sm); return false; @@ -155,7 +155,7 @@ public final class CallPc extends AbstractEffect if (activeChar.getInstanceId() > 0) { - Instance summonerInstance = InstanceManager.getInstance().getInstance(activeChar.getInstanceId()); + final Instance summonerInstance = InstanceManager.getInstance().getInstance(activeChar.getInstanceId()); if (!Config.ALLOW_SUMMON_IN_INSTANCE || !summonerInstance.isSummonAllowed()) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_FROM_YOUR_CURRENT_LOCATION); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 0fb4459905..00380db766 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -69,7 +69,7 @@ public final class ChameleonRest extends AbstractEffect } } - double manaDam = _power * getTicksMultiplier(); + final double manaDam = _power * getTicksMultiplier(); if (manaDam > info.getEffected().getCurrentMp()) { info.getEffected().sendPacket(SystemMessageId.YOUR_SKILL_WAS_DEACTIVATED_DUE_TO_LACK_OF_MP); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java index b57ab71b6c..dda3ac0dba 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java @@ -45,7 +45,7 @@ public final class ClanGate extends AbstractEffect final L2Clan clan = info.getEffected().getActingPlayer().getClan(); if (clan != null) { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.COURT_WIZARD_THE_PORTAL_HAS_BEEN_CREATED); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.COURT_WIZARD_THE_PORTAL_HAS_BEEN_CREATED); clan.broadcastToOtherOnlineMembers(msg, info.getEffected().getActingPlayer()); } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java index f2893cea5c..9516f573a9 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java @@ -58,7 +58,7 @@ public final class CpDamPercent extends AbstractEffect info.getEffected().stopFakeDeath(true); } - int damage = (int) ((info.getEffected().getCurrentCp() * _power) / 100); + final int damage = (int) ((info.getEffected().getCurrentCp() * _power) / 100); // Manage attack or cast break of the target (calculating rate, sending message) if (!info.getEffected().isRaid() && Formulas.calcAtkBreak(info.getEffected(), damage)) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 667f4de9e6..2286eb25fe 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -46,7 +46,7 @@ public final class CpHealOverTime extends AbstractEffect } double cp = info.getEffected().getCurrentCp(); - double maxcp = info.getEffected().getMaxRecoverableCp(); + final double maxcp = info.getEffected().getMaxRecoverableCp(); // Not needed to set the CP and send update packet if player is already at max CP if (cp >= maxcp) diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 7310d9e95b..05b6f8732c 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -57,8 +57,8 @@ public final class CpHealPercent extends AbstractEffect } double amount = 0; - double power = _power; - boolean full = (power == 100.0); + final double power = _power; + final boolean full = (power == 100.0); amount = full ? target.getMaxCp() : (target.getMaxCp() * power) / 100.0; // Prevents overheal and negative amount diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 1ae7cb4c4d..c122c7be5a 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -55,16 +55,16 @@ public final class DeathLink extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); if (activeChar.isAlikeDead()) { return; } - boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); - boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); + final boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); + final boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); if (target.isPlayer() && target.getActingPlayer().isFakeDeath()) { @@ -73,7 +73,7 @@ public final class DeathLink extends AbstractEffect final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill())); final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); - int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); + final int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); if (damage > 0) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 5d62547c13..3dc6c08c31 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -68,7 +68,7 @@ public final class DeleteHate extends AbstractEffect return; } - L2Attackable target = (L2Attackable) info.getEffected(); + final L2Attackable target = (L2Attackable) info.getEffected(); target.clearAggroList(); target.setWalking(); target.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index b24d68a80a..707bbb1541 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -68,7 +68,7 @@ public final class DeleteHateOfMe extends AbstractEffect return; } - L2Attackable target = (L2Attackable) info.getEffected(); + final L2Attackable target = (L2Attackable) info.getEffected(); target.stopHating(info.getEffector()); target.setWalking(); target.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index f90698ac0e..3afb28ef7c 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -51,7 +51,7 @@ public final class DispelBySlot extends AbstractEffect _dispelAbnormals = new EnumMap<>(AbnormalType.class); for (String ngtStack : _dispel.split(";")) { - String[] ngt = ngtStack.split(","); + final String[] ngt = ngtStack.split(","); _dispelAbnormals.put(AbnormalType.getAbnormalType(ngt[0]), Short.parseShort(ngt[1])); } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 5b45090a4e..5801d74b8e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -54,7 +54,7 @@ public final class DispelBySlotProbability extends AbstractEffect _dispelAbnormals = new EnumMap<>(AbnormalType.class); for (String ngtStack : _dispel.split(";")) { - String[] ngt = ngtStack.split(","); + final String[] ngt = ngtStack.split(","); _dispelAbnormals.put(AbnormalType.getAbnormalType(ngt[0]), (ngt.length > 1) ? Short.parseShort(ngt[1]) : Short.MAX_VALUE); } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Duel.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Duel.java index 68946cfb11..70763cc2df 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Duel.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Duel.java @@ -41,15 +41,15 @@ public final class Duel extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2PcInstance effector = info.getEffector().getActingPlayer(); - L2PcInstance effected = info.getEffected().getActingPlayer(); + final L2PcInstance effector = info.getEffector().getActingPlayer(); + final L2PcInstance effected = info.getEffected().getActingPlayer(); if (effected.isDead() || (effector == null) || (effected.getPvpFlag() == 0)) { return; } - Skill skill = SkillData.getInstance().getSkill(10319, 1); + final Skill skill = SkillData.getInstance().getSkill(10319, 1); skill.applyEffects(effector, effector); effector.setIsInvul(true); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java index f73665d50c..ad22a7a315 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java @@ -58,10 +58,10 @@ public final class EnemyCharge extends AbstractEffect final int curZ = info.getEffector().getZ(); // Calculate distance (dx,dy) between current position and destination - double dx = info.getEffected().getX() - curX; - double dy = info.getEffected().getY() - curY; - double dz = info.getEffected().getZ() - curZ; - double distance = Math.sqrt((dx * dx) + (dy * dy)); + final double dx = info.getEffected().getX() - curX; + final double dy = info.getEffected().getY() - curY; + final double dz = info.getEffected().getZ() - curZ; + final double distance = Math.sqrt((dx * dx) + (dy * dy)); if (distance > 2000) { _log.info("EffectEnemyCharge was going to use invalid coordinates for characters, getEffector: " + curX + "," + curY + " and getEffected: " + info.getEffected().getX() + "," + info.getEffected().getY()); @@ -85,13 +85,13 @@ public final class EnemyCharge extends AbstractEffect } // Calculate movement angles needed - double sin = dy / distance; - double cos = dx / distance; + final double sin = dy / distance; + final double cos = dx / distance; // Calculate the new destination with offset included - int x = curX + (int) ((distance - offset) * cos); - int y = curY + (int) ((distance - offset) * sin); - int z = info.getEffected().getZ(); + final int x = curX + (int) ((distance - offset) * cos); + final int y = curY + (int) ((distance - offset) * sin); + final int z = info.getEffected().getZ(); final Location destination = GeoData.getInstance().moveCheck(info.getEffector().getX(), info.getEffector().getY(), info.getEffector().getZ(), x, y, z, info.getEffector().getInstanceId()); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 109bdc5069..b139d7db7a 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -89,7 +89,7 @@ public final class EnergyAttack extends AbstractEffect if (!_ignoreShieldDefence) { - byte shield = Formulas.calcShldUse(attacker, target, skill, true); + final byte shield = Formulas.calcShldUse(attacker, target, skill, true); switch (shield) { case Formulas.SHIELD_DEFENSE_FAILED: @@ -114,13 +114,13 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { - double damageMultiplier = Formulas.calcWeaponTraitBonus(attacker, target) * Formulas.calcAttributeBonus(attacker, target, skill) * Formulas.calcGeneralTraitBonus(attacker, target, skill.getTraitType(), true); + final double damageMultiplier = Formulas.calcWeaponTraitBonus(attacker, target) * Formulas.calcAttributeBonus(attacker, target, skill) * Formulas.calcGeneralTraitBonus(attacker, target, skill.getTraitType(), true); - boolean ss = info.getSkill().useSoulShot() && attacker.isChargedShot(ShotType.SOULSHOTS); - double ssBoost = ss ? 2 : 1.0; + final boolean ss = info.getSkill().useSoulShot() && attacker.isChargedShot(ShotType.SOULSHOTS); + final double ssBoost = ss ? 2 : 1.0; double weaponTypeBoost; - L2Weapon weapon = attacker.getActiveWeaponItem(); + final L2Weapon weapon = attacker.getActiveWeaponItem(); if ((weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW))) { weaponTypeBoost = 70; @@ -147,7 +147,7 @@ public final class EnergyAttack extends AbstractEffect attacker.decreaseCharges(3); } - double addPower = (attacker.getStat().calcStat(Stats.MOMENTUM_SKILL_POWER, 1, null, null)); + final double addPower = (attacker.getStat().calcStat(Stats.MOMENTUM_SKILL_POWER, 1, null, null)); attack += _power; attack *= addPower; @@ -174,7 +174,7 @@ public final class EnergyAttack extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 3b25b661fb..bd10450e6d 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -71,25 +71,25 @@ public final class FatalBlow extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); - Skill skill = info.getSkill(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); + final Skill skill = info.getSkill(); if (activeChar.isAlikeDead()) { return; } - boolean ss = skill.useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS); - byte shld = Formulas.calcShldUse(activeChar, target, skill); + final boolean ss = skill.useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS); + final byte shld = Formulas.calcShldUse(activeChar, target, skill); double damage = Formulas.calcBlowDamage(activeChar, target, skill, shld, ss); if (_targetAbnormalType != "NULL") { - StringTokenizer st = new StringTokenizer(_targetAbnormalType, ","); + final StringTokenizer st = new StringTokenizer(_targetAbnormalType, ","); while (st.hasMoreTokens()) { - String abnormal = st.nextToken().trim(); + final String abnormal = st.nextToken().trim(); if (target.getEffectList().getBuffInfoByAbnormalType(AbnormalType.valueOf(abnormal)) != null) { damage *= _skillAddPower; @@ -98,14 +98,14 @@ public final class FatalBlow extends AbstractEffect } } - boolean crit = Formulas.calcCrit(activeChar, target, skill); + final boolean crit = Formulas.calcCrit(activeChar, target, skill); if (crit) { damage *= 2; } // reduce damage if target has maxdamage buff - double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); if (maxDamage > 0) { damage = (int) maxDamage; @@ -123,7 +123,7 @@ public final class FatalBlow extends AbstractEffect if (activeChar.isPlayer()) { - L2PcInstance activePlayer = activeChar.getActingPlayer(); + final L2PcInstance activePlayer = activeChar.getActingPlayer(); activePlayer.sendDamageMessage(target, (int) damage, false, true, false); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java index ec8e9ea0bb..bfb2581e19 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java @@ -101,7 +101,7 @@ public final class Fishing extends AbstractEffect } // check for equiped fishing rod - L2Weapon equipedWeapon = player.getActiveWeaponItem(); + final L2Weapon equipedWeapon = player.getActiveWeaponItem(); if (((equipedWeapon == null) || (equipedWeapon.getItemType() != WeaponType.FISHINGROD))) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_FISHING_POLE_EQUIPPED); @@ -109,7 +109,7 @@ public final class Fishing extends AbstractEffect } // check for equiped lure - L2ItemInstance equipedLeftHand = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance equipedLeftHand = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); if ((equipedLeftHand == null) || (equipedLeftHand.getItemType() != EtcItemType.LURE)) { player.sendPacket(SystemMessageId.YOU_MUST_PUT_BAIT_ON_YOUR_HOOK_BEFORE_YOU_CAN_FISH); @@ -152,7 +152,7 @@ public final class Fishing extends AbstractEffect // search for fishing and water zone L2FishingZone fishingZone = null; L2WaterZone waterZone = null; - for (final L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY)) + for (L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY)) { if (zone instanceof L2FishingZone) { @@ -180,7 +180,7 @@ public final class Fishing extends AbstractEffect // search for fishing and water zone again fishingZone = null; waterZone = null; - for (final L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY)) + for (L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY)) { if (zone instanceof L2FishingZone) { @@ -243,7 +243,7 @@ public final class Fishing extends AbstractEffect } // always use water zone, fishing zone high z is high in the air... - int baitZ = waterZone.getWaterZ(); + final int baitZ = waterZone.getWaterZ(); if (!GeoData.getInstance().canSeeTarget(player.getX(), player.getY(), player.getZ(), baitX, baitY, baitZ)) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java index dc6982bebe..805898d3f7 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java @@ -49,10 +49,10 @@ public final class FocusMaxEnergy extends AbstractEffect final Skill sonicMastery = info.getEffected().getSkills().get(992); final Skill focusMastery = info.getEffected().getSkills().get(993); final Skill maximumForceMastery = info.getEffected().getSkills().get(10301); - int maxCharge = (sonicMastery != null) ? sonicMastery.getLevel() : (focusMastery != null) ? focusMastery.getLevel() : (maximumForceMastery != null) ? 15 : 0; + final int maxCharge = (sonicMastery != null) ? sonicMastery.getLevel() : (focusMastery != null) ? focusMastery.getLevel() : (maximumForceMastery != null) ? 15 : 0; if (maxCharge != 0) { - int count = maxCharge - info.getEffected().getActingPlayer().getCharges(); + final int count = maxCharge - info.getEffected().getActingPlayer().getCharges(); info.getEffected().getActingPlayer().increaseCharges(count, maxCharge); } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 12d54ec6a6..f0e56911e9 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -59,10 +59,10 @@ public final class FocusSouls extends AbstractEffect final int maxSouls = (int) target.calcStat(Stats.MAX_SOULS, 0, null, null); if (maxSouls > 0) { - int amount = _charge; + final int amount = _charge; if ((target.getChargedSouls() < maxSouls)) { - int count = ((target.getChargedSouls() + amount) <= maxSouls) ? amount : (maxSouls - target.getChargedSouls()); + final int count = ((target.getChargedSouls() + amount) <= maxSouls) ? amount : (maxSouls - target.getChargedSouls()); target.increaseSouls(count); } else diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index 39f865932f..a1894f53b3 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -56,7 +56,7 @@ public final class GiveRecommendation extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2PcInstance target = info.getEffected() instanceof L2PcInstance ? (L2PcInstance) info.getEffected() : null; + final L2PcInstance target = info.getEffected() instanceof L2PcInstance ? (L2PcInstance) info.getEffected() : null; if (target != null) { int recommendationsGiven = _amount; @@ -70,7 +70,7 @@ public final class GiveRecommendation extends AbstractEffect { target.setRecomHave(target.getRecomHave() + recommendationsGiven); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATION_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATION_S); sm.addInt(recommendationsGiven); target.sendPacket(sm); target.sendPacket(new UserInfo(target)); @@ -78,7 +78,7 @@ public final class GiveRecommendation extends AbstractEffect } else { - L2PcInstance player = info.getEffector() instanceof L2PcInstance ? (L2PcInstance) info.getEffector() : null; + final L2PcInstance player = info.getEffector() instanceof L2PcInstance ? (L2PcInstance) info.getEffector() : null; if (player != null) { player.sendPacket(SystemMessageId.NOTHING_HAPPENED); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 7f2bfd7ca7..a76d586498 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -46,7 +46,7 @@ public final class Grow extends AbstractEffect { if (info.getEffected().isNpc()) { - L2Npc npc = (L2Npc) info.getEffected(); + final L2Npc npc = (L2Npc) info.getEffected(); npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); } } @@ -56,7 +56,7 @@ public final class Grow extends AbstractEffect { if (info.getEffected().isNpc()) { - L2Npc npc = (L2Npc) info.getEffected(); + final L2Npc npc = (L2Npc) info.getEffected(); npc.setCollisionRadius(npc.getTemplate().getCollisionRadiusGrown()); } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 069d601cf9..4e8d5724e2 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -63,8 +63,8 @@ public final class Heal extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); if ((target == null) || target.isDead() || target.isDoor() || target.isInvul()) { return; @@ -73,8 +73,8 @@ public final class Heal extends AbstractEffect double amount = _power; double staticShotBonus = 0; int mAtkMul = 1; - boolean sps = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); - boolean bss = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); + final boolean sps = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); + final boolean bss = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); if (((sps || bss) && (activeChar.isPlayer() && activeChar.getActingPlayer().isMageClass())) || activeChar.isSummon()) { @@ -134,14 +134,14 @@ public final class Heal extends AbstractEffect { if (activeChar.isPlayer() && (activeChar != target)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); sm.addString(activeChar.getName()); sm.addInt((int) amount); target.sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); sm.addInt((int) amount); target.sendPacket(sm); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 8d5f5a6753..85a7867cab 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -48,7 +48,7 @@ public final class HealOverTime extends AbstractEffect } double hp = info.getEffected().getCurrentHp(); - double maxhp = info.getEffected().getMaxRecoverableHp(); + final double maxhp = info.getEffected().getMaxRecoverableHp(); // Not needed to set the HP and send update packet if player is already at max HP if (hp >= maxhp) diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index e8e0f765e1..760588b9ca 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -57,15 +57,15 @@ public final class HealPercent extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); + final L2Character target = info.getEffected(); if ((target == null) || target.isDead() || target.isDoor()) { return; } double amount = 0; - double power = _power; - boolean full = (power == 100.0); + final double power = _power; + final boolean full = (power == 100.0); amount = full ? target.getMaxHp() : (target.getMaxHp() * power) / 100.0; // Prevents overheal and negative amount diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 825a3fedb6..9cc3d9ab34 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -42,7 +42,7 @@ public final class Hide extends AbstractEffect { if (info.getEffected().isPlayer()) { - L2PcInstance activeChar = info.getEffected().getActingPlayer(); + final L2PcInstance activeChar = info.getEffected().getActingPlayer(); if (!activeChar.inObserverMode()) { activeChar.setInvisible(false); @@ -55,7 +55,7 @@ public final class Hide extends AbstractEffect { if (info.getEffected().isPlayer()) { - L2PcInstance activeChar = info.getEffected().getActingPlayer(); + final L2PcInstance activeChar = info.getEffected().getActingPlayer(); activeChar.setInvisible(true); if ((activeChar.getAI().getNextIntention() != null) && (activeChar.getAI().getNextIntention().getCtrlIntention() == CtrlIntention.AI_INTENTION_ATTACK)) diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 13d0cb41ed..3c8ff636e1 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -63,8 +63,8 @@ public final class HpCpHeal extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); if ((target == null) || target.isDead() || target.isDoor() || target.isInvul()) { return; @@ -73,8 +73,8 @@ public final class HpCpHeal extends AbstractEffect double amount = _power; double staticShotBonus = 0; int mAtkMul = 1; - boolean sps = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); - boolean bss = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); + final boolean sps = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); + final boolean bss = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); if (((sps || bss) && (activeChar.isPlayer() && activeChar.getActingPlayer().isMageClass())) || activeChar.isSummon()) { @@ -134,14 +134,14 @@ public final class HpCpHeal extends AbstractEffect { if (activeChar.isPlayer() && (activeChar != target)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); sm.addString(activeChar.getName()); sm.addInt((int) healAmount); target.sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); sm.addInt((int) healAmount); target.sendPacket(sm); } @@ -155,14 +155,14 @@ public final class HpCpHeal extends AbstractEffect if (activeChar.isPlayer() && (activeChar != target)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1); sm.addString(activeChar.getName()); sm.addInt((int) amount); target.sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); sm.addInt((int) amount); target.sendPacket(sm); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index a602883ba6..8bcecbb779 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -57,8 +57,8 @@ public final class HpDrain extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); // TODO: Unhardcode Cubic Skill to avoid double damage if (activeChar.isAlikeDead() || (info.getSkill().getId() == 4050)) @@ -66,15 +66,15 @@ public final class HpDrain extends AbstractEffect return; } - boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); - boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); - boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill())); - byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); - int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); + final boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); + final boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); + final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill())); + final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); + final int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); int drain = 0; - int cp = (int) target.getCurrentCp(); - int hp = (int) target.getCurrentHp(); + final int cp = (int) target.getCurrentCp(); + final int hp = (int) target.getCurrentHp(); if (cp > 0) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/JumpToFriend.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/JumpToFriend.java index e890954cad..4d43e0eab5 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/JumpToFriend.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/JumpToFriend.java @@ -60,9 +60,9 @@ public final class JumpToFriend extends AbstractEffect final int curY = info.getEffected().getY(); // Calculate distance between effector and effected current position - double dx = info.getEffector().getX() - curX; - double dy = info.getEffector().getY() - curY; - double distance = Math.sqrt((dx * dx) + (dy * dy)); + final double dx = info.getEffector().getX() - curX; + final double dy = info.getEffector().getY() - curY; + final double distance = Math.sqrt((dx * dx) + (dy * dy)); if (distance > 2000) { _log.info("EffectThrow was going to use invalid coordinates for characters, getEffected: " + curX + "," + curY + " and getEffector: " + info.getEffector().getX() + "," + info.getEffector().getY()); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 3c63cf6611..1528b5c60a 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -53,8 +53,8 @@ public final class Lethal extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); if (activeChar.isPlayer() && !activeChar.getAccessLevel().canGiveDamage()) { return; @@ -70,7 +70,7 @@ public final class Lethal extends AbstractEffect return; } - double chanceMultiplier = Formulas.calcAttributeBonus(activeChar, target, info.getSkill()) * Formulas.calcGeneralTraitBonus(activeChar, target, info.getSkill().getTraitType(), false); + final double chanceMultiplier = Formulas.calcAttributeBonus(activeChar, target, info.getSkill()) * Formulas.calcGeneralTraitBonus(activeChar, target, info.getSkill().getTraitType(), false); // Lethal Strike if (Rnd.get(100) < (_fullLethal * chanceMultiplier)) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index d4aab73851..e0d51e5d65 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -55,8 +55,8 @@ public final class MagicalAttack extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); // TODO: Unhardcode Cubic Skill to avoid double damage if (activeChar.isAlikeDead() || (info.getSkill().getId() == 4049)) @@ -69,8 +69,8 @@ public final class MagicalAttack extends AbstractEffect target.stopFakeDeath(true); } - boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); - boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); + final boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); + final boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill())); final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); @@ -78,7 +78,7 @@ public final class MagicalAttack extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 4ac4371d51..55b7043bca 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -55,8 +55,8 @@ public final class MagicalAttackByAbnormal extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); if (activeChar.isAlikeDead()) { @@ -68,8 +68,8 @@ public final class MagicalAttackByAbnormal extends AbstractEffect target.stopFakeDeath(true); } - boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); - boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); + final boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); + final boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill())); final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); @@ -80,7 +80,7 @@ public final class MagicalAttackByAbnormal extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 6b83be6e22..022a443ddd 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -55,7 +55,7 @@ public final class MagicalAttackMp extends AbstractEffect } if (info.getEffected().isPlayer()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_C2_S_MAGIC); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_C2_S_MAGIC); sm.addCharName(info.getEffected()); sm.addCharName(info.getEffector()); info.getEffected().sendPacket(sm); @@ -80,20 +80,20 @@ public final class MagicalAttackMp extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); if (activeChar.isAlikeDead()) { return; } - boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); - boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); + final boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); + final boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill())); - double damage = Formulas.calcManaDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); - double mp = (damage > target.getCurrentMp() ? target.getCurrentMp() : damage); + final double damage = Formulas.calcManaDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); + final double mp = (damage > target.getCurrentMp() ? target.getCurrentMp() : damage); if (damage > 0) { @@ -103,7 +103,7 @@ public final class MagicalAttackMp extends AbstractEffect if (target.isPlayer()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1); sm.addCharName(activeChar); sm.addInt((int) mp); target.sendPacket(sm); @@ -111,7 +111,7 @@ public final class MagicalAttackMp extends AbstractEffect if (activeChar.isPlayer()) { - SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_S_MP_WAS_REDUCED_BY_S1); + final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_S_MP_WAS_REDUCED_BY_S1); sm2.addInt((int) mp); activeChar.sendPacket(sm2); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index 4bc24441ac..4238fdc196 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -55,8 +55,8 @@ public final class MagicalSoulAttack extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); if (activeChar.isAlikeDead()) { @@ -68,8 +68,8 @@ public final class MagicalSoulAttack extends AbstractEffect target.stopFakeDeath(true); } - boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); - boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); + final boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); + final boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill())); final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); @@ -77,14 +77,14 @@ public final class MagicalSoulAttack extends AbstractEffect if ((info.getSkill().getMaxSoulConsumeCount() > 0) && activeChar.isPlayer()) { // Souls Formula (each soul increase +4%) - int chargedSouls = (activeChar.getActingPlayer().getChargedSouls() <= info.getSkill().getMaxSoulConsumeCount()) ? activeChar.getActingPlayer().getChargedSouls() : info.getSkill().getMaxSoulConsumeCount(); + final int chargedSouls = (activeChar.getActingPlayer().getChargedSouls() <= info.getSkill().getMaxSoulConsumeCount()) ? activeChar.getActingPlayer().getChargedSouls() : info.getSkill().getMaxSoulConsumeCount(); damage *= 1 + (chargedSouls * 0.04); } if (damage > 0) { // reduce damage if target has maxdamage buff - double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 0744582816..0514fa3724 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -51,7 +51,7 @@ public final class ManaHeal extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); + final L2Character target = info.getEffected(); if ((target == null) || target.isDead() || target.isDoor() || target.isInvul()) { return; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index eb6801d8ed..4744b9b558 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -58,7 +58,7 @@ public final class ManaHealByLevel extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); + final L2Character target = info.getEffected(); if ((target == null) || target.isDead() || target.isDoor() || target.isInvul()) { return; @@ -71,7 +71,7 @@ public final class ManaHealByLevel extends AbstractEffect amount = target.calcStat(Stats.MANA_CHARGE, amount, null, null); if (target.getLevel() > info.getSkill().getMagicLevel()) { - int lvlDiff = target.getLevel() - info.getSkill().getMagicLevel(); + final int lvlDiff = target.getLevel() - info.getSkill().getMagicLevel(); // if target is too high compared to skill level, the amount of recharged mp gradually decreases. if (lvlDiff == 6) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 62a1e9751b..006440d45f 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -46,7 +46,7 @@ public final class ManaHealOverTime extends AbstractEffect } double mp = info.getEffected().getCurrentMp(); - double maxmp = info.getEffected().getMaxRecoverableMp(); + final double maxmp = info.getEffected().getMaxRecoverableMp(); // Not needed to set the MP and send update packet if player is already at max MP if (mp >= maxmp) diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index f02dc58249..201f8ed81e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -57,15 +57,15 @@ public final class ManaHealPercent extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); + final L2Character target = info.getEffected(); if ((target == null) || target.isDead() || target.isDoor()) { return; } double amount = 0; - double power = _power; - boolean full = (power == 100.0); + final double power = _power; + final boolean full = (power == 100.0); amount = full ? target.getMaxMp() : (target.getMaxMp() * power) / 100.0; // Prevents overheal and negative amount diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 446363ed8f..6464616eb1 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -101,7 +101,7 @@ public final class MaxCp extends AbstractEffect } if (_heal) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); sm.addInt((int) amount); effected.sendPacket(sm); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 9b52037705..da45523e52 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -102,7 +102,7 @@ public final class MaxHp extends AbstractEffect } if (_heal) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); sm.addInt((int) amount); effected.sendPacket(sm); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index a010446c16..f95442c3ab 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -52,7 +52,7 @@ public final class OpenCommonRecipeBook extends AbstractEffect return; } - L2PcInstance player = info.getEffector().getActingPlayer(); + final L2PcInstance player = info.getEffector().getActingPlayer(); if (player.getPrivateStoreType() != PrivateStoreType.NONE) { player.sendPacket(SystemMessageId.ITEM_CREATION_IS_NOT_POSSIBLE_WHILE_ENGAGED_IN_A_TRADE); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index d15cdb54d9..a6e7b3b3d4 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -52,7 +52,7 @@ public final class OpenDwarfRecipeBook extends AbstractEffect return; } - L2PcInstance player = info.getEffector().getActingPlayer(); + final L2PcInstance player = info.getEffector().getActingPlayer(); if (player.getPrivateStoreType() != PrivateStoreType.NONE) { player.sendPacket(SystemMessageId.ITEM_CREATION_IS_NOT_POSSIBLE_WHILE_ENGAGED_IN_A_TRADE); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Passive.java index 47958eb870..c0542e5c08 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -51,7 +51,7 @@ public final class Passive extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Attackable target = (L2Attackable) info.getEffected(); + final L2Attackable target = (L2Attackable) info.getEffected(); target.abortAttack(); target.abortCast(); target.disableAllSkills(); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 15cbe646a7..21ae1bfd0a 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -78,9 +78,9 @@ public final class PhysicalAttack extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); - Skill skill = info.getSkill(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); + final Skill skill = info.getSkill(); if (activeChar.isAlikeDead()) { @@ -101,7 +101,7 @@ public final class PhysicalAttack extends AbstractEffect } int damage = 0; - boolean ss = skill.isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS); + final boolean ss = skill.isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS); final byte shld = Formulas.calcShldUse(activeChar, target, skill); // Physical damage critical rate is only affected by STR. boolean crit = false; @@ -122,7 +122,7 @@ public final class PhysicalAttack extends AbstractEffect StringTokenizer st = new StringTokenizer(_type1, ","); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); if (activeChar.getActiveWeaponItem().getItemType() == WeaponType.valueOf(item)) { damage *= _valueReduce; @@ -132,7 +132,7 @@ public final class PhysicalAttack extends AbstractEffect st = new StringTokenizer(_type2, ","); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); if (activeChar.getActiveWeaponItem().getItemType() == WeaponType.valueOf(item)) { damage *= _valueIncrease; @@ -144,7 +144,7 @@ public final class PhysicalAttack extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 6090c08ec0..14e96ce046 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -63,9 +63,9 @@ public final class PhysicalAttackHpLink extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); - Skill skill = info.getSkill(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); + final Skill skill = info.getSkill(); if (activeChar.isAlikeDead()) { @@ -74,7 +74,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (activeChar.isMovementDisabled()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); sm.addSkillName(skill); activeChar.sendPacket(sm); return; @@ -89,13 +89,13 @@ public final class PhysicalAttackHpLink extends AbstractEffect } int damage = 0; - boolean ss = skill.isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS); + final boolean ss = skill.isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS); damage = (int) Formulas.calcPhysDam(activeChar, target, skill, shld, false, ss); if (damage > 0) { // reduce damage if target has maxdamage buff - double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 2803f1f01e..f999a7ac32 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -63,9 +63,9 @@ public final class PhysicalSoulAttack extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); - Skill skill = info.getSkill(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); + final Skill skill = info.getSkill(); if (activeChar.isAlikeDead()) { @@ -86,7 +86,7 @@ public final class PhysicalSoulAttack extends AbstractEffect } int damage = 0; - boolean ss = skill.isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS); + final boolean ss = skill.isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS); final byte shld = Formulas.calcShldUse(activeChar, target, skill); // Physical damage critical rate is only affected by STR. boolean crit = false; @@ -100,7 +100,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if ((skill.getMaxSoulConsumeCount() > 0) && activeChar.isPlayer()) { // Souls Formula (each soul increase +4%) - int chargedSouls = (activeChar.getActingPlayer().getChargedSouls() <= skill.getMaxSoulConsumeCount()) ? activeChar.getActingPlayer().getChargedSouls() : skill.getMaxSoulConsumeCount(); + final int chargedSouls = (activeChar.getActingPlayer().getChargedSouls() <= skill.getMaxSoulConsumeCount()) ? activeChar.getActingPlayer().getChargedSouls() : skill.getMaxSoulConsumeCount(); damage *= 1 + (chargedSouls * 0.04); } if (crit) @@ -111,7 +111,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 6304fb4016..9f37ef1cc0 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -88,7 +88,7 @@ public final class RebalanceHP extends AbstractEffect } } - double percentHP = currentHPs / fullHP; + final double percentHP = currentHPs / fullHP; for (L2PcInstance member : party.getMembers()) { if (!member.isDead() && Util.checkIfInRange(skill.getAffectRange(), effector, member, true)) diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index aa5576b0ab..1b4429848e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -43,8 +43,8 @@ public final class ResistSkill extends AbstractEffect for (int i = 1;; i++) { - int skillId = params.getInt("skillId" + i, 0); - int skillLvl = params.getInt("skillLvl" + i, 0); + final int skillId = params.getInt("skillId" + i, 0); + final int skillLvl = params.getInt("skillLvl" + i, 0); if (skillId == 0) { break; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index 19e61bf566..63714d0a35 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -57,8 +57,8 @@ public final class Resurrection extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); if (activeChar.isPlayer()) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 268b314f21..0e560fbd76 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -62,9 +62,9 @@ public final class ResurrectionSpecial extends AbstractEffect { return; } - L2PcInstance caster = info.getEffector().getActingPlayer(); + final L2PcInstance caster = info.getEffector().getActingPlayer(); - Skill skill = info.getSkill(); + final Skill skill = info.getSkill(); if (info.getEffected().isPlayer()) { @@ -73,7 +73,7 @@ public final class ResurrectionSpecial extends AbstractEffect } if (info.getEffected().isPet()) { - L2PetInstance pet = (L2PetInstance) info.getEffected(); + final L2PetInstance pet = (L2PetInstance) info.getEffected(); info.getEffected().getActingPlayer().reviveRequest(pet.getActingPlayer(), skill, true, _power); } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ShilensBreath.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ShilensBreath.java index b367bd48b4..c2354233a9 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ShilensBreath.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ShilensBreath.java @@ -45,7 +45,7 @@ public final class ShilensBreath extends AbstractEffect if (info.getEffected().isPlayer() && !info.getEffected().isDead()) { final L2PcInstance player = (L2PcInstance) info.getEffected(); - int nextLv = info.getSkill().getLevel() - 1; + final int nextLv = info.getSkill().getLevel() - 1; if (nextLv > 0) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 336e15fffd..4e3f8e56d1 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -63,21 +63,21 @@ public final class SoulBlow extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character target = info.getEffected(); - L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); if (activeChar.isAlikeDead()) { return; } - boolean ss = info.getSkill().useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS); - byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); + final boolean ss = info.getSkill().useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS); + final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); double damage = Formulas.calcBlowDamage(activeChar, target, info.getSkill(), shld, ss); if ((info.getSkill().getMaxSoulConsumeCount() > 0) && activeChar.isPlayer()) { // Souls Formula (each soul increase +4%) - int chargedSouls = (activeChar.getActingPlayer().getChargedSouls() <= info.getSkill().getMaxSoulConsumeCount()) ? activeChar.getActingPlayer().getChargedSouls() : info.getSkill().getMaxSoulConsumeCount(); + final int chargedSouls = (activeChar.getActingPlayer().getChargedSouls() <= info.getSkill().getMaxSoulConsumeCount()) ? activeChar.getActingPlayer().getChargedSouls() : info.getSkill().getMaxSoulConsumeCount(); damage *= 1 + (chargedSouls * 0.04); } @@ -93,7 +93,7 @@ public final class SoulBlow extends AbstractEffect if (activeChar.isPlayer()) { - L2PcInstance activePlayer = activeChar.getActingPlayer(); + final L2PcInstance activePlayer = activeChar.getActingPlayer(); activePlayer.sendDamageMessage(target, (int) damage, false, true, false); } // Check if damage should be reflected diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java index 54aee10c31..1f0717b7b6 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java @@ -54,7 +54,7 @@ public final class StaticDamage extends AbstractEffect } // reduce damage if target has maxdamage buff - double maxDamage = (info.getEffected().getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = (info.getEffected().getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); if (maxDamage > 0) { _power = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonDebuff.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonDebuff.java index 0123c211db..da5cbcfefd 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonDebuff.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonDebuff.java @@ -48,18 +48,18 @@ public final class SummonDebuff extends AbstractEffect @Override public boolean onActionTime(BuffInfo info) { - L2PcInstance player = info.getEffected().getActingPlayer(); + final L2PcInstance player = info.getEffected().getActingPlayer(); if (player.hasSummon()) { if (player.getEffectList().isAffectedBySkill(PRICE_OF_SUMMONING_LION)) { - Skill skill = SkillData.getInstance().getSkill(PRICE_OF_SUMMONING_LION, 1); + final Skill skill = SkillData.getInstance().getSkill(PRICE_OF_SUMMONING_LION, 1); skill.applyEffects(player, player); return true; } else if (player.getEffectList().isAffectedBySkill(PRICE_OF_SUMMONING_LUMI)) { - Skill skill = SkillData.getInstance().getSkill(PRICE_OF_SUMMONING_LUMI, 1); + final Skill skill = SkillData.getInstance().getSkill(PRICE_OF_SUMMONING_LUMI, 1); skill.applyEffects(player, player); return true; } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index cd06b449eb..0f01c7b9d6 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -52,7 +52,7 @@ public final class TargetMe extends AbstractEffect { if (info.getEffected().getTarget() != info.getEffector()) { - L2PcInstance effector = info.getEffector().getActingPlayer(); + final L2PcInstance effector = info.getEffector().getActingPlayer(); // If effector is null, then its not a player, but NPC. If its not null, then it should check if the skill is pvp skill. if ((effector == null) || effector.checkPvpSkill(info.getEffected(), info.getSkill())) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index ffcfa6cfe9..9f69fff4e7 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -59,7 +59,7 @@ public final class TargetMeProbability extends AbstractEffect { if (info.getEffected().getTarget() != info.getEffector()) { - L2PcInstance effector = info.getEffector().getActingPlayer(); + final L2PcInstance effector = info.getEffector().getActingPlayer(); // If effector is null, then its not a player, but NPC. If its not null, then it should check if the skill is pvp skill. if ((effector == null) || effector.checkPvpSkill(info.getEffected(), info.getSkill())) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index c5c5799fc7..483069c4cd 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -58,15 +58,15 @@ public final class TeleportToTarget extends AbstractEffect @Override public void onStart(BuffInfo info) { - L2Character activeChar = info.getEffector(); - L2Character target = info.getEffected(); + final L2Character activeChar = info.getEffector(); + final L2Character target = info.getEffected(); if (target == null) { return; } - int px = target.getX(); - int py = target.getY(); + final int px = target.getX(); + final int py = target.getY(); double ph = Util.convertHeadingToDegree(target.getHeading()); ph += 180; @@ -76,9 +76,9 @@ public final class TeleportToTarget extends AbstractEffect } ph = (Math.PI * ph) / 180; - int x = (int) (px + (25 * Math.cos(ph))); - int y = (int) (py + (25 * Math.sin(ph))); - int z = target.getZ(); + final int x = (int) (px + (25 * Math.cos(ph))); + final int y = (int) (py + (25 * Math.sin(ph))); + final int z = target.getZ(); final Location loc = GeoData.getInstance().moveCheck(activeChar.getX(), activeChar.getY(), activeChar.getZ(), x, y, z, activeChar.getInstanceId()); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java index b9a728e8e5..08d8fa395f 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java @@ -61,9 +61,9 @@ public final class ThrowHorizontal extends AbstractEffect final int curY = info.getEffected().getY(); // Calculate distance between effector and effected current position - double dx = info.getEffector().getX() - curX; - double dy = info.getEffector().getY() - curY; - double distance = Math.sqrt((dx * dx) + (dy * dy)); + final double dx = info.getEffector().getX() - curX; + final double dy = info.getEffector().getY() - curY; + final double distance = Math.sqrt((dx * dx) + (dy * dy)); if (distance > 2000) { _log.info("EffectThrow was going to use invalid coordinates for characters, getEffected: " + curX + "," + curY + " and getEffector: " + info.getEffector().getX() + "," + info.getEffector().getY()); @@ -76,14 +76,14 @@ public final class ThrowHorizontal extends AbstractEffect return; } - int x = info.getEffector().getX(); - int y = info.getEffector().getY(); - int z = info.getEffected().getZ(); + final int x = info.getEffector().getX(); + final int y = info.getEffector().getY(); + final int z = info.getEffected().getZ(); // Prevent using skill with this effect on NPC that not monster if (!(info.getEffected().isMonster() || info.getEffected().isRaidMinion() || info.getEffected().isMinion() || info.getEffected().isSummon() || info.getEffected().isPlayer())) { - L2PcInstance effector = (L2PcInstance) info.getEffector(); + final L2PcInstance effector = (L2PcInstance) info.getEffector(); effector.sendPacket(SystemMessageId.INVALID_TARGET); return; } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java index 0552d4f331..a014035b05 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java @@ -60,10 +60,10 @@ public final class ThrowUp extends AbstractEffect final int curZ = info.getEffected().getZ(); // Calculate distance between effector and effected current position - double dx = info.getEffector().getX() - curX; - double dy = info.getEffector().getY() - curY; - double dz = info.getEffector().getZ() - curZ; - double distance = Math.sqrt((dx * dx) + (dy * dy)); + final double dx = info.getEffector().getX() - curX; + final double dy = info.getEffector().getY() - curY; + final double dz = info.getEffector().getZ() - curZ; + final double distance = Math.sqrt((dx * dx) + (dy * dy)); if (distance > 2000) { _log.info("EffectThrow was going to use invalid coordinates for characters, getEffected: " + curX + "," + curY + " and getEffector: " + info.getEffector().getX() + "," + info.getEffector().getY()); @@ -93,9 +93,9 @@ public final class ThrowUp extends AbstractEffect cos = dx / distance; // Calculate the new destination with offset included - int x = info.getEffector().getX() - (int) (offset * cos); - int y = info.getEffector().getY() - (int) (offset * sin); - int z = info.getEffected().getZ(); + final int x = info.getEffector().getX() - (int) (offset * cos); + final int y = info.getEffector().getY() - (int) (offset * sin); + final int z = info.getEffected().getZ(); final Location destination = GeoData.getInstance().moveCheck(info.getEffected().getX(), info.getEffected().getY(), info.getEffected().getZ(), x, y, z, info.getEffected().getInstanceId()); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java index 600cc39066..23b6d2903d 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java @@ -258,7 +258,7 @@ public final class TriggerForce extends AbstractEffect } if ((activeForces >= 4) && (member.getEffectList().getBuffInfoBySkillId(AEORE_FORCE) != null) && (member.getEffectList().getBuffInfoBySkillId(SIGEL_FORCE) != null)) { - BuffInfo skill = member.getEffectList().getBuffInfoBySkillId(PARTY_SOLIDARITY); + final BuffInfo skill = member.getEffectList().getBuffInfoBySkillId(PARTY_SOLIDARITY); if (!member.getEffectList().isAffectedBySkill(PARTY_SOLIDARITY) || (skill.getSkill().getLevel() != Math.min((activeForces - 3), 3))) { member.makeTriggerCast(SkillData.getInstance().getSkill(PARTY_SOLIDARITY, Math.min((activeForces - 3), 3)), member); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index aa9a961738..94d0856b2e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -46,10 +46,10 @@ public final class Unsummon extends AbstractEffect @Override public boolean calcSuccess(BuffInfo info) { - int magicLevel = info.getSkill().getMagicLevel(); + final int magicLevel = info.getSkill().getMagicLevel(); if ((magicLevel <= 0) || ((info.getEffected().getLevel() - 9) <= magicLevel)) { - double chance = _chance * Formulas.calcAttributeBonus(info.getEffector(), info.getEffected(), info.getSkill()) * Formulas.calcGeneralTraitBonus(info.getEffector(), info.getEffected(), info.getSkill().getTraitType(), false); + final double chance = _chance * Formulas.calcAttributeBonus(info.getEffector(), info.getEffected(), info.getSkill()) * Formulas.calcGeneralTraitBonus(info.getEffector(), info.getEffected(), info.getSkill().getTraitType(), false); if (chance > (Rnd.nextDouble() * 100)) { return true; diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 410d94b2dd..3068d6453f 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -98,7 +98,7 @@ public class BeastSpiritShot implements IItemHandler return false; } - long shotCount = item.getCount(); + final long shotCount = item.getCount(); if (shotCount < shotConsumption) { // Not enough SpiritShots to use. diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d355629c44..796def85ee 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -43,12 +43,12 @@ public class BlessedSpiritShot implements IItemHandler return false; } - L2PcInstance activeChar = (L2PcInstance) playable; - L2ItemInstance weaponInst = activeChar.getActiveWeaponInstance(); - L2Weapon weaponItem = activeChar.getActiveWeaponItem(); + final L2PcInstance activeChar = (L2PcInstance) playable; + final L2ItemInstance weaponInst = activeChar.getActiveWeaponInstance(); + final L2Weapon weaponItem = activeChar.getActiveWeaponItem(); final SkillHolder[] skills = item.getItem().getSkills(); - int itemId = item.getId(); + final int itemId = item.getId(); if (skills == null) { @@ -73,7 +73,7 @@ public class BlessedSpiritShot implements IItemHandler } // Check for correct grade - boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus()); + final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus()); if (!gradeCheck) { diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/Book.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/Book.java index c2df01f7c8..ea992eeaa9 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -38,11 +38,11 @@ public class Book implements IItemHandler return false; } - L2PcInstance activeChar = (L2PcInstance) playable; + final L2PcInstance activeChar = (L2PcInstance) playable; final int itemId = item.getId(); - String filename = "html/help/" + itemId + ".htm"; - String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename); + final String filename = "html/help/" + itemId + ".htm"; + final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename); if (content == null) { diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 4813da58c7..ff97b23aad 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -37,11 +37,11 @@ public class Bypass implements IItemHandler { return false; } - L2PcInstance activeChar = (L2PcInstance) playable; + final L2PcInstance activeChar = (L2PcInstance) playable; final int itemId = item.getId(); - String filename = "html/item/" + itemId + ".htm"; - String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename); + final String filename = "html/item/" + itemId + ".htm"; + final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename); final NpcHtmlMessage html = new NpcHtmlMessage(0, item.getId()); if (content == null) { diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index caf23705c7..f46cd870e0 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -73,7 +73,7 @@ public class CharmOfCourage implements IItemHandler if (itemLevel < level) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); sm.addItemName(item.getId()); activeChar.sendPacket(sm); return false; diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index 742774708f..8d908fe5d5 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -64,7 +64,7 @@ public class EventItem implements IItemHandler final int blockCheckerArena = castor.getBlockCheckerArena(); if (blockCheckerArena == -1) { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); msg.addItemName(item); castor.sendPacket(msg); return false; @@ -87,7 +87,7 @@ public class EventItem implements IItemHandler if (holder != null) { final int team = holder.getPlayerTeam(castor); - for (final L2PcInstance pc : block.getKnownList().getKnownPlayersInRadius(sk.getEffectRange())) + for (L2PcInstance pc : block.getKnownList().getKnownPlayersInRadius(sk.getEffectRange())) { final int enemyTeam = holder.getPlayerTeam(pc); if ((enemyTeam != -1) && (enemyTeam != team)) diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index e5129379e6..6c2c1576e3 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -63,8 +63,8 @@ public class ExtractableItems implements IItemHandler return false; } - List extractedItems = new ArrayList<>(); - List enchantedItems = new ArrayList<>(); + final List extractedItems = new ArrayList<>(); + final List enchantedItems = new ArrayList<>(); if (etcitem.getExtractableCountMin() > 0) { while (extractedItems.size() < etcitem.getExtractableCountMin()) @@ -188,7 +188,7 @@ public class ExtractableItems implements IItemHandler } if (!enchantedItems.isEmpty()) { - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (L2ItemInstance i : enchantedItems) { playerIU.addModifiedItem(i); @@ -203,21 +203,21 @@ public class ExtractableItems implements IItemHandler { if (item.getCount() > 1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); sm.addItemName(item); sm.addLong(item.getCount()); player.sendPacket(sm); } else if (item.getEnchantLevel() > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); player.sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1); sm.addItemName(item); player.sendPacket(sm); } diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 3e215231f2..d34677fbc2 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -71,7 +71,7 @@ public class FishShots implements IItemHandler return false; } - boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus()); + final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus()); if (!gradeCheck) { @@ -86,7 +86,7 @@ public class FishShots implements IItemHandler activeChar.setChargedShot(ShotType.FISH_SOULSHOTS, true); activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), 1, null, false); - L2Object oldTarget = activeChar.getTarget(); + final L2Object oldTarget = activeChar.getTarget(); activeChar.setTarget(activeChar); Broadcast.toSelfAndKnownPlayers(activeChar, new MagicSkillUse(activeChar, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0)); diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index fe229dac28..b08ec6eecb 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -78,7 +78,7 @@ public class ItemSkillsTemplate implements IItemHandler continue; } - Skill itemSkill = skillInfo.getSkill(); + final Skill itemSkill = skillInfo.getSkill(); if (itemSkill != null) { @@ -111,7 +111,7 @@ public class ItemSkillsTemplate implements IItemHandler // Send message to the master. if (playable.isPet()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_USES_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_USES_S1); sm.addSkillName(itemSkill); playable.sendPacket(sm); } diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 17deaf54c9..57ed90986a 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -42,9 +42,9 @@ public class MercTicket implements IItemHandler return false; } - int itemId = item.getId(); - L2PcInstance activeChar = (L2PcInstance) playable; - Castle castle = CastleManager.getInstance().getCastle(activeChar); + final int itemId = item.getId(); + final L2PcInstance activeChar = (L2PcInstance) playable; + final Castle castle = CastleManager.getInstance().getCastle(activeChar); int castleId = -1; if (castle != null) { diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 3a29c0aa14..9c0d7e3c7e 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -40,8 +40,8 @@ public class RollingDice implements IItemHandler return false; } - L2PcInstance activeChar = playable.getActingPlayer(); - int itemId = item.getId(); + final L2PcInstance activeChar = playable.getActingPlayer(); + final int itemId = item.getId(); if (activeChar.isInOlympiadMode()) { @@ -49,7 +49,7 @@ public class RollingDice implements IItemHandler return false; } - int number = rollDice(activeChar); + final int number = rollDice(activeChar); if (number == 0) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_THROW_THE_DICE_AT_THIS_TIME_TRY_AGAIN_LATER); @@ -58,7 +58,7 @@ public class RollingDice implements IItemHandler Broadcast.toSelfAndKnownPlayers(activeChar, new Dice(activeChar.getObjectId(), itemId, number, activeChar.getX() - 30, activeChar.getY() - 30, activeChar.getZ())); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ROLLED_A_S2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ROLLED_A_S2); sm.addString(activeChar.getName()); sm.addInt(number); diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index ab20aef0b3..23eb699540 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -49,7 +49,7 @@ public class SoulShots implements IItemHandler final L2Weapon weaponItem = activeChar.getActiveWeaponItem(); final SkillHolder[] skills = item.getItem().getSkills(); - int itemId = item.getId(); + final int itemId = item.getId(); if (skills == null) { @@ -67,7 +67,7 @@ public class SoulShots implements IItemHandler return false; } - boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus()); + final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus()); if (!gradeCheck) { diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 59f938b12a..d625774366 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -48,7 +48,7 @@ public class SpiritShot implements IItemHandler final L2Weapon weaponItem = activeChar.getActiveWeaponItem(); final SkillHolder[] skills = item.getItem().getSkills(); - int itemId = item.getId(); + final int itemId = item.getId(); if (skills == null) { @@ -72,7 +72,7 @@ public class SpiritShot implements IItemHandler return false; } - boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus()); + final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus()); if (!gradeCheck) { diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java index 3d2fdd39bb..6e44a70e9d 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java @@ -40,7 +40,7 @@ public class TeleportBookmark implements IItemHandler return false; } - L2PcInstance player = playable.getActingPlayer(); + final L2PcInstance player = playable.getActingPlayer(); if (player.getBookMarkSlot() >= 9) { @@ -53,7 +53,7 @@ public class TeleportBookmark implements IItemHandler player.setBookMarkSlot(player.getBookMarkSlot() + 3); player.sendPacket(SystemMessageId.THE_NUMBER_OF_MY_TELEPORTS_SLOTS_HAS_BEEN_INCREASED); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(item.getId()); player.sendPacket(sm); return true; diff --git a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 4aec4797ef..96785b28dc 100644 --- a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -39,7 +39,7 @@ public class BanHandler implements IPunishmentHandler { case CHARACTER: { - int objectId = Integer.parseInt(String.valueOf(task.getKey())); + final int objectId = Integer.parseInt(String.valueOf(task.getKey())); final L2PcInstance player = L2World.getInstance().getPlayer(objectId); if (player != null) { @@ -49,7 +49,7 @@ public class BanHandler implements IPunishmentHandler } case ACCOUNT: { - String account = String.valueOf(task.getKey()); + final String account = String.valueOf(task.getKey()); final L2GameClient client = LoginServerThread.getInstance().getClient(account); if (client != null) { @@ -67,7 +67,7 @@ public class BanHandler implements IPunishmentHandler } case IP: { - String ip = String.valueOf(task.getKey()); + final String ip = String.valueOf(task.getKey()); for (L2PcInstance player : L2World.getInstance().getPlayers()) { if (player.getIPAddress().equals(ip)) diff --git a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f941074e1c..b5be61e7a0 100644 --- a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -40,7 +40,7 @@ public class ChatBanHandler implements IPunishmentHandler { case CHARACTER: { - int objectId = Integer.parseInt(String.valueOf(task.getKey())); + final int objectId = Integer.parseInt(String.valueOf(task.getKey())); final L2PcInstance player = L2World.getInstance().getPlayer(objectId); if (player != null) { @@ -50,7 +50,7 @@ public class ChatBanHandler implements IPunishmentHandler } case ACCOUNT: { - String account = String.valueOf(task.getKey()); + final String account = String.valueOf(task.getKey()); final L2GameClient client = LoginServerThread.getInstance().getClient(account); if (client != null) { @@ -64,7 +64,7 @@ public class ChatBanHandler implements IPunishmentHandler } case IP: { - String ip = String.valueOf(task.getKey()); + final String ip = String.valueOf(task.getKey()); for (L2PcInstance player : L2World.getInstance().getPlayers()) { if (player.getIPAddress().equals(ip)) @@ -84,7 +84,7 @@ public class ChatBanHandler implements IPunishmentHandler { case CHARACTER: { - int objectId = Integer.parseInt(String.valueOf(task.getKey())); + final int objectId = Integer.parseInt(String.valueOf(task.getKey())); final L2PcInstance player = L2World.getInstance().getPlayer(objectId); if (player != null) { @@ -94,7 +94,7 @@ public class ChatBanHandler implements IPunishmentHandler } case ACCOUNT: { - String account = String.valueOf(task.getKey()); + final String account = String.valueOf(task.getKey()); final L2GameClient client = LoginServerThread.getInstance().getClient(account); if (client != null) { @@ -108,7 +108,7 @@ public class ChatBanHandler implements IPunishmentHandler } case IP: { - String ip = String.valueOf(task.getKey()); + final String ip = String.valueOf(task.getKey()); for (L2PcInstance player : L2World.getInstance().getPlayers()) { if (player.getIPAddress().equals(ip)) @@ -128,7 +128,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private static void applyToPlayer(PunishmentTask task, L2PcInstance player) { - long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); + final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) { player.sendMessage("You've been chat banned for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 8f348c09b4..0014118139 100644 --- a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -70,7 +70,7 @@ public class JailHandler implements IPunishmentHandler { case CHARACTER: { - int objectId = Integer.parseInt(String.valueOf(task.getKey())); + final int objectId = Integer.parseInt(String.valueOf(task.getKey())); final L2PcInstance player = L2World.getInstance().getPlayer(objectId); if (player != null) { @@ -80,7 +80,7 @@ public class JailHandler implements IPunishmentHandler } case ACCOUNT: { - String account = String.valueOf(task.getKey()); + final String account = String.valueOf(task.getKey()); final L2GameClient client = LoginServerThread.getInstance().getClient(account); if (client != null) { @@ -94,7 +94,7 @@ public class JailHandler implements IPunishmentHandler } case IP: { - String ip = String.valueOf(task.getKey()); + final String ip = String.valueOf(task.getKey()); for (L2PcInstance player : L2World.getInstance().getPlayers()) { if (player.getIPAddress().equals(ip)) @@ -114,7 +114,7 @@ public class JailHandler implements IPunishmentHandler { case CHARACTER: { - int objectId = Integer.parseInt(String.valueOf(task.getKey())); + final int objectId = Integer.parseInt(String.valueOf(task.getKey())); final L2PcInstance player = L2World.getInstance().getPlayer(objectId); if (player != null) { @@ -124,7 +124,7 @@ public class JailHandler implements IPunishmentHandler } case ACCOUNT: { - String account = String.valueOf(task.getKey()); + final String account = String.valueOf(task.getKey()); final L2GameClient client = LoginServerThread.getInstance().getClient(account); if (client != null) { @@ -138,7 +138,7 @@ public class JailHandler implements IPunishmentHandler } case IP: { - String ip = String.valueOf(task.getKey()); + final String ip = String.valueOf(task.getKey()); for (L2PcInstance player : L2World.getInstance().getPlayers()) { if (player.getIPAddress().equals(ip)) @@ -188,7 +188,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); + final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); @@ -210,7 +210,7 @@ public class JailHandler implements IPunishmentHandler // Open a Html message to inform the player final NpcHtmlMessage msg = new NpcHtmlMessage(); - String content = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/jail_out.htm"); + final String content = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/jail_out.htm"); if (content != null) { msg.setHtml(content); diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/Area.java b/trunk/dist/game/data/scripts/handlers/targethandlers/Area.java index f691b6cc34..983d730cf3 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/Area.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/Area.java @@ -39,7 +39,7 @@ public class Area implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable()))) { activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); @@ -72,7 +72,7 @@ public class Area implements ITargetTypeHandler origin = activeChar; } - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); final Collection objs = activeChar.getKnownList().getKnownCharacters(); for (L2Character obj : objs) { diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java index 3a45236fdc..117ef1cfc1 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java @@ -43,8 +43,8 @@ public class AreaFriendly implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); - L2PcInstance player = activeChar.getActingPlayer(); + final List targetList = new ArrayList<>(); + final L2PcInstance player = activeChar.getActingPlayer(); if ((target == null) || (!checkTarget(player, target) && (skill.getCastRange() >= 0))) { @@ -69,7 +69,7 @@ public class AreaFriendly implements ITargetTypeHandler } targetList.add(target); // Add target to target list - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); final Collection objs = target.getKnownList().getKnownCharactersInRadius(skill.getAffectRange()); // TODO: Chain Heal - The recovery amount decreases starting from the most injured person. @@ -111,7 +111,7 @@ public class AreaFriendly implements ITargetTypeHandler if (target.isPlayable()) { - L2PcInstance targetPlayer = target.getActingPlayer(); + final L2PcInstance targetPlayer = target.getActingPlayer(); if (activeChar == targetPlayer) { diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java index 94108a7fbe..036594b488 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java @@ -38,7 +38,7 @@ public class AreaSummon implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if ((target == null) || !target.isServitor() || target.isDead()) { return EMPTY_TARGET_LIST; @@ -57,7 +57,7 @@ public class AreaSummon implements ITargetTypeHandler final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); final Collection objs = target.getKnownList().getKnownCharacters(); - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) { diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/AuraCorpseMob.java b/trunk/dist/game/data/scripts/handlers/targethandlers/AuraCorpseMob.java index 3db76dbc35..c2b46902cc 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/AuraCorpseMob.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/AuraCorpseMob.java @@ -36,10 +36,10 @@ public class AuraCorpseMob implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); // Go through the L2Character _knownList final Collection objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange()); - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) { if (obj.isAttackable() && obj.isDead()) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/AuraFriendly.java b/trunk/dist/game/data/scripts/handlers/targethandlers/AuraFriendly.java index 5529604813..392aa92958 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/AuraFriendly.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/AuraFriendly.java @@ -39,9 +39,9 @@ public class AuraFriendly implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); - L2PcInstance player = activeChar.getActingPlayer(); - int maxTargets = skill.getAffectLimit(); + final List targetList = new ArrayList<>(); + final L2PcInstance player = activeChar.getActingPlayer(); + final int maxTargets = skill.getAffectLimit(); for (L2Character obj : player.getKnownList().getKnownCharactersInRadius(skill.getAffectRange())) { if ((obj == activeChar) || !checkTarget(player, obj)) @@ -79,7 +79,7 @@ public class AuraFriendly implements ITargetTypeHandler if (target.isPlayable()) { - L2PcInstance targetPlayer = target.getActingPlayer(); + final L2PcInstance targetPlayer = target.getActingPlayer(); if (activeChar.isInDuelWith(target)) { diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/BehindArea.java b/trunk/dist/game/data/scripts/handlers/targethandlers/BehindArea.java index f2a229ff43..5abee953e3 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/BehindArea.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/BehindArea.java @@ -39,7 +39,7 @@ public class BehindArea implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable()))) { activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); @@ -73,7 +73,7 @@ public class BehindArea implements ITargetTypeHandler } final Collection objs = activeChar.getKnownList().getKnownCharacters(); - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) { if (!(obj.isAttackable() || obj.isPlayable())) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/BehindAura.java b/trunk/dist/game/data/scripts/handlers/targethandlers/BehindAura.java index e5acd2af6d..585c33ca18 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/BehindAura.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/BehindAura.java @@ -37,10 +37,10 @@ public class BehindAura implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); final Collection objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange()); - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) { if (obj.isAttackable() || obj.isPlayable()) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/Clan.java b/trunk/dist/game/data/scripts/handlers/targethandlers/Clan.java index 3922eacaac..c59b9ba432 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/Clan.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/Clan.java @@ -42,7 +42,7 @@ public class Clan implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if (activeChar.isPlayable()) { @@ -167,7 +167,7 @@ public class Clan implements ITargetTypeHandler targetList.add(activeChar); final Collection objs = activeChar.getKnownList().getKnownObjects().values(); - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); for (L2Object newTarget : objs) { if (newTarget.isNpc() && npc.isInMyClan((L2Npc) newTarget)) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/ClanMember.java b/trunk/dist/game/data/scripts/handlers/targethandlers/ClanMember.java index a8d5203ab8..1ecda9145d 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/ClanMember.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/ClanMember.java @@ -38,7 +38,7 @@ public class ClanMember implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if (activeChar.isNpc()) { // for buff purposes, returns friendly mobs nearby and mob itself diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/CommandChannel.java b/trunk/dist/game/data/scripts/handlers/targethandlers/CommandChannel.java index da465cf27a..e414a2c2cd 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/CommandChannel.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/CommandChannel.java @@ -70,7 +70,7 @@ public class CommandChannel implements ITargetTypeHandler } // Get all visible objects in a spherical area near the L2Character - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); final List members = hasChannel ? party.getCommandChannel().getMembers() : party.getMembers(); for (L2PcInstance member : members) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java b/trunk/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java index bb46ab1af6..5a77a6b91f 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java @@ -43,7 +43,7 @@ public class CorpseClan implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if (activeChar.isPlayable()) { final L2PcInstance player = activeChar.getActingPlayer(); @@ -139,7 +139,7 @@ public class CorpseClan implements ITargetTypeHandler targetList.add(activeChar); final Collection objs = activeChar.getKnownList().getKnownObjects().values(); - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); for (L2Object newTarget : objs) { if (newTarget.isNpc() && npc.isInMyClan((L2Npc) newTarget)) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java b/trunk/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java index cb9a2aa7fd..421b3dfcf0 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java @@ -36,7 +36,7 @@ public class EnemySummon implements ITargetTypeHandler { if (target.isSummon()) { - L2Summon targetSummon = (L2Summon) target; + final L2Summon targetSummon = (L2Summon) target; if ((activeChar.isPlayer() && (activeChar.getPet() != targetSummon) && activeChar.hasServitor(targetSummon.getObjectId()) && !targetSummon.isDead() && ((targetSummon.getOwner().getPvpFlag() != 0) || (targetSummon.getOwner().getReputation() < 0))) || (targetSummon.getOwner().isInsideZone(ZoneId.PVP) && activeChar.getActingPlayer().isInsideZone(ZoneId.PVP)) || (targetSummon.getOwner().isInDuel() && activeChar.getActingPlayer().isInDuel() && (targetSummon.getOwner().getDuelId() == activeChar.getActingPlayer().getDuelId()))) { return new L2Character[] diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/FrontArea.java b/trunk/dist/game/data/scripts/handlers/targethandlers/FrontArea.java index 7f7bbe6024..3bc97623e9 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/FrontArea.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/FrontArea.java @@ -39,7 +39,7 @@ public class FrontArea implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable()))) { activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); @@ -73,7 +73,7 @@ public class FrontArea implements ITargetTypeHandler } final Collection objs = activeChar.getKnownList().getKnownCharacters(); - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) { if (!(obj.isAttackable() || obj.isPlayable())) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/FrontAura.java b/trunk/dist/game/data/scripts/handlers/targethandlers/FrontAura.java index 21352ca587..b952695e9b 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/FrontAura.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/FrontAura.java @@ -37,10 +37,10 @@ public class FrontAura implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); final Collection objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange()); - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) { if (obj.isAttackable() || obj.isPlayable()) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/Party.java b/trunk/dist/game/data/scripts/handlers/targethandlers/Party.java index ec3fb65ecd..0f770019c2 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/Party.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/Party.java @@ -36,7 +36,7 @@ public class Party implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if (onlyFirst) { return new L2Character[] @@ -48,7 +48,7 @@ public class Party implements ITargetTypeHandler targetList.add(activeChar); final int radius = skill.getAffectRange(); - L2PcInstance player = activeChar.getActingPlayer(); + final L2PcInstance player = activeChar.getActingPlayer(); if (activeChar.isSummon()) { if (Skill.addCharacter(activeChar, player, radius, false)) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/PartyClan.java b/trunk/dist/game/data/scripts/handlers/targethandlers/PartyClan.java index 9dfa3490cf..67513418ab 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/PartyClan.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/PartyClan.java @@ -38,7 +38,7 @@ public class PartyClan implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if (onlyFirst) { return new L2Character[] @@ -81,7 +81,7 @@ public class PartyClan implements ITargetTypeHandler // Get all visible objects in a spherical area near the L2Character final Collection objs = activeChar.getKnownList().getKnownPlayersInRadius(radius); - int maxTargets = skill.getAffectLimit(); + final int maxTargets = skill.getAffectLimit(); for (L2PcInstance obj : objs) { if (obj == null) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/PcBody.java b/trunk/dist/game/data/scripts/handlers/targethandlers/PcBody.java index 6dcaa06733..ae334f15f2 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/PcBody.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/PcBody.java @@ -40,7 +40,7 @@ public class PcBody implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); if ((target != null) && target.isDead()) { final L2PcInstance player; diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/TargetParty.java b/trunk/dist/game/data/scripts/handlers/targethandlers/TargetParty.java index a951a0e2ca..0da25b047b 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/TargetParty.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/TargetParty.java @@ -37,7 +37,7 @@ public class TargetParty implements ITargetTypeHandler @Override public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { - List targetList = new ArrayList<>(); + final List targetList = new ArrayList<>(); // Check for null target or any other invalid target if ((target == null) || target.isDead() || (target == activeChar)) diff --git a/trunk/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java b/trunk/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java index 3429ff1127..9585f58103 100644 --- a/trunk/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java +++ b/trunk/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java @@ -62,12 +62,12 @@ public class ChatsHandler implements ITelnetHandler { try { - String val = command.substring(4); - StringTokenizer st = new StringTokenizer(val); - String name = st.nextToken(); - String message = val.substring(name.length() + 1); - L2PcInstance reciever = L2World.getInstance().getPlayer(name); - CreatureSay cs = new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", message); + final String val = command.substring(4); + final StringTokenizer st = new StringTokenizer(val); + final String name = st.nextToken(); + final String message = val.substring(name.length() + 1); + final L2PcInstance reciever = L2World.getInstance().getPlayer(name); + final CreatureSay cs = new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", message); if (reciever != null) { reciever.sendPacket(cs); @@ -89,7 +89,7 @@ public class ChatsHandler implements ITelnetHandler try { command = command.substring(7); - CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast from " + _cSocket.getInetAddress().getHostAddress(), command); + final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast from " + _cSocket.getInetAddress().getHostAddress(), command); AdminData.getInstance().broadcastToGMs(cs); _print.println("Your Message Has Been Sent To " + getOnlineGMS() + " GM(s)."); } diff --git a/trunk/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java b/trunk/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java index aea1064e7d..0af44e77ee 100644 --- a/trunk/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java +++ b/trunk/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java @@ -70,13 +70,13 @@ public class DebugHandler implements ITelnetHandler { if (command.startsWith("debug") && (command.length() > 6)) { - StringTokenizer st = new StringTokenizer(command.substring(6)); + final StringTokenizer st = new StringTokenizer(command.substring(6)); // TODO: Rewrite to use ARM. FileOutputStream fos = null; OutputStreamWriter out = null; try { - String dbg = st.nextToken(); + final String dbg = st.nextToken(); if (dbg.equals("decay")) { @@ -89,8 +89,8 @@ public class DebugHandler implements ITelnetHandler _print.println("Usage: debug packetsend "); return false; } - String charName = st.nextToken(); - L2PcInstance targetPlayer = L2World.getInstance().getPlayer(charName); + final String charName = st.nextToken(); + final L2PcInstance targetPlayer = L2World.getInstance().getPlayer(charName); if (targetPlayer == null) { @@ -98,10 +98,10 @@ public class DebugHandler implements ITelnetHandler return false; } - AdminForgePacket sp = new AdminForgePacket(); + final AdminForgePacket sp = new AdminForgePacket(); while (st.hasMoreTokens()) { - String b = st.nextToken(); + final String b = st.nextToken(); if (!b.isEmpty()) { sp.addPart("C".getBytes()[0], "0x" + b); @@ -113,7 +113,7 @@ public class DebugHandler implements ITelnetHandler } else if (dbg.equals("PacketTP")) { - String str = ThreadPoolManager.getInstance().getPacketStats(); + final String str = ThreadPoolManager.getInstance().getPacketStats(); _print.println(str); int i = 0; File f = new File("./log/StackTrace-PacketTP-" + i + ".txt"); @@ -129,7 +129,7 @@ public class DebugHandler implements ITelnetHandler } else if (dbg.equals("IOPacketTP")) { - String str = ThreadPoolManager.getInstance().getIOPacketStats(); + final String str = ThreadPoolManager.getInstance().getIOPacketStats(); _print.println(str); int i = 0; File f = new File("./log/StackTrace-IOPacketTP-" + i + ".txt"); @@ -145,7 +145,7 @@ public class DebugHandler implements ITelnetHandler } else if (dbg.equals("GeneralTP")) { - String str = ThreadPoolManager.getInstance().getGeneralStats(); + final String str = ThreadPoolManager.getInstance().getGeneralStats(); _print.println(str); int i = 0; File f = new File("./log/StackTrace-GeneralTP-" + i + ".txt"); @@ -161,10 +161,10 @@ public class DebugHandler implements ITelnetHandler } else if (dbg.equals("full")) { - Calendar cal = Calendar.getInstance(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); + final Calendar cal = Calendar.getInstance(); + final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append(sdf.format(cal.getTime())); sb.append("\n\n"); uptime = _uptime; @@ -194,8 +194,8 @@ public class DebugHandler implements ITelnetHandler sb.append('\n'); sb.append("\n## Class Path Information ##\n"); - String cp = System.getProperty("java.class.path"); - String[] libs = cp.split(File.pathSeparator); + final String cp = System.getProperty("java.class.path"); + final String[] libs = cp.split(File.pathSeparator); for (String lib : libs) { sb.append(lib); @@ -204,15 +204,15 @@ public class DebugHandler implements ITelnetHandler sb.append('\n'); sb.append("## Threads Information ##\n"); - Map allThread = Thread.getAllStackTraces(); + final Map allThread = Thread.getAllStackTraces(); final List> entries = new ArrayList<>(allThread.entrySet()); Collections.sort(entries, (e1, e2) -> e1.getKey().getName().compareTo(e2.getKey().getName())); for (Entry entry : entries) { - StackTraceElement[] stes = entry.getValue(); - Thread t = entry.getKey(); + final StackTraceElement[] stes = entry.getValue(); + final Thread t = entry.getKey(); sb.append("--------------\n"); sb.append(t.toString() + " (" + t.getId() + ")\n"); sb.append("State: " + t.getState() + '\n'); @@ -227,11 +227,11 @@ public class DebugHandler implements ITelnetHandler } sb.append('\n'); - ThreadMXBean mbean = ManagementFactory.getThreadMXBean(); - long[] ids = findDeadlockedThreads(mbean); + final ThreadMXBean mbean = ManagementFactory.getThreadMXBean(); + final long[] ids = findDeadlockedThreads(mbean); if ((ids != null) && (ids.length > 0)) { - Thread[] threads = new Thread[ids.length]; + final Thread[] threads = new Thread[ids.length]; for (int i = 0; i < threads.length; i++) { threads[i] = findMatchingThread(mbean.getThreadInfo(ids[i])); @@ -333,7 +333,7 @@ public class DebugHandler implements ITelnetHandler public String getServerStatus() { int playerCount = 0, objectCount = 0; - int max = LoginServerThread.getInstance().getMaxPlayer(); + final int max = LoginServerThread.getInstance().getMaxPlayer(); playerCount = L2World.getInstance().getAllPlayersCount(); objectCount = L2World.getInstance().getVisibleObjectsCount(); @@ -409,7 +409,7 @@ public class DebugHandler implements ITelnetHandler charCount++; } } - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append("Server Status: "); sb.append("\r\n ---> Player Count: " + playerCount + "/" + max); sb.append("\r\n ---> Offline Count: " + detachedCount + "/" + playerCount); @@ -444,19 +444,19 @@ public class DebugHandler implements ITelnetHandler { int uptime = (int) System.currentTimeMillis() - time; uptime = uptime / 1000; - int h = uptime / 3600; - int m = (uptime - (h * 3600)) / 60; - int s = ((uptime - (h * 3600)) - (m * 60)); + final int h = uptime / 3600; + final int m = (uptime - (h * 3600)) / 60; + final int s = ((uptime - (h * 3600)) - (m * 60)); return h + "hrs " + m + "mins " + s + "secs"; } private String gameTime() { - int t = GameTimeController.getInstance().getGameTime(); - int h = t / 60; - int m = t % 60; - SimpleDateFormat format = new SimpleDateFormat("H:mm"); - Calendar cal = Calendar.getInstance(); + final int t = GameTimeController.getInstance().getGameTime(); + final int h = t / 60; + final int m = t % 60; + final SimpleDateFormat format = new SimpleDateFormat("H:mm"); + final Calendar cal = Calendar.getInstance(); cal.set(Calendar.HOUR_OF_DAY, h); cal.set(Calendar.MINUTE, m); return format.format(cal.getTime()); diff --git a/trunk/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java b/trunk/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java index 9ac2f46719..60c8c70771 100644 --- a/trunk/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java +++ b/trunk/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java @@ -67,7 +67,7 @@ public class PlayerHandler implements ITelnetHandler try { command = command.substring(5); - L2PcInstance player = L2World.getInstance().getPlayer(command); + final L2PcInstance player = L2World.getInstance().getPlayer(command); if (player != null) { player.sendMessage("You are kicked by gm"); @@ -82,21 +82,21 @@ public class PlayerHandler implements ITelnetHandler } else if (command.startsWith("give")) { - StringTokenizer st = new StringTokenizer(command.substring(5)); + final StringTokenizer st = new StringTokenizer(command.substring(5)); try { - L2PcInstance player = L2World.getInstance().getPlayer(st.nextToken()); - int itemId = Integer.parseInt(st.nextToken()); - int amount = Integer.parseInt(st.nextToken()); + final L2PcInstance player = L2World.getInstance().getPlayer(st.nextToken()); + final int itemId = Integer.parseInt(st.nextToken()); + final int amount = Integer.parseInt(st.nextToken()); if (player != null) { - L2ItemInstance item = player.getInventory().addItem("Status-Give", itemId, amount, null, null); - InventoryUpdate iu = new InventoryUpdate(); + final L2ItemInstance item = player.getInventory().addItem("Status-Give", itemId, amount, null, null); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(item); player.sendPacket(iu); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); sm.addItemName(itemId); sm.addLong(amount); player.sendPacket(sm); @@ -115,12 +115,12 @@ public class PlayerHandler implements ITelnetHandler } else if (command.startsWith("enchant")) { - StringTokenizer st = new StringTokenizer(command.substring(8), " "); + final StringTokenizer st = new StringTokenizer(command.substring(8), " "); int enchant = 0, itemType = 0; try { - L2PcInstance player = L2World.getInstance().getPlayer(st.nextToken()); + final L2PcInstance player = L2World.getInstance().getPlayer(st.nextToken()); itemType = Integer.parseInt(st.nextToken()); enchant = Integer.parseInt(st.nextToken()); @@ -206,16 +206,16 @@ public class PlayerHandler implements ITelnetHandler } else if (command.startsWith("jail")) { - StringTokenizer st = new StringTokenizer(command.substring(5)); + final StringTokenizer st = new StringTokenizer(command.substring(5)); try { - String name = st.nextToken(); - int charId = CharNameTable.getInstance().getIdByName(name); + final String name = st.nextToken(); + final int charId = CharNameTable.getInstance().getIdByName(name); int delay = 0; String reason = ""; if (st.hasMoreTokens()) { - String token = st.nextToken(); + final String token = st.nextToken(); if (Util.isDigit(token)) { delay = Integer.parseInt(token); @@ -232,7 +232,7 @@ public class PlayerHandler implements ITelnetHandler if (charId > 0) { - long expirationTime = delay > 0 ? System.currentTimeMillis() + (delay * 60 * 1000) : -1; + final long expirationTime = delay > 0 ? System.currentTimeMillis() + (delay * 60 * 1000) : -1; PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, expirationTime, reason, "Telnet Admin: " + _cSocket.getInetAddress().getHostAddress())); _print.println("Character " + name + " jailed for " + (delay > 0 ? delay + " minutes." : "ever!")); } @@ -255,11 +255,11 @@ public class PlayerHandler implements ITelnetHandler } else if (command.startsWith("unjail")) { - StringTokenizer st = new StringTokenizer(command.substring(7)); + final StringTokenizer st = new StringTokenizer(command.substring(7)); try { - String name = st.nextToken(); - int charId = CharNameTable.getInstance().getIdByName(name); + final String name = st.nextToken(); + final int charId = CharNameTable.getInstance().getIdByName(name); if (charId > 0) { @@ -318,7 +318,7 @@ public class PlayerHandler implements ITelnetHandler activeChar.getInventory().equipItem(itemInstance); // send packets - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(itemInstance); activeChar.sendPacket(iu); activeChar.broadcastPacket(new CharInfo(activeChar)); diff --git a/trunk/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java b/trunk/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java index c9ea3138ab..a07368ae0f 100644 --- a/trunk/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java +++ b/trunk/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java @@ -55,10 +55,10 @@ public class ReloadHandler implements ITelnetHandler { if (command.startsWith("reload")) { - StringTokenizer st = new StringTokenizer(command.substring(7)); + final StringTokenizer st = new StringTokenizer(command.substring(7)); try { - String type = st.nextToken(); + final String type = st.nextToken(); if (type.equals("multisell")) { @@ -118,9 +118,9 @@ public class ReloadHandler implements ITelnetHandler { try { - String questPath = st.hasMoreTokens() ? st.nextToken() : ""; + final String questPath = st.hasMoreTokens() ? st.nextToken() : ""; - File file = new File(L2ScriptEngineManager.SCRIPT_FOLDER, questPath); + final File file = new File(L2ScriptEngineManager.SCRIPT_FOLDER, questPath); if (file.isFile()) { try diff --git a/trunk/dist/game/data/scripts/handlers/telnethandlers/ServerHandler.java b/trunk/dist/game/data/scripts/handlers/telnethandlers/ServerHandler.java index fcd2386238..c7c95aa627 100644 --- a/trunk/dist/game/data/scripts/handlers/telnethandlers/ServerHandler.java +++ b/trunk/dist/game/data/scripts/handlers/telnethandlers/ServerHandler.java @@ -43,7 +43,7 @@ public class ServerHandler implements ITelnetHandler { try { - int val = Integer.parseInt(command.substring(9)); + final int val = Integer.parseInt(command.substring(9)); Shutdown.getInstance().startTelnetShutdown(_cSocket.getInetAddress().getHostAddress(), val, false); _print.println("Server Will Shutdown In " + val + " Seconds!"); _print.println("Type \"abort\" To Abort Shutdown!"); @@ -61,7 +61,7 @@ public class ServerHandler implements ITelnetHandler { try { - int val = Integer.parseInt(command.substring(8)); + final int val = Integer.parseInt(command.substring(8)); Shutdown.getInstance().startTelnetShutdown(_cSocket.getInetAddress().getHostAddress(), val, true); _print.println("Server Will Restart In " + val + " Seconds!"); _print.println("Type \"abort\" To Abort Restart!"); diff --git a/trunk/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java b/trunk/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java index 1241c0e0a2..6b9d280d05 100644 --- a/trunk/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java +++ b/trunk/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java @@ -66,27 +66,27 @@ public class StatusHandler implements ITelnetHandler else if (command.equals("forcegc")) { System.gc(); - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append("RAM Used: " + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1048576)); // 1024 * 1024 = 1048576 _print.println(sb.toString()); } else if (command.startsWith("memusage")) { - double max = Runtime.getRuntime().maxMemory() / 1024; // maxMemory is the upper + final double max = Runtime.getRuntime().maxMemory() / 1024; // maxMemory is the upper // limit the jvm can use - double allocated = Runtime.getRuntime().totalMemory() / 1024; // totalMemory the + final double allocated = Runtime.getRuntime().totalMemory() / 1024; // totalMemory the // size of the // current // allocation pool - double nonAllocated = max - allocated; // non allocated memory till jvm limit - double cached = Runtime.getRuntime().freeMemory() / 1024; // freeMemory the + final double nonAllocated = max - allocated; // non allocated memory till jvm limit + final double cached = Runtime.getRuntime().freeMemory() / 1024; // freeMemory the // unused memory in // the allocation pool - double used = allocated - cached; // really used memory - double useable = max - used; // allocated, but non-used and non-allocated memory + final double used = allocated - cached; // really used memory + final double useable = max - used; // allocated, but non-used and non-allocated memory - DecimalFormat df = new DecimalFormat(" (0.0000'%')"); - DecimalFormat df2 = new DecimalFormat(" # 'KB'"); + final DecimalFormat df = new DecimalFormat(" (0.0000'%')"); + final DecimalFormat df2 = new DecimalFormat(" # 'KB'"); _print.println("+----");// ... _print.println("| Allowed Memory:" + df2.format(max)); @@ -120,7 +120,7 @@ public class StatusHandler implements ITelnetHandler public String getServerStatus() { int playerCount = 0, objectCount = 0; - int max = LoginServerThread.getInstance().getMaxPlayer(); + final int max = LoginServerThread.getInstance().getMaxPlayer(); playerCount = L2World.getInstance().getAllPlayersCount(); objectCount = L2World.getInstance().getVisibleObjectsCount(); @@ -196,7 +196,7 @@ public class StatusHandler implements ITelnetHandler charCount++; } } - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append("Server Status: "); sb.append("\r\n ---> Player Count: " + playerCount + "/" + max); sb.append("\r\n ---> Offline Count: " + detachedCount + "/" + playerCount); @@ -231,19 +231,19 @@ public class StatusHandler implements ITelnetHandler { int uptime = (int) System.currentTimeMillis() - time; uptime = uptime / 1000; - int h = uptime / 3600; - int m = (uptime - (h * 3600)) / 60; - int s = ((uptime - (h * 3600)) - (m * 60)); + final int h = uptime / 3600; + final int m = (uptime - (h * 3600)) / 60; + final int s = ((uptime - (h * 3600)) - (m * 60)); return h + "hrs " + m + "mins " + s + "secs"; } private String gameTime() { - int t = GameTimeController.getInstance().getGameTime(); - int h = t / 60; - int m = t % 60; - SimpleDateFormat format = new SimpleDateFormat("H:mm"); - Calendar cal = Calendar.getInstance(); + final int t = GameTimeController.getInstance().getGameTime(); + final int h = t / 60; + final int m = t % 60; + final SimpleDateFormat format = new SimpleDateFormat("H:mm"); + final Calendar cal = Calendar.getInstance(); cal.set(Calendar.HOUR_OF_DAY, h); cal.set(Calendar.MINUTE, m); return format.format(cal.getTime()); diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java index 9e1c079338..2d98adb575 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java @@ -47,9 +47,9 @@ public class ChannelDelete implements IUserCommandHandler { if (activeChar.getParty().isLeader(activeChar) && activeChar.getParty().isInCommandChannel() && activeChar.getParty().getCommandChannel().getLeader().equals(activeChar)) { - L2CommandChannel channel = activeChar.getParty().getCommandChannel(); + final L2CommandChannel channel = activeChar.getParty().getCommandChannel(); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED); channel.broadcastPacket(sm); channel.disbandChannel(); diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index c93d357dcc..0b0c67abf0 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -45,7 +45,7 @@ public class ClanPenalty implements IUserCommandHandler } boolean penalty = false; - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); final StringBuilder htmlContent = StringUtil.startAppend(500, "
PenaltyExpiration Date
"); if (activeChar.getClanJoinExpiryTime() > System.currentTimeMillis()) diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java index 8da9c1f146..d4cf921028 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java @@ -95,8 +95,8 @@ public class ClanWarsList implements IUserCommandHandler { while (rs.next()) { - String clanName = rs.getString("clan_name"); - int allyId = rs.getInt("ally_id"); + final String clanName = rs.getString("clan_name"); + final int allyId = rs.getInt("ally_id"); if (allyId > 0) { // Target With Ally diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java index 23a5e6abe4..0c84b373ed 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java @@ -41,7 +41,7 @@ public class Loc implements IUserCommandHandler public boolean useUserCommand(int id, L2PcInstance activeChar) { int region; - L2RespawnZone zone = ZoneManager.getInstance().getZone(activeChar, L2RespawnZone.class); + final L2RespawnZone zone = ZoneManager.getInstance().getZone(activeChar, L2RespawnZone.class); if (zone != null) { region = MapRegionManager.getInstance().getRestartRegion(activeChar, zone.getAllRespawnPoints().get(Race.HUMAN)).getLocId(); diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/MyBirthday.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/MyBirthday.java index b394e181cd..90c284bc15 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/MyBirthday.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/MyBirthday.java @@ -44,9 +44,9 @@ public class MyBirthday implements IUserCommandHandler return false; } - Calendar date = activeChar.getCreateDate(); + final Calendar date = activeChar.getCreateDate(); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_BIRTHDAY_IS_S3_S4_S2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_BIRTHDAY_IS_S3_S4_S2); sm.addPcName(activeChar); sm.addString(Integer.toString(date.get(Calendar.YEAR))); sm.addString(Integer.toString(date.get(Calendar.MONTH) + 1)); diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 786eb76392..5e29d4ee30 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -48,8 +48,8 @@ public class Time implements IUserCommandHandler return false; } - int t = GameTimeController.getInstance().getGameTime(); - String h = "" + ((t / 60) % 24); + final int t = GameTimeController.getInstance().getGameTime(); + final String h = "" + ((t / 60) % 24); String m; if ((t % 60) < 10) { diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index e715f1c19b..e76de1ad8c 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -59,7 +59,7 @@ public class Unstuck implements IUserCommandHandler return false; } - int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) { @@ -74,8 +74,8 @@ public class Unstuck implements IUserCommandHandler activeChar.forceIsCasting(GameTimeController.getInstance().getGameTicks() + (unstuckTimer / GameTimeController.MILLIS_IN_TICK)); - Skill escape = SkillData.getInstance().getSkill(2099, 1); // 5 minutes escape - Skill GM_escape = SkillData.getInstance().getSkill(2100, 1); // 1 second escape + final Skill escape = SkillData.getInstance().getSkill(2099, 1); // 5 minutes escape + final Skill GM_escape = SkillData.getInstance().getSkill(2100, 1); // 1 second escape if (activeChar.getAccessLevel().isGm()) { if (GM_escape != null) @@ -106,9 +106,9 @@ public class Unstuck implements IUserCommandHandler activeChar.setTarget(activeChar); activeChar.disableAllSkills(); - MagicSkillUse msk = new MagicSkillUse(activeChar, 1050, 1, unstuckTimer, 0); + final MagicSkillUse msk = new MagicSkillUse(activeChar, 1050, 1, unstuckTimer, 0); Broadcast.toSelfAndKnownPlayersInRadius(activeChar, msk, 900); - SetupGauge sg = new SetupGauge(0, unstuckTimer); + final SetupGauge sg = new SetupGauge(0, unstuckTimer); activeChar.sendPacket(sg); // End SoE Animation section diff --git a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index c2aaae7a5f..f4bbebfcd1 100644 --- a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -54,24 +54,24 @@ public class ChatAdmin implements IVoicedCommandHandler activeChar.sendMessage("Usage: .banchat name [minutes]"); return true; } - StringTokenizer st = new StringTokenizer(params); + final StringTokenizer st = new StringTokenizer(params); if (st.hasMoreTokens()) { - String name = st.nextToken(); + final String name = st.nextToken(); long expirationTime = 0; if (st.hasMoreTokens()) { - String token = st.nextToken(); + final String token = st.nextToken(); if (Util.isDigit(token)) { expirationTime = System.currentTimeMillis() + (Integer.parseInt(st.nextToken()) * 60 * 1000); } } - int objId = CharNameTable.getInstance().getIdByName(name); + final int objId = CharNameTable.getInstance().getIdByName(name); if (objId > 0) { - L2PcInstance player = L2World.getInstance().getPlayer(objId); + final L2PcInstance player = L2World.getInstance().getPlayer(objId); if ((player == null) || !player.isOnline()) { activeChar.sendMessage("Player not online !"); @@ -124,15 +124,15 @@ public class ChatAdmin implements IVoicedCommandHandler activeChar.sendMessage("Usage: .unbanchat name"); return true; } - StringTokenizer st = new StringTokenizer(params); + final StringTokenizer st = new StringTokenizer(params); if (st.hasMoreTokens()) { - String name = st.nextToken(); + final String name = st.nextToken(); - int objId = CharNameTable.getInstance().getIdByName(name); + final int objId = CharNameTable.getInstance().getIdByName(name); if (objId > 0) { - L2PcInstance player = L2World.getInstance().getPlayer(objId); + final L2PcInstance player = L2World.getInstance().getPlayer(objId); if ((player == null) || !player.isOnline()) { activeChar.sendMessage("Player not online !"); diff --git a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 84034b9a3e..fd05c34f66 100644 --- a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -38,12 +38,12 @@ public class Premium implements IVoicedCommandHandler { if (command.startsWith("premium") && Config.PREMIUM_SYSTEM_ENABLED) { - SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm"); - long endDate = PremiumManager.getInstance().getPremiumEndDate(activeChar.getAccountName()); + final SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm"); + final long endDate = PremiumManager.getInstance().getPremiumEndDate(activeChar.getAccountName()); if (endDate == 0) { - NpcHtmlMessage msg = new NpcHtmlMessage(5); - StringBuilder html = new StringBuilder("Account Details
"); + final NpcHtmlMessage msg = new NpcHtmlMessage(5); + final StringBuilder html = new StringBuilder("Account Details
"); html.append("
"); html.append(""); html.append(""); @@ -65,8 +65,8 @@ public class Premium implements IVoicedCommandHandler } else { - NpcHtmlMessage msg = new NpcHtmlMessage(5); - StringBuilder html = new StringBuilder("Premium Account Details
"); + final NpcHtmlMessage msg = new NpcHtmlMessage(5); + final StringBuilder html = new StringBuilder("Premium Account Details
"); html.append("
Account Status: Normal
Rate XP: x" + Config.RATE_XP + "
"); html.append(""); html.append(""); diff --git a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java index 810c52c931..f0bf4bd6fa 100644 --- a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java +++ b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java @@ -92,8 +92,8 @@ public class Wedding implements IVoicedCommandHandler return false; } - int _partnerId = activeChar.getPartnerId(); - int _coupleId = activeChar.getCoupleId(); + final int _partnerId = activeChar.getPartnerId(); + final int _coupleId = activeChar.getCoupleId(); long AdenaAmount = 0; if (activeChar.isMarried()) diff --git a/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index 35d53ad681..40dc480229 100644 --- a/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -425,18 +425,18 @@ public abstract class Chamber extends AbstractInstance return; } final Instance inst = InstanceManager.getInstance().getInstance(player.getInstanceId()); - Location ret = inst.getExitLoc(); + final Location ret = inst.getExitLoc(); final String return_point = player.getVariables().getString(RETURN, null); if (return_point != null) { - String[] coords = return_point.split(";"); + final String[] coords = return_point.split(";"); if (coords.length == 3) { try { - int x = Integer.parseInt(coords[0]); - int y = Integer.parseInt(coords[1]); - int z = Integer.parseInt(coords[2]); + final int x = Integer.parseInt(coords[0]); + final int y = Integer.parseInt(coords[1]); + final int z = Integer.parseInt(coords[2]); ret.setLocation(new Location(x, y, z)); } catch (Exception e) @@ -622,7 +622,7 @@ public abstract class Chamber extends AbstractInstance @Override public String onTalk(L2Npc npc, L2PcInstance player) { - int npcId = npc.getId(); + final int npcId = npc.getId(); QuestState st = getQuestState(player, false); if (st == null) diff --git a/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 3aea48392f..72ca0b5dff 100644 --- a/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -538,30 +538,30 @@ public final class CrystalCaverns extends AbstractInstance { if (partyMember.getLevel() < 78) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; } - L2ItemInstance item = partyMember.getInventory().getItemByItemId(CONT_CRYSTAL); + final L2ItemInstance item = partyMember.getInventory().getItemByItemId(CONT_CRYSTAL); if (item == null) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; } if (!Util.checkIfInRange(1000, player, partyMember, true)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; } - Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID); + final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID); if (System.currentTimeMillis() < reentertime) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; @@ -576,7 +576,7 @@ public final class CrystalCaverns extends AbstractInstance { return true; } - L2Party party = player.getParty(); + final L2Party party = player.getParty(); if (party == null) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); @@ -589,17 +589,17 @@ public final class CrystalCaverns extends AbstractInstance } for (L2PcInstance partyMember : party.getMembers()) { - L2ItemInstance item = partyMember.getInventory().getItemByItemId(RED_CORAL); + final L2ItemInstance item = partyMember.getInventory().getItemByItemId(RED_CORAL); if (item == null) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; } if (!Util.checkIfInRange(1000, player, partyMember, true)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; @@ -610,7 +610,7 @@ public final class CrystalCaverns extends AbstractInstance private boolean checkBaylorConditions(L2PcInstance player) { - L2Party party = player.getParty(); + final L2Party party = player.getParty(); if (party == null) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); @@ -623,19 +623,19 @@ public final class CrystalCaverns extends AbstractInstance } for (L2PcInstance partyMember : party.getMembers()) { - L2ItemInstance item1 = partyMember.getInventory().getItemByItemId(BOSS_CRYSTAL_1); - L2ItemInstance item2 = partyMember.getInventory().getItemByItemId(BOSS_CRYSTAL_2); - L2ItemInstance item3 = partyMember.getInventory().getItemByItemId(BOSS_CRYSTAL_3); + final L2ItemInstance item1 = partyMember.getInventory().getItemByItemId(BOSS_CRYSTAL_1); + final L2ItemInstance item2 = partyMember.getInventory().getItemByItemId(BOSS_CRYSTAL_2); + final L2ItemInstance item3 = partyMember.getInventory().getItemByItemId(BOSS_CRYSTAL_3); if ((item1 == null) || (item2 == null) || (item3 == null)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; } if (!Util.checkIfInRange(1000, player, partyMember, true)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); sm.addPcName(partyMember); party.broadcastPacket(sm); return false; @@ -653,10 +653,10 @@ public final class CrystalCaverns extends AbstractInstance final int curZ = effected.getZ(); // Calculate distance between effector and effected current position - double dx = effector.getX() - curX; - double dy = effector.getY() - curY; - double dz = effector.getZ() - curZ; - double distance = Math.sqrt((dx * dx) + (dy * dy)); + final double dx = effector.getX() - curX; + final double dy = effector.getY() - curY; + final double dz = effector.getZ() - curZ; + final double distance = Math.sqrt((dx * dx) + (dy * dy)); int offset = Math.min((int) distance + 300, 1400); double cos; @@ -679,11 +679,11 @@ public final class CrystalCaverns extends AbstractInstance cos = dx / distance; // Calculate the new destination with offset included - int _x = effector.getX() - (int) (offset * cos); - int _y = effector.getY() - (int) (offset * sin); - int _z = effected.getZ(); + final int _x = effector.getX() - (int) (offset * cos); + final int _y = effector.getY() - (int) (offset * sin); + final int _z = effected.getZ(); - Location destination = GeoData.getInstance().moveCheck(effected.getX(), effected.getY(), effected.getZ(), _x, _y, _z, effected.getInstanceId()); + final Location destination = GeoData.getInstance().moveCheck(effected.getX(), effected.getY(), effected.getZ(), _x, _y, _z, effected.getInstanceId()); effected.broadcastPacket(new FlyToLocation(effected, destination, FlyType.THROW_UP)); @@ -729,7 +729,7 @@ public final class CrystalCaverns extends AbstractInstance player.breakAttack(); player.breakCast(); player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - L2Summon pet = player.getPet(); + final L2Summon pet = player.getPet(); if (pet != null) { pet.setTarget(null); @@ -778,7 +778,7 @@ public final class CrystalCaverns extends AbstractInstance for (int[] spawn : HALL_SPAWNS) { - L2Npc mob = addSpawn(CGMOBS[getRandom(CGMOBS.length)], spawn[0], spawn[1], spawn[2], spawn[3], false, 0, false, world.getInstanceId()); + final L2Npc mob = addSpawn(CGMOBS[getRandom(CGMOBS.length)], spawn[0], spawn[1], spawn[2], spawn[3], false, 0, false, world.getInstanceId()); world.npcList1.put(mob, false); } } @@ -800,10 +800,10 @@ public final class CrystalCaverns extends AbstractInstance { world.setStatus(3); - Map spawnList = new HashMap<>(); + final Map spawnList = new HashMap<>(); for (int[] spawn : EMERALD_SPAWNS) { - L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId()); + final L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId()); spawnList.put(mob, false); } world.npcList2.put(0, spawnList); @@ -811,10 +811,10 @@ public final class CrystalCaverns extends AbstractInstance protected void runEmeraldRooms(CCWorld world, int[][] spawnList, int room) { - Map spawned = new HashMap<>(); + final Map spawned = new HashMap<>(); for (int[] spawn : spawnList) { - L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId()); + final L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId()); spawned.put(mob, false); } if (room == 1) @@ -839,10 +839,10 @@ public final class CrystalCaverns extends AbstractInstance { world.setStatus(status); - Map spawned = new HashMap<>(); + final Map spawned = new HashMap<>(); for (int[] spawn : spawnList) { - L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId()); + final L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId()); spawned.put(mob, false); } world.npcList2.put(0, spawned); @@ -885,10 +885,10 @@ public final class CrystalCaverns extends AbstractInstance { if (npc.getId() == ORACLE_GUIDE_1) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if ((world.getStatus() == 0) && world.oracle.contains(npc)) { return "32281.htm";// TODO: Missing HTML. @@ -899,10 +899,10 @@ public final class CrystalCaverns extends AbstractInstance } else if ((npc.getId() >= 32275) && (npc.getId() <= 32277)) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if (!world.OracleTriggered[npc.getId() - 32275]) { return "no.htm"; // TODO: Missing HTML. @@ -913,7 +913,7 @@ public final class CrystalCaverns extends AbstractInstance } else if (npc.getId() == 32274) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { return "no.htm"; // TODO: Missing HTML. @@ -969,7 +969,7 @@ public final class CrystalCaverns extends AbstractInstance if ((npc.getId() >= 32275) && (npc.getId() <= 32277) && (skill.getId() != 2360) && (skill.getId() != 2369)) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if ((tmpworld instanceof CCWorld) && (getRandom(100) < 15)) { for (L2Npc oracle : ((CCWorld) tmpworld).oracles.keySet()) @@ -988,10 +988,10 @@ public final class CrystalCaverns extends AbstractInstance { return super.onSkillSee(npc, caster, skill, targets, isSummon); } - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if (((world._dragonClawStart + DRAGONCLAWTIME) <= System.currentTimeMillis()) || (world._dragonClawNeed <= 0)) { @@ -1015,10 +1015,10 @@ public final class CrystalCaverns extends AbstractInstance } else if (npc.isInvul() && (npc.getId() == TEARS) && (skill.getId() == 2369) && (caster != null)) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if (caster.getParty() == null) { return super.onSkillSee(npc, caster, skill, targets, isSummon); @@ -1046,10 +1046,10 @@ public final class CrystalCaverns extends AbstractInstance { if (npc.getId() == TEARS) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if ((world.getStatus() != 4) && (attacker != null)) { // Lucky cheater, the code only kicks his/her ass out of the dungeon @@ -1078,13 +1078,13 @@ public final class CrystalCaverns extends AbstractInstance return ""; } - int maxHp = npc.getMaxHp(); - double nowHp = npc.getStatus().getCurrentHp(); - int rand = getRandom(1000); + final int maxHp = npc.getMaxHp(); + final double nowHp = npc.getStatus().getCurrentHp(); + final int rand = getRandom(1000); if ((nowHp < (maxHp * 0.4)) && (rand < 5)) { - L2Party party = attacker.getParty(); + final L2Party party = attacker.getParty(); if (party != null) { for (L2PcInstance partyMember : party.getMembers()) @@ -1096,10 +1096,10 @@ public final class CrystalCaverns extends AbstractInstance { stopAttack(attacker); } - L2Character target = npc.getAI().getAttackTarget(); + final L2Character target = npc.getAI().getAttackTarget(); for (int i = 0; i < 10; i++) { - L2Npc copy = addSpawn(TEARS_COPY, npc.getX(), npc.getY(), npc.getZ(), 0, false, 0, false, attacker.getInstanceId()); + final L2Npc copy = addSpawn(TEARS_COPY, npc.getX(), npc.getY(), npc.getZ(), 0, false, 0, false, attacker.getInstanceId()); copy.setRunning(); ((L2Attackable) copy).addDamageHate(target, 0, 99999); copy.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); @@ -1125,7 +1125,7 @@ public final class CrystalCaverns extends AbstractInstance { if ((npc.getId() == BAYLOR) && (skill.getId() == 5225)) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { ((CCWorld) tmpworld)._raidStatus++; @@ -1137,10 +1137,10 @@ public final class CrystalCaverns extends AbstractInstance @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if (event.equalsIgnoreCase("TeleportOut")) { teleportPlayer(player, new Location(149413, 173078, -5014), 0); @@ -1253,10 +1253,10 @@ public final class CrystalCaverns extends AbstractInstance { for (int i = 0; i < 10; i++) { - int radius = 300; - int x = (int) (radius * Math.cos(i * 0.618)); - int y = (int) (radius * Math.sin(i * 0.618)); - L2Npc mob = addSpawn(29104, 153571 + x, 142075 + y, -12737, 0, false, 0, false, world.getInstanceId()); + final int radius = 300; + final int x = (int) (radius * Math.cos(i * 0.618)); + final int y = (int) (radius * Math.sin(i * 0.618)); + final L2Npc mob = addSpawn(29104, 153571 + x, 142075 + y, -12737, 0, false, 0, false, world.getInstanceId()); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); world._animationMobs.add(mob); } @@ -1307,7 +1307,7 @@ public final class CrystalCaverns extends AbstractInstance { if (world._alarm == null) { - int[] spawnLoc = ALARMSPAWN[getRandom(ALARMSPAWN.length)]; + final int[] spawnLoc = ALARMSPAWN[getRandom(ALARMSPAWN.length)]; npc.addSkill(SkillData.getInstance().getSkill(5244, 1)); npc.addSkill(SkillData.getInstance().getSkill(5245, 1)); world._alarm = addSpawn(ALARMID, spawnLoc[0], spawnLoc[1], spawnLoc[2], 10800, false, 0, false, world.getInstanceId()); @@ -1324,9 +1324,9 @@ public final class CrystalCaverns extends AbstractInstance } else { - int maxHp = npc.getMaxHp(); - double nowHp = npc.getStatus().getCurrentHp(); - int rand = getRandom(100); + final int maxHp = npc.getMaxHp(); + final double nowHp = npc.getStatus().getCurrentHp(); + final int rand = getRandom(100); if ((nowHp < (maxHp * 0.2)) && (world._raidStatus < 3) && !npc.isAffectedBySkill(5224) && !npc.isAffectedBySkill(5225)) { @@ -1380,15 +1380,15 @@ public final class CrystalCaverns extends AbstractInstance return ""; } - CrystalGolem cryGolem = world.crystalGolems.get(npc); + final CrystalGolem cryGolem = world.crystalGolems.get(npc); int minDist = 300000; for (L2Object object : L2World.getInstance().getVisibleObjects(npc, 300)) { if (object.isItem() && (object.getId() == CRYSTALFOOD)) { - int dx = npc.getX() - object.getX(); - int dy = npc.getY() - object.getY(); - int d = (dx * dx) + (dy * dy); + final int dx = npc.getX() - object.getX(); + final int dy = npc.getY() - object.getY(); + final int d = (dx * dx) + (dy * dy); if (d < minDist) { minDist = d; @@ -1427,7 +1427,7 @@ public final class CrystalCaverns extends AbstractInstance } else if (event.equalsIgnoreCase("reachFood")) { - CrystalGolem cryGolem = world.crystalGolems.get(npc); + final CrystalGolem cryGolem = world.crystalGolems.get(npc); int dx; int dy; if ((cryGolem.foodItem == null) || !cryGolem.foodItem.isVisible()) @@ -1445,10 +1445,10 @@ public final class CrystalCaverns extends AbstractInstance cryGolem.foodItem = null; dx = npc.getX() - 142999; dy = npc.getY() - 151671; - int d1 = (dx * dx) + (dy * dy); + final int d1 = (dx * dx) + (dy * dy); dx = npc.getX() - 139494; dy = npc.getY() - 151668; - int d2 = (dx * dx) + (dy * dy); + final int d2 = (dx * dx) + (dy * dy); if ((d1 < 10000) || (d2 < 10000)) { npc.broadcastPacket(new MagicSkillUse(npc, npc, 5441, 1, 1, 0)); @@ -1470,8 +1470,8 @@ public final class CrystalCaverns extends AbstractInstance } else if (event.equalsIgnoreCase("getFood")) { - CrystalGolem cryGolem = world.crystalGolems.get(npc); - Location newLoc = new Location(cryGolem.foodItem.getX(), cryGolem.foodItem.getY(), cryGolem.foodItem.getZ(), 0); + final CrystalGolem cryGolem = world.crystalGolems.get(npc); + final Location newLoc = new Location(cryGolem.foodItem.getX(), cryGolem.foodItem.getY(), cryGolem.foodItem.getZ(), 0); cryGolem.oldLoc = new Location(npc.getX(), npc.getY(), npc.getZ(), npc.getHeading()); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, newLoc); startQuestTimer("reachFood", 2000, npc, null, true); @@ -1485,7 +1485,7 @@ public final class CrystalCaverns extends AbstractInstance { final int num = Math.max((int) Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER, 1); - L2Party party = player.getParty(); + final L2Party party = player.getParty(); if (party != null) { for (L2PcInstance partyMember : party.getMembers()) @@ -1530,10 +1530,10 @@ public final class CrystalCaverns extends AbstractInstance @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if ((world.getStatus() == 2) && world.npcList1.containsKey(npc)) { world.npcList1.put(npc, true); @@ -1546,8 +1546,8 @@ public final class CrystalCaverns extends AbstractInstance } world.setStatus(3); world.tears = addSpawn(TEARS, 144298, 154420, -11854, 32767, false, 0, false, world.getInstanceId()); // Tears - CrystalGolem crygolem1 = new CrystalGolem(); - CrystalGolem crygolem2 = new CrystalGolem(); + final CrystalGolem crygolem1 = new CrystalGolem(); + final CrystalGolem crygolem2 = new CrystalGolem(); world.crystalGolems.put(addSpawn(CRYSTAL_GOLEM, 140547, 151670, -11813, 32767, false, 0, false, world.getInstanceId()), crygolem1); world.crystalGolems.put(addSpawn(CRYSTAL_GOLEM, 141941, 151684, -11813, 63371, false, 0, false, world.getInstanceId()), crygolem2); for (L2Npc crygolem : world.crystalGolems.keySet()) @@ -1572,7 +1572,7 @@ public final class CrystalCaverns extends AbstractInstance { npc.dropItem(player, 9699, 1); runSteamRooms(world, STEAM1_SPAWNS, 22); - L2Party party = player.getParty(); + final L2Party party = player.getParty(); if (party != null) { for (L2PcInstance partyMember : party.getMembers()) @@ -1692,7 +1692,7 @@ public final class CrystalCaverns extends AbstractInstance break; case 25: world.setStatus(26); - L2Party party = player.getParty(); + final L2Party party = player.getParty(); if (party != null) { for (L2PcInstance partyMember : party.getMembers()) @@ -1704,7 +1704,7 @@ public final class CrystalCaverns extends AbstractInstance cancelQuestTimers("Timer51"); openDoor(DOOR3, npc.getInstanceId()); openDoor(DOOR4, npc.getInstanceId()); - L2Npc kechi = addSpawn(KECHI, 154069, 149525, -12158, 51165, false, 0, false, world.getInstanceId()); + final L2Npc kechi = addSpawn(KECHI, 154069, 149525, -12158, 51165, false, 0, false, world.getInstanceId()); startQuestTimer("checkKechiAttack", 1000, kechi, null); return ""; default: @@ -1751,7 +1751,7 @@ public final class CrystalCaverns extends AbstractInstance world.setStatus(31); world._baylor = null; npc.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ())); - Instance baylorInstance = InstanceManager.getInstance().getInstance(npc.getInstanceId()); + final Instance baylorInstance = InstanceManager.getInstance().getInstance(npc.getInstanceId()); baylorInstance.setDuration(300000); this.startQuestTimer("spawn_oracle", 1000, npc, null); giveRewards(player, npc.getInstanceId(), -1, true); @@ -1763,7 +1763,7 @@ public final class CrystalCaverns extends AbstractInstance @Override public String onTalk(L2Npc npc, L2PcInstance player) { - int npcId = npc.getId(); + final int npcId = npc.getId(); QuestState st = getQuestState(player, false); if (st == null) { @@ -1775,10 +1775,10 @@ public final class CrystalCaverns extends AbstractInstance return ""; } - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if (npcId == CRYSTAL_GOLEM) { } @@ -1786,7 +1786,7 @@ public final class CrystalCaverns extends AbstractInstance { boolean doTeleport = false; Location loc = null; - L2Party party = player.getParty(); + final L2Party party = player.getParty(); doTeleport = true; switch (npc.getId()) { @@ -1903,7 +1903,7 @@ public final class CrystalCaverns extends AbstractInstance if ((world.getStatus() < 30) && checkBaylorConditions(player)) { world._raiders.clear(); - L2Party party = player.getParty(); + final L2Party party = player.getParty(); if (party == null) { world._raiders.add(player); @@ -1923,19 +1923,19 @@ public final class CrystalCaverns extends AbstractInstance return ""; } world.setStatus(30); - long time = world.endTime - System.currentTimeMillis(); - Instance baylorInstance = InstanceManager.getInstance().getInstance(world.getInstanceId()); + final long time = world.endTime - System.currentTimeMillis(); + final Instance baylorInstance = InstanceManager.getInstance().getInstance(world.getInstanceId()); baylorInstance.setDuration((int) time); - int radius = 150; + final int radius = 150; int i = 0; - int members = world._raiders.size(); + final int members = world._raiders.size(); for (L2PcInstance p : world._raiders) { - int x = (int) (radius * Math.cos((i * 2 * Math.PI) / members)); - int y = (int) (radius * Math.sin((i++ * 2 * Math.PI) / members)); + final int x = (int) (radius * Math.cos((i * 2 * Math.PI) / members)); + final int y = (int) (radius * Math.sin((i++ * 2 * Math.PI) / members)); p.teleToLocation(new Location(153571 + x, 142075 + y, -12737)); - L2Summon pet = p.getPet(); + final L2Summon pet = p.getPet(); if (pet != null) { pet.teleToLocation(new Location(153571 + x, 142075 + y, -12737), true); @@ -1962,10 +1962,10 @@ public final class CrystalCaverns extends AbstractInstance @Override public String onTrapAction(L2TrapInstance trap, L2Character trigger, TrapAction action) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(trap.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(trap.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; switch (action) { case TRAP_DISARMED: @@ -1985,10 +1985,10 @@ public final class CrystalCaverns extends AbstractInstance { if (character instanceof L2PcInstance) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(character.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(character.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if (world.getStatus() == 8) { int room; @@ -2044,10 +2044,10 @@ public final class CrystalCaverns extends AbstractInstance { if (character instanceof L2PcInstance) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(character.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(character.getInstanceId()); if (tmpworld instanceof CCWorld) { - CCWorld world = (CCWorld) tmpworld; + final CCWorld world = (CCWorld) tmpworld; if (world.getStatus() == 8) { int doorId; diff --git a/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index a32914c325..44954e5a7b 100644 --- a/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -260,14 +260,14 @@ public final class DarkCloudMansion extends AbstractInstance { if (partyMember.getLevel() < 78) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(partyMember); player.sendPacket(sm); return false; } if (!partyMember.isInsideRadius(player, 1000, true, true)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); sm.addPcName(partyMember); player.sendPacket(sm); return false; @@ -303,7 +303,7 @@ public final class DarkCloudMansion extends AbstractInstance protected void runStartRoom(DMCWorld world) { world.setStatus(0); - DMCRoom StartRoom = new DMCRoom(); + final DMCRoom StartRoom = new DMCRoom(); DMCNpc thisnpc; thisnpc = new DMCNpc(); @@ -326,7 +326,7 @@ public final class DarkCloudMansion extends AbstractInstance protected void spawnHall(DMCWorld world) { - DMCRoom Hall = new DMCRoom(); + final DMCRoom Hall = new DMCRoom(); DMCNpc thisnpc; world.rooms.remove("Hall"); // remove room instance to avoid adding mob every time @@ -406,7 +406,7 @@ public final class DarkCloudMansion extends AbstractInstance protected void runFirstRoom(DMCWorld world) { - DMCRoom FirstRoom = new DMCRoom(); + final DMCRoom FirstRoom = new DMCRoom(); DMCNpc thisnpc; thisnpc = new DMCNpc(); @@ -455,7 +455,7 @@ public final class DarkCloudMansion extends AbstractInstance protected void runSecondRoom(DMCWorld world) { - DMCRoom SecondRoom = new DMCRoom(); + final DMCRoom SecondRoom = new DMCRoom(); DMCNpc thisnpc; // TODO: find a better way to initialize to [1,0,0,0,0,0,0] @@ -466,7 +466,7 @@ public final class DarkCloudMansion extends AbstractInstance SecondRoom.Order[i] = 0; } - int i = getRandom(MonolithOrder.length); + final int i = getRandom(MonolithOrder.length); thisnpc = new DMCNpc(); thisnpc.npc = addSpawn(BSM, 147800, 181150, -6117, 0, false, 0, false, world.getInstanceId()); @@ -512,8 +512,8 @@ public final class DarkCloudMansion extends AbstractInstance protected void runThirdRoom(DMCWorld world) { - DMCRoom ThirdRoom = new DMCRoom(); - DMCNpc thisnpc = new DMCNpc(); + final DMCRoom ThirdRoom = new DMCRoom(); + final DMCNpc thisnpc = new DMCNpc(); thisnpc.isDead = false; thisnpc.npc = addSpawn(BM[1], 148765, 180450, -6117, 0, false, 0, false, world.getInstanceId()); if (noRndWalk) @@ -559,8 +559,8 @@ public final class DarkCloudMansion extends AbstractInstance protected void runThirdRoom2(DMCWorld world) { addSpawn(SOAdventure, 148910, 178397, -6117, 16383, false, 0, false, world.getInstanceId()); - DMCRoom ThirdRoom = new DMCRoom(); - DMCNpc thisnpc = new DMCNpc(); + final DMCRoom ThirdRoom = new DMCRoom(); + final DMCNpc thisnpc = new DMCNpc(); thisnpc.isDead = false; thisnpc.npc = addSpawn(BM[1], 148765, 180450, -6117, 0, false, 0, false, world.getInstanceId()); if (noRndWalk) @@ -604,11 +604,11 @@ public final class DarkCloudMansion extends AbstractInstance protected void runForthRoom(DMCWorld world) { - DMCRoom ForthRoom = new DMCRoom(); + final DMCRoom ForthRoom = new DMCRoom(); ForthRoom.counter = 0; DMCNpc thisnpc; - int temp[] = new int[7]; - int templist[][] = new int[7][5]; + final int temp[] = new int[7]; + final int templist[][] = new int[7][5]; int xx = 0; for (int i = 0; i < 7; i++) @@ -660,7 +660,7 @@ public final class DarkCloudMansion extends AbstractInstance { int idx = 0; int temp[] = new int[6]; - DMCRoom FifthRoom = new DMCRoom(); + final DMCRoom FifthRoom = new DMCRoom(); DMCNpc thisnpc; temp = Beleths[getRandom(Beleths.length)]; @@ -716,10 +716,10 @@ public final class DarkCloudMansion extends AbstractInstance return; } - int i = getRandom(GolemSpawn.length); - int mobId = GolemSpawn[i][0]; - int x = GolemSpawn[i][1]; - int y = GolemSpawn[i][2]; + final int i = getRandom(GolemSpawn.length); + final int mobId = GolemSpawn[i][0]; + final int x = GolemSpawn[i][1]; + final int y = GolemSpawn[i][2]; npc.golem = addSpawn(mobId, x, y, -6117, 0, false, 0, false, world.getInstanceId()); if (noRndWalk) @@ -758,7 +758,7 @@ public final class DarkCloudMansion extends AbstractInstance protected void checkBelethSample(DMCWorld world, L2Npc npc, L2PcInstance player) { - DMCRoom FifthRoom = world.rooms.get("FifthRoom"); + final DMCRoom FifthRoom = world.rooms.get("FifthRoom"); for (DMCNpc mob : FifthRoom.npcList) { @@ -792,7 +792,7 @@ public final class DarkCloudMansion extends AbstractInstance protected void killedBelethSample(DMCWorld world, L2Npc npc) { int decayedSamples = 0; - DMCRoom FifthRoom = world.rooms.get("FifthRoom"); + final DMCRoom FifthRoom = world.rooms.get("FifthRoom"); for (DMCNpc mob : FifthRoom.npcList) { @@ -841,7 +841,7 @@ public final class DarkCloudMansion extends AbstractInstance protected boolean allStonesDone(DMCWorld world) { - DMCRoom SecondRoom = world.rooms.get("SecondRoom"); + final DMCRoom SecondRoom = world.rooms.get("SecondRoom"); for (DMCNpc mob : SecondRoom.npcList) { @@ -857,7 +857,7 @@ public final class DarkCloudMansion extends AbstractInstance protected void removeMonoliths(DMCWorld world) { - DMCRoom SecondRoom = world.rooms.get("SecondRoom"); + final DMCRoom SecondRoom = world.rooms.get("SecondRoom"); for (DMCNpc mob : SecondRoom.npcList) { @@ -867,7 +867,7 @@ public final class DarkCloudMansion extends AbstractInstance protected void chkShadowColumn(DMCWorld world, L2Npc npc) { - DMCRoom ForthRoom = world.rooms.get("ForthRoom"); + final DMCRoom ForthRoom = world.rooms.get("ForthRoom"); for (DMCNpc mob : ForthRoom.npcList) { @@ -910,7 +910,7 @@ public final class DarkCloudMansion extends AbstractInstance if (world.rooms.containsKey("FifthRoom")) { - DMCRoom FifthRoom = world.rooms.get("FifthRoom"); + final DMCRoom FifthRoom = world.rooms.get("FifthRoom"); if (event.equalsIgnoreCase("decayMe")) { for (DMCNpc mob : FifthRoom.npcList) @@ -994,7 +994,7 @@ public final class DarkCloudMansion extends AbstractInstance } if (world.getStatus() == 4) { - DMCRoom SecondRoom = world.rooms.get("SecondRoom"); + final DMCRoom SecondRoom = world.rooms.get("SecondRoom"); for (DMCNpc mob : SecondRoom.npcList) { if (mob.golem == npc) @@ -1046,7 +1046,7 @@ public final class DarkCloudMansion extends AbstractInstance world = (DMCWorld) tmpworld; if (world.getStatus() == 7) { - DMCRoom ForthRoom = world.rooms.get("ForthRoom"); + final DMCRoom ForthRoom = world.rooms.get("ForthRoom"); for (DMCNpc mob : ForthRoom.npcList) { if (mob.npc == npc) @@ -1070,14 +1070,14 @@ public final class DarkCloudMansion extends AbstractInstance @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); DMCWorld world; if (tmpworld instanceof DMCWorld) { world = (DMCWorld) tmpworld; if (world.getStatus() == 4) { - DMCRoom SecondRoom = world.rooms.get("SecondRoom"); + final DMCRoom SecondRoom = world.rooms.get("SecondRoom"); for (DMCNpc mob : SecondRoom.npcList) { if (mob.npc == npc) @@ -1117,7 +1117,7 @@ public final class DarkCloudMansion extends AbstractInstance } else { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); DMCWorld world; if (tmpworld instanceof DMCWorld) { @@ -1135,8 +1135,8 @@ public final class DarkCloudMansion extends AbstractInstance world.removeAllowed(player.getObjectId()); } teleportPlayer(player, new Location(139968, 150367, -3111), 0); - int instanceId = npc.getInstanceId(); - Instance instance = InstanceManager.getInstance().getInstance(instanceId); + final int instanceId = npc.getInstanceId(); + final Instance instance = InstanceManager.getInstance().getInstance(instanceId); if (instance.getPlayers().isEmpty()) { InstanceManager.getInstance().destroyInstance(instanceId); diff --git a/trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java b/trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java index f242520ba5..e1d8059daa 100644 --- a/trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java +++ b/trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java @@ -346,7 +346,7 @@ public final class DisciplesNecropolisPast extends AbstractInstance @Override public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isSummon) { - InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player); + final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player); if (tmpworld instanceof DNPWorld) { if (npc.isScriptValue(0)) @@ -441,7 +441,7 @@ public final class DisciplesNecropolisPast extends AbstractInstance if (qs.getCond() >= 3) { takeItems(talker, SACRED_SWORD_OF_EINHASAD, -1); - InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(talker); + final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(talker); world.removeAllowed(talker.getObjectId()); talker.teleToLocation(EXIT, 0); htmltext = "32587-01.html"; @@ -452,10 +452,10 @@ public final class DisciplesNecropolisPast extends AbstractInstance { if (qs.getCond() >= 3) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof DNPWorld) { - DNPWorld world = (DNPWorld) tmpworld; + final DNPWorld world = (DNPWorld) tmpworld; openDoor(DISCIPLES_NECROPOLIS_DOOR, world.getInstanceId()); talker.showQuestMovie(12); startQuestTimer("FIGHT", 1000, null, talker); diff --git a/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index 03614f34e2..31e7ec2b6e 100644 --- a/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -257,19 +257,19 @@ public final class FinalEmperialTomb extends AbstractInstance int spawnCount = 0; try { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); - File file = new File(Config.DATAPACK_ROOT + "/spawnZones/final_emperial_tomb.xml"); + final File file = new File(Config.DATAPACK_ROOT + "/spawnZones/final_emperial_tomb.xml"); if (!file.exists()) { _log.severe("[Final Emperial Tomb] Missing final_emperial_tomb.xml. The quest wont work without it!"); return; } - Document doc = factory.newDocumentBuilder().parse(file); - Node first = doc.getFirstChild(); + final Document doc = factory.newDocumentBuilder().parse(file); + final Node first = doc.getFirstChild(); if ((first != null) && "list".equalsIgnoreCase(first.getNodeName())) { for (Node n = first.getFirstChild(); n != null; n = n.getNextSibling()) @@ -287,7 +287,7 @@ public final class FinalEmperialTomb extends AbstractInstance _log.severe("[Final Emperial Tomb] Missing npcId in npc List, skipping"); continue; } - int npcId = Integer.parseInt(attrs.getNamedItem("npcId").getNodeValue()); + final int npcId = Integer.parseInt(attrs.getNamedItem("npcId").getNodeValue()); att = attrs.getNamedItem("flag"); if (att == null) @@ -296,7 +296,7 @@ public final class FinalEmperialTomb extends AbstractInstance continue; } - int flag = Integer.parseInt(attrs.getNamedItem("flag").getNodeValue()); + final int flag = Integer.parseInt(attrs.getNamedItem("flag").getNodeValue()); _spawnList.putIfAbsent(flag, new ArrayList()); for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) @@ -304,7 +304,7 @@ public final class FinalEmperialTomb extends AbstractInstance if ("loc".equalsIgnoreCase(cd.getNodeName())) { attrs = cd.getAttributes(); - FETSpawn spw = new FETSpawn(); + final FETSpawn spw = new FETSpawn(); spw.npcId = npcId; att = attrs.getNamedItem("x"); @@ -358,7 +358,7 @@ public final class FinalEmperialTomb extends AbstractInstance else if ("zone".equalsIgnoreCase(cd.getNodeName())) { attrs = cd.getAttributes(); - FETSpawn spw = new FETSpawn(); + final FETSpawn spw = new FETSpawn(); spw.npcId = npcId; spw.isZone = true; @@ -409,22 +409,22 @@ public final class FinalEmperialTomb extends AbstractInstance _log.severe("[Final Emperial Tomb] Missing id in spawnZones List, skipping"); continue; } - int id = Integer.parseInt(att.getNodeValue()); + final int id = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("minZ"); if (att == null) { _log.severe("[Final Emperial Tomb] Missing minZ in spawnZones List id: " + id + ", skipping"); continue; } - int minz = Integer.parseInt(att.getNodeValue()); + final int minz = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("maxZ"); if (att == null) { _log.severe("[Final Emperial Tomb] Missing maxZ in spawnZones List id: " + id + ", skipping"); continue; } - int maxz = Integer.parseInt(att.getNodeValue()); - L2Territory ter = new L2Territory(id); + final int maxz = Integer.parseInt(att.getNodeValue()); + final L2Territory ter = new L2Territory(id); for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) { @@ -501,7 +501,7 @@ public final class FinalEmperialTomb extends AbstractInstance } else if (player.getInventory().getItemByItemId(8073) == null) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED); sm.addPcName(player); player.sendPacket(sm); return false; @@ -760,7 +760,7 @@ public final class FinalEmperialTomb extends AbstractInstance { break; } - L2MonsterInstance demon = (L2MonsterInstance) addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, _world.getInstanceId()); + final L2MonsterInstance demon = (L2MonsterInstance) addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, _world.getInstanceId()); updateKnownList(_world, demon); _world.demons.add(demon); } @@ -813,7 +813,7 @@ public final class FinalEmperialTomb extends AbstractInstance { if (_world.frintezza.getScriptValue() != 1) { - int rnd = getRandom(100); + final int rnd = getRandom(100); for (FrintezzaSong element : FRINTEZZASONGLIST) { if (rnd < element.chance) @@ -835,7 +835,7 @@ public final class FinalEmperialTomb extends AbstractInstance break; case 1: // Frintezza song effect _world.songEffectTask = null; - Skill skill = _world.OnSong.effectSkill.getSkill(); + final Skill skill = _world.OnSong.effectSkill.getSkill(); if (skill == null) { return; @@ -848,7 +848,7 @@ public final class FinalEmperialTomb extends AbstractInstance { for (int objId : _world.getAllowed()) { - L2PcInstance player = L2World.getInstance().getPlayer(objId); + final L2PcInstance player = L2World.getInstance().getPlayer(objId); if ((player != null) && player.isOnline() && (player.getInstanceId() == _world.getInstanceId())) { if (!player.isDead()) @@ -967,7 +967,7 @@ public final class FinalEmperialTomb extends AbstractInstance for (int[] element : PORTRAIT_SPAWNS) { - L2MonsterInstance demon = (L2MonsterInstance) addSpawn(element[0] + 2, element[5], element[6], element[7], element[8], false, 0, false, _world.getInstanceId()); + final L2MonsterInstance demon = (L2MonsterInstance) addSpawn(element[0] + 2, element[5], element[6], element[7], element[8], false, 0, false, _world.getInstanceId()); demon.setIsImmobilized(true); demon.disableAllSkills(); updateKnownList(_world, demon); @@ -1071,7 +1071,7 @@ public final class FinalEmperialTomb extends AbstractInstance case 21: for (int i = 0; i < PORTRAIT_SPAWNS.length; i++) { - L2MonsterInstance portrait = (L2MonsterInstance) addSpawn(PORTRAIT_SPAWNS[i][0], PORTRAIT_SPAWNS[i][1], PORTRAIT_SPAWNS[i][2], PORTRAIT_SPAWNS[i][3], PORTRAIT_SPAWNS[i][4], false, 0, false, _world.getInstanceId()); + final L2MonsterInstance portrait = (L2MonsterInstance) addSpawn(PORTRAIT_SPAWNS[i][0], PORTRAIT_SPAWNS[i][1], PORTRAIT_SPAWNS[i][2], PORTRAIT_SPAWNS[i][3], PORTRAIT_SPAWNS[i][4], false, 0, false, _world.getInstanceId()); updateKnownList(_world, portrait); _world.portraits.put(portrait, i); } @@ -1203,7 +1203,7 @@ public final class FinalEmperialTomb extends AbstractInstance { for (int objId : _world.getAllowed()) { - L2PcInstance player = L2World.getInstance().getPlayer(objId); + final L2PcInstance player = L2World.getInstance().getPlayer(objId); if ((player != null) && player.isOnline() && (player.getInstanceId() == _world.getInstanceId())) { player.abortAttack(); @@ -1221,7 +1221,7 @@ public final class FinalEmperialTomb extends AbstractInstance { for (int objId : _world.getAllowed()) { - L2PcInstance player = L2World.getInstance().getPlayer(objId); + final L2PcInstance player = L2World.getInstance().getPlayer(objId); if ((player != null) && player.isOnline() && (player.getInstanceId() == _world.getInstanceId())) { player.enableAllSkills(); @@ -1234,7 +1234,7 @@ public final class FinalEmperialTomb extends AbstractInstance { for (int objId : _world.getAllowed()) { - L2PcInstance player = L2World.getInstance().getPlayer(objId); + final L2PcInstance player = L2World.getInstance().getPlayer(objId); if ((player != null) && player.isOnline() && (player.getInstanceId() == _world.getInstanceId())) { if (player.getX() < x) @@ -1331,7 +1331,7 @@ public final class FinalEmperialTomb extends AbstractInstance { for (int objId : world.getAllowed()) { - L2PcInstance player = L2World.getInstance().getPlayer(objId); + final L2PcInstance player = L2World.getInstance().getPlayer(objId); if ((player != null) && player.isOnline() && (player.getInstanceId() == world.getInstanceId())) { player.sendPacket(packet); @@ -1341,10 +1341,10 @@ public final class FinalEmperialTomb extends AbstractInstance protected void updateKnownList(FETWorld world, L2Npc npc) { - Map npcKnownPlayers = npc.getKnownList().getKnownPlayers(); + final Map npcKnownPlayers = npc.getKnownList().getKnownPlayers(); for (int objId : world.getAllowed()) { - L2PcInstance player = L2World.getInstance().getPlayer(objId); + final L2PcInstance player = L2World.getInstance().getPlayer(objId); if ((player != null) && player.isOnline() && (player.getInstanceId() == world.getInstanceId())) { npcKnownPlayers.put(player.getObjectId(), player); @@ -1398,10 +1398,10 @@ public final class FinalEmperialTomb extends AbstractInstance @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof FETWorld) { - FETWorld world = (FETWorld) tmpworld; + final FETWorld world = (FETWorld) tmpworld; if (npc.getId() == HALL_ALARM) { ThreadPoolManager.getInstance().scheduleGeneral(new StatusTask(world, 0), 2000); @@ -1456,7 +1456,7 @@ public final class FinalEmperialTomb extends AbstractInstance @Override public String onTalk(L2Npc npc, L2PcInstance player) { - int npcId = npc.getId(); + final int npcId = npc.getId(); getQuestState(player, true); if (npcId == GUIDE) { @@ -1464,8 +1464,8 @@ public final class FinalEmperialTomb extends AbstractInstance } else if (npc.getId() == CUBE) { - int x = -87534 + getRandom(500); - int y = -153048 + getRandom(500); + final int x = -87534 + getRandom(500); + final int y = -153048 + getRandom(500); player.teleToLocation(x, y, -9165); return null; } diff --git a/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 6491ba7bd9..7bb64fafd0 100644 --- a/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -114,7 +114,7 @@ public final class HarnakUndergroundRuins extends AbstractInstance @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = null; + final String htmltext = null; switch (event) { case "enter_instance": @@ -434,7 +434,7 @@ public final class HarnakUndergroundRuins extends AbstractInstance final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player); if (tmpworld instanceof HuRWorld) { - HuRWorld world = (HuRWorld) tmpworld; + final HuRWorld world = (HuRWorld) tmpworld; switch (world.timerCount) { case 0: @@ -695,7 +695,7 @@ public final class HarnakUndergroundRuins extends AbstractInstance final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player); if (tmpworld instanceof HuRWorld) { - HuRWorld world = (HuRWorld) tmpworld; + final HuRWorld world = (HuRWorld) tmpworld; if (world.isStatus(1)) { diff --git a/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java b/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java index b76a5674ee..434c8c1fb3 100644 --- a/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -1303,28 +1303,28 @@ public final class IceQueensCastleBattle extends AbstractInstance { if (channelMember.getLevel() < MIN_LEVEL) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(channelMember); party.broadcastPacket(sm); return false; } else if (!Util.checkIfInRange(1000, player, channelMember, true)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); sm.addPcName(channelMember); party.broadcastPacket(sm); return false; } else if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_EASY)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(channelMember); party.broadcastPacket(sm); return false; } else if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_HARD)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(channelMember); party.broadcastPacket(sm); return false; diff --git a/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 4e0d69fab1..fb845f59c4 100644 --- a/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -1261,7 +1261,7 @@ public final class Kamaloka extends AbstractInstance // player level must be in range if (Math.abs(partyMember.getLevel() - level) > MAX_LEVEL_DIFFERENCE) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(partyMember); player.sendPacket(sm); return false; @@ -1269,7 +1269,7 @@ public final class Kamaloka extends AbstractInstance // player must be near party leader if (!partyMember.isInsideRadius(player, 1000, true, true)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); sm.addPcName(partyMember); player.sendPacket(sm); return false; @@ -1289,7 +1289,7 @@ public final class Kamaloka extends AbstractInstance // if found instance still can't be reentered - exit if (System.currentTimeMillis() < instanceTimes.get(id)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); player.sendPacket(sm); return false; @@ -1360,13 +1360,13 @@ public final class Kamaloka extends AbstractInstance // check for level difference again on reenter if (Math.abs(player.getLevel() - LEVEL[((KamaWorld) world).index]) > MAX_LEVEL_DIFFERENCE) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(player); player.sendPacket(sm); return; } // check what instance still exist - Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); + final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); if (inst != null) { removeBuffs(player); @@ -1424,7 +1424,7 @@ public final class Kamaloka extends AbstractInstance { if (world instanceof KamaWorld) { - Calendar reenter = Calendar.getInstance(); + final Calendar reenter = Calendar.getInstance(); reenter.set(Calendar.MINUTE, RESET_MIN); // if time is >= RESET_HOUR - roll to the next day if (reenter.get(Calendar.HOUR_OF_DAY) >= RESET_HOUR) @@ -1433,13 +1433,13 @@ public final class Kamaloka extends AbstractInstance } reenter.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); sm.addInstanceName(world.getTemplateId()); // set instance reenter time for all allowed players for (int objectId : world.getAllowed()) { - L2PcInstance obj = L2World.getInstance().getPlayer(objectId); + final L2PcInstance obj = L2World.getInstance().getPlayer(objectId); if ((obj != null) && obj.isOnline()) { InstanceManager.getInstance().setInstanceTime(objectId, world.getTemplateId(), reenter.getTimeInMillis()); @@ -1448,7 +1448,7 @@ public final class Kamaloka extends AbstractInstance } // destroy instance after EXIT_TIME - Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); + final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); inst.setDuration(EXIT_TIME * 60000); inst.setEmptyDestroyTime(0); } @@ -1472,7 +1472,7 @@ public final class Kamaloka extends AbstractInstance if (npcs != null) { world.firstRoom = new ArrayList(spawns.length - 1); - int shaman = getRandom(spawns.length); // random position for shaman + final int shaman = getRandom(spawns.length); // random position for shaman for (int i = 0; i < spawns.length; i++) { @@ -1485,7 +1485,7 @@ public final class Kamaloka extends AbstractInstance else { npc = addSpawn(npcs[1], spawns[i][0], spawns[i][1], spawns[i][2], 0, false, 0, false, world.getInstanceId()); - L2Spawn spawn = npc.getSpawn(); + final L2Spawn spawn = npc.getSpawn(); spawn.setRespawnDelay(FIRST_ROOM_RESPAWN_DELAY); spawn.setAmount(1); spawn.startRespawn(); @@ -1570,7 +1570,7 @@ public final class Kamaloka extends AbstractInstance // party members must be in the instance if (world.isAllowed(player.getObjectId())) { - Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); + final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); // teleports entire party away for (L2PcInstance partyMember : party.getMembers()) diff --git a/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 34a88c37a5..cf38522310 100644 --- a/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -725,7 +725,7 @@ public final class KartiasLabyrinth extends AbstractInstance { lastEntry = player.getVariables().getLong(KARTIA_PARTY_ENTRY_VAR, 0); } - Calendar entryResetTime = Calendar.getInstance(); + final Calendar entryResetTime = Calendar.getInstance(); entryResetTime.set(Calendar.HOUR, 6); entryResetTime.set(Calendar.MINUTE, 30); entryResetTime.set(Calendar.AM_PM, Calendar.AM); diff --git a/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java b/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java index 36b6a9e116..68350bcc8a 100644 --- a/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java +++ b/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java @@ -256,7 +256,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI if ((holder != null) && (instanceId > 0)) { - L2Npc support = addSpawn(Elcadia_Support, player.getX(), player.getY(), player.getZ(), 0, false, 0L, false, player.getInstanceId()); + final L2Npc support = addSpawn(Elcadia_Support, player.getX(), player.getY(), player.getZ(), 0, false, 0L, false, player.getInstanceId()); holder.mobs.add(support); startQuestTimer("check_follow", 3000, support, player); } @@ -272,7 +272,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; } - Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); + final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); if (inst != null) { teleportPlayer(npc, player, TELEPORTS[ENTER], world.getInstanceId()); @@ -296,10 +296,10 @@ public class MonasteryOfSilence2 extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); + final String htmltext = getNoQuestMsg(player); QuestState st = player.getQuestState(MonasteryOfSilence2.class.getSimpleName()); - QuestState qs = player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName()); - QuestState qs1 = player.getQuestState(Q10295_SevenSignsSolinasTomb.class.getSimpleName()); + final QuestState qs = player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName()); + final QuestState qs1 = player.getQuestState(Q10295_SevenSignsSolinasTomb.class.getSimpleName()); if (st == null) { st = newQuestState(player); @@ -393,7 +393,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI player.showQuestMovie(29); startQuestTimer("teleport", 60000, npc, player); cancelQuestTimer("check_follow", npc, player); - InstanceHolder holder = instanceWorlds.get(player.getInstanceId()); + final InstanceHolder holder = instanceWorlds.get(player.getInstanceId()); if (holder != null) { for (L2Npc h : holder.mobs) @@ -433,7 +433,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI else if ("Exit".equals(event)) { cancelQuestTimer("check_follow", npc, player); - InstanceHolder holder = instanceWorlds.get(player.getInstanceId()); + final InstanceHolder holder = instanceWorlds.get(player.getInstanceId()); if (holder != null) { for (L2Npc h : holder.mobs) @@ -497,7 +497,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI { st = newQuestState(player); } - int npcId = npc.getId(); + final int npcId = npc.getId(); if (npcId == OddGlobe) { if ((player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName()) != null) && (player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName()).getState() == State.STARTED)) diff --git a/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java index ced70750ab..9299599c60 100644 --- a/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java +++ b/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java @@ -236,10 +236,10 @@ public final class NornilsGarden extends AbstractInstance private void exitInstance(L2PcInstance player) { - InstanceWorld inst = InstanceManager.getInstance().getWorld(player.getInstanceId()); + final InstanceWorld inst = InstanceManager.getInstance().getWorld(player.getInstanceId()); if (inst instanceof NornilsWorld) { - NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = ((NornilsWorld) inst); world.removeAllowed(player.getObjectId()); teleportPlayer(player, EXIT_PPL, 0); } @@ -258,7 +258,7 @@ public final class NornilsGarden extends AbstractInstance // check for level difference again on reenter if ((player.getLevel() > INSTANCE_LVL_MAX) || (player.getLevel() < INSTANCE_LVL_MIN)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(player); player.sendPacket(sm); return null; @@ -272,7 +272,7 @@ public final class NornilsGarden extends AbstractInstance return null; } // Creating new instance - String result = checkConditions(npc, player); + final String result = checkConditions(npc, player); if (!(result.equalsIgnoreCase("ok"))) { return result; @@ -321,10 +321,10 @@ public final class NornilsGarden extends AbstractInstance private void spawn1(L2Npc npc) { - InstanceWorld inst = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld inst = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (inst instanceof NornilsWorld) { - NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = ((NornilsWorld) inst); if (npc.equals(world.first_npc) && !world.spawned_1) { world.spawned_1 = true; @@ -339,10 +339,10 @@ public final class NornilsGarden extends AbstractInstance private void spawn2(L2Npc npc) { - InstanceWorld inst = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld inst = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (inst instanceof NornilsWorld) { - NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = ((NornilsWorld) inst); if (!world.spawned_2) { world.spawned_2 = true; @@ -357,10 +357,10 @@ public final class NornilsGarden extends AbstractInstance private void spawn3(L2Character cha) { - InstanceWorld inst = InstanceManager.getInstance().getWorld(cha.getInstanceId()); + final InstanceWorld inst = InstanceManager.getInstance().getWorld(cha.getInstanceId()); if (inst instanceof NornilsWorld) { - NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = ((NornilsWorld) inst); if (!world.spawned_3) { world.spawned_3 = true; @@ -375,10 +375,10 @@ public final class NornilsGarden extends AbstractInstance private void spawn4(L2Character cha) { - InstanceWorld inst = InstanceManager.getInstance().getWorld(cha.getInstanceId()); + final InstanceWorld inst = InstanceManager.getInstance().getWorld(cha.getInstanceId()); if (inst instanceof NornilsWorld) { - NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = ((NornilsWorld) inst); if (!world.spawned_4) { world.spawned_4 = true; @@ -394,7 +394,7 @@ public final class NornilsGarden extends AbstractInstance public void openDoor(QuestState st, L2PcInstance player, int doorId) { st.unset("correct"); - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId()); if (tmpworld instanceof NornilsWorld) { openDoor(doorId, tmpworld.getInstanceId()); @@ -423,21 +423,21 @@ public final class NornilsGarden extends AbstractInstance // player level must be in range if (partyMember.getLevel() > INSTANCE_LVL_MAX) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(partyMember); player.sendPacket(sm); return "32330-06.html"; } if (partyMember.getLevel() < INSTANCE_LVL_MIN) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(partyMember); player.sendPacket(sm); return "32330-07.html"; } if (partyMember.getClassId().level() != 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY); sm.addPcName(partyMember); player.sendPacket(sm); return "32330-06.html"; @@ -445,7 +445,7 @@ public final class NornilsGarden extends AbstractInstance // player must be near party leader if (!partyMember.isInsideRadius(player, 500, true, true)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED); sm.addPcName(partyMember); player.sendPacket(sm); return "32330-08.html"; @@ -467,7 +467,7 @@ public final class NornilsGarden extends AbstractInstance { if ((character instanceof L2PcInstance) && !character.isDead() && !character.isTeleporting() && ((L2PcInstance) character).isOnline()) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(character.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(character.getInstanceId()); if (tmpworld instanceof NornilsWorld) { for (int _auto[] : _auto_gates) @@ -495,7 +495,7 @@ public final class NornilsGarden extends AbstractInstance public final String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { String htmltext = event; - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); @@ -536,7 +536,7 @@ public final class NornilsGarden extends AbstractInstance } else if (event.equalsIgnoreCase("check")) { - int correct = st.getInt("correct"); + final int correct = st.getInt("correct"); if ((npc.getId() == 32260) && (correct == 3)) { openDoor(st, player, 16200014); @@ -611,7 +611,7 @@ public final class NornilsGarden extends AbstractInstance // Check if gatekeeper should open bridge, and open it if (_gk[2] > 0) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId()); if (tmpworld instanceof NornilsWorld) { openDoor(_gk[2], tmpworld.getInstanceId()); diff --git a/trunk/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/trunk/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java index e74316ba2a..433f171801 100644 --- a/trunk/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java +++ b/trunk/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java @@ -46,7 +46,7 @@ public class Q00015_SweetWhispers extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = event; + final String htmltext = event; final QuestState st = getQuestState(player, false); if (st == null) { diff --git a/trunk/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/trunk/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java index ac44601f84..e27ae23125 100644 --- a/trunk/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java +++ b/trunk/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java @@ -55,7 +55,7 @@ public class Q00016_TheComingDarkness extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = event; + final String htmltext = event; final QuestState st = getQuestState(player, false); if (st == null) { diff --git a/trunk/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/trunk/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java index 3a928dc6e9..4079e6447e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java +++ b/trunk/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java @@ -113,7 +113,7 @@ public class Q00042_HelpTheUncle extends Quest @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if ((st != null) && st.isCond(2)) { diff --git a/trunk/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/trunk/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java index e748f5f1fb..cd98ebd2e0 100644 --- a/trunk/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java +++ b/trunk/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java @@ -113,7 +113,7 @@ public class Q00043_HelpTheSister extends Quest @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if ((st != null) && st.isCond(2)) { diff --git a/trunk/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/trunk/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java index 089ca8783f..95cc5bcdf7 100644 --- a/trunk/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java +++ b/trunk/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java @@ -158,7 +158,7 @@ public final class Q00061_LawEnforcement extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); if (qs.isCompleted() && (npc.getId() == LIANE)) { diff --git a/trunk/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/trunk/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java index 6f6483922f..318d1f4faa 100644 --- a/trunk/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java +++ b/trunk/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java @@ -48,7 +48,7 @@ public class Q00109_InSearchOfTheNest extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); diff --git a/trunk/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/trunk/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java index 790cb47c70..801481b837 100644 --- a/trunk/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java +++ b/trunk/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java @@ -47,7 +47,7 @@ public class Q00110_ToThePrimevalIsle extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); diff --git a/trunk/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/trunk/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java index c6e3b89b63..dbb3e5ca23 100644 --- a/trunk/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java +++ b/trunk/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java @@ -250,7 +250,7 @@ public final class Q00111_ElrokianHuntersProof extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); if (qs == null) { diff --git a/trunk/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/trunk/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java index c0a8551a4d..fd0757d33f 100644 --- a/trunk/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java +++ b/trunk/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java @@ -365,7 +365,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest return getNoQuestMsg(player); } - int talk = st.getInt("talk"); + final int talk = st.getInt("talk"); switch (npc.getId()) { diff --git a/trunk/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java b/trunk/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java index 38e88b1f6f..5783832d6e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java +++ b/trunk/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java @@ -215,7 +215,7 @@ public final class Q00117_TheOceanOfDistantStars extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); if (qs.isCompleted()) { diff --git a/trunk/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/trunk/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java index 3d26c4a8f0..9f3daa4fa1 100644 --- a/trunk/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java +++ b/trunk/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java @@ -50,7 +50,7 @@ public class Q00124_MeetingTheElroki extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); diff --git a/trunk/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/trunk/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index df9991cbff..58f7172a9b 100644 --- a/trunk/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/trunk/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -80,7 +80,7 @@ public class Q00125_TheNameOfEvil1 extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); @@ -255,12 +255,12 @@ public class Q00125_TheNameOfEvil1 extends Quest } final QuestState st = getQuestState(partyMember, false); - int npcId = npc.getId(); + final int npcId = npc.getId(); if (ORNITHOMIMUS.containsKey(npcId)) { if (st.getQuestItemsCount(ORNITHOMIMUS_CLAW) < 2) { - float chance = ORNITHOMIMUS.get(npcId) * Config.RATE_QUEST_DROP; + final float chance = ORNITHOMIMUS.get(npcId) * Config.RATE_QUEST_DROP; if (getRandom(1000) < chance) { st.giveItems(ORNITHOMIMUS_CLAW, 1); @@ -272,7 +272,7 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (st.getQuestItemsCount(DEINONYCHUS_BONE) < 2) { - float chance = DEINONYCHUS.get(npcId) * Config.RATE_QUEST_DROP; + final float chance = DEINONYCHUS.get(npcId) * Config.RATE_QUEST_DROP; if (getRandom(1000) < chance) { st.giveItems(DEINONYCHUS_BONE, 1); diff --git a/trunk/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/trunk/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java index 848855f7ae..3b9a0fbae3 100644 --- a/trunk/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java +++ b/trunk/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java @@ -59,7 +59,7 @@ public class Q00126_TheNameOfEvil2 extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); diff --git a/trunk/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/trunk/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java index 63c7e8274b..4af9dd5ed8 100644 --- a/trunk/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java +++ b/trunk/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java @@ -158,7 +158,7 @@ public final class Q00128_PailakaSongOfIceAndFire extends Quest { st.exitQuest(false, true); - Instance inst = InstanceManager.getInstance().getInstance(npc.getInstanceId()); + final Instance inst = InstanceManager.getInstance().getInstance(npc.getInstanceId()); inst.setDuration(EXIT_TIME * 60000); inst.setEmptyDestroyTime(0); diff --git a/trunk/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/trunk/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java index 3b7afe1142..12c3248e93 100644 --- a/trunk/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java +++ b/trunk/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java @@ -133,7 +133,7 @@ public class Q00139_ShadowFoxPart1 extends Quest final QuestState st = getQuestState(member, false); if (!st.isSet("talk") && (getRandom(100) < DROP_CHANCE)) { - int itemId = (getRandom(11) == 0) ? CHEST : FRAGMENT; + final int itemId = (getRandom(11) == 0) ? CHEST : FRAGMENT; st.giveItems(itemId, 1); st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); } diff --git a/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 6286463279..bbf6b05636 100644 --- a/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -369,7 +369,7 @@ public class Q00144_PailakaInjuredDragon extends Quest qs.playSound(QuestSound.ITEMSOUND_QUEST_FINISH); qs.exitQuest(false); - Instance inst = InstanceManager.getInstance().getInstance(npc.getInstanceId()); + final Instance inst = InstanceManager.getInstance().getInstance(npc.getInstanceId()); inst.setDuration(EXIT_TIME * 60000); inst.setEmptyDestroyTime(0); @@ -419,7 +419,7 @@ public class Q00144_PailakaInjuredDragon extends Quest @Override public final String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); + final String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); if (qs == null) { @@ -489,7 +489,7 @@ public class Q00144_PailakaInjuredDragon extends Quest @Override public final String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { - QuestState qs = player.getQuestState(getName()); + final QuestState qs = player.getQuestState(getName()); if ((qs == null) || (qs.getState() != State.STARTED)) { return null; @@ -661,7 +661,7 @@ public class Q00144_PailakaInjuredDragon extends Quest { if ((character instanceof L2PcInstance) && !character.isDead() && !character.isTeleporting() && ((L2PcInstance) character).isOnline()) { - InstanceWorld world = InstanceManager.getInstance().getWorld(character.getInstanceId()); + final InstanceWorld world = InstanceManager.getInstance().getWorld(character.getInstanceId()); if ((world != null) && (world.getTemplateId() == INSTANCE_ID)) { // If a player wants to go by a mob wall without kill it, he will be returned back to a spawn point. @@ -933,7 +933,7 @@ public class Q00144_PailakaInjuredDragon extends Quest player.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON); return; } - Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); + final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); if (inst != null) { // Check max summon levels. diff --git a/trunk/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/trunk/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java index 38149b8eb9..9ca8e18e22 100644 --- a/trunk/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java +++ b/trunk/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java @@ -166,7 +166,7 @@ public final class Q00184_ArtOfPersuasion extends Quest { npc.getVariables().set("SPAWNED", true); npc.getVariables().set("PLAYER_ID", player.getObjectId()); - L2Npc alarm = addSpawn(ALARM_OF_GIANT, player.getX() + 80, player.getY() + 60, player.getZ(), 16384, false, 0); + final L2Npc alarm = addSpawn(ALARM_OF_GIANT, player.getX() + 80, player.getY() + 60, player.getZ(), 16384, false, 0); alarm.getVariables().set("player0", player); alarm.getVariables().set("npc0", npc); } diff --git a/trunk/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/trunk/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java index 537f510e8d..319636a755 100644 --- a/trunk/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java +++ b/trunk/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java @@ -166,7 +166,7 @@ public final class Q00185_NikolasCooperation extends Quest { npc.getVariables().set("SPAWNED", true); npc.getVariables().set("PLAYER_ID", player.getObjectId()); - L2Npc alarm = addSpawn(ALARM_OF_GIANT, player.getX() + 80, player.getY() + 60, player.getZ(), 16384, false, 0); + final L2Npc alarm = addSpawn(ALARM_OF_GIANT, player.getX() + 80, player.getY() + 60, player.getZ(), 16384, false, 0); alarm.getVariables().set("player0", player); alarm.getVariables().set("npc0", npc); } diff --git a/trunk/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/trunk/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java index 5cbb76bbae..0b5061607e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java +++ b/trunk/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java @@ -160,11 +160,11 @@ public final class Q00193_SevenSignsDyingMessage extends Quest if (st.isCond(4)) { isBusy = true; - NpcSay ns = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.S1_THAT_STRANGER_MUST_BE_DEFEATED_HERE_IS_THE_ULTIMATE_HELP); + final NpcSay ns = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.S1_THAT_STRANGER_MUST_BE_DEFEATED_HERE_IS_THE_ULTIMATE_HELP); ns.addStringParameter(player.getName()); npc.broadcastPacket(ns); startQuestTimer("heal", 30000 - getRandom(20000), npc, player); - L2MonsterInstance monster = (L2MonsterInstance) addSpawn(SHILENS_EVIL_THOUGHTS, 82425, 47232, -3216, 0, false, 0, false); + final L2MonsterInstance monster = (L2MonsterInstance) addSpawn(SHILENS_EVIL_THOUGHTS, 82425, 47232, -3216, 0, false, 0, false); monster.broadcastPacket(new NpcSay(monster.getObjectId(), ChatType.NPC_GENERAL, monster.getId(), NpcStringId.YOU_ARE_NOT_THE_OWNER_OF_THAT_ITEM)); monster.setRunning(); monster.addDamageHate(player, 0, 999); @@ -177,7 +177,7 @@ public final class Q00193_SevenSignsDyingMessage extends Quest { if (!npc.isInsideRadius(player, 600, true, false)) { - NpcSay ns = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LOOK_HERE_S1_DON_T_FALL_TOO_FAR_BEHIND); + final NpcSay ns = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LOOK_HERE_S1_DON_T_FALL_TOO_FAR_BEHIND); ns.addStringParameter(player.getName()); npc.broadcastPacket(ns); } diff --git a/trunk/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/trunk/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java index 07a7a9c23d..479b1905a5 100644 --- a/trunk/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java +++ b/trunk/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java @@ -110,7 +110,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest isBusy = true; npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.S1_THAT_STRANGER_MUST_BE_DEFEATED_HERE_IS_THE_ULTIMATE_HELP).addStringParameter(player.getName())); startQuestTimer("heal", 30000 - getRandom(20000), npc, player); - L2MonsterInstance monster = (L2MonsterInstance) addSpawn(SHILENS_EVIL_THOUGHTS, -23734, -9184, -5384, 0, false, 0, false, npc.getInstanceId()); + final L2MonsterInstance monster = (L2MonsterInstance) addSpawn(SHILENS_EVIL_THOUGHTS, -23734, -9184, -5384, 0, false, 0, false, npc.getInstanceId()); monster.broadcastPacket(new NpcSay(monster.getObjectId(), ChatType.NPC_GENERAL, monster.getId(), NpcStringId.YOU_ARE_NOT_THE_OWNER_OF_THAT_ITEM)); monster.setRunning(); monster.addDamageHate(player, 0, 999); @@ -123,7 +123,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest { if (!npc.isInsideRadius(player, 600, true, false)) { - NpcSay ns = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LOOK_HERE_S1_DON_T_FALL_TOO_FAR_BEHIND); + final NpcSay ns = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LOOK_HERE_S1_DON_T_FALL_TOO_FAR_BEHIND); ns.addStringParameter(player.getName()); npc.broadcastPacket(ns); } diff --git a/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java index cad9ebe442..a6fbc66f4d 100644 --- a/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java +++ b/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java @@ -117,7 +117,7 @@ public class Q00254_LegendaryTales extends Quest htmltext = (player.getLevel() < MIN_LEVEL) ? "30754-00.htm" : "30754-01.htm"; break; case State.STARTED: - long count = getQuestItemsCount(player, LARGE_DRAGON_SKULL); + final long count = getQuestItemsCount(player, LARGE_DRAGON_SKULL); if (st.isCond(1)) { htmltext = ((count > 0) ? "30754-14.htm" : "30754-06.html"); @@ -225,8 +225,8 @@ public class Q00254_LegendaryTales extends Quest if ((st != null) && st.isCond(1)) { - int raids = st.getInt("raids"); - Bosses boss = Bosses.valueOf(npc.getId()); + final int raids = st.getInt("raids"); + final Bosses boss = Bosses.valueOf(npc.getId()); if (!checkMask(st, boss)) { @@ -247,7 +247,7 @@ public class Q00254_LegendaryTales extends Quest private static boolean checkMask(QuestState qs, Bosses boss) { - int pos = boss.getMask(); + final int pos = boss.getMask(); return ((qs.getInt("raids") & pos) == pos); } } diff --git a/trunk/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/trunk/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index badbd013d4..9cffe51c83 100644 --- a/trunk/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/trunk/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -75,7 +75,7 @@ public class Q00278_HomeSecurity extends Quest } case "31537-07.html": { - int i0 = getRandom(100); + final int i0 = getRandom(100); if (i0 < 10) { diff --git a/trunk/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java b/trunk/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java index 90c29f3f0b..67fc59c6f4 100644 --- a/trunk/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java +++ b/trunk/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java @@ -69,7 +69,7 @@ public final class Q00279_TargetOfOpportunity extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = event; + final String htmltext = event; final QuestState st = getQuestState(player, false); if ((st == null) || (player.getLevel() < 82)) { @@ -93,7 +93,7 @@ public final class Q00279_TargetOfOpportunity extends Quest @Override public final String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { - L2PcInstance pl = getRandomPartyMember(player, "progress", "1"); + final L2PcInstance pl = getRandomPartyMember(player, "progress", "1"); final int idx = Arrays.binarySearch(MONSTERS, npc.getId()); if ((pl == null) || (idx < 0)) { diff --git a/trunk/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/trunk/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java index 1e0650c93c..0f1e631ea6 100644 --- a/trunk/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java +++ b/trunk/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java @@ -92,7 +92,7 @@ public final class Q00300_HuntingLetoLizardman extends Quest if (st.getQuestItemsCount(BRACELET_OF_LIZARDMAN) >= REQUIRED_BRACELET_COUNT) { st.takeItems(BRACELET_OF_LIZARDMAN, -1); - int rand = getRandom(1000); + final int rand = getRandom(1000); if (rand < 500) { giveItems(player, REWARD_ADENA); diff --git a/trunk/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/trunk/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index 3ac4a0d31e..2010bc8e09 100644 --- a/trunk/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/trunk/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -93,8 +93,8 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest { return "32711-09.html"; } - String respawn = loadGlobalQuestVar("Respawn"); - long remain = (!respawn.isEmpty()) ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; + final String respawn = loadGlobalQuestVar("Respawn"); + final long remain = (!respawn.isEmpty()) ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; if (remain > 0) { return "32711-09a.html"; diff --git a/trunk/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/trunk/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java index 6ca8aa3aa5..df5e496862 100644 --- a/trunk/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java +++ b/trunk/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java @@ -164,7 +164,7 @@ public final class Q00336_CoinsOfMagic extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = getNoQuestMsg(player); + final String htmltext = getNoQuestMsg(player); if (qs == null) { return htmltext; @@ -281,7 +281,7 @@ public final class Q00336_CoinsOfMagic extends Quest return null; } - String htmltext = null; + final String htmltext = null; if (event.equals("QUEST_ACCEPTED")) { @@ -300,8 +300,8 @@ public final class Q00336_CoinsOfMagic extends Quest { return event; } - int npcId = npc.getId(); - int eventID = Integer.parseInt(event); + final int npcId = npc.getId(); + final int eventID = Integer.parseInt(event); switch (npcId) { @@ -1102,7 +1102,7 @@ public final class Q00336_CoinsOfMagic extends Quest case HARIT_LIZARDMAN_SHAMAN: case HARIT_LIZARDM_MATRIARCH: { - QuestState qs = getRandomPlayerFromPartyCoin(killer, npc, 2); + final QuestState qs = getRandomPlayerFromPartyCoin(killer, npc, 2); if (qs != null) { if (getRandom(1000) < 63) @@ -1748,14 +1748,14 @@ public final class Q00336_CoinsOfMagic extends Quest } else { - int i0 = qs.getInt(PARAM_1) % 4; + final int i0 = qs.getInt(PARAM_1) % 4; int i1 = qs.getInt(PARAM_1) / 4; - int i2 = i1 / 4; + final int i2 = i1 / 4; i1 = i1 % 4; - int i3 = qs.getInt(FLAG) % 4; + final int i3 = qs.getInt(FLAG) % 4; int i4 = qs.getInt(FLAG) / 4; - int i5 = i4 / 4; + final int i5 = i4 / 4; i4 = i4 % 4; if (i0 == i3) @@ -1793,7 +1793,7 @@ public final class Q00336_CoinsOfMagic extends Quest private QuestState getRandomPlayerFromParty(L2PcInstance player, L2Npc npc, int memoState) { - QuestState qs = getQuestState(player, false); + final QuestState qs = getQuestState(player, false); final List candidates = new ArrayList<>(); if ((qs != null) && qs.isStarted() && (qs.getMemoState() == memoState)) @@ -1807,7 +1807,7 @@ public final class Q00336_CoinsOfMagic extends Quest player.getParty().getMembers().stream().forEach(pm -> { - QuestState qss = getQuestState(pm, false); + final QuestState qss = getQuestState(pm, false); if ((qss != null) && qss.isStarted() && (qss.getMemoState() == memoState) && Util.checkIfInRange(1500, npc, pm, true)) { candidates.add(qss); @@ -1819,7 +1819,7 @@ public final class Q00336_CoinsOfMagic extends Quest private QuestState getRandomPlayerFromPartyCoin(L2PcInstance player, L2Npc npc, int memoState) { - QuestState qs = getQuestState(player, false); + final QuestState qs = getQuestState(player, false); final List candidates = new ArrayList<>(); if ((qs != null) && qs.isStarted() && (qs.getMemoState() == memoState) && !qs.hasQuestItems(Q_KALDIS_GOLD_DRAGON)) { @@ -1832,7 +1832,7 @@ public final class Q00336_CoinsOfMagic extends Quest player.getParty().getMembers().stream().forEach(pm -> { - QuestState qss = getQuestState(pm, false); + final QuestState qss = getQuestState(pm, false); if ((qss != null) && qss.isStarted() && (qss.getMemoState() == memoState) && !qss.hasQuestItems(Q_KALDIS_GOLD_DRAGON) && Util.checkIfInRange(1500, npc, pm, true)) { candidates.add(qss); diff --git a/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 186cdcaaac..b58dfaf597 100644 --- a/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -151,8 +151,8 @@ public class Q00350_EnhanceYourWeapon extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = event; - QuestState st = getQuestState(player, false); + final String htmltext = event; + final QuestState st = getQuestState(player, false); if (event.endsWith("-04.htm")) { st.startQuest(); @@ -263,7 +263,7 @@ public class Q00350_EnhanceYourWeapon extends Quest if (Item != null) { // Prepare inventory update packet - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); playerIU.addRemovedItem(Item); // Add new crystal to the killer's inventory @@ -281,7 +281,7 @@ public class Q00350_EnhanceYourWeapon extends Quest } // Send system message - SystemMessage sms = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1); + final SystemMessage sms = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1); sms.addItemName(giveid); player.sendPacket(sms); @@ -298,11 +298,11 @@ public class Q00350_EnhanceYourWeapon extends Quest return null; } - L2ItemInstance[] inv = player.getInventory().getItems(); + final L2ItemInstance[] inv = player.getInventory().getItems(); SoulCrystal ret = null; for (L2ItemInstance item : inv) { - int itemId = item.getId(); + final int itemId = item.getId(); if (!SOUL_CRYSTALS.containsKey(itemId)) { continue; @@ -367,7 +367,7 @@ public class Q00350_EnhanceYourWeapon extends Quest return; } - Map players = new HashMap<>(); + final Map players = new HashMap<>(); int maxSCLevel = 0; // TODO: what if mob support last_hit + party? @@ -381,7 +381,7 @@ public class Q00350_EnhanceYourWeapon extends Quest continue; } - SoulCrystal sc = getSCForPlayer(pl); + final SoulCrystal sc = getSCForPlayer(pl); if (sc == null) { continue; @@ -396,7 +396,7 @@ public class Q00350_EnhanceYourWeapon extends Quest } else { - SoulCrystal sc = getSCForPlayer(killer); + final SoulCrystal sc = getSCForPlayer(killer); if (sc != null) { players.put(killer, sc); @@ -407,7 +407,7 @@ public class Q00350_EnhanceYourWeapon extends Quest } } // Init some useful vars - LevelingInfo mainlvlInfo = NPC_LEVELING_INFO.get(mob.getId()).get(maxSCLevel); + final LevelingInfo mainlvlInfo = NPC_LEVELING_INFO.get(mob.getId()).get(maxSCLevel); if (mainlvlInfo == null) { @@ -426,7 +426,7 @@ public class Q00350_EnhanceYourWeapon extends Quest } // Fail if the killer isn't in the _absorbersList of this L2Attackable and mob is not boss - AbsorberInfo ai = mob.getAbsorbersList().get(killer.getObjectId()); + final AbsorberInfo ai = mob.getAbsorbersList().get(killer.getObjectId()); boolean isSuccess = true; if ((ai == null) || (ai.getObjectId() != killer.getObjectId())) { @@ -454,7 +454,7 @@ public class Q00350_EnhanceYourWeapon extends Quest // among those who have crystals, only. However, this might actually be correct (same as retail). if (killer.getParty() != null) { - L2PcInstance lucky = killer.getParty().getMembers().get(getRandom(killer.getParty().getMemberCount())); + final L2PcInstance lucky = killer.getParty().getMembers().get(getRandom(killer.getParty().getMemberCount())); levelCrystal(lucky, players.get(lucky), mob); } else @@ -465,11 +465,11 @@ public class Q00350_EnhanceYourWeapon extends Quest case PARTY_RANDOM: if (killer.getParty() != null) { - List luckyParty = new ArrayList<>(); + final List luckyParty = new ArrayList<>(); luckyParty.addAll(killer.getParty().getMembers()); while ((getRandom(100) < 33) && !luckyParty.isEmpty()) { - L2PcInstance lucky = luckyParty.remove(getRandom(luckyParty.size())); + final L2PcInstance lucky = luckyParty.remove(getRandom(luckyParty.size())); if (players.containsKey(lucky)) { levelCrystal(lucky, players.get(lucky), mob); @@ -507,19 +507,19 @@ public class Q00350_EnhanceYourWeapon extends Quest { try { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); - File file = new File(Config.DATAPACK_ROOT, "levelUpCrystalData.xml"); + final File file = new File(Config.DATAPACK_ROOT, "levelUpCrystalData.xml"); if (!file.exists()) { _log.severe("[EnhanceYourWeapon] Missing levelUpCrystalData.xml. The quest wont work without it!"); return; } - Document doc = factory.newDocumentBuilder().parse(file); - Node first = doc.getFirstChild(); + final Document doc = factory.newDocumentBuilder().parse(file); + final Node first = doc.getFirstChild(); if ((first != null) && "list".equalsIgnoreCase(first.getNodeName())) { for (Node n = first.getFirstChild(); n != null; n = n.getNextSibling()) @@ -530,14 +530,14 @@ public class Q00350_EnhanceYourWeapon extends Quest { if ("item".equalsIgnoreCase(d.getNodeName())) { - NamedNodeMap attrs = d.getAttributes(); + final NamedNodeMap attrs = d.getAttributes(); Node att = attrs.getNamedItem("itemId"); if (att == null) { _log.severe("[EnhanceYourWeapon] Missing itemId in Crystal List, skipping"); continue; } - int itemId = Integer.parseInt(attrs.getNamedItem("itemId").getNodeValue()); + final int itemId = Integer.parseInt(attrs.getNamedItem("itemId").getNodeValue()); att = attrs.getNamedItem("level"); if (att == null) @@ -545,7 +545,7 @@ public class Q00350_EnhanceYourWeapon extends Quest _log.severe("[EnhanceYourWeapon] Missing level in Crystal List itemId: " + itemId + ", skipping"); continue; } - int level = Integer.parseInt(attrs.getNamedItem("level").getNodeValue()); + final int level = Integer.parseInt(attrs.getNamedItem("level").getNodeValue()); att = attrs.getNamedItem("leveledItemId"); if (att == null) @@ -553,7 +553,7 @@ public class Q00350_EnhanceYourWeapon extends Quest _log.severe("[EnhanceYourWeapon] Missing leveledItemId in Crystal List itemId: " + itemId + ", skipping"); continue; } - int leveledItemId = Integer.parseInt(attrs.getNamedItem("leveledItemId").getNodeValue()); + final int leveledItemId = Integer.parseInt(attrs.getNamedItem("leveledItemId").getNodeValue()); SOUL_CRYSTALS.put(itemId, new SoulCrystal(level, itemId, leveledItemId)); } @@ -573,8 +573,8 @@ public class Q00350_EnhanceYourWeapon extends Quest continue; } - int npcId = Integer.parseInt(att.getNodeValue()); - Map temp = new HashMap<>(); + final int npcId = Integer.parseInt(att.getNodeValue()); + final Map temp = new HashMap<>(); for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) { boolean isSkillNeeded = false; @@ -603,17 +603,17 @@ public class Q00350_EnhanceYourWeapon extends Quest isSkillNeeded = Boolean.parseBoolean(att.getNodeValue()); } - Node att1 = attrs.getNamedItem("maxLevel"); - Node att2 = attrs.getNamedItem("levelList"); + final Node att1 = attrs.getNamedItem("maxLevel"); + final Node att2 = attrs.getNamedItem("levelList"); if ((att1 == null) && (att2 == null)) { _log.severe("[EnhanceYourWeapon] Missing maxlevel/levelList in NPC List npcId: " + npcId + ", skipping"); continue; } - LevelingInfo info = new LevelingInfo(absorbType, isSkillNeeded, chance); + final LevelingInfo info = new LevelingInfo(absorbType, isSkillNeeded, chance); if (att1 != null) { - int maxLevel = Integer.parseInt(att1.getNodeValue()); + final int maxLevel = Integer.parseInt(att1.getNodeValue()); for (int i = 0; i <= maxLevel; i++) { temp.put(i, info); @@ -621,8 +621,8 @@ public class Q00350_EnhanceYourWeapon extends Quest } else if (att2 != null) { - StringTokenizer st = new StringTokenizer(att2.getNodeValue(), ","); - int tokenCount = st.countTokens(); + final StringTokenizer st = new StringTokenizer(att2.getNodeValue(), ","); + final int tokenCount = st.countTokens(); for (int i = 0; i < tokenCount; i++) { Integer value = Integer.decode(st.nextToken().trim()); diff --git a/trunk/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/trunk/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index da35142716..df7fe82ac0 100644 --- a/trunk/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/trunk/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -210,7 +210,7 @@ public final class Q00371_ShrieksOfGhosts extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); if (qs.isCreated()) { diff --git a/trunk/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/trunk/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java index 42663359eb..0840290e60 100644 --- a/trunk/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java +++ b/trunk/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java @@ -109,7 +109,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest final QuestState qs = getRandomPartyMemberState(player, -1, 3, npc); if (qs != null) { - int npcId = npc.getId(); + final int npcId = npc.getId(); if (MOBS1.containsKey(npcId)) { final int itemCount = ((getRandom(1000) < MOBS1.get(npcId)) ? 3 : 2); diff --git a/trunk/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/trunk/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index f796a58e98..ab21623995 100644 --- a/trunk/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/trunk/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -114,7 +114,7 @@ public final class Q00386_StolenDignity extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = getNoQuestMsg(player); + final String htmltext = getNoQuestMsg(player); if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP)) { if (qs.isCreated()) @@ -153,7 +153,7 @@ public final class Q00386_StolenDignity extends Quest { return event; } - int ask = Integer.parseInt(event); + final int ask = Integer.parseInt(event); switch (ask) { case 3: @@ -318,7 +318,7 @@ public final class Q00386_StolenDignity extends Quest { for (int i0 = 0; i0 < 9; i0 = i0 + 1) { - int i1 = getNumberFromBingoBoard(qs, i0); + final int i1 = getNumberFromBingoBoard(qs, i0); if (isSelectedBingoNumber(qs, i1)) { html = html.replace("", i1 + ""); @@ -335,7 +335,7 @@ public final class Q00386_StolenDignity extends Quest { for (int i0 = 0; i0 < 9; i0 = i0 + 1) { - int i1 = getNumberFromBingoBoard(qs, i0); + final int i1 = getNumberFromBingoBoard(qs, i0); html = html.replace("", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff"); html = html.replace("", i1 + ""); } @@ -347,7 +347,7 @@ public final class Q00386_StolenDignity extends Quest if (!isSelectedBingoNumber(qs, num)) { selectBingoNumber(qs, num); - int i3 = getMatchedBingoLineCount(qs); + final int i3 = getMatchedBingoLineCount(qs); String html; if ((i3 == 3) && ((getBingoSelectCount(qs)) == 6)) { @@ -546,7 +546,7 @@ public final class Q00386_StolenDignity extends Quest private void createBingoBoard(QuestState qs) { //@formatter:off - Integer[] arr = {1,2,3,4,5,6,7,8,9}; + final Integer[] arr = {1,2,3,4,5,6,7,8,9}; //@formatter:on Collections.shuffle(Arrays.asList(arr)); qs.set("numbers", Arrays.asList(arr).toString().replaceAll("[^\\d ]", "")); @@ -559,7 +559,7 @@ public final class Q00386_StolenDignity extends Quest */ private int getMatchedBingoLineCount(QuestState qs) { - String[] q = qs.get("selected").split(" "); + final String[] q = qs.get("selected").split(" "); int found = 0; // Horizontal if ((q[0] + q[1] + q[2]).matches("\\d+")) @@ -605,7 +605,7 @@ public final class Q00386_StolenDignity extends Quest */ private void selectBingoNumber(QuestState qs, int num) { - String[] numbers = qs.get("numbers").split(" "); + final String[] numbers = qs.get("numbers").split(" "); int pos = 0; for (int i = 0; i < numbers.length; i++) { @@ -615,7 +615,7 @@ public final class Q00386_StolenDignity extends Quest break; } } - String[] selected = qs.get("selected").split(" "); + final String[] selected = qs.get("selected").split(" "); for (int i = 0; i < selected.length; i++) { if (i == pos) @@ -658,7 +658,7 @@ public final class Q00386_StolenDignity extends Quest */ private int getBingoSelectCount(QuestState qs) { - String current = qs.get("selected"); + final String current = qs.get("selected"); return current.replaceAll("\\D", "").length(); } @@ -872,7 +872,7 @@ public final class Q00386_StolenDignity extends Quest private QuestState getRandomPlayerFromParty(L2PcInstance player, L2Npc npc) { - QuestState qs = getQuestState(player, false); + final QuestState qs = getQuestState(player, false); final List candidates = new ArrayList<>(); if ((qs != null) && qs.isStarted()) @@ -886,7 +886,7 @@ public final class Q00386_StolenDignity extends Quest player.getParty().getMembers().stream().forEach(pm -> { - QuestState qss = getQuestState(pm, false); + final QuestState qss = getQuestState(pm, false); if ((qss != null) && qss.isStarted() && Util.checkIfInRange(1500, npc, pm, true)) { candidates.add(qss); diff --git a/trunk/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/trunk/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index dc5c21d936..c65ec04b71 100644 --- a/trunk/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/trunk/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -454,7 +454,7 @@ public final class Q00421_LittleWingsBigAdventure extends Quest { for (int i = 0; i < 20; i++) { - L2Npc guardian = addSpawn(SOUL_OF_TREE_GUARDIAN, npc); + final L2Npc guardian = addSpawn(SOUL_OF_TREE_GUARDIAN, npc); startQuestTimer("DESPAWN_GUARDIAN", 300000, guardian, null); if (i == 0) diff --git a/trunk/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/trunk/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java index ac9855596c..d20f108393 100644 --- a/trunk/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java +++ b/trunk/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java @@ -54,7 +54,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); diff --git a/trunk/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/trunk/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index 87dee8a135..e20a88b41b 100644 --- a/trunk/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/trunk/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -111,7 +111,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest private void increaseKill(L2PcInstance player, L2Npc npc) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { @@ -143,7 +143,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest npcId = MONSTER1[3]; } - int i = st.getInt(String.valueOf(npcId)); + final int i = st.getInt(String.valueOf(npcId)); if (i < 15) { st.set(Integer.toString(npcId), Integer.toString(i + 1)); @@ -172,7 +172,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest npcId = MONSTER2[2]; } - int i = st.getInt(String.valueOf(npcId)); + final int i = st.getInt(String.valueOf(npcId)); if (i < 20) { st.set(Integer.toString(npcId), Integer.toString(i + 1)); @@ -200,7 +200,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest npcId = MONSTER3[2]; } - int i = st.getInt(String.valueOf(npcId)); + final int i = st.getInt(String.valueOf(npcId)); if (i < 20) { st.set(Integer.toString(npcId), Integer.toString(i + 1)); @@ -220,8 +220,8 @@ public class Q00453_NotStrongEnoughAlone extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = event; - QuestState st = getQuestState(player, false); + final String htmltext = event; + final QuestState st = getQuestState(player, false); if (st == null) { @@ -269,7 +269,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest { String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - QuestState prev = player.getQuestState(Q10282_ToTheSeedOfAnnihilation.class.getSimpleName()); + final QuestState prev = player.getQuestState(Q10282_ToTheSeedOfAnnihilation.class.getSimpleName()); if (st == null) { return htmltext; diff --git a/trunk/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/trunk/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 6b881032d9..dee7fc2345 100644 --- a/trunk/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/trunk/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -281,7 +281,7 @@ public final class Q00456_DontKnowDontCare extends Quest return super.onKill(npc, killer, isSummon); } - Set allowedPlayers = new HashSet<>(); + final Set allowedPlayers = new HashSet<>(); for (AggroInfo aggro : ((L2Attackable) npc).getAggroList().values()) { @@ -290,7 +290,7 @@ public final class Q00456_DontKnowDontCare extends Quest continue; } - L2PcInstance attacker = aggro.getAttacker().getActingPlayer(); + final L2PcInstance attacker = aggro.getAttacker().getActingPlayer(); if (attacker.isInParty() // && attacker.getParty().isInCommandChannel() // @@ -314,7 +314,7 @@ public final class Q00456_DontKnowDontCare extends Quest private static void rewardPlayer(L2PcInstance player, L2Npc npc) { - int chance = getRandom(10000); + final int chance = getRandom(10000); final int reward; int count = 1; @@ -353,8 +353,8 @@ public final class Q00456_DontKnowDontCare extends Quest } giveItems(player, reward, count); - L2Item item = ItemTable.getInstance().getTemplate(reward); - NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.S1_RECEIVED_A_S2_ITEM_AS_A_REWARD_FROM_THE_SEPARATED_SOUL); + final L2Item item = ItemTable.getInstance().getTemplate(reward); + final NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.S1_RECEIVED_A_S2_ITEM_AS_A_REWARD_FROM_THE_SEPARATED_SOUL); packet.addStringParameter(player.getName()); packet.addStringParameter(item.getName()); npc.broadcastPacket(packet); diff --git a/trunk/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/trunk/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java index 20d6fe948e..39d56f8f8e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java +++ b/trunk/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java @@ -87,7 +87,7 @@ public class Q00458_PerfectForm extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String noQuest = getNoQuestMsg(player); + final String noQuest = getNoQuestMsg(player); final QuestState st = getQuestState(player, false); if (st == null) { @@ -178,20 +178,20 @@ public class Q00458_PerfectForm extends Quest case "32768-17.html": if (st.isCond(2)) { - int overhitsConsecutive = st.getInt("overhitsConsecutive"); + final int overhitsConsecutive = st.getInt("overhitsConsecutive"); if (overhitsConsecutive >= 20) { - int rnd = getRandom(ICARUS_WEAPON_RECIPES.length); + final int rnd = getRandom(ICARUS_WEAPON_RECIPES.length); st.rewardItems(ICARUS_WEAPON_RECIPES[rnd], 1); } else if (overhitsConsecutive >= 7) { - int rnd = getRandom(ICARUS_WEAPON_PIECES.length); + final int rnd = getRandom(ICARUS_WEAPON_PIECES.length); st.rewardItems(ICARUS_WEAPON_PIECES[rnd], 5); } else { - int rnd = getRandom(ICARUS_WEAPON_PIECES.length); + final int rnd = getRandom(ICARUS_WEAPON_PIECES.length); st.rewardItems(ICARUS_WEAPON_PIECES[rnd], 2); // not sure if this should use rewardItems st.giveItems(15482, 10); // Golden Spice Crate @@ -226,24 +226,24 @@ public class Q00458_PerfectForm extends Quest npcId++; } - String variable = String.valueOf(npcId); // i3 - int currentValue = st.getInt(variable); + final String variable = String.valueOf(npcId); // i3 + final int currentValue = st.getInt(variable); if (currentValue < 10) { st.set(variable, String.valueOf(currentValue + 1)); // IncreaseNPCLogByID - L2Attackable mob = (L2Attackable) npc; + final L2Attackable mob = (L2Attackable) npc; if (mob.isOverhit()) { st.set("overhitsTotal", String.valueOf(st.getInt("overhitsTotal") + 1)); // memoStateEx 1 - int maxHp = mob.getMaxHp(); + final int maxHp = mob.getMaxHp(); // L2Attackable#calculateOverhitExp() way of calculating overhit % seems illogical - double overhitPercentage = (maxHp + mob.getOverhitDamage()) / maxHp; + final double overhitPercentage = (maxHp + mob.getOverhitDamage()) / maxHp; if (overhitPercentage >= 1.2) { st.set("overhitsCritical", String.valueOf(st.getInt("overhitsCritical") + 1)); // memoStateEx 2 } - int overhitsConsecutive = st.getInt("overhitsConsecutive") + 1; + final int overhitsConsecutive = st.getInt("overhitsConsecutive") + 1; st.set("overhitsConsecutive", String.valueOf(overhitsConsecutive)); // memoStateEx 3 /* * Retail logic (makes for a long/messy string in database): int i0 = overhitsConsecutive % 100; int i1 = overhitsConsecutive - (i0 * 100); if (i0 < i1) { st.set("overhitsConsecutive", String.valueOf((i1 * 100) + i1)); } diff --git a/trunk/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/trunk/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java index d5b8ea540c..942409a120 100644 --- a/trunk/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java +++ b/trunk/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java @@ -127,7 +127,7 @@ public class Q00463_IMustBeaGenius extends Quest { case "32069-03.htm": st.startQuest(); - int number = getRandom(51) + 550; + final int number = getRandom(51) + 550; st.set("number", String.valueOf(number)); st.set("chance", String.valueOf(getRandom(4))); htmltext = getHtm(player.getHtmlPrefix(), event).replace("%num%", String.valueOf(number)); @@ -138,8 +138,8 @@ public class Q00463_IMustBeaGenius extends Quest case "reward": if (st.isCond(2)) { - int rnd = getRandom(REWARD.length); - String str = (REWARD[rnd][2] < 10) ? "0" + REWARD[rnd][2] : String.valueOf(REWARD[rnd][2]); + final int rnd = getRandom(REWARD.length); + final String str = (REWARD[rnd][2] < 10) ? "0" + REWARD[rnd][2] : String.valueOf(REWARD[rnd][2]); st.addExpAndSp(REWARD[rnd][0], REWARD[rnd][1]); st.exitQuest(QuestType.DAILY, true); diff --git a/trunk/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/trunk/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java index b66c82ce6a..b5f3420bd7 100644 --- a/trunk/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java +++ b/trunk/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java @@ -107,7 +107,7 @@ public class Q00464_Oath extends Quest return getNoQuestMsg(player); } - int cond = getRandom(2, 9); + final int cond = getRandom(2, 9); st.set("npc", String.valueOf(NPC[cond - 1][0])); st.setCond(cond, true); st.takeItems(BOOK, 1); @@ -146,7 +146,7 @@ public class Q00464_Oath extends Quest return getNoQuestMsg(player); } - int i = st.getCond() - 1; + final int i = st.getCond() - 1; st.addExpAndSp(NPC[i][1], NPC[i][2]); st.giveAdena(NPC[i][3], true); st.exitQuest(QuestType.DAILY, true); @@ -226,7 +226,7 @@ public class Q00464_Oath extends Quest if ((st != null) && st.isStarted()) { - int npcId = npc.getId(); + final int npcId = npc.getId(); if (npcId == NPC[0][0]) { diff --git a/trunk/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/trunk/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java index db84eefa9b..9ac5ce3f04 100644 --- a/trunk/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java +++ b/trunk/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java @@ -55,7 +55,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest return null; } - String htmltext = event; + final String htmltext = event; if (event.equals("33647-03.htm")) { qs.startQuest(); diff --git a/trunk/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/trunk/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java index b087b40cfc..6fbd7444d7 100644 --- a/trunk/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java +++ b/trunk/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java @@ -55,7 +55,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest return null; } - String htmltext = event; + final String htmltext = event; if (event.equals("33647-03.htm")) { qs.startQuest(); diff --git a/trunk/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/trunk/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java index ac1961fc11..0c2effe135 100644 --- a/trunk/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java +++ b/trunk/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java @@ -55,7 +55,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest return null; } - String htmltext = event; + final String htmltext = event; if (event.equals("33647-03.htm")) { qs.startQuest(); diff --git a/trunk/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/trunk/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java index 0d750d69d6..95ee014e22 100644 --- a/trunk/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java +++ b/trunk/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java @@ -55,7 +55,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest return null; } - String htmltext = event; + final String htmltext = event; if (event.equals("33647-03.htm")) { qs.startQuest(); diff --git a/trunk/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/trunk/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java index 51296fc528..6d58c751e4 100644 --- a/trunk/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java +++ b/trunk/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java @@ -55,7 +55,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest return null; } - String htmltext = event; + final String htmltext = event; if (event.equals("33647-03.htm")) { qs.startQuest(); diff --git a/trunk/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/trunk/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java index b70ca247e1..9c2f654d8d 100644 --- a/trunk/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java +++ b/trunk/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java @@ -55,7 +55,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest return null; } - String htmltext = event; + final String htmltext = event; if (event.equals("33647-03.htm")) { qs.startQuest(); diff --git a/trunk/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/trunk/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java index 6bf936a96c..b043da9579 100644 --- a/trunk/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java +++ b/trunk/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java @@ -445,7 +445,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest { if (player.isClanLeader()) { - L2Clan clan = player.getClan(); + final L2Clan clan = player.getClan(); if (clan != null) { if (clan.getLevel() < 4) diff --git a/trunk/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/trunk/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java index 889c69bc46..2d461435ce 100644 --- a/trunk/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java +++ b/trunk/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java @@ -78,7 +78,7 @@ public class Q00508_AClansReputation extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); @@ -135,7 +135,7 @@ public class Q00508_AClansReputation extends Quest } else { - L2PcInstance pleader = player.getClan().getLeader().getPlayerInstance(); + final L2PcInstance pleader = player.getClan().getLeader().getPlayerInstance(); if ((pleader != null) && player.isInsideRadius(pleader, 1500, true, false)) { st = pleader.getQuestState(getName()); @@ -144,7 +144,7 @@ public class Q00508_AClansReputation extends Quest if ((st != null) && st.isStarted()) { - int raid = st.getInt("raid"); + final int raid = st.getInt("raid"); if (REWARD_POINTS.containsKey(raid)) { if ((npc.getId() == REWARD_POINTS.get(raid).get(0)) && !st.hasQuestItems(REWARD_POINTS.get(raid).get(1))) @@ -167,7 +167,7 @@ public class Q00508_AClansReputation extends Quest return htmltext; } - L2Clan clan = player.getClan(); + final L2Clan clan = player.getClan(); switch (st.getState()) { case State.CREATED: @@ -180,7 +180,7 @@ public class Q00508_AClansReputation extends Quest return "30868-8.html"; } - int raid = st.getInt("raid"); + final int raid = st.getInt("raid"); if (REWARD_POINTS.containsKey(raid)) { diff --git a/trunk/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/trunk/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java index da8653bf20..351b53f7f0 100644 --- a/trunk/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java +++ b/trunk/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java @@ -73,7 +73,7 @@ public class Q00509_AClansFame extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); @@ -122,7 +122,7 @@ public class Q00509_AClansFame extends Quest } else { - L2PcInstance pleader = player.getClan().getLeader().getPlayerInstance(); + final L2PcInstance pleader = player.getClan().getLeader().getPlayerInstance(); if ((pleader != null) && player.isInsideRadius(pleader, 1500, true, false)) { st = pleader.getQuestState(getName()); @@ -131,7 +131,7 @@ public class Q00509_AClansFame extends Quest if ((st != null) && st.isStarted()) { - int raid = st.getInt("raid"); + final int raid = st.getInt("raid"); if (REWARD_POINTS.containsKey(raid)) { if ((npc.getId() == REWARD_POINTS.get(raid).get(0)) && !st.hasQuestItems(REWARD_POINTS.get(raid).get(1))) @@ -154,7 +154,7 @@ public class Q00509_AClansFame extends Quest return htmltext; } - L2Clan clan = player.getClan(); + final L2Clan clan = player.getClan(); switch (st.getState()) { case State.CREATED: @@ -167,7 +167,7 @@ public class Q00509_AClansFame extends Quest return "31331-6.html"; } - int raid = st.getInt("raid"); + final int raid = st.getInt("raid"); if (REWARD_POINTS.containsKey(raid)) { diff --git a/trunk/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/trunk/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java index a05e512a96..d832163f91 100644 --- a/trunk/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java +++ b/trunk/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java @@ -58,7 +58,7 @@ public class Q00510_AClansPrestige extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); @@ -91,7 +91,7 @@ public class Q00510_AClansPrestige extends Quest } else { - L2PcInstance pleader = player.getClan().getLeader().getPlayerInstance(); + final L2PcInstance pleader = player.getClan().getLeader().getPlayerInstance(); if ((pleader != null) && player.isInsideRadius(pleader, 1500, true, false)) { st = getQuestState(pleader, false); @@ -116,7 +116,7 @@ public class Q00510_AClansPrestige extends Quest return htmltext; } - L2Clan clan = player.getClan(); + final L2Clan clan = player.getClan(); switch (st.getState()) { case State.CREATED: @@ -135,8 +135,8 @@ public class Q00510_AClansPrestige extends Quest } else { - int count = (int) st.getQuestItemsCount(TYRANNOSAURUS_CLAW); - int reward = (count < 10) ? (30 * count) : (59 + (30 * count)); + final int count = (int) st.getQuestItemsCount(TYRANNOSAURUS_CLAW); + final int reward = (count < 10) ? (30 * count) : (59 + (30 * count)); st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_1); st.takeItems(TYRANNOSAURUS_CLAW, -1); clan.addReputationScore(reward, true); diff --git a/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index f67119546b..25052f3c59 100644 --- a/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -104,7 +104,7 @@ public final class Q00511_AwlUnderFoot extends Quest { spawnId = RAIDS3[getRandom(RAIDS3.length)]; } - L2Npc raid = addSpawn(spawnId, 53319, 245814, -6576, 0, false, 0, false, _world.getInstanceId()); + final L2Npc raid = addSpawn(spawnId, 53319, 245814, -6576, 0, false, 0, false, _world.getInstanceId()); if (raid instanceof L2RaidBossInstance) { ((L2RaidBossInstance) raid).setUseRaidCurse(false); @@ -198,7 +198,7 @@ public final class Q00511_AwlUnderFoot extends Quest { return null; } - L2Party party = player.getParty(); + final L2Party party = player.getParty(); if (party == null) { return "FortressWarden-03.htm"; @@ -224,8 +224,8 @@ public final class Q00511_AwlUnderFoot extends Quest private String checkFortCondition(L2PcInstance player, L2Npc npc, boolean isEnter) { - Fort fortress = npc.getFort(); - FortDungeon dungeon = _fortDungeons.get(npc.getId()); + final Fort fortress = npc.getFort(); + final FortDungeon dungeon = _fortDungeons.get(npc.getId()); if ((player == null) || (fortress == null) || (dungeon == null)) { return "FortressWarden-01.htm"; @@ -247,7 +247,7 @@ public final class Q00511_AwlUnderFoot extends Quest return "FortressWarden-07.htm"; } - L2Party party = player.getParty(); + final L2Party party = player.getParty(); if (party == null) { return "FortressWarden-03.htm"; @@ -287,9 +287,9 @@ public final class Q00511_AwlUnderFoot extends Quest { return ret; } - L2Party party = player.getParty(); - int instanceId = InstanceManager.getInstance().createDynamicInstance(template); - Instance ins = InstanceManager.getInstance().getInstance(instanceId); + final L2Party party = player.getParty(); + final int instanceId = InstanceManager.getInstance().createDynamicInstance(template); + final Instance ins = InstanceManager.getInstance().getInstance(instanceId); ins.setExitLoc(new Location(player)); world = new FAUWorld(); world.setInstanceId(instanceId); @@ -321,16 +321,16 @@ public final class Q00511_AwlUnderFoot extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = event; + final String htmltext = event; if (event.equalsIgnoreCase("enter")) { - int[] tele = new int[3]; + final int[] tele = new int[3]; tele[0] = 53322; tele[1] = 246380; tele[2] = -6580; return enterInstance(player, "fortdungeon.xml", tele, _fortDungeons.get(npc.getId()), checkFortCondition(player, npc, true)); } - QuestState st = getQuestState(player, true); + final QuestState st = getQuestState(player, true); if (event.equalsIgnoreCase("FortressWarden-10.htm")) { @@ -349,7 +349,7 @@ public final class Q00511_AwlUnderFoot extends Quest @Override public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isSummon) { - L2Playable attacker = (isSummon ? player.getServitors().values().stream().findFirst().orElse(player.getPet()) : player); + final L2Playable attacker = (isSummon ? player.getServitors().values().stream().findFirst().orElse(player.getPet()) : player); if ((attacker.getLevel() - npc.getLevel()) >= 9) { if ((attacker.getBuffCount() > 0) || (attacker.getDanceCount() > 0)) @@ -375,10 +375,10 @@ public final class Q00511_AwlUnderFoot extends Quest @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { - InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); + final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (tmpworld instanceof FAUWorld) { - FAUWorld world = (FAUWorld) tmpworld; + final FAUWorld world = (FAUWorld) tmpworld; if (Util.contains(RAIDS3, npc.getId())) { if (player.getParty() != null) @@ -393,7 +393,7 @@ public final class Q00511_AwlUnderFoot extends Quest rewardPlayer(player); } - Instance instanceObj = InstanceManager.getInstance().getInstance(world.getInstanceId()); + final Instance instanceObj = InstanceManager.getInstance().getInstance(world.getInstanceId()); instanceObj.setDuration(360000); instanceObj.removeNpcs(); } @@ -411,14 +411,14 @@ public final class Q00511_AwlUnderFoot extends Quest { String htmltext = Quest.getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - String ret = checkFortCondition(player, npc, false); + final String ret = checkFortCondition(player, npc, false); if (ret != null) { return ret; } else if (st != null) { - int npcId = npc.getId(); + final int npcId = npc.getId(); int cond = 0; if (st.getState() == State.CREATED) { @@ -442,7 +442,7 @@ public final class Q00511_AwlUnderFoot extends Quest } else if (_fortDungeons.containsKey(npcId) && (cond > 0) && (st.getState() == State.STARTED)) { - long count = st.getQuestItemsCount(DL_MARK); + final long count = st.getQuestItemsCount(DL_MARK); if ((cond == 1) && (count > 0)) { htmltext = "FortressWarden-14.htm"; @@ -460,7 +460,7 @@ public final class Q00511_AwlUnderFoot extends Quest private void rewardPlayer(L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st.isCond(1)) { st.giveItems(DL_MARK, 140); diff --git a/trunk/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/trunk/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java index fd71db11cc..0f064823c8 100644 --- a/trunk/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java +++ b/trunk/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java @@ -144,7 +144,7 @@ public final class Q00621_EggDelivery extends Quest { if (qs.isCond(7)) { - int rnd = getRandom(1000); + final int rnd = getRandom(1000); if (rnd < 800) { rewardItems(player, QUICK_STEP_POTION, 1); diff --git a/trunk/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/trunk/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java index 143db4f1d7..f19d8cecc2 100644 --- a/trunk/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java +++ b/trunk/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java @@ -144,7 +144,7 @@ public final class Q00622_SpecialtyLiquorDelivery extends Quest { if (qs.isCond(7)) { - int rnd = getRandom(1000); + final int rnd = getRandom(1000); if (rnd < 800) { rewardItems(player, QUICK_STEP_POTION, 1); diff --git a/trunk/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/trunk/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java index fca32077bf..3b33faa580 100644 --- a/trunk/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java +++ b/trunk/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java @@ -93,7 +93,7 @@ public final class Q00623_TheFinestFood extends Quest { if (hasAllItems(player, true, LEAF_OF_FLAVA, BUFFALO_MEAT, HORN_OF_ANTELOPE)) { - int random = getRandom(1000); + final int random = getRandom(1000); if (random < 120) { giveAdena(player, 25000, true); diff --git a/trunk/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/trunk/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java index 755ec59c50..af190585ef 100644 --- a/trunk/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java +++ b/trunk/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java @@ -97,7 +97,7 @@ public final class Q00625_TheFinestIngredientsPart2 extends Quest { if (hasItem(player, SPECIAL_YETI_MEAT)) { - int random = getRandom(1000); + final int random = getRandom(1000); if (random < 167) { rewardItems(player, GREATER_DYE_OF_STR_1); @@ -143,7 +143,7 @@ public final class Q00625_TheFinestIngredientsPart2 extends Quest { qs.setCond(2, true); takeItem(player, FOOD_FOR_BUMBALUMP); - L2Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC); + final L2Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC); umpaloopa.setSummoner(player); htmltext = event; } @@ -234,7 +234,7 @@ public final class Q00625_TheFinestIngredientsPart2 extends Quest { if (!isBumbalumpSpawned()) { - L2Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC); + final L2Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC); umpaloopa.setSummoner(talker); htmltext = "31542-02.html"; } diff --git a/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java index 17160777d8..d058853540 100644 --- a/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java +++ b/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java @@ -61,7 +61,7 @@ public class Q00641_AttackSailren extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { return getNoQuestMsg(player); diff --git a/trunk/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/trunk/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index 98616649d7..870b6e3367 100644 --- a/trunk/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/trunk/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -131,7 +131,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest return null; } - int npcId = npc.getId(); + final int npcId = npc.getId(); if (MOBS_TISSUE.containsKey(npcId)) { @@ -147,7 +147,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); if (qs.isCreated()) diff --git a/trunk/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/trunk/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java index 31b1bb2881..b4a6bd450a 100644 --- a/trunk/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java +++ b/trunk/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java @@ -191,11 +191,11 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest } final QuestState st = getQuestState(partyMember, false); - int npcId = npc.getId(); + final int npcId = npc.getId(); if (Util.contains(MOBS1, npcId)) { - float chance = (CHANCE_MOBS1 * Config.RATE_QUEST_DROP); + final float chance = (CHANCE_MOBS1 * Config.RATE_QUEST_DROP); if (getRandom(1000) < chance) { st.rewardItems(BONES_OF_A_PLAINS_DINOSAUR, 2); @@ -209,7 +209,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest if (Util.contains(MOBS2, npcId)) { - float chance = (CHANCE_MOBS2 * Config.RATE_QUEST_DROP); + final float chance = (CHANCE_MOBS2 * Config.RATE_QUEST_DROP); if (getRandom(1000) < chance) { st.rewardItems(BONES_OF_A_PLAINS_DINOSAUR, 1); @@ -219,7 +219,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest if (npcId == DEINONYCHUS) { - float chance = (CHANCE_DEINO * Config.RATE_QUEST_DROP); + final float chance = (CHANCE_DEINO * Config.RATE_QUEST_DROP); if (getRandom(1000) < chance) { st.rewardItems(BONES_OF_A_PLAINS_DINOSAUR, 1); diff --git a/trunk/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/trunk/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java index 28a7593a72..07a0cb5fc8 100644 --- a/trunk/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java +++ b/trunk/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java @@ -212,7 +212,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest if ((st.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (st.getInt("ex") > 0)) { takeItems(player, SILVER_ICE_CRYSTAL, 1); - int val = (st.getInt("ex") + 1); + final int val = (st.getInt("ex") + 1); st.set("ex", val); playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY); htmltext = event; @@ -224,7 +224,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest if ((st.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (st.getInt("ex") > 0)) { takeItems(player, SILVER_ICE_CRYSTAL, 1); - int val = (st.getInt("ex") + 2); + final int val = (st.getInt("ex") + 2); st.set("ex", val); playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY); htmltext = event; @@ -235,9 +235,9 @@ public final class Q00648_AnIceMerchantsDream extends Quest { if ((st.getCond() >= 1) && (st.getInt("ex") > 0)) { - int ex = st.getInt("ex"); - int val1 = ex / 10; - int val2 = ex - (val1 * 10); + final int ex = st.getInt("ex"); + final int val1 = ex / 10; + final int val2 = ex - (val1 * 10); if (val1 == val2) { htmltext = "32023-07.html"; @@ -257,9 +257,9 @@ public final class Q00648_AnIceMerchantsDream extends Quest { if ((st.getCond() >= 1) && (st.getInt("ex") > 0)) { - int ex = st.getInt("ex"); - int val1 = ex / 10; - int val2 = ((ex - (val1 * 10)) + 2); + final int ex = st.getInt("ex"); + final int val1 = ex / 10; + final int val2 = ((ex - (val1 * 10)) + 2); if (val1 == val2) { htmltext = "32023-07.html"; diff --git a/trunk/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/trunk/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index 1dceaf9833..f96e9b2efa 100644 --- a/trunk/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/trunk/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -255,12 +255,12 @@ public final class Q00662_AGameOfCards extends Quest { final int cond = st.getInt("v1"); int i1 = st.getInt("ExMemoState"); - int i5 = i1 % 100; + final int i5 = i1 % 100; int i9 = i1 / 100; i1 = cond % 100; - int i2 = (cond % 10000) / 100; - int i3 = (cond % 1000000) / 10000; - int i4 = (cond % 100000000) / 1000000; + final int i2 = (cond % 10000) / 100; + final int i3 = (cond % 1000000) / 10000; + final int i4 = (cond % 100000000) / 1000000; switch (event) { case "turncard1": @@ -633,14 +633,14 @@ public final class Q00662_AGameOfCards extends Quest } else if (st.getInt("ExMemoState") != 0) { - int i0 = st.getInt("v1"); + final int i0 = st.getInt("v1"); int i1 = st.getInt("ExMemoState"); - int i5 = i1 % 100; - int i9 = i1 / 100; + final int i5 = i1 % 100; + final int i9 = i1 / 100; i1 = i0 % 100; - int i2 = (i0 % 10000) / 100; - int i3 = (i0 % 1000000) / 10000; - int i4 = (i0 % 100000000) / 1000000; + final int i2 = (i0 % 10000) / 100; + final int i3 = (i0 % 1000000) / 10000; + final int i4 = (i0 % 100000000) / 1000000; htmltext = getHtm(player.getHtmlPrefix(), "30845-11a.html"); if ((i9 % 2) < 1) diff --git a/trunk/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/trunk/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java index fd7b770a7d..0d3e2a2fb8 100644 --- a/trunk/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java +++ b/trunk/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java @@ -131,7 +131,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest final QuestState st = getQuestState(partyMember, false); - float chance = (DROP_RATE * Config.RATE_QUEST_DROP); + final float chance = (DROP_RATE * Config.RATE_QUEST_DROP); if (getRandom(1000) < chance) { st.rewardItems(DINOSAUR_FANG_NECKLACE, 1); diff --git a/trunk/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/trunk/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java index 69299b8746..42b6dbc483 100644 --- a/trunk/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java +++ b/trunk/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java @@ -105,7 +105,8 @@ public class Q00699_GuardianOfTheSkies extends Quest { if (npc.getId() == VALDSTONE) { - int amount = 0, chance = getRandom(1000); + int amount = 0; + final int chance = getRandom(1000); if (chance < 215) { amount = getRandom(10) + 90; diff --git a/trunk/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/trunk/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java index 6aa124aec9..047e5a5c01 100644 --- a/trunk/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java +++ b/trunk/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java @@ -127,10 +127,10 @@ public class Q00700_CursedLife extends Quest } case State.STARTED: { - long bones = st.getQuestItemsCount(SWALLOWED_BONES); - long ribs = st.getQuestItemsCount(SWALLOWED_STERNUM); - long skulls = st.getQuestItemsCount(SWALLOWED_SKULL); - long sum = bones + ribs + skulls; + final long bones = st.getQuestItemsCount(SWALLOWED_BONES); + final long ribs = st.getQuestItemsCount(SWALLOWED_STERNUM); + final long skulls = st.getQuestItemsCount(SWALLOWED_SKULL); + final long sum = bones + ribs + skulls; if (sum > 0) { st.giveAdena(((bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0)), true); @@ -246,8 +246,8 @@ public class Q00700_CursedLife extends Quest } else { - Integer[] chances = MONSTERS.get(npc.getId()); - int chance = getRandom(1000); + final Integer[] chances = MONSTERS.get(npc.getId()); + final int chance = getRandom(1000); if (chance < chances[0]) { st.giveItems(SWALLOWED_BONES, 1); diff --git a/trunk/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/trunk/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java index 32f196a6cb..d51629d82e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java +++ b/trunk/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java @@ -162,8 +162,8 @@ public class Q00702_ATrapForRevenge extends Quest } else if (event.equalsIgnoreCase("32555-15.html")) { - int i0 = getRandom(1000); - int i1 = getRandom(1000); + final int i0 = getRandom(1000); + final int i1 = getRandom(1000); if ((i0 >= 500) && (i1 >= 600)) { diff --git a/trunk/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/trunk/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java index 171e3f11d1..15ed220ad4 100644 --- a/trunk/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java +++ b/trunk/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java @@ -48,7 +48,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - String htmltext = event; + final String htmltext = event; final QuestState st = getQuestState(player, false); if (st == null) { diff --git a/trunk/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/trunk/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java index 5a1f794db1..2b1a236476 100644 --- a/trunk/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java +++ b/trunk/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java @@ -136,7 +136,7 @@ public class Q10283_RequestOfIceMerchant extends Quest switch (st.getState()) { case State.CREATED: - QuestState _prev = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName()); + final QuestState _prev = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName()); htmltext = ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82)) ? "32020-01.htm" : "32020-00.htm"; break; case State.STARTED: diff --git a/trunk/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/trunk/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java index 21346788b3..976353a1b9 100644 --- a/trunk/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java +++ b/trunk/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java @@ -52,7 +52,7 @@ public class Q10288_SecretMission extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); if (st == null) { @@ -99,7 +99,7 @@ public class Q10288_SecretMission extends Quest @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - QuestState st = getQuestState(player, false); + final QuestState st = getQuestState(player, false); // dialog only changes when you talk to Aquilani after quest completion if ((st != null) && st.isCompleted()) { diff --git a/trunk/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/trunk/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index f2655ac7d1..2bae2aab40 100644 --- a/trunk/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/trunk/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -52,7 +52,7 @@ public class Q10289_FadeToBlack extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, false); + final QuestState qs = getQuestState(player, false); String htmltext = null; if (qs == null) { @@ -188,7 +188,7 @@ public class Q10289_FadeToBlack extends Quest break; } - long marksOfDarkness = getQuestItemsCount(player, MARK_OF_DARKNESS); + final long marksOfDarkness = getQuestItemsCount(player, MARK_OF_DARKNESS); if (marksOfDarkness > 0) { addExpAndSp(player, 55983 * marksOfDarkness, 136500 * (int) marksOfDarkness); diff --git a/trunk/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/trunk/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java index 580ba12d7a..059b4a0158 100644 --- a/trunk/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java +++ b/trunk/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java @@ -80,11 +80,11 @@ public final class Q10290_LandDragonConqueror extends Quest return super.onKill(npc, player, isSummon); } - Function rewardCheck = p -> + final Function rewardCheck = p -> { if (Util.checkIfInRange(8000, npc, p, false)) { - QuestState st = getQuestState(p, false); + final QuestState st = getQuestState(p, false); if ((st != null) && st.isCond(1) && st.hasQuestItems(SHABBY_NECKLACE)) { diff --git a/trunk/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/trunk/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java index c714c417b0..45f16cd294 100644 --- a/trunk/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java +++ b/trunk/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java @@ -79,11 +79,11 @@ public class Q10291_FireDragonDestroyer extends Quest return super.onKill(npc, player, isSummon); } - Function rewardCheck = p -> + final Function rewardCheck = p -> { if (Util.checkIfInRange(8000, npc, p, false)) { - QuestState st = getQuestState(p, false); + final QuestState st = getQuestState(p, false); if ((st != null) && st.isCond(1) && st.hasQuestItems(POOR_NECKLACE)) { diff --git a/trunk/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/trunk/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java index 3b573136a2..02f33ea0a7 100644 --- a/trunk/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java +++ b/trunk/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java @@ -204,7 +204,7 @@ public final class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); if ((qs.getCond() >= 1) && (qs.getCond() < 8)) { diff --git a/trunk/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/trunk/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java index 1b18db3ca9..bf5d177009 100644 --- a/trunk/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java +++ b/trunk/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java @@ -121,7 +121,7 @@ public final class Q10295_SevenSignsSolinasTomb extends Quest public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { String htmltext = event; - QuestState st = player.getQuestState(getName()); + final QuestState st = player.getQuestState(getName()); int progress = st.getInt("progress"); if ("32792-05.html".equals(event)) { @@ -333,12 +333,12 @@ public final class Q10295_SevenSignsSolinasTomb extends Quest return htmltext; } - int cond = st.getCond(); - int npcId = npc.getId(); + final int cond = st.getCond(); + final int npcId = npc.getId(); switch (st.getState()) { case State.CREATED: - QuestState ToTheMonastery = player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName()); + final QuestState ToTheMonastery = player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName()); if ((player.getLevel() >= 81) && ToTheMonastery.isCompleted()) { htmltext = "32792-01.htm"; @@ -469,11 +469,11 @@ public final class Q10295_SevenSignsSolinasTomb extends Quest @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isPet) { - QuestState st = player.getQuestState(getName()); - int cond = st.getInt("cond"); + final QuestState st = player.getQuestState(getName()); + final int cond = st.getInt("cond"); int tomb = st.getInt("tomb"); int solina = st.getInt("solina"); - int npcId = npc.getId(); + final int npcId = npc.getId(); if (cond == 1) { if (npcId == SOLINAS[0]) diff --git a/trunk/dist/game/data/scripts/quests/Q10296_SevenSignsPowerOfTheSeal/Q10296_SevenSignsPowerOfTheSeal.java b/trunk/dist/game/data/scripts/quests/Q10296_SevenSignsPowerOfTheSeal/Q10296_SevenSignsPowerOfTheSeal.java index 347f59e5f9..43760aa404 100644 --- a/trunk/dist/game/data/scripts/quests/Q10296_SevenSignsPowerOfTheSeal/Q10296_SevenSignsPowerOfTheSeal.java +++ b/trunk/dist/game/data/scripts/quests/Q10296_SevenSignsPowerOfTheSeal/Q10296_SevenSignsPowerOfTheSeal.java @@ -109,7 +109,7 @@ public final class Q10296_SevenSignsPowerOfTheSeal extends Quest switch (st.getState()) { case State.CREATED: - QuestState SolinasTomb = player.getQuestState("Q10295_SevenSignsSolinasTomb"); + final QuestState SolinasTomb = player.getQuestState("Q10295_SevenSignsSolinasTomb"); if ((player.getLevel() >= 81) && SolinasTomb.isCompleted()) { htmltext = "32792-01.htm"; @@ -200,7 +200,7 @@ public final class Q10296_SevenSignsPowerOfTheSeal extends Quest @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isPet) { - QuestState st = player.getQuestState(getName()); + final QuestState st = player.getQuestState(getName()); if (st == null) { return null; diff --git a/trunk/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/trunk/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java index 94f08efacc..2c083cda2f 100644 --- a/trunk/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java +++ b/trunk/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java @@ -65,7 +65,7 @@ public class Q10333_DisappearedSakum extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, false); + final QuestState qs = getQuestState(player, false); if (qs == null) { return null; @@ -253,7 +253,7 @@ public class Q10333_DisappearedSakum extends Quest } } - ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); log.addNpc(LANGK_LIZARDMAN, qs.getInt(Integer.toString(LANGK_LIZARDMAN))); log.addNpc(VUKU_ORC_FIGHTER, qs.getInt(Integer.toString(VUKU_ORC_FIGHTER))); killer.sendPacket(log); diff --git a/trunk/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/trunk/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java index 46527232d7..69c1d56e7c 100644 --- a/trunk/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java +++ b/trunk/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java @@ -71,7 +71,7 @@ public class Q10335_RequestToFindSakum extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, false); + final QuestState qs = getQuestState(player, false); if (qs == null) { return null; @@ -221,7 +221,7 @@ public class Q10335_RequestToFindSakum extends Quest qs.set(Integer.toString(npc.getId()), kills); } - ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); log.addNpc(SKELETON_TRACKER, qs.getInt(Integer.toString(SKELETON_TRACKER))); log.addNpc(SKELETON_BOWMAN, qs.getInt(Integer.toString(SKELETON_BOWMAN))); log.addNpc(RUIN_SPARTOI, qs.getInt(Integer.toString(RUIN_SPARTOI))); diff --git a/trunk/dist/game/data/scripts/quests/Q10337_SakumsInfluence/Q10337_SakumsInfluence.java b/trunk/dist/game/data/scripts/quests/Q10337_SakumsInfluence/Q10337_SakumsInfluence.java index 33c125cc44..98428b6f8d 100644 --- a/trunk/dist/game/data/scripts/quests/Q10337_SakumsInfluence/Q10337_SakumsInfluence.java +++ b/trunk/dist/game/data/scripts/quests/Q10337_SakumsInfluence/Q10337_SakumsInfluence.java @@ -235,7 +235,7 @@ public class Q10337_SakumsInfluence extends Quest } } - ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); log.addNpc(SKELETON_WARRIOR, qs.getInt(Integer.toString(SKELETON_WARRIOR))); log.addNpc(RUIN_IMP, qs.getInt(Integer.toString(RUIN_IMP))); log.addNpc(BAT, qs.getInt(Integer.toString(BAT))); diff --git a/trunk/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/trunk/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java index 1dbd8fdec2..58479eada9 100644 --- a/trunk/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java +++ b/trunk/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java @@ -211,7 +211,7 @@ public class Q10358_DividedSakumPoslof extends Quest } if (qs.isCond(1)) { - ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); log.addNpc(ZOMBIE_WARRIOR, qs.getInt(Integer.toString(ZOMBIE_WARRIOR))); log.addNpc(VEELAN_BUGBEAR_WARRIOR, qs.getInt(Integer.toString(VEELAN_BUGBEAR_WARRIOR))); killer.sendPacket(log); @@ -223,7 +223,7 @@ public class Q10358_DividedSakumPoslof extends Quest } else if (qs.isCond(3)) { - ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); log.addNpc(POSLOF, qs.getInt(Integer.toString(POSLOF))); killer.sendPacket(log); } diff --git a/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index d9483699d2..60d6966aeb 100644 --- a/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -213,7 +213,7 @@ public class Q10360_CertificationOfFate extends Quest } if (event.startsWith("CC") && (qs.getCond() > 7)) // Change Class { - ClassId desired = ClassId.valueOf(event.replace("CC_", "")); + final ClassId desired = ClassId.valueOf(event.replace("CC_", "")); switch (desired) { case PALADIN: diff --git a/trunk/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/trunk/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java index 392e83b488..ce0fcdd9ac 100644 --- a/trunk/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java +++ b/trunk/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java @@ -188,7 +188,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest } } - ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); log.addNpc(CRAWLER, qs.getInt(Integer.toString(CRAWLER))); log.addNpc(STALKER, qs.getInt(Integer.toString(STALKER))); killer.sendPacket(log); diff --git a/trunk/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java b/trunk/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java index 5d94dc8635..06394dfa85 100644 --- a/trunk/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java +++ b/trunk/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java @@ -150,7 +150,7 @@ public class Q10368_RebellionOfMonsters extends Quest qs.set(Integer.toString(npc.getId()), kills); } - ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); log.addNpc(WEARY_JAGUAR, qs.getInt(Integer.toString(WEARY_JAGUAR))); log.addNpc(WEARY_JAGUAR_SCOUT, qs.getInt(Integer.toString(WEARY_JAGUAR_SCOUT))); log.addNpc(ANT_SOLDIER, qs.getInt(Integer.toString(ANT_SOLDIER))); diff --git a/trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java index 54eea56a36..9bbb0c4947 100644 --- a/trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java +++ b/trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java @@ -145,7 +145,7 @@ public class Q10734_DoOrDie extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); if (qs.isCompleted()) diff --git a/trunk/java/com/l2jserver/Config.java b/trunk/java/com/l2jserver/Config.java index 3354a69e2a..b8f18d41b5 100644 --- a/trunk/java/com/l2jserver/Config.java +++ b/trunk/java/com/l2jserver/Config.java @@ -1213,7 +1213,7 @@ public final class Config MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7); MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100); - String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";"); + final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";"); PROTOCOL_LIST = new ArrayList<>(protocols.length); for (String protocol : protocols) { @@ -1241,7 +1241,7 @@ public final class Config } // Hosts and Subnets - IPConfigData ipcd = new IPConfigData(); + final IPConfigData ipcd = new IPConfigData(); GAME_SERVER_SUBNETS = ipcd.getSubnets(); GAME_SERVER_HOSTS = ipcd.getHosts(); @@ -1414,11 +1414,11 @@ public final class Config // Create Map only if enabled if (ENABLE_MODIFY_SKILL_DURATION) { - String[] propertySplit = character.getString("SkillDurationList", "").split(";"); + final String[] propertySplit = character.getString("SkillDurationList", "").split(";"); SKILL_DURATION_LIST = new HashMap<>(propertySplit.length); for (String skill : propertySplit) { - String[] skillSplit = skill.split(","); + final String[] skillSplit = skill.split(","); if (skillSplit.length != 2) { _log.warning(StringUtil.concat("[SkillDurationList]: invalid config property -> SkillDurationList \"", skill, "\"")); @@ -1443,11 +1443,11 @@ public final class Config // Create Map only if enabled if (ENABLE_MODIFY_SKILL_REUSE) { - String[] propertySplit = character.getString("SkillReuseList", "").split(";"); + final String[] propertySplit = character.getString("SkillReuseList", "").split(";"); SKILL_REUSE_LIST = new HashMap<>(propertySplit.length); for (String skill : propertySplit) { - String[] skillSplit = skill.split(","); + final String[] skillSplit = skill.split(","); if (skillSplit.length != 2) { _log.warning(StringUtil.concat("[SkillReuseList]: invalid config property -> SkillReuseList \"", skill, "\"")); @@ -1553,7 +1553,7 @@ public final class Config ENCHANT_CHANCE_ELEMENT_JEWEL = character.getDouble("EnchantChanceElementJewel", 20); ENCHANT_CHANCE_ELEMENT_ENERGY = character.getDouble("EnchantChanceElementEnergy", 10); CHANGE_CHANCE_ELEMENT = character.getInt("ChangeChanceElement", 60); - String[] notenchantable = character.getString("EnchantBlackList", "7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,13293,13294,13296").split(","); + final String[] notenchantable = character.getString("EnchantBlackList", "7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,13293,13294,13296").split(","); ENCHANT_BLACKLIST = new int[notenchantable.length]; for (int i = 0; i < notenchantable.length; i++) { @@ -1676,7 +1676,7 @@ public final class Config UNSTUCK_INTERVAL = character.getInt("UnstuckInterval", 300); TELEPORT_WATCHDOG_TIMEOUT = character.getInt("TeleportWatchdogTimeout", 0); PLAYER_SPAWN_PROTECTION = character.getInt("PlayerSpawnProtection", 0); - String[] items = character.getString("PlayerSpawnProtectionAllowedItems", "0").split(","); + final String[] items = character.getString("PlayerSpawnProtectionAllowedItems", "0").split(","); SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<>(items.length); for (String item : items) { @@ -1829,7 +1829,7 @@ public final class Config ALLOW_DISCARDITEM = General.getBoolean("AllowDiscardItem", true); AUTODESTROY_ITEM_AFTER = General.getInt("AutoDestroyDroppedItemAfter", 600); HERB_AUTO_DESTROY_TIME = General.getInt("AutoDestroyHerbTime", 60) * 1000; - String[] split = General.getString("ListOfProtectedItems", "0").split(","); + final String[] split = General.getString("ListOfProtectedItems", "0").split(","); LIST_PROTECTED_ITEMS = new ArrayList<>(split.length); for (String id : split) { @@ -2040,7 +2040,7 @@ public final class Config GUARD_ATTACK_AGGRO_MOB = NPC.getBoolean("GuardAttackAggroMob", false); ENABLE_GUARD_RETURN = NPC.getBoolean("EnableGuardReturn", false); ALLOW_WYVERN_UPGRADER = NPC.getBoolean("AllowWyvernUpgrader", false); - String[] listPetRentNpc = NPC.getString("ListPetRentNpc", "30827").split(","); + final String[] listPetRentNpc = NPC.getString("ListPetRentNpc", "30827").split(","); LIST_PET_RENT_NPC = new ArrayList<>(listPetRentNpc.length); for (String id : listPetRentNpc) { @@ -2059,7 +2059,7 @@ public final class Config MINIONS_RESPAWN_TIME = new HashMap<>(propertySplit.length); for (String prop : propertySplit) { - String[] propSplit = prop.split(","); + final String[] propSplit = prop.split(","); if (propSplit.length != 2) { _log.warning(StringUtil.concat("[CustomMinionsRespawnTime]: invalid config property -> CustomMinionsRespawnTime \"", prop, "\"")); @@ -2148,13 +2148,13 @@ public final class Config RATE_CORPSE_DROP_CHANCE_MULTIPLIER = RatesSettings.getFloat("CorpseDropChanceMultiplier", 1); RATE_HERB_DROP_CHANCE_MULTIPLIER = RatesSettings.getFloat("HerbDropChanceMultiplier", 1); RATE_RAID_DROP_CHANCE_MULTIPLIER = RatesSettings.getFloat("RaidDropChanceMultiplier", 1); - String[] dropAmountMultiplier = RatesSettings.getString("DropAmountMultiplierByItemId", "").split(";"); + final String[] dropAmountMultiplier = RatesSettings.getString("DropAmountMultiplierByItemId", "").split(";"); RATE_DROP_AMOUNT_MULTIPLIER = new HashMap<>(dropAmountMultiplier.length); if (!dropAmountMultiplier[0].isEmpty()) { for (String item : dropAmountMultiplier) { - String[] itemSplit = item.split(","); + final String[] itemSplit = item.split(","); if (itemSplit.length != 2) { _log.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\"")); @@ -2176,13 +2176,13 @@ public final class Config } } - String[] dropChanceMultiplier = RatesSettings.getString("DropChanceMultiplierByItemId", "").split(";"); + final String[] dropChanceMultiplier = RatesSettings.getString("DropChanceMultiplierByItemId", "").split(";"); RATE_DROP_CHANCE_MULTIPLIER = new HashMap<>(dropChanceMultiplier.length); if (!dropChanceMultiplier[0].isEmpty()) { for (String item : dropChanceMultiplier) { - String[] itemSplit = item.split(","); + final String[] itemSplit = item.split(","); if (itemSplit.length != 2) { _log.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\"")); @@ -2328,7 +2328,7 @@ public final class Config tvtNpcCoords = CustomSettings.getString("TvTEventReward", "57,100000").split(";"); for (String reward : tvtNpcCoords) { - String[] rewardSplit = reward.split(","); + final String[] rewardSplit = reward.split(","); if (rewardSplit.length != 2) { _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"", reward, "\"")); @@ -2396,7 +2396,7 @@ public final class Config TVT_EVENT_FIGHTER_BUFFS = new HashMap<>(tvtNpcCoords.length); for (String skill : tvtNpcCoords) { - String[] skillSplit = skill.split(","); + final String[] skillSplit = skill.split(","); if (skillSplit.length != 2) { _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventFighterBuffs \"", skill, "\"")); @@ -2424,7 +2424,7 @@ public final class Config TVT_EVENT_MAGE_BUFFS = new HashMap<>(tvtNpcCoords.length); for (String skill : tvtNpcCoords) { - String[] skillSplit = skill.split(","); + final String[] skillSplit = skill.split(","); if (skillSplit.length != 2) { _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventMageBuffs \"", skill, "\"")); @@ -2523,11 +2523,11 @@ public final class Config L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP = CustomSettings.getInt("DualboxCheckMaxPlayersPerIP", 0); L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP = CustomSettings.getInt("DualboxCheckMaxOlympiadParticipantsPerIP", 0); L2JMOD_DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP = CustomSettings.getInt("DualboxCheckMaxL2EventParticipantsPerIP", 0); - String[] dualboxCheckWhiteList = CustomSettings.getString("DualboxCheckWhitelist", "127.0.0.1,0").split(";"); + final String[] dualboxCheckWhiteList = CustomSettings.getString("DualboxCheckWhitelist", "127.0.0.1,0").split(";"); L2JMOD_DUALBOX_CHECK_WHITELIST = new HashMap<>(dualboxCheckWhiteList.length); for (String entry : dualboxCheckWhiteList) { - String[] entrySplit = entry.split(","); + final String[] entrySplit = entry.split(","); if (entrySplit.length != 2) { _log.warning(StringUtil.concat("DualboxCheck[Config.load()]: invalid config property -> DualboxCheckWhitelist \"", entry, "\"")); @@ -2570,7 +2570,7 @@ public final class Config MOB_MIN_SPAWN_RANGE = MOB_MAX_SPAWN_RANGE * -1; if (ENABLE_RANDOM_MONSTER_SPAWNS) { - String[] mobsIds = CustomSettings.getString("MobsSpawnNotRandom", "18812,18813,18814,22138").split(","); + final String[] mobsIds = CustomSettings.getString("MobsSpawnNotRandom", "18812,18813,18814,22138").split(","); MOBS_LIST_NOT_RANDOM = new ArrayList<>(mobsIds.length); for (String id : mobsIds) { @@ -2620,13 +2620,13 @@ public final class Config PREMIUM_RATE_SP = CustomSettings.getFloat("PremiumRateSp", 2); PREMIUM_RATE_DROP_CHANCE = CustomSettings.getFloat("PremiumRateDropChance", 1); PREMIUM_RATE_DROP_AMOUNT = CustomSettings.getFloat("PremiumRateDropAmount", 2); - String[] premiumDropChanceMultiplier = CustomSettings.getString("PremiumDropChanceMultiplierByItemId", "").split(";"); + final String[] premiumDropChanceMultiplier = CustomSettings.getString("PremiumDropChanceMultiplierByItemId", "").split(";"); PREMIUM_RATE_DROP_CHANCE_MULTIPLIER = new HashMap<>(premiumDropChanceMultiplier.length); if (!premiumDropChanceMultiplier[0].isEmpty()) { for (String item : premiumDropChanceMultiplier) { - String[] itemSplit = item.split(","); + final String[] itemSplit = item.split(","); if (itemSplit.length != 2) { _log.warning(StringUtil.concat("Config.load(): invalid config property -> PremiumDropChanceMultiplierByItemId \"", item, "\"")); @@ -2647,13 +2647,13 @@ public final class Config } } } - String[] premiumDropAmountMultiplier = CustomSettings.getString("PremiumDropAmountMultiplierByItemId", "").split(";"); + final String[] premiumDropAmountMultiplier = CustomSettings.getString("PremiumDropAmountMultiplierByItemId", "").split(";"); PREMIUM_RATE_DROP_AMOUNT_MULTIPLIER = new HashMap<>(premiumDropAmountMultiplier.length); if (!premiumDropAmountMultiplier[0].isEmpty()) { for (String item : premiumDropAmountMultiplier) { - String[] itemSplit = item.split(","); + final String[] itemSplit = item.split(","); if (itemSplit.length != 2) { _log.warning(StringUtil.concat("Config.load(): invalid config property -> PremiumDropAmountMultiplierByItemId \"", item, "\"")); @@ -2779,7 +2779,7 @@ public final class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); + final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); for (String id : olyRestrictedItems) { @@ -2894,7 +2894,7 @@ public final class Config { for (int regionY = L2World.TILE_Y_MIN; regionY <= L2World.TILE_Y_MAX; regionY++) { - String key = regionX + "_" + regionY; + final String key = regionX + "_" + regionY; if (geoData.containskey(regionX + "_" + regionY)) { GEODATA_REGIONS.put(key, geoData.getBoolean(key, false)); @@ -3725,8 +3725,8 @@ public final class Config { pName = pName.toUpperCase(); } - Field clazField = Config.class.getField(pName); - int modifiers = clazField.getModifiers(); + final Field clazField = Config.class.getField(pName); + final int modifiers = clazField.getModifiers(); // just in case :) if (!Modifier.isStatic(modifiers) || !Modifier.isPublic(modifiers) || Modifier.isFinal(modifiers)) { @@ -3804,8 +3804,8 @@ public final class Config { try { - Properties hexSetting = new Properties(); - File file = new File(fileName); + final Properties hexSetting = new Properties(); + final File file = new File(fileName); // Create a new empty file only if it doesn't exist file.createNewFile(); try (OutputStream out = new FileOutputStream(file)) @@ -3993,8 +3993,8 @@ public final class Config */ private static Map parseConfigLine(String line) { - String[] propertySplit = line.split(","); - Map ret = new HashMap<>(propertySplit.length); + final String[] propertySplit = line.split(","); + final Map ret = new HashMap<>(propertySplit.length); int i = 0; for (String value : propertySplit) { @@ -4106,7 +4106,7 @@ public final class Config } } - Node att = n.getAttributes().getNamedItem("address"); + final Node att = n.getAttributes().getNamedItem("address"); if (att == null) { LOGGER.log(Level.WARNING, "Failed to load " + IP_CONFIG_FILE + " file - default server address is missing."); @@ -4126,7 +4126,7 @@ public final class Config String externalIp = "127.0.0.1"; try { - URL autoIp = new URL("http://ip1.dynupdate.no-ip.com:8245/"); + final URL autoIp = new URL("http://ip1.dynupdate.no-ip.com:8245/"); try (BufferedReader in = new BufferedReader(new InputStreamReader(autoIp.openStream()))) { externalIp = in.readLine(); @@ -4140,11 +4140,11 @@ public final class Config try { - Enumeration niList = NetworkInterface.getNetworkInterfaces(); + final Enumeration niList = NetworkInterface.getNetworkInterfaces(); while (niList.hasMoreElements()) { - NetworkInterface ni = niList.nextElement(); + final NetworkInterface ni = niList.nextElement(); if (!ni.isUp() || ni.isVirtual()) { diff --git a/trunk/java/com/l2jserver/commons/geodriver/blocks/ComplexBlock.java b/trunk/java/com/l2jserver/commons/geodriver/blocks/ComplexBlock.java index c7879bbbcc..e1dfba0737 100644 --- a/trunk/java/com/l2jserver/commons/geodriver/blocks/ComplexBlock.java +++ b/trunk/java/com/l2jserver/commons/geodriver/blocks/ComplexBlock.java @@ -50,7 +50,7 @@ public final class ComplexBlock implements IBlock private int _getCellHeight(int geoX, int geoY) { - short height = (short) (_getCellData(geoX, geoY) & 0x0FFF0); + final short height = (short) (_getCellData(geoX, geoY) & 0x0FFF0); return height >> 1; } @@ -69,14 +69,14 @@ public final class ComplexBlock implements IBlock @Override public int getNextLowerZ(int geoX, int geoY, int worldZ) { - int cellHeight = _getCellHeight(geoX, geoY); + final int cellHeight = _getCellHeight(geoX, geoY); return cellHeight <= worldZ ? cellHeight : worldZ; } @Override public int getNextHigherZ(int geoX, int geoY, int worldZ) { - int cellHeight = _getCellHeight(geoX, geoY); + final int cellHeight = _getCellHeight(geoX, geoY); return cellHeight >= worldZ ? cellHeight : worldZ; } } diff --git a/trunk/java/com/l2jserver/commons/geodriver/blocks/MultilayerBlock.java b/trunk/java/com/l2jserver/commons/geodriver/blocks/MultilayerBlock.java index d4b774d1b1..23183878d3 100644 --- a/trunk/java/com/l2jserver/commons/geodriver/blocks/MultilayerBlock.java +++ b/trunk/java/com/l2jserver/commons/geodriver/blocks/MultilayerBlock.java @@ -35,11 +35,11 @@ public class MultilayerBlock implements IBlock */ public MultilayerBlock(ByteBuffer bb) { - int start = bb.position(); + final int start = bb.position(); for (int blockCellOffset = 0; blockCellOffset < IBlock.BLOCK_CELLS; blockCellOffset++) { - byte nLayers = bb.get(); + final byte nLayers = bb.get(); if ((nLayers <= 0) || (nLayers > 125)) { throw new RuntimeException("L2JGeoDriver: Geo file corrupted! Invalid layers count!"); @@ -55,24 +55,24 @@ public class MultilayerBlock implements IBlock private short _getNearestLayer(int geoX, int geoY, int worldZ) { - int startOffset = _getCellDataOffset(geoX, geoY); - byte nLayers = _data[startOffset]; - int endOffset = startOffset + 1 + (nLayers * 2); + final int startOffset = _getCellDataOffset(geoX, geoY); + final byte nLayers = _data[startOffset]; + final int endOffset = startOffset + 1 + (nLayers * 2); // 1 layer at least was required on loading so this is set at least once on the loop below int nearestDZ = 0; short nearestData = 0; for (int offset = startOffset + 1; offset < endOffset; offset += 2) { - short layerData = _extractLayerData(offset); - int layerZ = _extractLayerHeight(layerData); + final short layerData = _extractLayerData(offset); + final int layerZ = _extractLayerHeight(layerData); if (layerZ == worldZ) { // exact z return layerData; } - int layerDZ = Math.abs(layerZ - worldZ); + final int layerDZ = Math.abs(layerZ - worldZ); if ((offset == (startOffset + 1)) || (layerDZ < nearestDZ)) { nearestDZ = layerDZ; @@ -85,7 +85,7 @@ public class MultilayerBlock implements IBlock private int _getCellDataOffset(int geoX, int geoY) { - int cellLocalOffset = ((geoX % IBlock.BLOCK_CELLS_X) * IBlock.BLOCK_CELLS_Y) + (geoY % IBlock.BLOCK_CELLS_Y); + final int cellLocalOffset = ((geoX % IBlock.BLOCK_CELLS_X) * IBlock.BLOCK_CELLS_Y) + (geoY % IBlock.BLOCK_CELLS_Y); int cellDataOffset = 0; // move index to cell, we need to parse on each request, OR we parse on creation and save indexes for (int i = 0; i < cellLocalOffset; i++) @@ -133,16 +133,16 @@ public class MultilayerBlock implements IBlock @Override public int getNextLowerZ(int geoX, int geoY, int worldZ) { - int startOffset = _getCellDataOffset(geoX, geoY); - byte nLayers = _data[startOffset]; - int endOffset = startOffset + 1 + (nLayers * 2); + final int startOffset = _getCellDataOffset(geoX, geoY); + final byte nLayers = _data[startOffset]; + final int endOffset = startOffset + 1 + (nLayers * 2); int lowerZ = Integer.MIN_VALUE; for (int offset = startOffset + 1; offset < endOffset; offset += 2) { - short layerData = _extractLayerData(offset); + final short layerData = _extractLayerData(offset); - int layerZ = _extractLayerHeight(layerData); + final int layerZ = _extractLayerHeight(layerData); if (layerZ == worldZ) { // exact z @@ -161,16 +161,16 @@ public class MultilayerBlock implements IBlock @Override public int getNextHigherZ(int geoX, int geoY, int worldZ) { - int startOffset = _getCellDataOffset(geoX, geoY); - byte nLayers = _data[startOffset]; - int endOffset = startOffset + 1 + (nLayers * 2); + final int startOffset = _getCellDataOffset(geoX, geoY); + final byte nLayers = _data[startOffset]; + final int endOffset = startOffset + 1 + (nLayers * 2); int higherZ = Integer.MAX_VALUE; for (int offset = startOffset + 1; offset < endOffset; offset += 2) { - short layerData = _extractLayerData(offset); + final short layerData = _extractLayerData(offset); - int layerZ = _extractLayerHeight(layerData); + final int layerZ = _extractLayerHeight(layerData); if (layerZ == worldZ) { // exact z diff --git a/trunk/java/com/l2jserver/commons/geodriver/regions/Region.java b/trunk/java/com/l2jserver/commons/geodriver/regions/Region.java index a7ca9f1390..13163369bd 100644 --- a/trunk/java/com/l2jserver/commons/geodriver/regions/Region.java +++ b/trunk/java/com/l2jserver/commons/geodriver/regions/Region.java @@ -37,7 +37,7 @@ public final class Region implements IRegion { for (int blockOffset = 0; blockOffset < IRegion.REGION_BLOCKS; blockOffset++) { - int blockType = bb.get(); + final int blockType = bb.get(); switch (blockType) { case IBlock.TYPE_FLAT: diff --git a/trunk/java/com/l2jserver/commons/javaengine/JavaCompiler.java b/trunk/java/com/l2jserver/commons/javaengine/JavaCompiler.java index 49a15e3551..2fa7179581 100644 --- a/trunk/java/com/l2jserver/commons/javaengine/JavaCompiler.java +++ b/trunk/java/com/l2jserver/commons/javaengine/JavaCompiler.java @@ -52,7 +52,7 @@ public class JavaCompiler public Map compile(String source, String fileName) { - PrintWriter err = new PrintWriter(System.err); + final PrintWriter err = new PrintWriter(System.err); return compile(source, fileName, err, null, null); } @@ -78,17 +78,17 @@ public class JavaCompiler public Map compile(String fileName, String source, Writer err, String sourcePath, String classPath) { // to collect errors, warnings etc. - DiagnosticCollector diagnostics = new DiagnosticCollector<>(); + final DiagnosticCollector diagnostics = new DiagnosticCollector<>(); // create a new memory JavaFileManager - MemoryJavaFileManager manager = new MemoryJavaFileManager(); + final MemoryJavaFileManager manager = new MemoryJavaFileManager(); // prepare the compilation unit - List compUnits = new ArrayList<>(1); + final List compUnits = new ArrayList<>(1); compUnits.add(MemoryJavaFileManager.makeStringSource(fileName, source)); // javac options - List options = new ArrayList<>(); + final List options = new ArrayList<>(); options.add("-warn:-enumSwitch"); options.add("-g"); options.add("-deprecation"); @@ -105,11 +105,11 @@ public class JavaCompiler } // create a compilation task - CompilationTask task = tool.getTask(err, manager, diagnostics, options, null, compUnits); + final CompilationTask task = tool.getTask(err, manager, diagnostics, options, null, compUnits); if (!task.call()) { - PrintWriter perr = new PrintWriter(err); + final PrintWriter perr = new PrintWriter(err); for (Diagnostic diagnostic : diagnostics.getDiagnostics()) { perr.println(diagnostic.getMessage(Locale.getDefault())); @@ -118,7 +118,7 @@ public class JavaCompiler return null; } - Map classBytes = manager.getClassBytes(); + final Map classBytes = manager.getClassBytes(); manager.close(); return classBytes; } diff --git a/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngine.java b/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngine.java index 789a5dee36..00a9b6aaa6 100644 --- a/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngine.java +++ b/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngine.java @@ -87,9 +87,9 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable { if (_class == null) { - Map classBytesCopy = new HashMap<>(); + final Map classBytesCopy = new HashMap<>(); classBytesCopy.putAll(_classBytes); - MemoryClassLoader loader = new MemoryClassLoader(classBytesCopy, _classPath, JavaScriptEngine.getParentLoader(ctx)); + final MemoryClassLoader loader = new MemoryClassLoader(classBytesCopy, _classPath, JavaScriptEngine.getParentLoader(ctx)); _class = JavaScriptEngine.parseMain(loader, ctx); } return JavaScriptEngine.evalClass(_class, ctx); @@ -111,7 +111,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable @Override public Object eval(String str, ScriptContext ctx) throws ScriptException { - Class clazz = parse(str, ctx); + final Class clazz = parse(str, ctx); return evalClass(clazz, ctx); } @@ -149,9 +149,9 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable private Class parse(String str, ScriptContext ctx) throws ScriptException { - String fileName = getFileName(ctx); - String sourcePath = getSourcePath(ctx); - String classPath = getClassPath(ctx); + final String fileName = getFileName(ctx); + final String sourcePath = getSourcePath(ctx); + final String classPath = getClassPath(ctx); Writer err = ctx.getErrorWriter(); if (err == null) @@ -159,7 +159,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable err = new StringWriter(); } - Map classBytes = compiler.compile(fileName, str, err, sourcePath, classPath); + final Map classBytes = compiler.compile(fileName, str, err, sourcePath, classPath); if (classBytes == null) { @@ -171,19 +171,19 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable } // create a ClassLoader to load classes from MemoryJavaFileManager - MemoryClassLoader loader = new MemoryClassLoader(classBytes, classPath, getParentLoader(ctx)); + final MemoryClassLoader loader = new MemoryClassLoader(classBytes, classPath, getParentLoader(ctx)); return parseMain(loader, ctx); } protected static Class parseMain(MemoryClassLoader loader, ScriptContext ctx) throws ScriptException { - String mainClassName = getMainClassName(ctx); + final String mainClassName = getMainClassName(ctx); if (mainClassName != null) { try { - Class clazz = loader.load(mainClassName); - Method mainMethod = findMainMethod(clazz); + final Class clazz = loader.load(mainClassName); + final Method mainMethod = findMainMethod(clazz); if (mainMethod == null) { throw new ScriptException("no main method in " + mainClassName); @@ -209,7 +209,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable } // search for class with main method - Class c = findMainClass(classes); + final Class c = findMainClass(classes); if (c != null) { return c; @@ -217,7 +217,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable // if class with "main" method, then // return first class - Iterator> itr = classes.iterator(); + final Iterator> itr = classes.iterator(); if (itr.hasNext()) { return itr.next(); @@ -227,9 +227,9 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable private JavaCompiledScript compile(String str, ScriptContext ctx) throws ScriptException { - String fileName = getFileName(ctx); - String sourcePath = getSourcePath(ctx); - String classPath = getClassPath(ctx); + final String fileName = getFileName(ctx); + final String sourcePath = getSourcePath(ctx); + final String classPath = getClassPath(ctx); Writer err = ctx.getErrorWriter(); if (err == null) @@ -237,7 +237,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable err = new StringWriter(); } - Map classBytes = compiler.compile(fileName, str, err, sourcePath, classPath); + final Map classBytes = compiler.compile(fileName, str, err, sourcePath, classPath); if (classBytes == null) { if (err instanceof StringWriter) @@ -255,10 +255,10 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable // find a public class with public static main method for (Class clazz : classes) { - int modifiers = clazz.getModifiers(); + final int modifiers = clazz.getModifiers(); if (Modifier.isPublic(modifiers)) { - Method mainMethod = findMainMethod(clazz); + final Method mainMethod = findMainMethod(clazz); if (mainMethod != null) { return clazz; @@ -270,7 +270,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable // has public static main method for (Class clazz : classes) { - Method mainMethod = findMainMethod(clazz); + final Method mainMethod = findMainMethod(clazz); if (mainMethod != null) { return clazz; @@ -286,11 +286,11 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable { try { - Method mainMethod = clazz.getMethod("main", new Class[] + final Method mainMethod = clazz.getMethod("main", new Class[] { String[].class }); - int modifiers = mainMethod.getModifiers(); + final int modifiers = mainMethod.getModifiers(); if (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers)) { return mainMethod; @@ -307,11 +307,11 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable { try { - Method setCtxMethod = clazz.getMethod("setScriptContext", new Class[] + final Method setCtxMethod = clazz.getMethod("setScriptContext", new Class[] { ScriptContext.class }); - int modifiers = setCtxMethod.getModifiers(); + final int modifiers = setCtxMethod.getModifiers(); if (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers)) { return setCtxMethod; @@ -325,7 +325,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable private static String getFileName(ScriptContext ctx) { - int scope = ctx.getAttributesScope("javax.script.filename"); + final int scope = ctx.getAttributesScope("javax.script.filename"); if (scope != -1) { return ctx.getAttribute("javax.script.filename", scope).toString(); @@ -342,10 +342,10 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable private static String[] getArguments(ScriptContext ctx) { - int scope = ctx.getAttributesScope(ARGUMENTS); + final int scope = ctx.getAttributesScope(ARGUMENTS); if (scope != -1) { - Object obj = ctx.getAttribute(ARGUMENTS, scope); + final Object obj = ctx.getAttribute(ARGUMENTS, scope); if (obj instanceof String[]) { return (String[]) obj; @@ -359,7 +359,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable private static String getSourcePath(ScriptContext ctx) { - int scope = ctx.getAttributesScope(SOURCEPATH); + final int scope = ctx.getAttributesScope(SOURCEPATH); if (scope != -1) { return ctx.getAttribute(SOURCEPATH).toString(); @@ -373,7 +373,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable private static String getClassPath(ScriptContext ctx) { - int scope = ctx.getAttributesScope(CLASSPATH); + final int scope = ctx.getAttributesScope(CLASSPATH); if (scope != -1) { return ctx.getAttribute(CLASSPATH).toString(); @@ -392,7 +392,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable private static String getMainClassName(ScriptContext ctx) { - int scope = ctx.getAttributesScope(MAINCLASS); + final int scope = ctx.getAttributesScope(MAINCLASS); if (scope != -1) { return ctx.getAttribute(MAINCLASS).toString(); @@ -406,10 +406,10 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable protected static ClassLoader getParentLoader(ScriptContext ctx) { - int scope = ctx.getAttributesScope(PARENTLOADER); + final int scope = ctx.getAttributesScope(PARENTLOADER); if (scope != -1) { - Object loader = ctx.getAttribute(PARENTLOADER); + final Object loader = ctx.getAttribute(PARENTLOADER); if (loader instanceof ClassLoader) { return (ClassLoader) loader; @@ -428,10 +428,10 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable } try { - boolean isPublicClazz = Modifier.isPublic(clazz.getModifiers()); + final boolean isPublicClazz = Modifier.isPublic(clazz.getModifiers()); // find the setScriptContext method - Method setCtxMethod = findSetScriptContextMethod(clazz); + final Method setCtxMethod = findSetScriptContextMethod(clazz); // call setScriptContext and pass current ctx variable if (setCtxMethod != null) { @@ -447,7 +447,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable } // find the main method - Method mainMethod = findMainMethod(clazz); + final Method mainMethod = findMainMethod(clazz); if (mainMethod != null) { if (!isPublicClazz) @@ -457,7 +457,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable } // get "command line" args for the main method - String args[] = getArguments(ctx); + final String args[] = getArguments(ctx); // call main method mainMethod.invoke(null, new Object[] @@ -479,8 +479,8 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable // read a Reader fully and return the content as string private String readFully(Reader reader) throws ScriptException { - char[] arr = new char[8 * 1024]; // 8K at a time - StringBuilder buf = new StringBuilder(); + final char[] arr = new char[8 * 1024]; // 8K at a time + final StringBuilder buf = new StringBuilder(); int numChars; try { diff --git a/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngineFactory.java b/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngineFactory.java index 9a63462f8c..a28ade9ff1 100644 --- a/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngineFactory.java +++ b/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngineFactory.java @@ -69,7 +69,7 @@ public class JavaScriptEngineFactory implements ScriptEngineFactory @Override public String getMethodCallSyntax(String obj, String m, String... args) { - StringBuilder buf = new StringBuilder(); + final StringBuilder buf = new StringBuilder(); buf.append(obj); buf.append('.'); buf.append(m); @@ -102,12 +102,12 @@ public class JavaScriptEngineFactory implements ScriptEngineFactory @Override public String getOutputStatement(String toDisplay) { - StringBuilder buf = new StringBuilder(); + final StringBuilder buf = new StringBuilder(); buf.append("System.out.print(\""); - int len = toDisplay.length(); + final int len = toDisplay.length(); for (int i = 0; i < len; i++) { - char ch = toDisplay.charAt(i); + final char ch = toDisplay.charAt(i); switch (ch) { case 34: // '"' @@ -161,7 +161,7 @@ public class JavaScriptEngineFactory implements ScriptEngineFactory // we generate a Main class with main method // that contains all the given statements - StringBuilder buf = new StringBuilder(); + final StringBuilder buf = new StringBuilder(); buf.append("class "); buf.append(getClassName()); buf.append(" {\n"); @@ -183,7 +183,7 @@ public class JavaScriptEngineFactory implements ScriptEngineFactory @Override public ScriptEngine getScriptEngine() { - JavaScriptEngine engine = new JavaScriptEngine(); + final JavaScriptEngine engine = new JavaScriptEngine(); engine.setFactory(this); return engine; } diff --git a/trunk/java/com/l2jserver/commons/javaengine/MemoryClassLoader.java b/trunk/java/com/l2jserver/commons/javaengine/MemoryClassLoader.java index ead675be30..e4eba57861 100644 --- a/trunk/java/com/l2jserver/commons/javaengine/MemoryClassLoader.java +++ b/trunk/java/com/l2jserver/commons/javaengine/MemoryClassLoader.java @@ -58,7 +58,7 @@ public final class MemoryClassLoader extends URLClassLoader public Iterable> loadAll() throws ClassNotFoundException { - List> classes = new ArrayList<>(classBytes.size()); + final List> classes = new ArrayList<>(classBytes.size()); for (String name : classBytes.keySet()) { classes.add(loadClass(name)); @@ -69,7 +69,7 @@ public final class MemoryClassLoader extends URLClassLoader @Override protected Class findClass(String className) throws ClassNotFoundException { - byte buf[] = classBytes.get(className); + final byte buf[] = classBytes.get(className); if (buf != null) { // clear the bytes in map -- we don't need it anymore @@ -86,12 +86,12 @@ public final class MemoryClassLoader extends URLClassLoader return new URL[0]; } - List list = new ArrayList<>(); - StringTokenizer st = new StringTokenizer(classPath, File.pathSeparator); + final List list = new ArrayList<>(); + final StringTokenizer st = new StringTokenizer(classPath, File.pathSeparator); while (st.hasMoreTokens()) { - String token = st.nextToken(); - File file = new File(token); + final String token = st.nextToken(); + final File file = new File(token); if (file.exists()) { try @@ -116,7 +116,7 @@ public final class MemoryClassLoader extends URLClassLoader } } - URL res[] = new URL[list.size()]; + final URL res[] = new URL[list.size()]; list.toArray(res); return res; } diff --git a/trunk/java/com/l2jserver/commons/javaengine/MemoryJavaFileManager.java b/trunk/java/com/l2jserver/commons/javaengine/MemoryJavaFileManager.java index 926d4a9fc8..41a9fd7f1a 100644 --- a/trunk/java/com/l2jserver/commons/javaengine/MemoryJavaFileManager.java +++ b/trunk/java/com/l2jserver/commons/javaengine/MemoryJavaFileManager.java @@ -114,7 +114,7 @@ public final class MemoryJavaFileManager extends EclipseFileManager public void close() throws IOException { out.close(); - ByteArrayOutputStream bos = (ByteArrayOutputStream) out; + final ByteArrayOutputStream bos = (ByteArrayOutputStream) out; classBytes.put(name, bos.toByteArray()); } }; @@ -138,7 +138,7 @@ public final class MemoryJavaFileManager extends EclipseFileManager static URI toURI(String name) { - File file = new File(name); + final File file = new File(name); if (file.exists()) { return file.toURI(); diff --git a/trunk/java/com/l2jserver/commons/mmocore/SelectorThread.java b/trunk/java/com/l2jserver/commons/mmocore/SelectorThread.java index 7d3edd8c29..59041cd349 100644 --- a/trunk/java/com/l2jserver/commons/mmocore/SelectorThread.java +++ b/trunk/java/com/l2jserver/commons/mmocore/SelectorThread.java @@ -102,10 +102,10 @@ public final class SelectorThread> extends Thread public final void openServerSocket(InetAddress address, int tcpPort) throws IOException { - ServerSocketChannel selectable = ServerSocketChannel.open(); + final ServerSocketChannel selectable = ServerSocketChannel.open(); selectable.configureBlocking(false); - ServerSocket ss = selectable.socket(); + final ServerSocket ss = selectable.socket(); if (address == null) { @@ -247,7 +247,7 @@ public final class SelectorThread> extends Thread private final void acceptConnection(final SelectionKey key, MMOConnection con) { - ServerSocketChannel ssc = (ServerSocketChannel) key.channel(); + final ServerSocketChannel ssc = (ServerSocketChannel) key.channel(); SocketChannel sc; try @@ -257,7 +257,7 @@ public final class SelectorThread> extends Thread if ((_acceptFilter == null) || _acceptFilter.accept(sc)) { sc.configureBlocking(false); - SelectionKey clientKey = sc.register(_selector, SelectionKey.OP_READ); + final SelectionKey clientKey = sc.register(_selector, SelectionKey.OP_READ); con = new MMOConnection<>(this, sc.socket(), clientKey, TCP_NODELAY); con.setClient(_clientFactory.create(con)); clientKey.attach(con); @@ -678,7 +678,7 @@ public final class SelectorThread> extends Thread protected void closeSelectorThread() { - for (final SelectionKey key : _selector.keys()) + for (SelectionKey key : _selector.keys()) { try { diff --git a/trunk/java/com/l2jserver/gameserver/GameServer.java b/trunk/java/com/l2jserver/gameserver/GameServer.java index 4ee4d48613..264f00bc18 100644 --- a/trunk/java/com/l2jserver/gameserver/GameServer.java +++ b/trunk/java/com/l2jserver/gameserver/GameServer.java @@ -170,7 +170,7 @@ public final class GameServer public GameServer() throws Exception { - long serverLoadStart = System.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); if (!IdFactory.getInstance().isInitialized()) { @@ -470,7 +470,7 @@ public final class GameServer /*** Main ***/ // Create log folder - File logFolder = new File(".", LOG_FOLDER); + final File logFolder = new File(".", LOG_FOLDER); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory diff --git a/trunk/java/com/l2jserver/gameserver/GameTimeController.java b/trunk/java/com/l2jserver/gameserver/GameTimeController.java index fc5b1453dc..3022152630 100644 --- a/trunk/java/com/l2jserver/gameserver/GameTimeController.java +++ b/trunk/java/com/l2jserver/gameserver/GameTimeController.java @@ -156,7 +156,7 @@ public final class GameTimeController extends Thread { moveObjects(); } - catch (final Throwable e) + catch (Throwable e) { _log.log(Level.WARNING, "", e); } @@ -168,7 +168,7 @@ public final class GameTimeController extends Thread { Thread.sleep(sleepTime); } - catch (final InterruptedException e) + catch (InterruptedException e) { } diff --git a/trunk/java/com/l2jserver/gameserver/GeoData.java b/trunk/java/com/l2jserver/gameserver/GeoData.java index 4ecca9f3ec..56566950e4 100644 --- a/trunk/java/com/l2jserver/gameserver/GeoData.java +++ b/trunk/java/com/l2jserver/gameserver/GeoData.java @@ -200,7 +200,7 @@ public class GeoData return z; } - int nextLowerZ = getNextLowerZ(geoX, geoY, z + 20); + final int nextLowerZ = getNextLowerZ(geoX, geoY, z + 20); return Math.abs(nextLowerZ - z) <= SPAWN_Z_DELTA_LIMIT ? nextLowerZ : z; } @@ -353,31 +353,31 @@ public class GeoData geoY = tmp; } - LinePointIterator3D pointIter = new LinePointIterator3D(geoX, geoY, z, tGeoX, tGeoY, tz); + final LinePointIterator3D pointIter = new LinePointIterator3D(geoX, geoY, z, tGeoX, tGeoY, tz); // first point is guaranteed to be available, skip it, we can always see our own position pointIter.next(); int prevX = pointIter.x(); int prevY = pointIter.y(); - int prevZ = pointIter.z(); + final int prevZ = pointIter.z(); int prevGeoZ = prevZ; int ptIndex = 0; while (pointIter.next()) { - int curX = pointIter.x(); - int curY = pointIter.y(); + final int curX = pointIter.x(); + final int curY = pointIter.y(); if ((curX == prevX) && (curY == prevY)) { continue; } - int beeCurZ = pointIter.z(); + final int beeCurZ = pointIter.z(); int curGeoZ = prevGeoZ; // check if the position has geodata if (hasGeoPos(curX, curY)) { - int nswe = GeoUtils.computeNswe(prevX, prevY, curX, curY); + final int nswe = GeoUtils.computeNswe(prevX, prevY, curX, curY); curGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, curX, curY, nswe); int maxHeight; if (ptIndex < ELEVATED_SEE_OVER_DISTANCE) @@ -394,26 +394,26 @@ public class GeoData { if ((nswe & Cell.NSWE_NORTH_EAST) == Cell.NSWE_NORTH_EAST) { - int northGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY - 1, Cell.NSWE_EAST); - int eastGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX + 1, prevY, Cell.NSWE_NORTH); + final int northGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY - 1, Cell.NSWE_EAST); + final int eastGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX + 1, prevY, Cell.NSWE_NORTH); canSeeThrough = (northGeoZ <= maxHeight) && (eastGeoZ <= maxHeight) && (northGeoZ <= getNearestZ(prevX, prevY - 1, beeCurZ)) && (eastGeoZ <= getNearestZ(prevX + 1, prevY, beeCurZ)); } else if ((nswe & Cell.NSWE_NORTH_WEST) == Cell.NSWE_NORTH_WEST) { - int northGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY - 1, Cell.NSWE_WEST); - int westGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX - 1, prevY, Cell.NSWE_NORTH); + final int northGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY - 1, Cell.NSWE_WEST); + final int westGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX - 1, prevY, Cell.NSWE_NORTH); canSeeThrough = (northGeoZ <= maxHeight) && (westGeoZ <= maxHeight) && (northGeoZ <= getNearestZ(prevX, prevY - 1, beeCurZ)) && (westGeoZ <= getNearestZ(prevX - 1, prevY, beeCurZ)); } else if ((nswe & Cell.NSWE_SOUTH_EAST) == Cell.NSWE_SOUTH_EAST) { - int southGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY + 1, Cell.NSWE_EAST); - int eastGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX + 1, prevY, Cell.NSWE_SOUTH); + final int southGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY + 1, Cell.NSWE_EAST); + final int eastGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX + 1, prevY, Cell.NSWE_SOUTH); canSeeThrough = (southGeoZ <= maxHeight) && (eastGeoZ <= maxHeight) && (southGeoZ <= getNearestZ(prevX, prevY + 1, beeCurZ)) && (eastGeoZ <= getNearestZ(prevX + 1, prevY, beeCurZ)); } else if ((nswe & Cell.NSWE_SOUTH_WEST) == Cell.NSWE_SOUTH_WEST) { - int southGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY + 1, Cell.NSWE_WEST); - int westGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX - 1, prevY, Cell.NSWE_SOUTH); + final int southGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY + 1, Cell.NSWE_WEST); + final int westGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX - 1, prevY, Cell.NSWE_SOUTH); canSeeThrough = (southGeoZ <= maxHeight) && (westGeoZ <= maxHeight) && (southGeoZ <= getNearestZ(prevX, prevY + 1, beeCurZ)) && (westGeoZ <= getNearestZ(prevX - 1, prevY, beeCurZ)); } else @@ -461,11 +461,11 @@ public class GeoData */ public Location moveCheck(int x, int y, int z, int tx, int ty, int tz, int instanceId) { - int geoX = getGeoX(x); - int geoY = getGeoY(y); + final int geoX = getGeoX(x); + final int geoY = getGeoY(y); z = getNearestZ(geoX, geoY, z); - int tGeoX = getGeoX(tx); - int tGeoY = getGeoY(ty); + final int tGeoX = getGeoX(tx); + final int tGeoY = getGeoY(ty); tz = getNearestZ(tGeoX, tGeoY, tz); if (DoorData.getInstance().checkIfDoorsBetween(x, y, z, tx, ty, tz, instanceId, false)) @@ -473,7 +473,7 @@ public class GeoData return new Location(x, y, getHeight(x, y, z)); } - LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); + final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); // first point is guaranteed to be available pointIter.next(); int prevX = pointIter.x(); @@ -482,13 +482,13 @@ public class GeoData while (pointIter.next()) { - int curX = pointIter.x(); - int curY = pointIter.y(); - int curZ = getNearestZ(curX, curY, prevZ); + final int curX = pointIter.x(); + final int curY = pointIter.y(); + final int curZ = getNearestZ(curX, curY, prevZ); if (hasGeoPos(prevX, prevY)) { - int nswe = GeoUtils.computeNswe(prevX, prevY, curX, curY); + final int nswe = GeoUtils.computeNswe(prevX, prevY, curX, curY); if (!checkNearestNsweAntiCornerCut(prevX, prevY, prevZ, nswe)) { // can't move, return previous location @@ -523,11 +523,11 @@ public class GeoData */ public boolean canMove(int fromX, int fromY, int fromZ, int toX, int toY, int toZ, int instanceId) { - int geoX = getGeoX(fromX); - int geoY = getGeoY(fromY); + final int geoX = getGeoX(fromX); + final int geoY = getGeoY(fromY); fromZ = getNearestZ(geoX, geoY, fromZ); - int tGeoX = getGeoX(toX); - int tGeoY = getGeoY(toY); + final int tGeoX = getGeoX(toX); + final int tGeoY = getGeoY(toY); toZ = getNearestZ(tGeoX, tGeoY, toZ); if (DoorData.getInstance().checkIfDoorsBetween(fromX, fromY, fromZ, toX, toY, toZ, instanceId, false)) @@ -535,7 +535,7 @@ public class GeoData return false; } - LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); + final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); // first point is guaranteed to be available pointIter.next(); int prevX = pointIter.x(); @@ -544,13 +544,13 @@ public class GeoData while (pointIter.next()) { - int curX = pointIter.x(); - int curY = pointIter.y(); - int curZ = getNearestZ(curX, curY, prevZ); + final int curX = pointIter.x(); + final int curY = pointIter.y(); + final int curZ = getNearestZ(curX, curY, prevZ); if (hasGeoPos(prevX, prevY)) { - int nswe = GeoUtils.computeNswe(prevX, prevY, curX, curY); + final int nswe = GeoUtils.computeNswe(prevX, prevY, curX, curY); if (!checkNearestNsweAntiCornerCut(prevX, prevY, prevZ, nswe)) { return false; @@ -573,22 +573,22 @@ public class GeoData public int traceTerrainZ(int x, int y, int z, int tx, int ty) { - int geoX = getGeoX(x); - int geoY = getGeoY(y); + final int geoX = getGeoX(x); + final int geoY = getGeoY(y); z = getNearestZ(geoX, geoY, z); - int tGeoX = getGeoX(tx); - int tGeoY = getGeoY(ty); + final int tGeoX = getGeoX(tx); + final int tGeoY = getGeoY(ty); - LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); + final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); // first point is guaranteed to be available pointIter.next(); int prevZ = z; while (pointIter.next()) { - int curX = pointIter.x(); - int curY = pointIter.y(); - int curZ = getNearestZ(curX, curY, prevZ); + final int curX = pointIter.x(); + final int curY = pointIter.y(); + final int curZ = getNearestZ(curX, curY, prevZ); prevZ = curZ; } diff --git a/trunk/java/com/l2jserver/gameserver/LoginServerThread.java b/trunk/java/com/l2jserver/gameserver/LoginServerThread.java index f80d6b156b..0aff2bbb87 100644 --- a/trunk/java/com/l2jserver/gameserver/LoginServerThread.java +++ b/trunk/java/com/l2jserver/gameserver/LoginServerThread.java @@ -154,11 +154,11 @@ public class LoginServerThread extends Thread // Connection _log.info("Connecting to login on " + _hostname + ":" + _port); _loginSocket = new Socket(_hostname, _port); - InputStream in = _loginSocket.getInputStream(); + final InputStream in = _loginSocket.getInputStream(); _out = new BufferedOutputStream(_loginSocket.getOutputStream()); // init Blowfish - byte[] blowfishKey = Util.generateHex(40); + final byte[] blowfishKey = Util.generateHex(40); // Protect the new blowfish key what cannot begin with zero if (blowfishKey[0] == 0) { @@ -177,7 +177,7 @@ public class LoginServerThread extends Thread break; } - byte[] incoming = new byte[length - 2]; + final byte[] incoming = new byte[length - 2]; int receivedBytes = 0; int newBytes = 0; @@ -205,11 +205,11 @@ public class LoginServerThread extends Thread break; } - int packetType = incoming[0] & 0xff; + final int packetType = incoming[0] & 0xff; switch (packetType) { case 0x00: - InitLS init = new InitLS(incoming); + final InitLS init = new InitLS(incoming); if (init.getRevision() != REVISION) { // TODO: revision mismatch @@ -221,9 +221,9 @@ public class LoginServerThread extends Thread try { - KeyFactory kfac = KeyFactory.getInstance("RSA"); - BigInteger modulus = new BigInteger(init.getRSAKey()); - RSAPublicKeySpec kspec1 = new RSAPublicKeySpec(modulus, RSAKeyGenParameterSpec.F4); + final KeyFactory kfac = KeyFactory.getInstance("RSA"); + final BigInteger modulus = new BigInteger(init.getRSAKey()); + final RSAPublicKeySpec kspec1 = new RSAPublicKeySpec(modulus, RSAKeyGenParameterSpec.F4); publicKey = (RSAPublicKey) kfac.generatePublic(kspec1); } catch (GeneralSecurityException e) @@ -238,17 +238,17 @@ public class LoginServerThread extends Thread sendPacket(new AuthRequest(_requestID, _acceptAlternate, _hexID, _gamePort, _reserveHost, _maxPlayer, _subnets, _hosts)); break; case 0x01: - LoginServerFail lsf = new LoginServerFail(incoming); + final LoginServerFail lsf = new LoginServerFail(incoming); _log.info("Damn! Registeration Failed: " + lsf.getReasonString()); // login will close the connection here break; case 0x02: - AuthResponse aresp = new AuthResponse(incoming); - int serverID = aresp.getServerId(); + final AuthResponse aresp = new AuthResponse(incoming); + final int serverID = aresp.getServerId(); _serverName = aresp.getServerName(); Config.saveHexid(serverID, hexToString(_hexID)); _log.info("Registered on login as Server " + serverID + " : " + _serverName); - ServerStatus st = new ServerStatus(); + final ServerStatus st = new ServerStatus(); if (Config.SERVER_LIST_BRACKET) { st.addAttribute(ServerStatus.SERVER_LIST_SQUARE_BRACKET, ServerStatus.ON); @@ -290,8 +290,8 @@ public class LoginServerThread extends Thread } break; case 0x03: - PlayerAuthResponse par = new PlayerAuthResponse(incoming); - String account = par.getAccount(); + final PlayerAuthResponse par = new PlayerAuthResponse(incoming); + final String account = par.getAccount(); WaitingClient wcToRemove = null; synchronized (_waitingClients) { @@ -307,11 +307,11 @@ public class LoginServerThread extends Thread { if (par.isAuthed()) { - PlayerInGame pig = new PlayerInGame(par.getAccount()); + final PlayerInGame pig = new PlayerInGame(par.getAccount()); sendPacket(pig); wcToRemove.gameClient.setState(GameClientState.AUTHED); wcToRemove.gameClient.setSessionId(wcToRemove.session); - CharSelectionInfo cl = new CharSelectionInfo(wcToRemove.account, wcToRemove.gameClient.getSessionId().playOkID1); + final CharSelectionInfo cl = new CharSelectionInfo(wcToRemove.account, wcToRemove.gameClient.getSessionId().playOkID1); wcToRemove.gameClient.getConnection().sendPacket(cl); wcToRemove.gameClient.setCharSelection(cl.getCharInfo()); } @@ -326,11 +326,11 @@ public class LoginServerThread extends Thread } break; case 0x04: - KickPlayer kp = new KickPlayer(incoming); + final KickPlayer kp = new KickPlayer(incoming); doKickPlayer(kp.getAccount()); break; case 0x05: - RequestCharacters rc = new RequestCharacters(incoming); + final RequestCharacters rc = new RequestCharacters(incoming); getCharsOnServer(rc.getAccount()); break; case 0x06: @@ -385,12 +385,12 @@ public class LoginServerThread extends Thread */ public void addWaitingClientAndSendRequest(String acc, L2GameClient client, SessionKey key) { - WaitingClient wc = new WaitingClient(acc, client, key); + final WaitingClient wc = new WaitingClient(acc, client, key); synchronized (_waitingClients) { _waitingClients.add(wc); } - PlayerAuthRequest par = new PlayerAuthRequest(acc, key); + final PlayerAuthRequest par = new PlayerAuthRequest(acc, key); try { sendPacket(par); @@ -434,7 +434,7 @@ public class LoginServerThread extends Thread { return; } - PlayerLogout pl = new PlayerLogout(account); + final PlayerLogout pl = new PlayerLogout(account); try { sendPacket(pl); @@ -467,7 +467,7 @@ public class LoginServerThread extends Thread */ public void sendAccessLevel(String account, int level) { - ChangeAccessLevel cal = new ChangeAccessLevel(account, level); + final ChangeAccessLevel cal = new ChangeAccessLevel(account, level); try { sendPacket(cal); @@ -484,7 +484,7 @@ public class LoginServerThread extends Thread */ public void sendClientTracert(String account, String[] address) { - PlayerTracert ptc = new PlayerTracert(account, address[0], address[1], address[2], address[3], address[4]); + final PlayerTracert ptc = new PlayerTracert(account, address[0], address[1], address[2], address[3], address[4]); try { sendPacket(ptc); @@ -502,7 +502,7 @@ public class LoginServerThread extends Thread */ public void sendMail(String account, String mailId, String... args) { - SendMail sem = new SendMail(account, mailId, args); + final SendMail sem = new SendMail(account, mailId, args); try { sendPacket(sem); @@ -520,7 +520,7 @@ public class LoginServerThread extends Thread */ public void sendTempBan(String account, String ip, long time) { - TempBan tbn = new TempBan(account, ip, time); + final TempBan tbn = new TempBan(account, ip, time); try { sendPacket(tbn); @@ -546,10 +546,10 @@ public class LoginServerThread extends Thread */ public void doKickPlayer(String account) { - L2GameClient client = _accountsInGameServer.get(account); + final L2GameClient client = _accountsInGameServer.get(account); if (client != null) { - LogRecord record = new LogRecord(Level.WARNING, "Kicked by login"); + final LogRecord record = new LogRecord(Level.WARNING, "Kicked by login"); record.setParameters(new Object[] { client @@ -568,7 +568,7 @@ public class LoginServerThread extends Thread { int chars = 0; - List charToDel = new ArrayList<>(); + final List charToDel = new ArrayList<>(); try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT deletetime FROM characters WHERE account_name=?")) { @@ -578,7 +578,7 @@ public class LoginServerThread extends Thread while (rs.next()) { chars++; - long delTime = rs.getLong("deletetime"); + final long delTime = rs.getLong("deletetime"); if (delTime != 0) { charToDel.add(delTime); @@ -591,7 +591,7 @@ public class LoginServerThread extends Thread _log.log(Level.WARNING, "Exception: getCharsOnServer: " + e.getMessage(), e); } - ReplyCharacters rec = new ReplyCharacters(account, chars, charToDel); + final ReplyCharacters rec = new ReplyCharacters(account, chars, charToDel); try { sendPacket(rec); @@ -608,11 +608,11 @@ public class LoginServerThread extends Thread */ private void sendPacket(BaseSendablePacket sl) throws IOException { - byte[] data = sl.getContent(); + final byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); _blowfish.crypt(data, 0, data.length); - int len = data.length + 2; + final int len = data.length + 2; synchronized (_out) // avoids tow threads writing in the mean time { _out.write(len & 0xff); @@ -648,7 +648,7 @@ public class LoginServerThread extends Thread */ public void sendServerStatus(int id, int value) { - ServerStatus ss = new ServerStatus(); + final ServerStatus ss = new ServerStatus(); ss.addAttribute(id, value); try { @@ -664,7 +664,7 @@ public class LoginServerThread extends Thread */ public void sendServerType() { - ServerStatus ss = new ServerStatus(); + final ServerStatus ss = new ServerStatus(); ss.addAttribute(ServerStatus.SERVER_TYPE, Config.SERVER_LIST_TYPE); try { @@ -684,7 +684,7 @@ public class LoginServerThread extends Thread */ public void sendChangePassword(String accountName, String charName, String oldpass, String newpass) { - ChangePassword cp = new ChangePassword(accountName, charName, oldpass, newpass); + final ChangePassword cp = new ChangePassword(accountName, charName, oldpass, newpass); try { sendPacket(cp); diff --git a/trunk/java/com/l2jserver/gameserver/MonsterRace.java b/trunk/java/com/l2jserver/gameserver/MonsterRace.java index 085874cd47..df435d7e4e 100644 --- a/trunk/java/com/l2jserver/gameserver/MonsterRace.java +++ b/trunk/java/com/l2jserver/gameserver/MonsterRace.java @@ -54,7 +54,7 @@ public class MonsterRace for (int i = 0; i < 8; i++) { - int id = 31003; + final int id = 31003; random = Rnd.get(24); while (true) { @@ -70,8 +70,8 @@ public class MonsterRace } try { - L2NpcTemplate template = NpcData.getInstance().getTemplate(id + random); - Constructor constructor = Class.forName("com.l2jserver.gameserver.model.actor.instance." + template.getType() + "Instance").getConstructors()[0]; + final L2NpcTemplate template = NpcData.getInstance().getTemplate(id + random); + final Constructor constructor = Class.forName("com.l2jserver.gameserver.model.actor.instance." + template.getType() + "Instance").getConstructors()[0]; _monsters[i] = (L2Npc) constructor.newInstance(template); } catch (Exception e) diff --git a/trunk/java/com/l2jserver/gameserver/RecipeController.java b/trunk/java/com/l2jserver/gameserver/RecipeController.java index 33087ac1e4..4bbc8a47d1 100644 --- a/trunk/java/com/l2jserver/gameserver/RecipeController.java +++ b/trunk/java/com/l2jserver/gameserver/RecipeController.java @@ -69,7 +69,7 @@ public class RecipeController // Check if player is trying to alter recipe book while engaged in manufacturing. if (!_activeMakers.containsKey(player.getObjectId())) { - RecipeBookItemList response = new RecipeBookItemList(isDwarvenCraft, player.getMaxMp()); + final RecipeBookItemList response = new RecipeBookItemList(isDwarvenCraft, player.getMaxMp()); response.addRecipes(isDwarvenCraft ? player.getDwarvenRecipeBook() : player.getCommonRecipeBook()); player.sendPacket(response); return; @@ -90,8 +90,8 @@ public class RecipeController return; } - List dwarfRecipes = Arrays.asList(manufacturer.getDwarvenRecipeBook()); - List commonRecipes = Arrays.asList(manufacturer.getCommonRecipeBook()); + final List dwarfRecipes = Arrays.asList(manufacturer.getDwarvenRecipeBook()); + final List commonRecipes = Arrays.asList(manufacturer.getCommonRecipeBook()); if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) { @@ -136,8 +136,8 @@ public class RecipeController return; } - List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); - List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); + final List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); + final List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) { @@ -148,7 +148,7 @@ public class RecipeController // Check if player is busy (possible if alt game creation is enabled) if (Config.ALT_GAME_CREATION && _activeMakers.containsKey(player.getObjectId())) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1); sm.addItemName(recipeList.getItemId()); sm.addString("You are busy creating."); player.sendPacket(sm); @@ -353,7 +353,7 @@ public class RecipeController _delay = (int) (Config.ALT_GAME_CREATION_SPEED * _player.getMReuseRate(_skill) * GameTimeController.TICKS_PER_SECOND * GameTimeController.MILLIS_IN_TICK); // FIXME: please fix this packet to show crafting animation (somebody) - MagicSkillUse msk = new MagicSkillUse(_player, _skillId, _skillLevel, _delay, 0); + final MagicSkillUse msk = new MagicSkillUse(_player, _skillId, _skillLevel, _delay, 0); _player.broadcastPacket(msk); _player.sendPacket(new SetupGauge(0, _delay)); @@ -394,7 +394,7 @@ public class RecipeController if ((_target != _player) && (_price > 0)) // customer must pay for services { // attempt to pay for item - L2ItemInstance adenatransfer = _target.transferItem("PayManufacture", _target.getInventory().getAdenaInstance().getObjectId(), _price, _player.getInventory(), _player); + final L2ItemInstance adenatransfer = _target.transferItem("PayManufacture", _target.getInventory().getAdenaInstance().getObjectId(), _price, _player.getInventory(), _player); if (adenatransfer == null) { @@ -464,7 +464,7 @@ public class RecipeController private void updateCurMp() { - StatusUpdate su = new StatusUpdate(_target); + final StatusUpdate su = new StatusUpdate(_target); su.addAttribute(StatusUpdate.CUR_MP, (int) _target.getCurrentMp()); _target.sendPacket(su); } @@ -474,7 +474,7 @@ public class RecipeController int grabItems = _itemGrab; while ((grabItems > 0) && !_items.isEmpty()) { - TempItem item = _items.get(0); + final TempItem item = _items.get(0); int count = item.getQuantity(); if (count >= grabItems) @@ -496,7 +496,7 @@ public class RecipeController if (_target == _player) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPPED_S1_S2); // you equipped ... + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPPED_S1_S2); // you equipped ... sm.addLong(count); sm.addItemName(item.getItemId()); _player.sendPacket(sm); @@ -542,7 +542,7 @@ public class RecipeController boolean ret = true; for (L2RecipeStatInstance statUse : _recipeList.getStatUse()) { - double modifiedValue = statUse.getValue() / _creationPasses; + final double modifiedValue = statUse.getValue() / _creationPasses; if (statUse.getType() == StatType.HP) { // we do not want to kill the player, so its CurrentHP must be greater than the reduce value @@ -601,17 +601,17 @@ public class RecipeController private List listItems(boolean remove) { - L2RecipeInstance[] recipes = _recipeList.getRecipes(); - Inventory inv = _target.getInventory(); - List materials = new ArrayList<>(); + final L2RecipeInstance[] recipes = _recipeList.getRecipes(); + final Inventory inv = _target.getInventory(); + final List materials = new ArrayList<>(); SystemMessage sm; for (L2RecipeInstance recipe : recipes) { if (recipe.getQuantity() > 0) { - L2ItemInstance item = inv.getItemByItemId(recipe.getItemId()); - long itemQuantityAmount = item == null ? 0 : item.getCount(); + final L2ItemInstance item = inv.getItemByItemId(recipe.getItemId()); + final long itemQuantityAmount = item == null ? 0 : item.getCount(); // check materials if (itemQuantityAmount < recipe.getQuantity()) @@ -663,10 +663,10 @@ public class RecipeController private void rewardPlayer() { - int rareProdId = _recipeList.getRareItemId(); + final int rareProdId = _recipeList.getRareItemId(); int itemId = _recipeList.getItemId(); int itemCount = _recipeList.getCount(); - L2Item template = ItemTable.getInstance().getTemplate(itemId); + final L2Item template = ItemTable.getInstance().getTemplate(itemId); // check that the current recipe has a rare production or not if ((rareProdId != -1) && ((rareProdId == itemId) || Config.CRAFT_MASTERWORK)) @@ -739,7 +739,7 @@ public class RecipeController if (Config.ALT_GAME_CREATION) { - int recipeLevel = _recipeList.getLevel(); + final int recipeLevel = _recipeList.getLevel(); if (_exp < 0) { _exp = template.getReferencePrice() * itemCount; diff --git a/trunk/java/com/l2jserver/gameserver/Shutdown.java b/trunk/java/com/l2jserver/gameserver/Shutdown.java index 73a8629a55..a252ae6b07 100644 --- a/trunk/java/com/l2jserver/gameserver/Shutdown.java +++ b/trunk/java/com/l2jserver/gameserver/Shutdown.java @@ -77,7 +77,7 @@ public class Shutdown extends Thread */ private void SendServerQuit(int seconds) { - SystemMessage sysm = SystemMessage.getSystemMessage(SystemMessageId.THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECOND_S_PLEASE_FIND_A_SAFE_PLACE_TO_LOG_OUT); + final SystemMessage sysm = SystemMessage.getSystemMessage(SystemMessageId.THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECOND_S_PLEASE_FIND_A_SAFE_PLACE_TO_LOG_OUT); sysm.addInt(seconds); Broadcast.toAllOnlinePlayers(sysm); } @@ -185,8 +185,8 @@ public class Shutdown extends Thread { if (this == getInstance()) { - TimeCounter tc = new TimeCounter(); - TimeCounter tc1 = new TimeCounter(); + final TimeCounter tc = new TimeCounter(); + final TimeCounter tc1 = new TimeCounter(); try { @@ -456,7 +456,7 @@ public class Shutdown extends Thread _secondsShut--; - int delay = 1000; // milliseconds + final int delay = 1000; // milliseconds Thread.sleep(delay); if (_shutdownMode == ABORT) @@ -490,7 +490,7 @@ public class Shutdown extends Thread } - TimeCounter tc = new TimeCounter(); + final TimeCounter tc = new TimeCounter(); // Save all raidboss and GrandBoss status ^_^ RaidBossSpawnManager.getInstance().cleanUp(); @@ -571,7 +571,7 @@ public class Shutdown extends Thread // Logout Character try { - L2GameClient client = player.getClient(); + final L2GameClient client = player.getClient(); if ((client != null) && !client.isDetached()) { client.close(ServerClose.STATIC_PACKET); diff --git a/trunk/java/com/l2jserver/gameserver/ThreadPoolManager.java b/trunk/java/com/l2jserver/gameserver/ThreadPoolManager.java index cee1eb927f..cf61252e1f 100644 --- a/trunk/java/com/l2jserver/gameserver/ThreadPoolManager.java +++ b/trunk/java/com/l2jserver/gameserver/ThreadPoolManager.java @@ -88,7 +88,7 @@ public class ThreadPoolManager { _r.run(); } - catch (final Throwable e) + catch (Throwable e) { final Thread t = Thread.currentThread(); final UncaughtExceptionHandler h = t.getUncaughtExceptionHandler(); @@ -633,7 +633,7 @@ public class ThreadPoolManager @Override public Thread newThread(Runnable r) { - Thread t = new Thread(_group, r, _name + "-" + _threadNumber.getAndIncrement()); + final Thread t = new Thread(_group, r, _name + "-" + _threadNumber.getAndIncrement()); t.setPriority(_prio); return t; } @@ -690,12 +690,12 @@ public class ThreadPoolManager public String getPacketStats() { final StringBuilder sb = new StringBuilder(1000); - ThreadFactory tf = _generalPacketsThreadPool.getThreadFactory(); + final ThreadFactory tf = _generalPacketsThreadPool.getThreadFactory(); if (tf instanceof PriorityThreadFactory) { - PriorityThreadFactory ptf = (PriorityThreadFactory) tf; - int count = ptf.getGroup().activeCount(); - Thread[] threads = new Thread[count + 2]; + final PriorityThreadFactory ptf = (PriorityThreadFactory) tf; + final int count = ptf.getGroup().activeCount(); + final Thread[] threads = new Thread[count + 2]; ptf.getGroup().enumerate(threads); StringUtil.append(sb, "General Packet Thread Pool:" + Config.EOL + "Tasks in the queue: ", String.valueOf(_generalPacketsThreadPool.getQueue().size()), Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be ", String.valueOf(count), " Threads" + Config.EOL); for (Thread t : threads) @@ -721,13 +721,13 @@ public class ThreadPoolManager public String getIOPacketStats() { final StringBuilder sb = new StringBuilder(1000); - ThreadFactory tf = _ioPacketsThreadPool.getThreadFactory(); + final ThreadFactory tf = _ioPacketsThreadPool.getThreadFactory(); if (tf instanceof PriorityThreadFactory) { - PriorityThreadFactory ptf = (PriorityThreadFactory) tf; - int count = ptf.getGroup().activeCount(); - Thread[] threads = new Thread[count + 2]; + final PriorityThreadFactory ptf = (PriorityThreadFactory) tf; + final int count = ptf.getGroup().activeCount(); + final Thread[] threads = new Thread[count + 2]; ptf.getGroup().enumerate(threads); StringUtil.append(sb, "I/O Packet Thread Pool:" + Config.EOL + "Tasks in the queue: ", String.valueOf(_ioPacketsThreadPool.getQueue().size()), Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be ", String.valueOf(count), " Threads" + Config.EOL); @@ -755,13 +755,13 @@ public class ThreadPoolManager public String getGeneralStats() { final StringBuilder sb = new StringBuilder(1000); - ThreadFactory tf = _generalThreadPool.getThreadFactory(); + final ThreadFactory tf = _generalThreadPool.getThreadFactory(); if (tf instanceof PriorityThreadFactory) { - PriorityThreadFactory ptf = (PriorityThreadFactory) tf; - int count = ptf.getGroup().activeCount(); - Thread[] threads = new Thread[count + 2]; + final PriorityThreadFactory ptf = (PriorityThreadFactory) tf; + final int count = ptf.getGroup().activeCount(); + final Thread[] threads = new Thread[count + 2]; ptf.getGroup().enumerate(threads); StringUtil.append(sb, "General Thread Pool:" + Config.EOL + "Tasks in the queue: ", String.valueOf(_generalThreadPool.getQueue().size()), Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be ", String.valueOf(count), " Threads" + Config.EOL); diff --git a/trunk/java/com/l2jserver/gameserver/ai/AbstractAI.java b/trunk/java/com/l2jserver/gameserver/ai/AbstractAI.java index 839131c286..9d5ccbeaa0 100644 --- a/trunk/java/com/l2jserver/gameserver/ai/AbstractAI.java +++ b/trunk/java/com/l2jserver/gameserver/ai/AbstractAI.java @@ -93,7 +93,7 @@ public abstract class AbstractAI implements Ctrl return; } - L2Character followTarget = _followTarget; // copy to prevent NPE + final L2Character followTarget = _followTarget; // copy to prevent NPE if (followTarget == null) { if (_actor instanceof L2Summon) @@ -660,7 +660,7 @@ public abstract class AbstractAI implements Ctrl { if (_actor instanceof L2Summon) { - L2Summon summon = (L2Summon) _actor; + final L2Summon summon = (L2Summon) _actor; if (summon.getOwner() != null) { summon.getOwner().getAI().setAutoAttacking(isAutoAttacking); @@ -678,7 +678,7 @@ public abstract class AbstractAI implements Ctrl { if (_actor instanceof L2Summon) { - L2Summon summon = (L2Summon) _actor; + final L2Summon summon = (L2Summon) _actor; if (summon.getOwner() != null) { summon.getOwner().getAI().clientStartAutoAttack(); @@ -711,7 +711,7 @@ public abstract class AbstractAI implements Ctrl { if (_actor instanceof L2Summon) { - L2Summon summon = (L2Summon) _actor; + final L2Summon summon = (L2Summon) _actor; if (summon.getOwner() != null) { summon.getOwner().getAI().clientStopAutoAttack(); @@ -739,7 +739,7 @@ public abstract class AbstractAI implements Ctrl protected void clientNotifyDead() { // Send a Server->Client packet Die to the actor and all L2PcInstance in its _knownPlayers - Die msg = new Die(_actor); + final Die msg = new Die(_actor); _actor.broadcastPacket(msg); // Init AI diff --git a/trunk/java/com/l2jserver/gameserver/ai/L2AttackableAI.java b/trunk/java/com/l2jserver/gameserver/ai/L2AttackableAI.java index 5e119b0370..52641b7bca 100644 --- a/trunk/java/com/l2jserver/gameserver/ai/L2AttackableAI.java +++ b/trunk/java/com/l2jserver/gameserver/ai/L2AttackableAI.java @@ -338,7 +338,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE)) { // Check if actor is not dead - L2Attackable npc = getActiveChar(); + final L2Attackable npc = getActiveChar(); if (!npc.isAlikeDead()) { // If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE @@ -466,7 +466,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable */ protected void thinkActive() { - L2Attackable npc = getActiveChar(); + final L2Attackable npc = getActiveChar(); // Update every 1s the _globalAggro counter to come close to 0 if (_globalAggro != 0) @@ -486,7 +486,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable if (_globalAggro >= 0) { // Get all visible objects inside its Aggro Range - Collection objs = npc.getKnownList().getKnownObjects().values(); + final Collection objs = npc.getKnownList().getKnownObjects().values(); for (L2Object obj : objs) { @@ -494,7 +494,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { continue; } - L2Character target = (L2Character) obj; + final L2Character target = (L2Character) obj; // For each L2Character check if the target is autoattackable if (autoAttackCondition(target)) // check aggression @@ -509,7 +509,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } // Get the hate level of the L2Attackable against this L2Character target contained in _aggroList - int hating = npc.getHating(target); + final int hating = npc.getHating(target); // Add the attacker to the L2Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -534,7 +534,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the L2Attackable against this L2Character target contained in _aggroList - int aggro = npc.getHating(hated); + final int aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { @@ -681,12 +681,12 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } // Calculate the distance between the current position of the L2Character and the target (x,y) - double distance2 = npc.calculateDistance(x1, y1, 0, false, true); + final double distance2 = npc.calculateDistance(x1, y1, 0, false, true); if (distance2 > ((range + range) * (range + range))) { npc.setisReturningToSpawnPoint(true); - float delay = (float) Math.sqrt(distance2) / range; + final float delay = (float) Math.sqrt(distance2) / range; x1 = npc.getX() + (int) ((x1 - npc.getX()) / delay); y1 = npc.getY() + (int) ((y1 - npc.getY()) / delay); } @@ -709,7 +709,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } else { - int deltaX = Rnd.nextInt(range * 2); // x + final int deltaX = Rnd.nextInt(range * 2); // x int deltaY = Rnd.get(deltaX, range * 2); // distance deltaY = (int) Math.sqrt((deltaY * deltaY) - (deltaX * deltaX)); // y x1 = (deltaX + x1) - range; @@ -741,7 +741,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable return; } - L2Character originalAttackTarget = getAttackTarget(); + final L2Character originalAttackTarget = getAttackTarget(); // Check if target is dead or if timeout is expired to stop this attack if ((originalAttackTarget == null) || originalAttackTarget.isAlikeDead()) { @@ -774,7 +774,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable // Handle all L2Object of its Faction inside the Faction Range - Set clans = getActiveChar().getTemplate().getClans(); + final Set clans = getActiveChar().getTemplate().getClans(); if ((clans != null) && !clans.isEmpty()) { final int factionRange = npc.getTemplate().getClanHelpRange() + collision; @@ -785,7 +785,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { if (obj instanceof L2Npc) { - L2Npc called = (L2Npc) obj; + final L2Npc called = (L2Npc) obj; if (!getActiveChar().getTemplate().isClan(called.getTemplate().getClans())) { @@ -826,7 +826,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } // Initialize data - L2Character mostHate = npc.getMostHated(); + final L2Character mostHate = npc.getMostHated(); if (mostHate == null) { setIntention(AI_INTENTION_ACTIVE); @@ -884,7 +884,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable if (!npc.isInsideRadius(newX, newY, 0, collision, false, false)) { - int newZ = npc.getZ() + 30; + final int newZ = npc.getZ() + 30; if (GeoData.getInstance().canMove(npc.getX(), npc.getY(), npc.getZ(), newX, newY, newZ, npc.getInstanceId())) { moveTo(newX, newY, newZ); @@ -900,12 +900,12 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable if (Rnd.get(100) <= npc.getDodge()) { // Micht: kepping this one otherwise we should do 2 sqrt - double distance2 = npc.calculateDistance(mostHate, false, true); + final double distance2 = npc.calculateDistance(mostHate, false, true); if (Math.sqrt(distance2) <= (60 + combinedCollision)) { int posX = npc.getX(); int posY = npc.getY(); - int posZ = npc.getZ() + 30; + final int posZ = npc.getZ() + 30; if (originalAttackTarget.getX() < posX) { @@ -970,7 +970,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { if (_chaosTime > Config.GRAND_CHAOS_TIME) { - double chaosRate = 100 - ((npc.getCurrentHp() * 300) / npc.getMaxHp()); + final double chaosRate = 100 - ((npc.getCurrentHp() * 300) / npc.getMaxHp()); if (((chaosRate <= 10) && (Rnd.get(100) <= 10)) || ((chaosRate > 10) && (Rnd.get(100) <= chaosRate))) { aggroReconsider(); @@ -1004,7 +1004,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable double percentage = (npc.getCurrentHp() / npc.getMaxHp()) * 100; if (npc.isMinion()) { - L2Character leader = npc.getLeader(); + final L2Character leader = npc.getLeader(); if ((leader != null) && !leader.isDead() && (Rnd.get(100) > ((leader.getCurrentHp() / leader.getMaxHp()) * 100))) { for (Skill healSkill : aiHealSkills) @@ -1113,7 +1113,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { if (npc.isMinion()) { - L2Character leader = npc.getLeader(); + final L2Character leader = npc.getLeader(); if ((leader != null) && leader.isDead()) { for (Skill sk : aiResSkills) @@ -1163,7 +1163,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable continue; } - L2Attackable targets = ((L2Attackable) obj); + final L2Attackable targets = ((L2Attackable) obj); if (!npc.isInMyClan(targets)) { continue; @@ -1198,8 +1198,8 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } } - double dist = npc.calculateDistance(mostHate, false, false); - int dist2 = (int) dist - collision; + final double dist = npc.calculateDistance(mostHate, false, false); + final int dist2 = (int) dist - collision; int range = npc.getPhysicalAttackRange() + combinedCollision; if (mostHate.isMoving()) { @@ -1300,10 +1300,10 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable return false; } - double dist = caster.calculateDistance(attackTarget, false, false); + final double dist = caster.calculateDistance(attackTarget, false, false); double dist2 = dist - attackTarget.getTemplate().getCollisionRadius(); - double range = caster.getPhysicalAttackRange() + caster.getTemplate().getCollisionRadius() + attackTarget.getTemplate().getCollisionRadius(); - double srange = sk.getCastRange() + caster.getTemplate().getCollisionRadius(); + final double range = caster.getPhysicalAttackRange() + caster.getTemplate().getCollisionRadius() + attackTarget.getTemplate().getCollisionRadius(); + final double srange = sk.getCastRange() + caster.getTemplate().getCollisionRadius(); if (attackTarget.isMoving()) { dist2 = dist2 - 30; @@ -1329,7 +1329,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } if (sk.getTargetType() == L2TargetType.ONE) { - L2Character target = effectTargetReconsider(sk, true); + final L2Character target = effectTargetReconsider(sk, true); if (target != null) { clientStopMoving(null); @@ -1376,7 +1376,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } else if (sk.getTargetType() == L2TargetType.ONE) { - L2Character target = effectTargetReconsider(sk, false); + final L2Character target = effectTargetReconsider(sk, false); if (target != null) { clientStopMoving(null); @@ -1397,7 +1397,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable caster.doCast(sk); return true; } - L2Character target = effectTargetReconsider(sk, false); + final L2Character target = effectTargetReconsider(sk, false); if (target != null) { clientStopMoving(null); @@ -1430,7 +1430,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable double percentage = (caster.getCurrentHp() / caster.getMaxHp()) * 100; if (caster.isMinion() && (sk.getTargetType() != L2TargetType.SELF)) { - L2Character leader = caster.getLeader(); + final L2Character leader = caster.getLeader(); if ((leader != null) && !leader.isDead() && (Rnd.get(100) > ((leader.getCurrentHp() / leader.getMaxHp()) * 100))) { if (!Util.checkIfInRange((sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()), caster, leader, false) && !isParty(sk) && !caster.isMovementDisabled()) @@ -1466,7 +1466,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable continue; } - L2Attackable targets = ((L2Attackable) obj); + final L2Attackable targets = ((L2Attackable) obj); if (!caster.isInMyClan(targets)) { continue; @@ -1495,7 +1495,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable continue; } - L2Npc targets = ((L2Npc) obj); + final L2Npc targets = ((L2Npc) obj); if (targets.isInMyClan(caster)) { if ((obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) @@ -1522,7 +1522,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable return true; } - L2Character target = skillTargetReconsider(sk); + final L2Character target = skillTargetReconsider(sk); if (target != null) { clientStopMoving(null); @@ -1557,7 +1557,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } } - L2Character target = effectTargetReconsider(sk, false); + final L2Character target = effectTargetReconsider(sk, false); if (target != null) { clientStopMoving(null); @@ -1610,7 +1610,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } else if (sk.getTargetType() == L2TargetType.ONE) { - L2Character target = effectTargetReconsider(sk, false); + final L2Character target = effectTargetReconsider(sk, false); if (target != null) { clientStopMoving(null); @@ -1648,7 +1648,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } else if (sk.getTargetType() == L2TargetType.ONE) { - L2Character target = effectTargetReconsider(sk, false); + final L2Character target = effectTargetReconsider(sk, false); if (target != null) { clientStopMoving(null); @@ -1664,7 +1664,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { if (caster.isMinion() && (sk.getTargetType() != L2TargetType.SELF)) { - L2Character leader = caster.getLeader(); + final L2Character leader = caster.getLeader(); if (leader != null) { if (leader.isDead()) @@ -1692,7 +1692,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable continue; } - L2Attackable targets = ((L2Attackable) obj); + final L2Attackable targets = ((L2Attackable) obj); if (!caster.isInMyClan(targets)) { continue; @@ -1719,7 +1719,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { continue; } - L2Npc targets = ((L2Npc) obj); + final L2Npc targets = ((L2Npc) obj); if (caster.isInMyClan(targets)) { if ((obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) @@ -1745,7 +1745,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable return true; } - L2Character target = skillTargetReconsider(sk); + final L2Character target = skillTargetReconsider(sk); if (target != null) { clientStopMoving(null); @@ -1797,7 +1797,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { // ------------------------------------------------------------- // Try to stop the target or disable the target as priority - int random = Rnd.get(100); + final int random = Rnd.get(100); if (!getAttackTarget().isImmobilized() && (random < 2)) { for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.IMMOBILIZE)) @@ -2020,7 +2020,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { return null; } - L2Attackable actor = getActiveChar(); + final L2Attackable actor = getActiveChar(); if (!sk.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT)) { if (!positive) @@ -2107,7 +2107,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable continue; } - L2Attackable targets = ((L2Attackable) obj); + final L2Attackable targets = ((L2Attackable) obj); if (targets.isInMyClan(actor)) { continue; @@ -2187,7 +2187,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable double dist = 0; double dist2 = 0; int range = 0; - L2Attackable actor = getActiveChar(); + final L2Attackable actor = getActiveChar(); if (actor.getHateList() != null) { for (L2Character obj : actor.getHateList()) @@ -2218,7 +2218,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable if (!(actor instanceof L2GuardInstance)) { - Collection objs = actor.getKnownList().getKnownObjects().values(); + final Collection objs = actor.getKnownList().getKnownObjects().values(); for (L2Object target : objs) { try @@ -2274,8 +2274,8 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable double dist = 0; double dist2 = 0; int range = 0; - L2Attackable actor = getActiveChar(); - L2Character MostHate = actor.getMostHated(); + final L2Attackable actor = getActiveChar(); + final L2Character MostHate = actor.getMostHated(); if (actor.getHateList() != null) { for (L2Character obj : actor.getHateList()) @@ -2317,7 +2317,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } if (!(actor instanceof L2GuardInstance)) { - Collection objs = actor.getKnownList().getKnownObjects().values(); + final Collection objs = actor.getKnownList().getKnownObjects().values(); for (L2Object target : objs) { L2Character obj = null; @@ -2384,12 +2384,12 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable private void aggroReconsider() { - L2Attackable actor = getActiveChar(); - L2Character MostHate = actor.getMostHated(); + final L2Attackable actor = getActiveChar(); + final L2Character MostHate = actor.getMostHated(); if (actor.getHateList() != null) { - int rand = Rnd.get(actor.getHateList().size()); + final int rand = Rnd.get(actor.getHateList().size()); int count = 0; for (L2Character obj : actor.getHateList()) { @@ -2428,7 +2428,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable if (!(actor instanceof L2GuardInstance)) { - Collection objs = actor.getKnownList().getKnownObjects().values(); + final Collection objs = actor.getKnownList().getKnownObjects().values(); for (L2Object target : objs) { L2Character obj = null; @@ -2551,7 +2551,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable @Override protected void onEvtAttacked(L2Character attacker) { - L2Attackable me = getActiveChar(); + final L2Attackable me = getActiveChar(); // Calculate the attack timeout _attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks(); diff --git a/trunk/java/com/l2jserver/gameserver/ai/L2CharacterAI.java b/trunk/java/com/l2jserver/gameserver/ai/L2CharacterAI.java index fb514e23b8..a48c88ca08 100644 --- a/trunk/java/com/l2jserver/gameserver/ai/L2CharacterAI.java +++ b/trunk/java/com/l2jserver/gameserver/ai/L2CharacterAI.java @@ -746,7 +746,7 @@ public class L2CharacterAI extends AbstractAI if (_actor instanceof L2Npc) { - L2Npc npc = (L2Npc) _actor; + final L2Npc npc = (L2Npc) _actor; WalkingManager.getInstance().onArrived(npc); // Walking Manager support // Notify to scripts @@ -962,11 +962,11 @@ public class L2CharacterAI extends AbstractAI @Override protected void onEvtAfraid(L2Character effector, boolean start) { - double radians = Math.toRadians(start ? Util.calculateAngleFrom(effector, _actor) : Util.convertHeadingToDegree(_actor.getHeading())); + final double radians = Math.toRadians(start ? Util.calculateAngleFrom(effector, _actor) : Util.convertHeadingToDegree(_actor.getHeading())); - int posX = (int) (_actor.getX() + (FEAR_RANGE * Math.cos(radians))); - int posY = (int) (_actor.getY() + (FEAR_RANGE * Math.sin(radians))); - int posZ = _actor.getZ(); + final int posX = (int) (_actor.getX() + (FEAR_RANGE * Math.cos(radians))); + final int posY = (int) (_actor.getY() + (FEAR_RANGE * Math.sin(radians))); + final int posZ = _actor.getZ(); if (!_actor.isPet()) { @@ -1016,13 +1016,13 @@ public class L2CharacterAI extends AbstractAI int x = _actor.getX(); int y = _actor.getY(); - double dx = worldPosition.getX() - x; - double dy = worldPosition.getY() - y; + final double dx = worldPosition.getX() - x; + final double dy = worldPosition.getY() - y; double dist = Math.sqrt((dx * dx) + (dy * dy)); - double sin = dy / dist; - double cos = dx / dist; + final double sin = dy / dist; + final double cos = dx / dist; dist -= offset - 5; @@ -1080,7 +1080,7 @@ public class L2CharacterAI extends AbstractAI if (target.isDoor()) { - L2DoorInstance dor = (L2DoorInstance) target; + final L2DoorInstance dor = (L2DoorInstance) target; int xPoint = 0; int yPoint = 0; for (int i : dor.getTemplate().getNodeX()) @@ -1229,7 +1229,7 @@ public class L2CharacterAI extends AbstractAI // check if player is fakedeath if (target instanceof L2PcInstance) { - L2PcInstance target2 = (L2PcInstance) target; // convert object to chara + final L2PcInstance target2 = (L2PcInstance) target; // convert object to chara if (target2.isFakeDeath()) { @@ -1326,7 +1326,7 @@ public class L2CharacterAI extends AbstractAI { continue; } - int castRange = sk.getCastRange(); + final int castRange = sk.getCastRange(); boolean hasLongRangeDamageSkill = false; if (sk.isContinuous()) @@ -1475,7 +1475,7 @@ public class L2CharacterAI extends AbstractAI } else { - L2Weapon weapon = target.getActiveWeaponItem(); + final L2Weapon weapon = target.getActiveWeaponItem(); if ((weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW))) { isArcher = true; @@ -1538,7 +1538,7 @@ public class L2CharacterAI extends AbstractAI } if (target instanceof L2Attackable) { - L2Npc actors = ((L2Npc) _actor); + final L2Npc actors = ((L2Npc) _actor); if (!actors.isChaos()) { @@ -1567,7 +1567,7 @@ public class L2CharacterAI extends AbstractAI } if (target instanceof L2Attackable) { - L2Npc actors = ((L2Npc) _actor); + final L2Npc actors = ((L2Npc) _actor); if (!actors.isChaos()) { @@ -1599,7 +1599,7 @@ public class L2CharacterAI extends AbstractAI } if (target instanceof L2Attackable) { - L2Npc actors = ((L2Npc) _actor); + final L2Npc actors = ((L2Npc) _actor); if (!actors.isChaos()) { @@ -1629,7 +1629,7 @@ public class L2CharacterAI extends AbstractAI if (target instanceof L2Attackable) { - L2Npc actors = ((L2Npc) _actor); + final L2Npc actors = ((L2Npc) _actor); if (!actors.isChaos()) { continue; @@ -1662,8 +1662,8 @@ public class L2CharacterAI extends AbstractAI { continue; } - L2Npc targets = ((L2Npc) target); - L2Npc actors = ((L2Npc) _actor); + final L2Npc targets = ((L2Npc) target); + final L2Npc actors = ((L2Npc) _actor); if (targets.isInMyClan(actors)) { count++; diff --git a/trunk/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java b/trunk/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java index d3b3355b50..8885ee24bc 100644 --- a/trunk/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java +++ b/trunk/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java @@ -69,14 +69,14 @@ public final class L2ControllableMobAI extends L2AttackableAI protected void thinkFollow() { - L2Attackable me = (L2Attackable) _actor; + final L2Attackable me = (L2Attackable) _actor; if (!Util.checkIfInRange(MobGroupTable.FOLLOW_RANGE, me, getForcedTarget(), true)) { - int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; - int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; - int randX = Rnd.nextInt(MobGroupTable.FOLLOW_RANGE); - int randY = Rnd.nextInt(MobGroupTable.FOLLOW_RANGE); + final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; + final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; + final int randX = Rnd.nextInt(MobGroupTable.FOLLOW_RANGE); + final int randY = Rnd.nextInt(MobGroupTable.FOLLOW_RANGE); moveTo(getForcedTarget().getX() + (signX * randX), getForcedTarget().getY() + (signY * randY), getForcedTarget().getZ()); } @@ -135,7 +135,7 @@ public final class L2ControllableMobAI extends L2AttackableAI @Override protected void thinkCast() { - L2Attackable npc = (L2Attackable) _actor; + final L2Attackable npc = (L2Attackable) _actor; if ((getAttackTarget() == null) || getAttackTarget().isAlikeDead()) { setAttackTarget(findNextRndTarget()); @@ -176,7 +176,7 @@ public final class L2ControllableMobAI extends L2AttackableAI protected void thinkAttackGroup() { - L2Character target = getForcedTarget(); + final L2Character target = getForcedTarget(); if ((target == null) || target.isAlikeDead()) { // try to get next group target @@ -191,12 +191,12 @@ public final class L2ControllableMobAI extends L2AttackableAI _actor.setTarget(target); // as a response, we put the target in a forced attack mode - L2ControllableMobInstance theTarget = (L2ControllableMobInstance) target; - L2ControllableMobAI ctrlAi = (L2ControllableMobAI) theTarget.getAI(); + final L2ControllableMobInstance theTarget = (L2ControllableMobInstance) target; + final L2ControllableMobAI ctrlAi = (L2ControllableMobAI) theTarget.getAI(); ctrlAi.forceAttack(_actor); - double dist2 = _actor.calculateDistance(target, false, true); - int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + target.getTemplate().getCollisionRadius(); + final double dist2 = _actor.calculateDistance(target, false, true); + final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + target.getTemplate().getCollisionRadius(); int max_range = range; if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) @@ -204,7 +204,7 @@ public final class L2ControllableMobAI extends L2AttackableAI // check distant skills for (Skill sk : _actor.getAllSkills()) { - int castRange = sk.getCastRange(); + final int castRange = sk.getCastRange(); if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk))) { @@ -235,8 +235,8 @@ public final class L2ControllableMobAI extends L2AttackableAI } _actor.setTarget(getForcedTarget()); - double dist2 = _actor.calculateDistance(getForcedTarget(), false, true); - int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getForcedTarget().getTemplate().getCollisionRadius(); + final double dist2 = _actor.calculateDistance(getForcedTarget(), false, true); + final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getForcedTarget().getTemplate().getCollisionRadius(); int max_range = range; if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) @@ -244,7 +244,7 @@ public final class L2ControllableMobAI extends L2AttackableAI // check distant skills for (Skill sk : _actor.getAllSkills()) { - int castRange = sk.getCastRange(); + final int castRange = sk.getCastRange(); if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk))) { @@ -274,7 +274,7 @@ public final class L2ControllableMobAI extends L2AttackableAI if (getAttackTarget() != null) { // stop hating - L2Attackable npc = (L2Attackable) _actor; + final L2Attackable npc = (L2Attackable) _actor; npc.stopHating(getAttackTarget()); } @@ -285,7 +285,7 @@ public final class L2ControllableMobAI extends L2AttackableAI // notify aggression if (((L2Npc) _actor).getTemplate().getClans() != null) { - Collection objs = _actor.getKnownList().getKnownObjects().values(); + final Collection objs = _actor.getKnownList().getKnownObjects().values(); for (L2Object obj : objs) { if (!(obj instanceof L2Npc)) @@ -293,7 +293,7 @@ public final class L2ControllableMobAI extends L2AttackableAI continue; } - L2Npc npc = (L2Npc) obj; + final L2Npc npc = (L2Npc) obj; if (!npc.isInMyClan((L2Npc) _actor)) { @@ -308,8 +308,8 @@ public final class L2ControllableMobAI extends L2AttackableAI } _actor.setTarget(getAttackTarget()); - double dist2 = _actor.calculateDistance(getAttackTarget(), false, true); - int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getAttackTarget().getTemplate().getCollisionRadius(); + final double dist2 = _actor.calculateDistance(getAttackTarget(), false, true); + final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getAttackTarget().getTemplate().getCollisionRadius(); int max_range = range; if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) @@ -317,7 +317,7 @@ public final class L2ControllableMobAI extends L2AttackableAI // check distant skills for (Skill sk : _actor.getAllSkills()) { - int castRange = sk.getCastRange(); + final int castRange = sk.getCastRange(); if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk))) { @@ -359,7 +359,7 @@ public final class L2ControllableMobAI extends L2AttackableAI { for (Skill sk : _actor.getAllSkills()) { - int castRange = sk.getCastRange(); + final int castRange = sk.getCastRange(); if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() < _actor.getStat().getMpConsume(sk))) { diff --git a/trunk/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java b/trunk/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java index bc05b75016..b015ae0723 100644 --- a/trunk/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java +++ b/trunk/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java @@ -160,7 +160,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable // Get the owner if the target is a summon if (target instanceof L2Summon) { - L2PcInstance owner = ((L2Summon) target).getOwner(); + final L2PcInstance owner = ((L2Summon) target).getOwner(); if (_actor.isInsideRadius(owner, 1000, true, false)) { target = owner; @@ -201,7 +201,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable // Check if actor is not dead if (!_actor.isAlikeDead()) { - L2Attackable npc = (L2Attackable) _actor; + final L2Attackable npc = (L2Attackable) _actor; // If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE if (!npc.getKnownList().getKnownPlayers().isEmpty()) @@ -269,7 +269,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable */ private void thinkActive() { - L2Attackable npc = (L2Attackable) _actor; + final L2Attackable npc = (L2Attackable) _actor; // Update every 1s the _globalAggro counter to come close to 0 if (_globalAggro != 0) @@ -297,7 +297,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable if (autoAttackCondition(target)) // check aggression { // Get the hate level of the L2Attackable against this L2Character target contained in _aggroList - int hating = npc.getHating(target); + final int hating = npc.getHating(target); // Add the attacker to the L2Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -323,7 +323,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable if (hated != null) { // Get the hate level of the L2Attackable against this L2Character target contained in _aggroList - int aggro = npc.getHating(hated); + final int aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { @@ -386,14 +386,14 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable } } - L2Character attackTarget = getAttackTarget(); + final L2Character attackTarget = getAttackTarget(); // Check if target is dead or if timeout is expired to stop this attack if ((attackTarget == null) || attackTarget.isAlikeDead() || (_attackTimeout < GameTimeController.getInstance().getGameTicks())) { // Stop hating this target after the attack timeout or if target is dead if (attackTarget != null) { - L2Attackable npc = (L2Attackable) _actor; + final L2Attackable npc = (L2Attackable) _actor; npc.stopHating(attackTarget); } @@ -414,7 +414,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable private final void factionNotifyAndSupport() { - L2Character target = getAttackTarget(); + final L2Character target = getAttackTarget(); // Call all L2Object of its Faction inside the Faction Range if ((((L2Npc) _actor).getTemplate().getClans() == null) || (target == null)) { @@ -457,7 +457,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable continue; } - int chance = 5; + final int chance = 5; if (chance >= Rnd.get(100)) { continue; @@ -467,7 +467,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable break; } - L2Object OldTarget = _actor.getTarget(); + final L2Object OldTarget = _actor.getTarget(); _actor.setTarget(cha); clientStopMoving(null); _actor.doCast(sk); @@ -479,7 +479,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable continue; } - L2Npc npc = (L2Npc) cha; + final L2Npc npc = (L2Npc) cha; if (!npc.isInMyClan((L2Npc) _actor)) { @@ -516,7 +516,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable continue; } - int chance = 4; + final int chance = 4; if (chance >= Rnd.get(100)) { continue; @@ -526,7 +526,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable break; } - L2Object OldTarget = _actor.getTarget(); + final L2Object OldTarget = _actor.getTarget(); _actor.setTarget(npc); clientStopMoving(null); _actor.doCast(sk); @@ -600,12 +600,12 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable // check for long ranged skills and heal/buff skills for (Skill sk : skills) { - int castRange = sk.getCastRange(); + final int castRange = sk.getCastRange(); if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { - L2Object OldTarget = _actor.getTarget(); + final L2Object OldTarget = _actor.getTarget(); if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL))) { boolean useSkillSelf = true; @@ -643,11 +643,11 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable } else { - double dx = _actor.getX() - attackTarget.getX(); - double dy = _actor.getY() - attackTarget.getY(); - double dz = _actor.getZ() - attackTarget.getZ(); - double homeX = attackTarget.getX() - sGuard.getSpawn().getX(); - double homeY = attackTarget.getY() - sGuard.getSpawn().getY(); + final double dx = _actor.getX() - attackTarget.getX(); + final double dy = _actor.getY() - attackTarget.getY(); + final double dz = _actor.getZ() - attackTarget.getZ(); + final double homeX = attackTarget.getX() - sGuard.getSpawn().getX(); + final double homeY = attackTarget.getY() - sGuard.getSpawn().getY(); // Check if the L2SiegeGuardInstance isn't too far from it's home location if ((((dx * dx) + (dy * dy)) > 10000) && (((homeX * homeX) + (homeY * homeY)) > 3240000) // 1800 * 1800 @@ -693,7 +693,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable { // Temporary hack for preventing guards jumping off towers, // before replacing this with effective geodata checks and AI modification - double dz = _actor.getZ() - attackTarget.getZ(); + final double dz = _actor.getZ() - attackTarget.getZ(); if ((dz * dz) < (170 * 170)) // normally 130 if guard z coordinates correct { if (_selfAnalysis.isMage) @@ -746,11 +746,11 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable { for (Skill sk : skills) { - int castRange = sk.getCastRange(); + final int castRange = sk.getCastRange(); if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) { - L2Object OldTarget = _actor.getTarget(); + final L2Object OldTarget = _actor.getTarget(); if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL))) { boolean useSkillSelf = true; @@ -876,7 +876,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable { return; } - L2Attackable me = (L2Attackable) _actor; + final L2Attackable me = (L2Attackable) _actor; if (target != null) { @@ -915,8 +915,8 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable { sGuard = (L2DefenderInstance) _actor; } - double homeX = target.getX() - sGuard.getSpawn().getX(); - double homeY = target.getY() - sGuard.getSpawn().getY(); + final double homeX = target.getX() - sGuard.getSpawn().getX(); + final double homeY = target.getY() - sGuard.getSpawn().getY(); // Check if the L2SiegeGuardInstance is not too far from its home location if (((homeX * homeX) + (homeY * homeY)) < 3240000) @@ -933,7 +933,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable return; } - L2Character mostHated = me.getMostHated(); + final L2Character mostHated = me.getMostHated(); if (mostHated == null) { _globalAggro = -25; diff --git a/trunk/java/com/l2jserver/gameserver/ai/L2PlayerAI.java b/trunk/java/com/l2jserver/gameserver/ai/L2PlayerAI.java index 376bfcf6f5..2fcc0d111e 100644 --- a/trunk/java/com/l2jserver/gameserver/ai/L2PlayerAI.java +++ b/trunk/java/com/l2jserver/gameserver/ai/L2PlayerAI.java @@ -134,7 +134,7 @@ public class L2PlayerAI extends L2PlayableAI { // run interrupted or next intention - IntentionCommand nextIntention = _nextIntention; + final IntentionCommand nextIntention = _nextIntention; if (nextIntention != null) { if (nextIntention._crtlIntention != AI_INTENTION_CAST) // previous state shouldn't be casting @@ -230,7 +230,7 @@ public class L2PlayerAI extends L2PlayableAI private void thinkAttack() { - L2Character target = getAttackTarget(); + final L2Character target = getAttackTarget(); if (target == null) { return; @@ -251,7 +251,7 @@ public class L2PlayerAI extends L2PlayableAI private void thinkCast() { - L2Character target = getCastTarget(); + final L2Character target = getCastTarget(); if ((_skill.getTargetType() == L2TargetType.GROUND) && (_actor instanceof L2PcInstance)) { if (maybeMoveToPosition(((L2PcInstance) _actor).getCurrentSkillWorldPosition(), _actor.getMagicalAttackRange(_skill))) @@ -293,7 +293,7 @@ public class L2PlayerAI extends L2PlayableAI { return; } - L2Object target = getTarget(); + final L2Object target = getTarget(); if (checkTargetLost(target)) { return; @@ -312,7 +312,7 @@ public class L2PlayerAI extends L2PlayableAI { return; } - L2Object target = getTarget(); + final L2Object target = getTarget(); if (checkTargetLost(target)) { return; diff --git a/trunk/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java b/trunk/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java index 9775538a86..02e275f6dd 100644 --- a/trunk/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java +++ b/trunk/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java @@ -149,7 +149,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable // Get the owner if the target is a summon if (target instanceof L2Summon) { - L2PcInstance owner = ((L2Summon) target).getOwner(); + final L2PcInstance owner = ((L2Summon) target).getOwner(); if (_actor.isInsideRadius(owner, 1000, true, false)) { target = owner; @@ -190,7 +190,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable // Check if actor is not dead if (!_actor.isAlikeDead()) { - L2Attackable npc = (L2Attackable) _actor; + final L2Attackable npc = (L2Attackable) _actor; // If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE if (!npc.getKnownList().getKnownPlayers().isEmpty()) @@ -258,7 +258,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable */ private void thinkActive() { - L2Attackable npc = (L2Attackable) _actor; + final L2Attackable npc = (L2Attackable) _actor; // Update every 1s the _globalAggro counter to come close to 0 if (_globalAggro != 0) @@ -286,7 +286,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable if (autoAttackCondition(target)) // check aggression { // Get the hate level of the L2Attackable against this L2Character target contained in _aggroList - int hating = npc.getHating(target); + final int hating = npc.getHating(target); // Add the attacker to the L2Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -312,7 +312,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable if (hated != null) { // Get the hate level of the L2Attackable against this L2Character target contained in _aggroList - int aggro = npc.getHating(hated); + final int aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { @@ -365,14 +365,14 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable } } - L2Character attackTarget = getAttackTarget(); + final L2Character attackTarget = getAttackTarget(); // Check if target is dead or if timeout is expired to stop this attack if ((attackTarget == null) || attackTarget.isAlikeDead() || (_attackTimeout < GameTimeController.getInstance().getGameTicks())) { // Stop hating this target after the attack timeout or if target is dead if (attackTarget != null) { - L2Attackable npc = (L2Attackable) _actor; + final L2Attackable npc = (L2Attackable) _actor; npc.stopHating(attackTarget); } @@ -393,7 +393,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable private final void factionNotifyAndSupport() { - L2Character target = getAttackTarget(); + final L2Character target = getAttackTarget(); // Call all L2Object of its Faction inside the Faction Range if ((((L2Npc) _actor).getTemplate().getClans() == null) || (target == null)) { @@ -436,7 +436,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable continue; } - int chance = 5; + final int chance = 5; if (chance >= Rnd.get(100)) { continue; @@ -446,7 +446,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable break; } - L2Object OldTarget = _actor.getTarget(); + final L2Object OldTarget = _actor.getTarget(); _actor.setTarget(cha); clientStopMoving(null); _actor.doCast(sk); @@ -458,7 +458,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable continue; } - L2Npc npc = (L2Npc) cha; + final L2Npc npc = (L2Npc) cha; if (!npc.isInMyClan((L2Npc) _actor)) { @@ -495,7 +495,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable continue; } - int chance = 4; + final int chance = 4; if (chance >= Rnd.get(100)) { continue; @@ -505,7 +505,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable break; } - L2Object OldTarget = _actor.getTarget(); + final L2Object OldTarget = _actor.getTarget(); _actor.setTarget(npc); clientStopMoving(null); _actor.doCast(sk); @@ -523,7 +523,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable Collection skills = null; double dist_2 = 0; int range = 0; - L2DefenderInstance sGuard = (L2DefenderInstance) _actor; + final L2DefenderInstance sGuard = (L2DefenderInstance) _actor; L2Character attackTarget = getAttackTarget(); try @@ -573,12 +573,12 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable // check for long ranged skills and heal/buff skills for (Skill sk : skills) { - int castRange = sk.getCastRange(); + final int castRange = sk.getCastRange(); if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { - L2Object OldTarget = _actor.getTarget(); + final L2Object OldTarget = _actor.getTarget(); if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL))) { boolean useSkillSelf = true; @@ -616,11 +616,11 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable } else { - double dx = _actor.getX() - attackTarget.getX(); - double dy = _actor.getY() - attackTarget.getY(); - double dz = _actor.getZ() - attackTarget.getZ(); - double homeX = attackTarget.getX() - sGuard.getSpawn().getX(); - double homeY = attackTarget.getY() - sGuard.getSpawn().getY(); + final double dx = _actor.getX() - attackTarget.getX(); + final double dy = _actor.getY() - attackTarget.getY(); + final double dz = _actor.getZ() - attackTarget.getZ(); + final double homeX = attackTarget.getX() - sGuard.getSpawn().getX(); + final double homeY = attackTarget.getY() - sGuard.getSpawn().getY(); // Check if the L2SiegeGuardInstance isn't too far from it's home location if ((((dx * dx) + (dy * dy)) > 10000) && (((homeX * homeX) + (homeY * homeY)) > 3240000) // 1800 * 1800 @@ -666,7 +666,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable { // Temporary hack for preventing guards jumping off towers, // before replacing this with effective geodata checks and AI modification - double dz = _actor.getZ() - attackTarget.getZ(); + final double dz = _actor.getZ() - attackTarget.getZ(); if ((dz * dz) < (170 * 170)) // normally 130 if guard z coordinates correct { if (_selfAnalysis.isMage) @@ -715,11 +715,11 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable { for (Skill sk : skills) { - int castRange = sk.getCastRange(); + final int castRange = sk.getCastRange(); if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) { - L2Object OldTarget = _actor.getTarget(); + final L2Object OldTarget = _actor.getTarget(); if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL))) { boolean useSkillSelf = true; @@ -848,7 +848,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable { return; } - L2Attackable me = (L2Attackable) _actor; + final L2Attackable me = (L2Attackable) _actor; if (target != null) { @@ -878,9 +878,9 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable _actor.setRunning(); } - L2DefenderInstance sGuard = (L2DefenderInstance) _actor; - double homeX = target.getX() - sGuard.getSpawn().getX(); - double homeY = target.getY() - sGuard.getSpawn().getY(); + final L2DefenderInstance sGuard = (L2DefenderInstance) _actor; + final double homeX = target.getX() - sGuard.getSpawn().getX(); + final double homeY = target.getY() - sGuard.getSpawn().getY(); // Check if the L2SiegeGuardInstance is not too far from its home location if (((homeX * homeX) + (homeY * homeY)) < 3240000) @@ -897,7 +897,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable return; } - L2Character mostHated = me.getMostHated(); + final L2Character mostHated = me.getMostHated(); if (mostHated == null) { _globalAggro = -25; diff --git a/trunk/java/com/l2jserver/gameserver/ai/L2SummonAI.java b/trunk/java/com/l2jserver/gameserver/ai/L2SummonAI.java index 578c2f954b..12d0038c92 100644 --- a/trunk/java/com/l2jserver/gameserver/ai/L2SummonAI.java +++ b/trunk/java/com/l2jserver/gameserver/ai/L2SummonAI.java @@ -72,7 +72,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable @Override protected void onIntentionActive() { - L2Summon summon = (L2Summon) _actor; + final L2Summon summon = (L2Summon) _actor; if (_startFollow) { setIntention(AI_INTENTION_FOLLOW, summon.getOwner()); @@ -116,13 +116,13 @@ public class L2SummonAI extends L2PlayableAI implements Runnable private void thinkCast() { - L2Summon summon = (L2Summon) _actor; + final L2Summon summon = (L2Summon) _actor; if (checkTargetLost(getCastTarget())) { setCastTarget(null); return; } - boolean val = _startFollow; + final boolean val = _startFollow; if (maybeMoveToPawn(getCastTarget(), _actor.getMagicalAttackRange(_skill))) { return; diff --git a/trunk/java/com/l2jserver/gameserver/cache/HtmCache.java b/trunk/java/com/l2jserver/gameserver/cache/HtmCache.java index ad30ae8966..1a4d65eee6 100644 --- a/trunk/java/com/l2jserver/gameserver/cache/HtmCache.java +++ b/trunk/java/com/l2jserver/gameserver/cache/HtmCache.java @@ -120,13 +120,13 @@ public class HtmCache BufferedInputStream bis = new BufferedInputStream(fis)) { final int bytes = bis.available(); - byte[] raw = new byte[bytes]; + final byte[] raw = new byte[bytes]; bis.read(raw); content = new String(raw, "UTF-8"); content = content.replaceAll("(?s)", ""); // Remove html comments - String oldContent = _cache.put(relpath, content); + final String oldContent = _cache.put(relpath, content); if (oldContent == null) { _bytesBuffLen += bytes; diff --git a/trunk/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java b/trunk/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java index 336d892e2b..91594c8ff5 100644 --- a/trunk/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java +++ b/trunk/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java @@ -53,7 +53,7 @@ public class WarehouseCacheManager @Override public void run() { - long cTime = System.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (L2PcInstance pc : _cachedWh.keySet()) { if ((cTime - _cachedWh.get(pc)) > _cacheTime) diff --git a/trunk/java/com/l2jserver/gameserver/communitybbs/BB/Forum.java b/trunk/java/com/l2jserver/gameserver/communitybbs/BB/Forum.java index 8ae7483711..4efad1a018 100644 --- a/trunk/java/com/l2jserver/gameserver/communitybbs/BB/Forum.java +++ b/trunk/java/com/l2jserver/gameserver/communitybbs/BB/Forum.java @@ -122,7 +122,7 @@ public final class Forum { while (rs.next()) { - Topic t = new Topic(Topic.ConstructorType.RESTORE, rs.getInt("topic_id"), rs.getInt("topic_forum_id"), rs.getString("topic_name"), rs.getLong("topic_date"), rs.getString("topic_ownername"), rs.getInt("topic_ownerid"), rs.getInt("topic_type"), rs.getInt("topic_reply")); + final Topic t = new Topic(Topic.ConstructorType.RESTORE, rs.getInt("topic_id"), rs.getInt("topic_forum_id"), rs.getString("topic_name"), rs.getLong("topic_date"), rs.getString("topic_ownername"), rs.getInt("topic_ownerid"), rs.getInt("topic_type"), rs.getInt("topic_reply")); _topic.put(t.getID(), t); if (t.getID() > TopicBBSManager.getInstance().getMaxID(this)) { diff --git a/trunk/java/com/l2jserver/gameserver/communitybbs/BB/Post.java b/trunk/java/com/l2jserver/gameserver/communitybbs/BB/Post.java index 36a2b378b9..18ab6da63f 100644 --- a/trunk/java/com/l2jserver/gameserver/communitybbs/BB/Post.java +++ b/trunk/java/com/l2jserver/gameserver/communitybbs/BB/Post.java @@ -155,7 +155,7 @@ public class Post */ public void updatetxt(int i) { - CPost cp = getCPost(i); + final CPost cp = getCPost(i); try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE posts SET post_txt=? WHERE post_id=? AND post_topic_id=? AND post_forum_id=?")) { diff --git a/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/BaseBBSManager.java b/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/BaseBBSManager.java index 6ca57f3698..705bc24993 100644 --- a/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/BaseBBSManager.java +++ b/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/BaseBBSManager.java @@ -58,7 +58,7 @@ public abstract class BaseBBSManager */ protected void send1002(L2PcInstance activeChar, String string, String string2, String string3) { - List _arg = new ArrayList<>(); + final List _arg = new ArrayList<>(); _arg.add("0"); _arg.add("0"); _arg.add("0"); diff --git a/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/ForumsBBSManager.java b/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/ForumsBBSManager.java index 4579d0a465..faf1b1d785 100644 --- a/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/ForumsBBSManager.java +++ b/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/ForumsBBSManager.java @@ -47,8 +47,8 @@ public class ForumsBBSManager extends BaseBBSManager { while (rs.next()) { - int forumId = rs.getInt("forum_id"); - Forum f = new Forum(forumId, null); + final int forumId = rs.getInt("forum_id"); + final Forum f = new Forum(forumId, null); addForum(f); } } @@ -112,7 +112,7 @@ public class ForumsBBSManager extends BaseBBSManager */ public Forum createNewForum(String name, Forum parent, int type, int perm, int oid) { - Forum forum = new Forum(name, parent, type, perm, oid); + final Forum forum = new Forum(name, parent, type, perm, oid); forum.insertIntoDb(); return forum; } diff --git a/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/PostBBSManager.java b/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/PostBBSManager.java index 4292988e77..711a2a1076 100644 --- a/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/PostBBSManager.java +++ b/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/PostBBSManager.java @@ -66,11 +66,11 @@ public class PostBBSManager extends BaseBBSManager { if (command.startsWith("_bbsposts;read;")) { - StringTokenizer st = new StringTokenizer(command, ";"); + final StringTokenizer st = new StringTokenizer(command, ";"); st.nextToken(); st.nextToken(); - int idf = Integer.parseInt(st.nextToken()); - int idp = Integer.parseInt(st.nextToken()); + final int idf = Integer.parseInt(st.nextToken()); + final int idp = Integer.parseInt(st.nextToken()); String index = null; if (st.hasMoreTokens()) { @@ -90,12 +90,12 @@ public class PostBBSManager extends BaseBBSManager } else if (command.startsWith("_bbsposts;edit;")) { - StringTokenizer st = new StringTokenizer(command, ";"); + final StringTokenizer st = new StringTokenizer(command, ";"); st.nextToken(); st.nextToken(); - int idf = Integer.parseInt(st.nextToken()); - int idt = Integer.parseInt(st.nextToken()); - int idp = Integer.parseInt(st.nextToken()); + final int idf = Integer.parseInt(st.nextToken()); + final int idt = Integer.parseInt(st.nextToken()); + final int idp = Integer.parseInt(st.nextToken()); showEditPost((TopicBBSManager.getInstance().getTopicByID(idt)), ForumsBBSManager.getInstance().getForumByID(idf), activeChar, idp); } else @@ -149,9 +149,9 @@ public class PostBBSManager extends BaseBBSManager private void showMemoPost(Topic topic, L2PcInstance activeChar, Forum forum) { - Post p = getGPosttByTopic(topic); - Locale locale = Locale.getDefault(); - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.FULL, locale); + final Post p = getGPosttByTopic(topic); + final Locale locale = Locale.getDefault(); + final DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.FULL, locale); String mes = p.getCPost(0).postTxt.replace(">", ">"); mes = mes.replace("<", "<"); @@ -163,19 +163,19 @@ public class PostBBSManager extends BaseBBSManager @Override public void parsewrite(String ar1, String ar2, String ar3, String ar4, String ar5, L2PcInstance activeChar) { - StringTokenizer st = new StringTokenizer(ar1, ";"); - int idf = Integer.parseInt(st.nextToken()); - int idt = Integer.parseInt(st.nextToken()); - int idp = Integer.parseInt(st.nextToken()); + final StringTokenizer st = new StringTokenizer(ar1, ";"); + final int idf = Integer.parseInt(st.nextToken()); + final int idt = Integer.parseInt(st.nextToken()); + final int idp = Integer.parseInt(st.nextToken()); - Forum f = ForumsBBSManager.getInstance().getForumByID(idf); + final Forum f = ForumsBBSManager.getInstance().getForumByID(idf); if (f == null) { CommunityBoardHandler.separateAndSend("

the forum: " + idf + " does not exist !


", activeChar); } else { - Topic t = f.getTopic(idt); + final Topic t = f.getTopic(idt); if (t == null) { CommunityBoardHandler.separateAndSend("

the topic: " + idt + " does not exist !


", activeChar); diff --git a/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/TopicBBSManager.java b/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/TopicBBSManager.java index c88504bda0..98751a4260 100644 --- a/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/TopicBBSManager.java +++ b/trunk/java/com/l2jserver/gameserver/communitybbs/Manager/TopicBBSManager.java @@ -62,7 +62,7 @@ public class TopicBBSManager extends BaseBBSManager public int getMaxID(Forum f) { - Integer i = _maxId.get(f); + final Integer i = _maxId.get(f); if (i == null) { return 0; @@ -87,7 +87,7 @@ public class TopicBBSManager extends BaseBBSManager { if (ar1.equals("crea")) { - Forum f = ForumsBBSManager.getInstance().getForumByID(Integer.parseInt(ar2)); + final Forum f = ForumsBBSManager.getInstance().getForumByID(Integer.parseInt(ar2)); if (f == null) { CommunityBoardHandler.separateAndSend("

the forum: " + ar2 + " is not implemented yet


", activeChar); @@ -95,10 +95,10 @@ public class TopicBBSManager extends BaseBBSManager else { f.vload(); - Topic t = new Topic(Topic.ConstructorType.CREATE, TopicBBSManager.getInstance().getMaxID(f) + 1, Integer.parseInt(ar2), ar5, Calendar.getInstance().getTimeInMillis(), activeChar.getName(), activeChar.getObjectId(), Topic.MEMO, 0); + final Topic t = new Topic(Topic.ConstructorType.CREATE, TopicBBSManager.getInstance().getMaxID(f) + 1, Integer.parseInt(ar2), ar5, Calendar.getInstance().getTimeInMillis(), activeChar.getName(), activeChar.getObjectId(), Topic.MEMO, 0); f.addTopic(t); TopicBBSManager.getInstance().setMaxID(t.getID(), f); - Post p = new Post(activeChar.getName(), activeChar.getObjectId(), Calendar.getInstance().getTimeInMillis(), t.getID(), f.getID(), ar4); + final Post p = new Post(activeChar.getName(), activeChar.getObjectId(), Calendar.getInstance().getTimeInMillis(), t.getID(), f.getID(), ar4); PostBBSManager.getInstance().addPostByTopic(p, t); parsecmd("_bbsmemo", activeChar); } @@ -106,14 +106,14 @@ public class TopicBBSManager extends BaseBBSManager } else if (ar1.equals("del")) { - Forum f = ForumsBBSManager.getInstance().getForumByID(Integer.parseInt(ar2)); + final Forum f = ForumsBBSManager.getInstance().getForumByID(Integer.parseInt(ar2)); if (f == null) { CommunityBoardHandler.separateAndSend("

the forum: " + ar2 + " does not exist !


", activeChar); } else { - Topic t = f.getTopic(Integer.parseInt(ar3)); + final Topic t = f.getTopic(Integer.parseInt(ar3)); if (t == null) { CommunityBoardHandler.separateAndSend("

the topic: " + ar3 + " does not exist !


", activeChar); @@ -121,7 +121,7 @@ public class TopicBBSManager extends BaseBBSManager else { // CPost cp = null; - Post p = PostBBSManager.getInstance().getGPosttByTopic(t); + final Post p = PostBBSManager.getInstance().getGPosttByTopic(t); if (p != null) { p.deleteme(t); @@ -146,10 +146,10 @@ public class TopicBBSManager extends BaseBBSManager } else if (command.startsWith("_bbstopics;read")) { - StringTokenizer st = new StringTokenizer(command, ";"); + final StringTokenizer st = new StringTokenizer(command, ";"); st.nextToken(); st.nextToken(); - int idf = Integer.parseInt(st.nextToken()); + final int idf = Integer.parseInt(st.nextToken()); String index = null; if (st.hasMoreTokens()) { @@ -168,27 +168,27 @@ public class TopicBBSManager extends BaseBBSManager } else if (command.startsWith("_bbstopics;crea")) { - StringTokenizer st = new StringTokenizer(command, ";"); + final StringTokenizer st = new StringTokenizer(command, ";"); st.nextToken(); st.nextToken(); - int idf = Integer.parseInt(st.nextToken()); + final int idf = Integer.parseInt(st.nextToken()); showNewTopic(ForumsBBSManager.getInstance().getForumByID(idf), activeChar, idf); } else if (command.startsWith("_bbstopics;del")) { - StringTokenizer st = new StringTokenizer(command, ";"); + final StringTokenizer st = new StringTokenizer(command, ";"); st.nextToken(); st.nextToken(); - int idf = Integer.parseInt(st.nextToken()); - int idt = Integer.parseInt(st.nextToken()); - Forum f = ForumsBBSManager.getInstance().getForumByID(idf); + final int idf = Integer.parseInt(st.nextToken()); + final int idt = Integer.parseInt(st.nextToken()); + final Forum f = ForumsBBSManager.getInstance().getForumByID(idf); if (f == null) { CommunityBoardHandler.separateAndSend("

the forum: " + idf + " does not exist !


", activeChar); } else { - Topic t = f.getTopic(idt); + final Topic t = f.getTopic(idt); if (t == null) { CommunityBoardHandler.separateAndSend("

the topic: " + idt + " does not exist !


", activeChar); @@ -196,7 +196,7 @@ public class TopicBBSManager extends BaseBBSManager else { // CPost cp = null; - Post p = PostBBSManager.getInstance().getGPosttByTopic(t); + final Post p = PostBBSManager.getInstance().getGPosttByTopic(t); if (p != null) { p.deleteme(t); @@ -263,7 +263,7 @@ public class TopicBBSManager extends BaseBBSManager { break; } - Topic t = forum.getTopic(j); + final Topic t = forum.getTopic(j); if (t != null) { if (i++ >= (12 * (index - 1))) diff --git a/trunk/java/com/l2jserver/gameserver/data/sql/impl/CharSummonTable.java b/trunk/java/com/l2jserver/gameserver/data/sql/impl/CharSummonTable.java index 4d42e68a3c..eac20b513d 100644 --- a/trunk/java/com/l2jserver/gameserver/data/sql/impl/CharSummonTable.java +++ b/trunk/java/com/l2jserver/gameserver/data/sql/impl/CharSummonTable.java @@ -192,11 +192,11 @@ public class CharSummonTable Skill skill; while (rs.next()) { - int summonObjId = rs.getInt("summonId"); - int skillId = rs.getInt("summonSkillId"); - int curHp = rs.getInt("curHp"); - int curMp = rs.getInt("curMp"); - int time = rs.getInt("time"); + final int summonObjId = rs.getInt("summonId"); + final int skillId = rs.getInt("summonSkillId"); + final int curHp = rs.getInt("curHp"); + final int curMp = rs.getInt("curMp"); + final int time = rs.getInt("time"); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); if ((skill == null) || !activeChar.hasServitor(summonObjId)) diff --git a/trunk/java/com/l2jserver/gameserver/data/sql/impl/ClanTable.java b/trunk/java/com/l2jserver/gameserver/data/sql/impl/ClanTable.java index 05cace7951..86d5a1e181 100644 --- a/trunk/java/com/l2jserver/gameserver/data/sql/impl/ClanTable.java +++ b/trunk/java/com/l2jserver/gameserver/data/sql/impl/ClanTable.java @@ -88,7 +88,7 @@ public class ClanTable { while (rs.next()) { - int clanId = rs.getInt("clan_id"); + final int clanId = rs.getInt("clan_id"); _clans.put(clanId, new L2Clan(clanId)); clan = getClan(clanId); if (clan.getDissolvingExpiryTime() != 0) @@ -186,14 +186,14 @@ public class ClanTable if (null != getClanByName(clanName)) { // clan name is already taken - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); sm.addString(clanName); player.sendPacket(sm); return null; } - L2Clan clan = new L2Clan(IdFactory.getInstance().getNextId(), clanName); - L2ClanMember leader = new L2ClanMember(clan, player); + final L2Clan clan = new L2Clan(IdFactory.getInstance().getNextId(), clanName); + final L2ClanMember leader = new L2ClanMember(clan, player); clan.setLeader(leader); leader.setPlayerInstance(player); clan.store(); @@ -217,14 +217,14 @@ public class ClanTable public synchronized void destroyClan(int clanId) { - L2Clan clan = getClan(clanId); + final L2Clan clan = getClan(clanId); if (clan == null) { return; } clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_HAS_DISPERSED)); - int castleId = clan.getCastleId(); + final int castleId = clan.getCastleId(); if (castleId == 0) { for (Siege siege : SiegeManager.getInstance().getSieges()) @@ -233,7 +233,7 @@ public class ClanTable } } - int fortId = clan.getFortId(); + final int fortId = clan.getFortId(); if (fortId == 0) { for (FortSiege siege : FortSiegeManager.getInstance().getSieges()) @@ -242,7 +242,7 @@ public class ClanTable } } - int hallId = clan.getHideoutId(); + final int hallId = clan.getHideoutId(); if (hallId == 0) { for (SiegableHall hall : CHSiegeManager.getInstance().getConquerableHalls().values()) @@ -251,13 +251,13 @@ public class ClanTable } } - Auction auction = ClanHallAuctionManager.getInstance().getAuction(clan.getAuctionBiddedAt()); + final Auction auction = ClanHallAuctionManager.getInstance().getAuction(clan.getAuctionBiddedAt()); if (auction != null) { auction.cancelBid(clan.getId()); } - L2ClanMember leaderMember = clan.getLeader(); + final L2ClanMember leaderMember = clan.getLeader(); if (leaderMember == null) { clan.getWarehouse().destroyAllItems("ClanRemove", null, null); @@ -325,10 +325,10 @@ public class ClanTable if (fortId != 0) { - Fort fort = FortManager.getInstance().getFortById(fortId); + final Fort fort = FortManager.getInstance().getFortById(fortId); if (fort != null) { - L2Clan owner = fort.getOwnerClan(); + final L2Clan owner = fort.getOwnerClan(); if (clan == owner) { fort.removeOwner(true); @@ -338,7 +338,7 @@ public class ClanTable if (hallId != 0) { - SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(hallId); + final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(hallId); if ((hall != null) && (hall.getOwnerId() == clanId)) { hall.free(); @@ -424,8 +424,8 @@ public class ClanTable public void deleteclanswars(int clanId1, int clanId2) { - L2Clan clan1 = getClan(clanId1); - L2Clan clan2 = getClan(clanId2); + final L2Clan clan1 = getClan(clanId1); + final L2Clan clan2 = getClan(clanId2); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarFinish(clan1, clan2)); @@ -508,7 +508,7 @@ public class ClanTable { for (L2Clan clan : _clans.values()) { - int allyId = clan.getAllyId(); + final int allyId = clan.getAllyId(); if ((allyId != 0) && (clan.getId() != allyId)) { if (!_clans.containsKey(allyId)) diff --git a/trunk/java/com/l2jserver/gameserver/data/sql/impl/CrestTable.java b/trunk/java/com/l2jserver/gameserver/data/sql/impl/CrestTable.java index 23019de8b7..41dd71e1de 100644 --- a/trunk/java/com/l2jserver/gameserver/data/sql/impl/CrestTable.java +++ b/trunk/java/com/l2jserver/gameserver/data/sql/impl/CrestTable.java @@ -55,7 +55,7 @@ public final class CrestTable public synchronized void load() { _crests.clear(); - Set crestsInUse = new HashSet<>(); + final Set crestsInUse = new HashSet<>(); for (L2Clan clan : ClanTable.getInstance().getClans()) { if (clan.getCrestId() != 0) @@ -80,7 +80,7 @@ public final class CrestTable { while (rs.next()) { - int id = rs.getInt("crest_id"); + final int id = rs.getInt("crest_id"); if (_nextId.get() <= id) { @@ -95,8 +95,8 @@ public final class CrestTable continue; } - byte[] data = rs.getBytes("data"); - CrestType crestType = CrestType.getById(rs.getInt("type")); + final byte[] data = rs.getBytes("data"); + final CrestType crestType = CrestType.getById(rs.getInt("type")); if (crestType != null) { _crests.put(id, new L2Crest(id, data, crestType)); diff --git a/trunk/java/com/l2jserver/gameserver/data/sql/impl/NpcBufferTable.java b/trunk/java/com/l2jserver/gameserver/data/sql/impl/NpcBufferTable.java index bed7bdd35e..9b70fb91af 100644 --- a/trunk/java/com/l2jserver/gameserver/data/sql/impl/NpcBufferTable.java +++ b/trunk/java/com/l2jserver/gameserver/data/sql/impl/NpcBufferTable.java @@ -99,12 +99,12 @@ public class NpcBufferTable while (rset.next()) { - int npcId = rset.getInt("npc_id"); - int skillId = rset.getInt("skill_id"); - int skillLevel = rset.getInt("skill_level"); - int skillFeeId = rset.getInt("skill_fee_id"); - int skillFeeAmount = rset.getInt("skill_fee_amount"); - int buffGroup = rset.getInt("buff_group"); + final int npcId = rset.getInt("npc_id"); + final int skillId = rset.getInt("skill_id"); + final int skillLevel = rset.getInt("skill_level"); + final int skillFeeId = rset.getInt("skill_fee_id"); + final int skillFeeAmount = rset.getInt("skill_fee_amount"); + final int buffGroup = rset.getInt("buff_group"); if (npcId != lastNpcId) { @@ -145,12 +145,12 @@ public class NpcBufferTable NpcBufferSkills skills = null; while (rset.next()) { - int npcId = rset.getInt("npc_id"); - int skillId = rset.getInt("skill_id"); - int skillLevel = rset.getInt("skill_level"); - int skillFeeId = rset.getInt("skill_fee_id"); - int skillFeeAmount = rset.getInt("skill_fee_amount"); - int buffGroup = rset.getInt("buff_group"); + final int npcId = rset.getInt("npc_id"); + final int skillId = rset.getInt("skill_id"); + final int skillLevel = rset.getInt("skill_level"); + final int skillFeeId = rset.getInt("skill_fee_id"); + final int skillFeeAmount = rset.getInt("skill_fee_amount"); + final int buffGroup = rset.getInt("buff_group"); if (npcId != lastNpcId) { diff --git a/trunk/java/com/l2jserver/gameserver/data/sql/impl/OfflineTradersTable.java b/trunk/java/com/l2jserver/gameserver/data/sql/impl/OfflineTradersTable.java index e0ef6ff977..515e9cd08a 100644 --- a/trunk/java/com/l2jserver/gameserver/data/sql/impl/OfflineTradersTable.java +++ b/trunk/java/com/l2jserver/gameserver/data/sql/impl/OfflineTradersTable.java @@ -154,10 +154,10 @@ public class OfflineTradersTable { while (rs.next()) { - long time = rs.getLong("time"); + final long time = rs.getLong("time"); if (Config.OFFLINE_MAX_DAYS > 0) { - Calendar cal = Calendar.getInstance(); + final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); if (cal.getTimeInMillis() <= System.currentTimeMillis()) @@ -166,7 +166,7 @@ public class OfflineTradersTable } } - PrivateStoreType type = PrivateStoreType.findById(rs.getInt("type")); + final PrivateStoreType type = PrivateStoreType.findById(rs.getInt("type")); if (type == null) { LOGGER.warning(getClass().getSimpleName() + ": PrivateStoreType with id " + rs.getInt("type") + " could not be found."); @@ -182,7 +182,7 @@ public class OfflineTradersTable try { - L2GameClient client = new L2GameClient(null); + final L2GameClient client = new L2GameClient(null); client.setDetached(true); player = L2PcInstance.load(rs.getInt("charId")); client.setActiveChar(player); diff --git a/trunk/java/com/l2jserver/gameserver/data/sql/impl/PetNameTable.java b/trunk/java/com/l2jserver/gameserver/data/sql/impl/PetNameTable.java index 2b56ed0209..54a695e810 100644 --- a/trunk/java/com/l2jserver/gameserver/data/sql/impl/PetNameTable.java +++ b/trunk/java/com/l2jserver/gameserver/data/sql/impl/PetNameTable.java @@ -48,7 +48,7 @@ public class PetNameTable PreparedStatement ps = con.prepareStatement("SELECT name FROM pets p, items i WHERE p.item_obj_id = i.object_id AND name=? AND i.item_id IN (?)")) { ps.setString(1, name); - StringBuilder cond = new StringBuilder(); + final StringBuilder cond = new StringBuilder(); if (!cond.toString().isEmpty()) { cond.append(", "); @@ -87,7 +87,7 @@ public class PetNameTable LOGGER.warning(getClass().getSimpleName() + ": Pet name pattern of config is wrong!"); pattern = Pattern.compile(".*"); } - Matcher regexp = pattern.matcher(name); + final Matcher regexp = pattern.matcher(name); if (!regexp.matches()) { result = false; @@ -98,7 +98,7 @@ public class PetNameTable private boolean isAlphaNumeric(String text) { boolean result = true; - char[] chars = text.toCharArray(); + final char[] chars = text.toCharArray(); for (int i = 0; i < chars.length; i++) { if (!Character.isLetterOrDigit(chars[i])) diff --git a/trunk/java/com/l2jserver/gameserver/data/sql/impl/SummonSkillsTable.java b/trunk/java/com/l2jserver/gameserver/data/sql/impl/SummonSkillsTable.java index 25b2de35b1..f06eb4eb80 100644 --- a/trunk/java/com/l2jserver/gameserver/data/sql/impl/SummonSkillsTable.java +++ b/trunk/java/com/l2jserver/gameserver/data/sql/impl/SummonSkillsTable.java @@ -61,8 +61,8 @@ public class SummonSkillsTable _skillTrees.put(npcId, skillTree); } - int id = rs.getInt("skillId"); - int lvl = rs.getInt("skillLvl"); + final int id = rs.getInt("skillId"); + final int lvl = rs.getInt("skillLvl"); skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl, rs.getInt("minLvl"))); count++; } @@ -82,7 +82,7 @@ public class SummonSkillsTable LOGGER.warning(getClass().getSimpleName() + ": Pet id " + cha.getId() + " does not have any skills assigned."); return lvl; } - Collection skills = _skillTrees.get(cha.getId()).values(); + final Collection skills = _skillTrees.get(cha.getId()).values(); for (L2PetSkillLearn temp : skills) { if (temp.getId() != skillId) @@ -105,7 +105,7 @@ public class SummonSkillsTable } // formula usable for skill that have 10 or more skill levels - int maxLvl = SkillData.getInstance().getMaxLevel(temp.getId()); + final int maxLvl = SkillData.getInstance().getMaxLevel(temp.getId()); if (lvl > maxLvl) { lvl = maxLvl; @@ -125,13 +125,13 @@ public class SummonSkillsTable public List getAvailableSkills(L2Summon cha) { - List skillIds = new ArrayList<>(); + final List skillIds = new ArrayList<>(); if (!_skillTrees.containsKey(cha.getId())) { LOGGER.warning(getClass().getSimpleName() + ": Pet id " + cha.getId() + " does not have any skills assigned."); return skillIds; } - Collection skills = _skillTrees.get(cha.getId()).values(); + final Collection skills = _skillTrees.get(cha.getId()).values(); for (L2PetSkillLearn temp : skills) { if (skillIds.contains(temp.getId())) diff --git a/trunk/java/com/l2jserver/gameserver/data/sql/impl/TerritoryTable.java b/trunk/java/com/l2jserver/gameserver/data/sql/impl/TerritoryTable.java index fdc9d2b8a7..ee505c43fb 100644 --- a/trunk/java/com/l2jserver/gameserver/data/sql/impl/TerritoryTable.java +++ b/trunk/java/com/l2jserver/gameserver/data/sql/impl/TerritoryTable.java @@ -80,7 +80,7 @@ public class TerritoryTable { while (rset.next()) { - int terrId = rset.getInt("loc_id"); + final int terrId = rset.getInt("loc_id"); L2Territory terr = _territory.get(terrId); if (terr == null) { diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java index 8a66838e0a..2c987535b8 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java @@ -303,7 +303,7 @@ public final class AdminData implements IXmlReader for (String name : getAllGmNames(player.isGM())) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.GM_C1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.GM_C1); sm.addString(name); player.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java index e85a5137b7..21a01d1eb2 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java @@ -114,8 +114,8 @@ public final class ArmorSetsData implements IXmlReader } case "shield_skill": { - int skillId = parseInteger(attrs, "id"); - int skillLevel = parseInteger(attrs, "level"); + final int skillId = parseInteger(attrs, "id"); + final int skillLevel = parseInteger(attrs, "level"); set.addShieldSkill(new SkillHolder(skillId, skillLevel)); break; } diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/BeautyShopData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/BeautyShopData.java index 0f3091d193..1b1aab3cac 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/BeautyShopData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/BeautyShopData.java @@ -86,7 +86,7 @@ public final class BeautyShopData implements IXmlReader sex = parseEnum(att, Sex.class); } - BeautyData beautyData = new BeautyData(); + final BeautyData beautyData = new BeautyData(); for (Node a = b.getFirstChild(); a != null; a = a.getNextSibling()) { @@ -99,7 +99,7 @@ public final class BeautyShopData implements IXmlReader att = attrs.item(i); set.set(att.getNodeName(), att.getNodeValue()); } - BeautyItem hair = new BeautyItem(set); + final BeautyItem hair = new BeautyItem(set); for (Node g = a.getFirstChild(); g != null; g = g.getNextSibling()) { @@ -126,7 +126,7 @@ public final class BeautyShopData implements IXmlReader att = attrs.item(i); set.set(att.getNodeName(), att.getNodeValue()); } - BeautyItem face = new BeautyItem(set); + final BeautyItem face = new BeautyItem(set); beautyData.addFace(face); } } diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java index 50ea521fcd..2e7898eb30 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java @@ -72,10 +72,10 @@ public final class BuyListData implements IXmlReader { while (rs.next()) { - int buyListId = rs.getInt("buylist_id"); - int itemId = rs.getInt("item_id"); - long count = rs.getLong("count"); - long nextRestockTime = rs.getLong("next_restock_time"); + final int buyListId = rs.getInt("buylist_id"); + final int itemId = rs.getInt("item_id"); + final long count = rs.getLong("count"); + final long nextRestockTime = rs.getLong("next_restock_time"); final L2BuyList buyList = getBuyList(buyListId); if (buyList == null) { @@ -121,7 +121,7 @@ public final class BuyListData implements IXmlReader long price = -1; long restockDelay = -1; long count = -1; - NamedNodeMap attrs = list_node.getAttributes(); + final NamedNodeMap attrs = list_node.getAttributes(); Node attr = attrs.getNamedItem("id"); itemId = Integer.parseInt(attr.getNodeValue()); attr = attrs.getNamedItem("price"); @@ -155,7 +155,7 @@ public final class BuyListData implements IXmlReader { if ("npc".equalsIgnoreCase(npcs_node.getNodeName())) { - int npcId = Integer.parseInt(npcs_node.getTextContent()); + final int npcId = Integer.parseInt(npcs_node.getTextContent()); buyList.addAllowedNpc(npcId); } } diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/DailyMissionData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/DailyMissionData.java index e7ae024ee4..7f207fe6d4 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/DailyMissionData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/DailyMissionData.java @@ -77,7 +77,7 @@ public class DailyMissionData implements IXmlReader { if ("mission".equalsIgnoreCase(d.getNodeName())) { - NamedNodeMap attrs = d.getAttributes(); + final NamedNodeMap attrs = d.getAttributes(); Node att; id = -1; clientId = 0; @@ -219,7 +219,7 @@ public class DailyMissionData implements IXmlReader */ public List getDailyMissions(int classId) { - List missions = new ArrayList<>(); + final List missions = new ArrayList<>(); for (DailyMissionHolder mission : _dailyMissions) { if (mission.getAvailableClasses().contains(classId)) @@ -237,7 +237,7 @@ public class DailyMissionData implements IXmlReader */ public List getDailyLevelUpMissions(int classId) { - List missions = new ArrayList<>(); + final List missions = new ArrayList<>(); for (DailyMissionHolder mission : _dailyLevelUpMissions) { if (mission.getAvailableClasses().contains(classId)) diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java index 979baaaac2..342ddd7f43 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java @@ -119,8 +119,8 @@ public class DoorData implements IXmlReader private void makeDoor(StatsSet set) { insertCollisionData(set); - L2DoorTemplate template = new L2DoorTemplate(set); - L2DoorInstance door = new L2DoorInstance(template); + final L2DoorTemplate template = new L2DoorTemplate(set); + final L2DoorInstance door = new L2DoorInstance(template); door.setCurrentHp(door.getMaxHp()); door.spawnMe(template.getX(), template.getY(), template.getZ()); putDoor(door, MapRegionManager.getInstance().getMapRegionLocId(door)); @@ -218,20 +218,20 @@ public class DoorData implements IXmlReader boolean intersectFace = false; for (int i = 0; i < 4; i++) { - int j = (i + 1) < 4 ? i + 1 : 0; + final int j = (i + 1) < 4 ? i + 1 : 0; // lower part of the multiplier fraction, if it is 0 we avoid an error and also know that the lines are parallel - int denominator = ((ty - y) * (doorInst.getX(i) - doorInst.getX(j))) - ((tx - x) * (doorInst.getY(i) - doorInst.getY(j))); + final int denominator = ((ty - y) * (doorInst.getX(i) - doorInst.getX(j))) - ((tx - x) * (doorInst.getY(i) - doorInst.getY(j))); if (denominator == 0) { continue; } // multipliers to the equations of the lines. If they are lower than 0 or bigger than 1, we know that segments don't intersect - float multiplier1 = (float) (((doorInst.getX(j) - doorInst.getX(i)) * (y - doorInst.getY(i))) - ((doorInst.getY(j) - doorInst.getY(i)) * (x - doorInst.getX(i)))) / denominator; - float multiplier2 = (float) (((tx - x) * (y - doorInst.getY(i))) - ((ty - y) * (x - doorInst.getX(i)))) / denominator; + final float multiplier1 = (float) (((doorInst.getX(j) - doorInst.getX(i)) * (y - doorInst.getY(i))) - ((doorInst.getY(j) - doorInst.getY(i)) * (x - doorInst.getX(i)))) / denominator; + final float multiplier2 = (float) (((tx - x) * (y - doorInst.getY(i))) - ((ty - y) * (x - doorInst.getX(i)))) / denominator; if ((multiplier1 >= 0) && (multiplier1 <= 1) && (multiplier2 >= 0) && (multiplier2 <= 1)) { - int intersectZ = Math.round(z + (multiplier1 * (tz - z))); + final int intersectZ = Math.round(z + (multiplier1 * (tz - z))); // now checking if the resulting point is between door's min and max z if ((intersectZ > doorInst.getZMin()) && (intersectZ < doorInst.getZMax())) { diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemGroupsData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemGroupsData.java index 57583e2b87..a5d2882dd1 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemGroupsData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemGroupsData.java @@ -75,13 +75,13 @@ public final class EnchantItemGroupsData implements IXmlReader { if ("current".equalsIgnoreCase(cd.getNodeName())) { - String range = parseString(cd.getAttributes(), "enchant"); - double chance = parseDouble(cd.getAttributes(), "chance"); + final String range = parseString(cd.getAttributes(), "enchant"); + final double chance = parseDouble(cd.getAttributes(), "chance"); int min = -1; int max = 0; if (range.contains("-")) { - String[] split = range.split("-"); + final String[] split = range.split("-"); if ((split.length == 2) && Util.isDigit(split[0]) && Util.isDigit(split[1])) { min = Integer.parseInt(split[0]); @@ -103,7 +103,7 @@ public final class EnchantItemGroupsData implements IXmlReader } else if ("enchantScrollGroup".equals(d.getNodeName())) { - int id = parseInteger(d.getAttributes(), "id"); + final int id = parseInteger(d.getAttributes(), "id"); final EnchantScrollGroup group = new EnchantScrollGroup(id); for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) { diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java index e67dc74b7f..e069fa30ec 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java @@ -94,7 +94,7 @@ public class EnchantItemHPBonusData implements IXmlReader final Collection armorIds = it.getAllArmorsId(); for (Integer itemId : armorIds) { - L2Item item = it.getTemplate(itemId); + final L2Item item = it.getTemplate(itemId); if ((item != null) && (item.getCrystalType() != CrystalType.NONE)) { switch (item.getBodyPart()) diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemOptionsData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemOptionsData.java index 4ced728d23..99589b3e45 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemOptionsData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemOptionsData.java @@ -61,7 +61,7 @@ public class EnchantItemOptionsData implements IXmlReader { if ("item".equalsIgnoreCase(d.getNodeName())) { - int itemId = parseInteger(d.getAttributes(), "id"); + final int itemId = parseInteger(d.getAttributes(), "id"); if (!_data.containsKey(itemId)) { _data.put(itemId, new HashMap()); diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 068d094767..159f28c738 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -112,11 +112,11 @@ public class EnchantSkillGroupsData implements IXmlReader if ("enchant".equalsIgnoreCase(b.getNodeName())) { attrs = b.getAttributes(); - StatsSet set = new StatsSet(); + final StatsSet set = new StatsSet(); for (int i = 0; i < attrs.getLength(); i++) { - Node att = attrs.item(i); + final Node att = attrs.item(i); set.set(att.getNodeName(), att.getNodeValue()); } group.addEnchantDetail(new EnchantSkillHolder(set)); diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ExperienceData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ExperienceData.java index 398d97fa57..73c9cf2c89 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ExperienceData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ExperienceData.java @@ -80,7 +80,7 @@ public final class ExperienceData implements IXmlReader { if ("experience".equals(n.getNodeName())) { - NamedNodeMap attrs = n.getAttributes(); + final NamedNodeMap attrs = n.getAttributes(); maxLevel = parseInteger(attrs, "level"); if (maxLevel > Config.PLAYER_MAXIMUM_LEVEL) { diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java index 5b5b94232b..9b0c92ba94 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java @@ -71,7 +71,7 @@ public final class HitConditionBonusData implements IXmlReader { for (Node d = doc.getFirstChild().getFirstChild(); d != null; d = d.getNextSibling()) { - NamedNodeMap attrs = d.getAttributes(); + final NamedNodeMap attrs = d.getAttributes(); switch (d.getNodeName()) { case "front": diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java index 9a35efba2c..c13c39a7eb 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java @@ -95,7 +95,7 @@ public final class InitialEquipmentData implements IXmlReader attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { - Node attr = attrs.item(i); + final Node attr = attrs.item(i); set.set(attr.getNodeName(), attr.getNodeValue()); } equipList.add(new PcItemTemplate(set)); diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ItemCrystalizationData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ItemCrystalizationData.java index 9e259767f5..f973887f9f 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ItemCrystalizationData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ItemCrystalizationData.java @@ -66,7 +66,7 @@ public final class ItemCrystalizationData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - NamedNodeMap attrs = c.getAttributes(); + final NamedNodeMap attrs = c.getAttributes(); final int itemId = parseInteger(attrs, "id"); final long itemCount = parseLong(attrs, "count"); final double itemChance = parseDouble(attrs, "chance"); diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java index 374eac3287..5d4513a897 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java @@ -62,7 +62,7 @@ public class KarmaData implements IXmlReader if ("increase".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - int level = parseInteger(attrs, "lvl"); + final int level = parseInteger(attrs, "lvl"); if (level >= Config.PLAYER_MAXIMUM_LEVEL) { break; diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/LuckyGameData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/LuckyGameData.java index fe5670eed0..c03cbfec37 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/LuckyGameData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/LuckyGameData.java @@ -64,8 +64,8 @@ public class LuckyGameData implements IXmlReader { if ("list".equalsIgnoreCase(n.getNodeName())) { - NamedNodeMap at = n.getAttributes(); - Node attribute = at.getNamedItem("enabled"); + final NamedNodeMap at = n.getAttributes(); + final Node attribute = at.getNamedItem("enabled"); if ((attribute != null) && Boolean.parseBoolean(attribute.getNodeValue())) // (DropListScope.class); } - List dropList = new ArrayList<>(); + final List dropList = new ArrayList<>(); parseDropList(f, dropListsNode, dropListScope, dropList); dropLists.put(dropListScope, Collections.unmodifiableList(dropList)); } @@ -629,19 +629,19 @@ public class NpcData implements IXmlReader { for (Node dropNode = dropListNode.getFirstChild(); dropNode != null; dropNode = dropNode.getNextSibling()) { - NamedNodeMap attrs = dropNode.getAttributes(); + final NamedNodeMap attrs = dropNode.getAttributes(); switch (dropNode.getNodeName().toLowerCase()) { case "group": { - GroupedGeneralDropItem dropItem = dropListScope.newGroupedDropItem(parseDouble(attrs, "chance")); - List groupedDropList = new ArrayList<>(2); + final GroupedGeneralDropItem dropItem = dropListScope.newGroupedDropItem(parseDouble(attrs, "chance")); + final List groupedDropList = new ArrayList<>(2); for (Node groupNode = dropNode.getFirstChild(); groupNode != null; groupNode = groupNode.getNextSibling()) { parseDropListItem(groupNode, dropListScope, groupedDropList); } - List items = new ArrayList<>(groupedDropList.size()); + final List items = new ArrayList<>(groupedDropList.size()); for (IDropItem item : groupedDropList) { if (item instanceof GeneralDropItem) @@ -669,7 +669,7 @@ public class NpcData implements IXmlReader private void parseDropListItem(Node dropListItem, DropListScope dropListScope, List drops) { - NamedNodeMap attrs = dropListItem.getAttributes(); + final NamedNodeMap attrs = dropListItem.getAttributes(); switch (dropListItem.getNodeName().toLowerCase()) { case "item": @@ -707,7 +707,7 @@ public class NpcData implements IXmlReader */ public int getClanId(String clanName) { - Integer id = _clans.get(clanName.toUpperCase()); + final Integer id = _clans.get(clanName.toUpperCase()); return id != null ? id : -1; } @@ -839,7 +839,7 @@ public class NpcData implements IXmlReader { final List minions = new ArrayList<>(1); NamedNodeMap attrs = listNode.getAttributes(); - int id = parseInteger(attrs, "id"); + final int id = parseInteger(attrs, "id"); for (Node npcNode = listNode.getFirstChild(); npcNode != null; npcNode = npcNode.getNextSibling()) { if ("minion".equals(npcNode.getNodeName())) diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java index fe6f65a25a..ec3ed39bd2 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java @@ -131,8 +131,8 @@ public class OptionData implements IXmlReader private void parseFuncs(NamedNodeMap attrs, String functionName, Options op) { - Stats stat = Stats.valueOfXml(parseString(attrs, "stat")); - double val = parseDouble(attrs, "val"); + final Stats stat = Stats.valueOfXml(parseString(attrs, "stat")); + final double val = parseDouble(attrs, "val"); int order = -1; final Node orderNode = attrs.getNamedItem("order"); if (orderNode != null) diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java index 05bc6e178c..8cad5f86a0 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java @@ -60,21 +60,21 @@ public final class PetDataTable implements IXmlReader public void parseDocument(Document doc) { NamedNodeMap attrs; - Node n = doc.getFirstChild(); + final Node n = doc.getFirstChild(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equals("pet")) { - int npcId = parseInteger(d.getAttributes(), "id"); - int itemId = parseInteger(d.getAttributes(), "itemId"); + final int npcId = parseInteger(d.getAttributes(), "id"); + final int itemId = parseInteger(d.getAttributes(), "itemId"); // index ignored for now - L2PetData data = new L2PetData(npcId, itemId); + final L2PetData data = new L2PetData(npcId, itemId); for (Node p = d.getFirstChild(); p != null; p = p.getNextSibling()) { if (p.getNodeName().equals("set")) { attrs = p.getAttributes(); - String type = attrs.getNamedItem("name").getNodeValue(); + final String type = attrs.getNamedItem("name").getNodeValue(); if ("food".equals(type)) { for (String foodId : attrs.getNamedItem("val").getNodeValue().split(";")) diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java index 2fcf68e310..ddfdbceaab 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java @@ -79,9 +79,9 @@ public final class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - StatsSet set = new StatsSet(); + final StatsSet set = new StatsSet(); set.set("classId", classId); - List creationPoints = new ArrayList<>(); + final List creationPoints = new ArrayList<>(); for (Node nd = d.getFirstChild(); nd != null; nd = nd.getNextSibling()) { @@ -152,10 +152,10 @@ public final class PlayerTemplateData implements IXmlReader if ("level".equalsIgnoreCase(lvlNode.getNodeName())) { attrs = lvlNode.getAttributes(); - int level = parseInteger(attrs, "val"); + final int level = parseInteger(attrs, "val"); for (Node valNode = lvlNode.getFirstChild(); valNode != null; valNode = valNode.getNextSibling()) { - String nodeName = valNode.getNodeName(); + final String nodeName = valNode.getNodeName(); if ((level < Config.PLAYER_MAXIMUM_LEVEL) && (nodeName.startsWith("hp") || nodeName.startsWith("mp") || nodeName.startsWith("cp")) && _playerTemplates.containsKey(ClassId.getClassId(classId))) { diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerXpPercentLostData.java index 99194c785f..6b902de940 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerXpPercentLostData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerXpPercentLostData.java @@ -58,8 +58,8 @@ public final class PlayerXpPercentLostData implements IXmlReader { if ("xpLost".equalsIgnoreCase(d.getNodeName())) { - NamedNodeMap attrs = d.getAttributes(); - Integer level = parseInteger(attrs, "level"); + final NamedNodeMap attrs = d.getAttributes(); + final Integer level = parseInteger(attrs, "level"); if (level > _maxlevel) { break; diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/PrimeShopData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/PrimeShopData.java index b2a49293db..89be230631 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/PrimeShopData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/PrimeShopData.java @@ -71,8 +71,8 @@ public class PrimeShopData implements IXmlReader { if ("list".equalsIgnoreCase(n.getNodeName())) { - NamedNodeMap at = n.getAttributes(); - Node attribute = at.getNamedItem("enabled"); + final NamedNodeMap at = n.getAttributes(); + final Node attribute = at.getNamedItem("enabled"); if ((attribute != null) && Boolean.parseBoolean(attribute.getNodeValue())) { for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) @@ -81,14 +81,14 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - StatsSet set = new StatsSet(); + final StatsSet set = new StatsSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); set.set(att.getNodeName(), att.getNodeValue()); } - List items = new ArrayList<>(); + final List items = new ArrayList<>(); for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling()) { if ("item".equalsIgnoreCase(b.getNodeName())) diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java index 204a562ada..8d1ec3d747 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java @@ -76,11 +76,11 @@ public class RecipeData implements IXmlReader recipePartList.clear(); recipeStatUseList.clear(); recipeAltStatChangeList.clear(); - NamedNodeMap attrs = d.getAttributes(); + final NamedNodeMap attrs = d.getAttributes(); Node att; int id = -1; boolean haveRare = false; - StatsSet set = new StatsSet(); + final StatsSet set = new StatsSet(); att = attrs.getNamedItem("id"); if (att == null) @@ -135,8 +135,8 @@ public class RecipeData implements IXmlReader { if ("statUse".equalsIgnoreCase(c.getNodeName())) { - String statName = c.getAttributes().getNamedItem("name").getNodeValue(); - int value = Integer.parseInt(c.getAttributes().getNamedItem("value").getNodeValue()); + final String statName = c.getAttributes().getNamedItem("name").getNodeValue(); + final int value = Integer.parseInt(c.getAttributes().getNamedItem("value").getNodeValue()); try { recipeStatUseList.add(new L2RecipeStatInstance(statName, value)); @@ -149,8 +149,8 @@ public class RecipeData implements IXmlReader } else if ("altStatChange".equalsIgnoreCase(c.getNodeName())) { - String statName = c.getAttributes().getNamedItem("name").getNodeValue(); - int value = Integer.parseInt(c.getAttributes().getNamedItem("value").getNodeValue()); + final String statName = c.getAttributes().getNamedItem("name").getNodeValue(); + final int value = Integer.parseInt(c.getAttributes().getNamedItem("value").getNodeValue()); try { recipeAltStatChangeList.add(new L2RecipeStatInstance(statName, value)); @@ -163,8 +163,8 @@ public class RecipeData implements IXmlReader } else if ("ingredient".equalsIgnoreCase(c.getNodeName())) { - int ingId = Integer.parseInt(c.getAttributes().getNamedItem("id").getNodeValue()); - int ingCount = Integer.parseInt(c.getAttributes().getNamedItem("count").getNodeValue()); + final int ingId = Integer.parseInt(c.getAttributes().getNamedItem("id").getNodeValue()); + final int ingCount = Integer.parseInt(c.getAttributes().getNamedItem("count").getNodeValue()); recipePartList.add(new L2RecipeInstance(ingId, ingCount)); } else if ("production".equalsIgnoreCase(c.getNodeName())) @@ -181,7 +181,7 @@ public class RecipeData implements IXmlReader } } - L2RecipeList recipeList = new L2RecipeList(set, haveRare); + final L2RecipeList recipeList = new L2RecipeList(set, haveRare); for (L2RecipeInstance recipePart : recipePartList) { recipeList.addRecipe(recipePart); @@ -235,7 +235,7 @@ public class RecipeData implements IXmlReader */ public int[] getAllItemIds() { - int[] idList = new int[_recipes.size()]; + final int[] idList = new int[_recipes.size()]; int i = 0; for (L2RecipeList rec : _recipes.values()) { @@ -252,7 +252,7 @@ public class RecipeData implements IXmlReader */ public L2RecipeList getValidRecipeList(L2PcInstance player, int id) { - L2RecipeList recipeList = _recipes.get(id); + final L2RecipeList recipeList = _recipes.get(id); if ((recipeList == null) || (recipeList.getRecipes().length == 0)) { player.sendMessage(getClass().getSimpleName() + ": No recipe for: " + id); diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ShuttleData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ShuttleData.java index 0efdc47eea..11ce83dc35 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ShuttleData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ShuttleData.java @@ -110,7 +110,7 @@ public final class ShuttleData implements IXmlReader if ("stop".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - L2ShuttleStop stop = new L2ShuttleStop(parseInteger(attrs, "id")); + final L2ShuttleStop stop = new L2ShuttleStop(parseInteger(attrs, "id")); for (Node z = a.getFirstChild(); z != null; z = z.getNextSibling()) { @@ -131,7 +131,7 @@ public final class ShuttleData implements IXmlReader if ("route".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - List locs = new ArrayList<>(); + final List locs = new ArrayList<>(); for (Node z = a.getFirstChild(); z != null; z = z.getNextSibling()) { if ("loc".equalsIgnoreCase(z.getNodeName())) @@ -141,7 +141,7 @@ public final class ShuttleData implements IXmlReader } } - VehiclePathPoint[] route = new VehiclePathPoint[locs.size()]; + final VehiclePathPoint[] route = new VehiclePathPoint[locs.size()]; int i = 0; for (Location loc : locs) { diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java index a3b4632d17..c1a78775bd 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java @@ -75,8 +75,8 @@ public class SiegeScheduleData implements IXmlReader final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { - Node node = attrs.item(i); - String key = node.getNodeName(); + final Node node = attrs.item(i); + final String key = node.getNodeName(); String val = node.getNodeValue(); if ("day".equals(key)) { diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java index e405e623b1..2bbc382790 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java @@ -773,13 +773,13 @@ public final class SkillTreesData implements IXmlReader public Collection getAllAvailableSkills(L2PcInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet) { // Get available skills - PlayerSkillHolder holder = new PlayerSkillHolder(player); + final PlayerSkillHolder holder = new PlayerSkillHolder(player); List learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder); while (learnable.size() > 0) { for (L2SkillLearn s : learnable) { - Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel()); + final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel()); holder.addSkill(sk); } @@ -894,7 +894,7 @@ public final class SkillTreesData implements IXmlReader public List getAvailableRevelationSkills(L2PcInstance player, SubclassType type) { final List result = new ArrayList<>(); - Map revelationSkills = _revelationSkillTree.get(type); + final Map revelationSkills = _revelationSkillTree.get(type); for (L2SkillLearn skill : revelationSkills.values()) { diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java index a4da30181a..b0e2c998fb 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java @@ -86,7 +86,7 @@ public final class StaticObjectData implements IXmlReader */ private void addObject(StatsSet set) { - L2StaticObjectInstance obj = new L2StaticObjectInstance(new L2CharTemplate(new StatsSet()), set.getInt("id")); + final L2StaticObjectInstance obj = new L2StaticObjectInstance(new L2CharTemplate(new StatsSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java index 6fa01d60de..805c892f49 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java @@ -70,16 +70,16 @@ public final class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - StatsSet set = new StatsSet(); + final StatsSet set = new StatsSet(); for (int i = 0; i < attrs.getLength(); i++) { - Node att = attrs.item(i); + final Node att = attrs.item(i); set.set(att.getNodeName(), att.getNodeValue()); } final Transform transform = new Transform(set); for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) { - boolean isMale = "Male".equalsIgnoreCase(cd.getNodeName()); + final boolean isMale = "Male".equalsIgnoreCase(cd.getNodeName()); if ("Male".equalsIgnoreCase(cd.getNodeName()) || "Female".equalsIgnoreCase(cd.getNodeName())) { TransformTemplate templateData = null; @@ -103,7 +103,7 @@ public final class TransformData implements IXmlReader attrs = s.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { - Node att = attrs.item(i); + final Node att = attrs.item(i); set.set(att.getNodeName(), att.getNodeValue()); } break; @@ -126,8 +126,8 @@ public final class TransformData implements IXmlReader if ("skill".equals(s.getNodeName())) { attrs = s.getAttributes(); - int skillId = parseInteger(attrs, "id"); - int skillLevel = parseInteger(attrs, "level"); + final int skillId = parseInteger(attrs, "id"); + final int skillLevel = parseInteger(attrs, "level"); templateData.addSkill(new SkillHolder(skillId, skillLevel)); } } @@ -157,9 +157,9 @@ public final class TransformData implements IXmlReader if ("skill".equals(s.getNodeName())) { attrs = s.getAttributes(); - int skillId = parseInteger(attrs, "id"); - int skillLevel = parseInteger(attrs, "level"); - int minLevel = parseInteger(attrs, "minLevel"); + final int skillId = parseInteger(attrs, "id"); + final int skillLevel = parseInteger(attrs, "level"); + final int minLevel = parseInteger(attrs, "minLevel"); templateData.addAdditionalSkill(new AdditionalSkillHolder(skillId, skillLevel, minLevel)); } } @@ -177,8 +177,8 @@ public final class TransformData implements IXmlReader if ("item".equals(s.getNodeName())) { attrs = s.getAttributes(); - int itemId = parseInteger(attrs, "id"); - boolean allowed = parseBoolean(attrs, "allowed"); + final int itemId = parseInteger(attrs, "id"); + final boolean allowed = parseBoolean(attrs, "allowed"); templateData.addAdditionalItem(new AdditionalItemHolder(itemId, allowed)); } } @@ -200,7 +200,7 @@ public final class TransformData implements IXmlReader attrs = s.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { - Node att = attrs.item(i); + final Node att = attrs.item(i); levelsSet.set(att.getNodeName(), att.getNodeValue()); } } diff --git a/trunk/java/com/l2jserver/gameserver/datatables/AugmentationData.java b/trunk/java/com/l2jserver/gameserver/datatables/AugmentationData.java index 18e3e2f41e..aea82c0c56 100644 --- a/trunk/java/com/l2jserver/gameserver/datatables/AugmentationData.java +++ b/trunk/java/com/l2jserver/gameserver/datatables/AugmentationData.java @@ -219,7 +219,7 @@ public class AugmentationData private final void load() { // Load stats - DocumentBuilderFactory factory2 = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory2 = DocumentBuilderFactory.newInstance(); factory2.setValidating(false); factory2.setIgnoringComments(true); @@ -232,18 +232,18 @@ public class AugmentationData try { int badAugmantData = 0; - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); - File file = new File(Config.DATAPACK_ROOT + "/stats/augmentation/augmentation_skillmap.xml"); + final File file = new File(Config.DATAPACK_ROOT + "/stats/augmentation/augmentation_skillmap.xml"); if (!file.exists()) { LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": ERROR The augmentation skillmap file is missing."); return; } - Document doc = factory.newDocumentBuilder().parse(file); + final Document doc = factory.newDocumentBuilder().parse(file); for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) { @@ -254,7 +254,8 @@ public class AugmentationData if ("augmentation".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - int skillId = 0, augmentationId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); + int skillId = 0; + final int augmentationId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); int skillLvL = 0; String type = "blue"; @@ -286,7 +287,7 @@ public class AugmentationData badAugmantData++; continue; } - int k = (augmentationId - BLUE_START) / SKILLS_BLOCKSIZE; + final int k = (augmentationId - BLUE_START) / SKILLS_BLOCKSIZE; if (type.equalsIgnoreCase("blue")) { @@ -319,11 +320,11 @@ public class AugmentationData } else { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); - File aFile = new File(Config.DATAPACK_ROOT + "/stats/augmentation/retailchances.xml"); + final File aFile = new File(Config.DATAPACK_ROOT + "/stats/augmentation/retailchances.xml"); if (aFile.exists()) { Document aDoc = null; @@ -413,11 +414,11 @@ public class AugmentationData } if (Config.RETAIL_LIKE_AUGMENTATION_ACCESSORY) { - DocumentBuilderFactory factory3 = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory3 = DocumentBuilderFactory.newInstance(); factory3.setValidating(false); factory3.setIgnoringComments(true); - File aFile3 = new File(Config.DATAPACK_ROOT + "/stats/augmentation/retailchances_accessory.xml"); + final File aFile3 = new File(Config.DATAPACK_ROOT + "/stats/augmentation/retailchances_accessory.xml"); if (aFile3.exists()) { Document aDoc = null; @@ -536,8 +537,8 @@ public class AugmentationData { if (item.getItem().isMagicWeapon()) { - List _selectedChances12 = new ArrayList<>(); - List _selectedChances34 = new ArrayList<>(); + final List _selectedChances12 = new ArrayList<>(); + final List _selectedChances34 = new ArrayList<>(); for (AugmentationChance ac : _augmentationChances) { if (ac.getWeaponType().equals("mage") && (ac.getStoneId() == lifeStoneId)) @@ -598,7 +599,7 @@ public class AugmentationData { c = 3; } - List _selectedChances34final = new ArrayList<>(); + final List _selectedChances34final = new ArrayList<>(); for (AugmentationChance ac : _selectedChances34) { if (ac.getCategoryChance() == c) @@ -621,8 +622,8 @@ public class AugmentationData } else { - List _selectedChances12 = new ArrayList<>(); - List _selectedChances34 = new ArrayList<>(); + final List _selectedChances12 = new ArrayList<>(); + final List _selectedChances34 = new ArrayList<>(); for (AugmentationChance ac : _augmentationChances) { if (ac.getWeaponType().equals("warrior") && (ac.getStoneId() == lifeStoneId)) @@ -683,7 +684,7 @@ public class AugmentationData { c = 3; } - List _selectedChances34final = new ArrayList<>(); + final List _selectedChances34final = new ArrayList<>(); for (AugmentationChance ac : _selectedChances34) { if (ac.getCategoryChance() == c) @@ -838,8 +839,8 @@ public class AugmentationData int offset; if (stat34 == 0) { - int temp = Rnd.get(2, 3); - int colorOffset = (resultColor * (10 * STAT_SUBBLOCKSIZE)) + (temp * STAT_BLOCKSIZE) + 1; + final int temp = Rnd.get(2, 3); + final int colorOffset = (resultColor * (10 * STAT_SUBBLOCKSIZE)) + (temp * STAT_BLOCKSIZE) + 1; offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + colorOffset; stat34 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1); @@ -878,8 +879,8 @@ public class AugmentationData int stat34 = 0; if (Config.RETAIL_LIKE_AUGMENTATION_ACCESSORY) { - List _selectedChances12 = new ArrayList<>(); - List _selectedChances34 = new ArrayList<>(); + final List _selectedChances12 = new ArrayList<>(); + final List _selectedChances34 = new ArrayList<>(); for (augmentationChanceAcc ac : _augmentationChancesAcc) { if (ac.getWeaponType().equals("warrior") && (ac.getStoneId() == lifeStoneId)) @@ -921,7 +922,7 @@ public class AugmentationData { c = 1; } - List _selectedChances34final = new ArrayList<>(); + final List _selectedChances34final = new ArrayList<>(); for (augmentationChanceAcc ac : _selectedChances34) { if (ac.getCategoryChance() == c) @@ -964,7 +965,7 @@ public class AugmentationData return null; } - int resultColor = Rnd.get(0, 3); + final int resultColor = Rnd.get(0, 3); // first augmentation (stats only) stat12 = Rnd.get(ACC_STAT_SUBBLOCKSIZE); diff --git a/trunk/java/com/l2jserver/gameserver/datatables/BotReportTable.java b/trunk/java/com/l2jserver/gameserver/datatables/BotReportTable.java index 8f7027e0d5..aff58d56e5 100644 --- a/trunk/java/com/l2jserver/gameserver/datatables/BotReportTable.java +++ b/trunk/java/com/l2jserver/gameserver/datatables/BotReportTable.java @@ -86,13 +86,13 @@ public final class BotReportTable try { - File punishments = new File("./config/botreport_punishments.xml"); + final File punishments = new File("./config/botreport_punishments.xml"); if (!punishments.exists()) { throw new FileNotFoundException(punishments.getName()); } - SAXParser parser = SAXParserFactory.newInstance().newSAXParser(); + final SAXParser parser = SAXParserFactory.newInstance().newSAXParser(); parser.parse(punishments, new PunishmentsLoader()); } catch (Exception e) @@ -118,8 +118,8 @@ public final class BotReportTable long lastResetTime = 0; try { - String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - Calendar c = Calendar.getInstance(); + final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; + final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); @@ -137,16 +137,16 @@ public final class BotReportTable while (rset.next()) { - int botId = rset.getInt(COLUMN_BOT_ID); - int reporter = rset.getInt(COLUMN_REPORTER_ID); - long date = rset.getLong(COLUMN_REPORT_TIME); + final int botId = rset.getInt(COLUMN_BOT_ID); + final int reporter = rset.getInt(COLUMN_REPORTER_ID); + final long date = rset.getLong(COLUMN_REPORT_TIME); if (_reports.containsKey(botId)) { _reports.get(botId).addReporter(reporter, date); } else { - ReportedCharData rcd = new ReportedCharData(); + final ReportedCharData rcd = new ReportedCharData(); rcd.addReporter(reporter, date); _reports.put(rset.getInt(COLUMN_BOT_ID), rcd); } @@ -189,7 +189,7 @@ public final class BotReportTable for (Map.Entry entrySet : _reports.entrySet()) { - Map reportTable = entrySet.getValue()._reporters; + final Map reportTable = entrySet.getValue()._reporters; for (int reporterId : reportTable.keySet()) { ps.setInt(1, entrySet.getKey()); @@ -212,14 +212,14 @@ public final class BotReportTable */ public boolean reportBot(L2PcInstance reporter) { - L2Object target = reporter.getTarget(); + final L2Object target = reporter.getTarget(); if (target == null) { return false; } - L2PcInstance bot = target.getActingPlayer(); + final L2PcInstance bot = target.getActingPlayer(); if ((bot == null) || (target.getObjectId() == reporter.getObjectId())) { @@ -292,10 +292,10 @@ public final class BotReportTable return false; } - long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); sm.addInt((int) (reuse / 60000)); sm.addInt(rcdRep.getPointsLeft()); reporter.sendPacket(sm); @@ -368,7 +368,7 @@ public final class BotReportTable ph._punish.applyEffects(bot, bot); if (ph._systemMessageId > -1) { - SystemMessageId id = SystemMessageId.getSystemMessageId(ph._systemMessageId); + final SystemMessageId id = SystemMessageId.getSystemMessageId(ph._systemMessageId); if (id != null) { bot.sendPacket(id); @@ -386,7 +386,7 @@ public final class BotReportTable */ void addPunishment(int neededReports, int skillId, int skillLevel, int sysMsg) { - Skill sk = SkillData.getInstance().getSkill(skillId, skillLevel); + final Skill sk = SkillData.getInstance().getSkill(skillId, skillLevel); if (sk != null) { _punishments.put(neededReports, new PunishHolder(sk, sysMsg)); @@ -414,8 +414,8 @@ public final class BotReportTable { try { - String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - Calendar c = Calendar.getInstance(); + final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; + final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); @@ -445,9 +445,9 @@ public final class BotReportTable */ private static int hashIp(L2PcInstance player) { - String con = player.getClient().getConnection().getInetAddress().getHostAddress(); - String[] rawByte = con.split("\\."); - int[] rawIp = new int[4]; + final String con = player.getClient().getConnection().getInetAddress().getHostAddress(); + final String[] rawByte = con.split("\\."); + final int[] rawIp = new int[4]; for (int i = 0; i < 4; i++) { rawIp[i] = Integer.parseInt(rawByte[i]); @@ -572,8 +572,8 @@ public final class BotReportTable { reportCount = Integer.parseInt(attr.getValue("neededReportCount")); skillId = Integer.parseInt(attr.getValue("skillId")); - String level = attr.getValue("skillLevel"); - String systemMessageId = attr.getValue("sysMessageId"); + final String level = attr.getValue("skillLevel"); + final String systemMessageId = attr.getValue("sysMessageId"); if (level != null) { skillLevel = Integer.parseInt(level); diff --git a/trunk/java/com/l2jserver/gameserver/datatables/ItemTable.java b/trunk/java/com/l2jserver/gameserver/datatables/ItemTable.java index c9ba7310ee..55e80f62f4 100644 --- a/trunk/java/com/l2jserver/gameserver/datatables/ItemTable.java +++ b/trunk/java/com/l2jserver/gameserver/datatables/ItemTable.java @@ -211,14 +211,14 @@ public class ItemTable public L2ItemInstance createItem(String process, int itemId, long count, L2PcInstance actor, Object reference) { // Create and Init the L2ItemInstance corresponding to the Item Identifier - L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId); + final L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId); if (process.equalsIgnoreCase("loot")) { ScheduledFuture itemLootShedule; if ((reference instanceof L2Attackable) && ((L2Attackable) reference).isRaid()) // loot privilege for raids { - L2Attackable raid = (L2Attackable) reference; + final L2Attackable raid = (L2Attackable) reference; // if in CommandChannel and was killing a World/RaidBoss if ((raid.getFirstCommandChannelAttacked() != null) && !Config.AUTO_LOOT_RAIDS) { @@ -253,7 +253,7 @@ public class ItemTable { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) { - LogRecord record = new LogRecord(Level.INFO, "CREATE:" + process); + final LogRecord record = new LogRecord(Level.INFO, "CREATE:" + process); record.setLoggerName("item"); record.setParameters(new Object[] { @@ -278,7 +278,7 @@ public class ItemTable { referenceName = (String) reference; } - String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); + final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + itemId + " count: " + count + " name: " + item.getItemName() + " objId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName); @@ -313,7 +313,7 @@ public class ItemTable { synchronized (item) { - long old = item.getCount(); + final long old = item.getCount(); item.setCount(0); item.setOwnerId(0); item.setItemLocation(ItemLocation.VOID); @@ -326,7 +326,7 @@ public class ItemTable { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) { - LogRecord record = new LogRecord(Level.INFO, "DELETE:" + process); + final LogRecord record = new LogRecord(Level.INFO, "DELETE:" + process); record.setLoggerName("item"); record.setParameters(new Object[] { @@ -352,7 +352,7 @@ public class ItemTable { referenceName = (String) reference; } - String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); + final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName); diff --git a/trunk/java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java b/trunk/java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java index 91e01469be..fe46deab3a 100644 --- a/trunk/java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java +++ b/trunk/java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java @@ -75,17 +75,17 @@ public class MerchantPriceConfigTable implements InstanceListManager public void loadXML() throws SAXException, IOException, ParserConfigurationException { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); - File file = new File(Config.DATAPACK_ROOT + "/" + MPCS_FILE); + final File file = new File(Config.DATAPACK_ROOT + "/" + MPCS_FILE); if (file.exists()) { int defaultPriceConfigId; - Document doc = factory.newDocumentBuilder().parse(file); + final Document doc = factory.newDocumentBuilder().parse(file); Node n = doc.getDocumentElement(); - Node dpcNode = n.getAttributes().getNamedItem("defaultPriceConfig"); + final Node dpcNode = n.getAttributes().getNamedItem("defaultPriceConfig"); if (dpcNode == null) { throw new IllegalStateException("merchantPriceConfig must define an 'defaultPriceConfig'"); @@ -102,7 +102,7 @@ public class MerchantPriceConfigTable implements InstanceListManager } } - MerchantPriceConfig defaultMpc = this.getMerchantPriceConfig(defaultPriceConfigId); + final MerchantPriceConfig defaultMpc = this.getMerchantPriceConfig(defaultPriceConfigId); if (defaultMpc == null) { throw new IllegalStateException("'defaultPriceConfig' points to an non-loaded priceConfig"); @@ -176,7 +176,7 @@ public class MerchantPriceConfigTable implements InstanceListManager @Override public void updateReferences() { - for (final MerchantPriceConfig mpc : _mpcs.values()) + for (MerchantPriceConfig mpc : _mpcs.values()) { mpc.updateReferences(); } diff --git a/trunk/java/com/l2jserver/gameserver/datatables/NpcPersonalAIData.java b/trunk/java/com/l2jserver/gameserver/datatables/NpcPersonalAIData.java index cec499695d..cc73574fa8 100644 --- a/trunk/java/com/l2jserver/gameserver/datatables/NpcPersonalAIData.java +++ b/trunk/java/com/l2jserver/gameserver/datatables/NpcPersonalAIData.java @@ -92,7 +92,7 @@ public class NpcPersonalAIData { if (_AIData.containsKey(spawnName)) { - Map map = _AIData.get(spawnName); + final Map map = _AIData.get(spawnName); try { diff --git a/trunk/java/com/l2jserver/gameserver/datatables/SpawnTable.java b/trunk/java/com/l2jserver/gameserver/datatables/SpawnTable.java index 783d73f4d4..d247143d92 100644 --- a/trunk/java/com/l2jserver/gameserver/datatables/SpawnTable.java +++ b/trunk/java/com/l2jserver/gameserver/datatables/SpawnTable.java @@ -90,7 +90,7 @@ public final class SpawnTable implements IXmlReader */ private boolean checkTemplate(int npcId) { - L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcId); + final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcId); if (npcTemplate == null) { LOGGER.warning(getClass().getSimpleName() + ": Data missing in NPC table for ID: " + npcId + "."); @@ -198,7 +198,7 @@ public final class SpawnTable implements IXmlReader continue; } - StatsSet spawnInfo = new StatsSet(); + final StatsSet spawnInfo = new StatsSet(); spawnInfo.set("npcTemplateid", templateId); spawnInfo.set("x", x); spawnInfo.set("y", y); @@ -229,7 +229,7 @@ public final class SpawnTable implements IXmlReader if (attrs.getNamedItem("periodOfDay") != null) { - String period = attrs.getNamedItem("periodOfDay").getNodeValue(); + final String period = attrs.getNamedItem("periodOfDay").getNodeValue(); if (period.equalsIgnoreCase("day") || period.equalsIgnoreCase("night")) { spawnInfo.set("periodOfDay", period.equalsIgnoreCase("day") ? 1 : 2); @@ -259,8 +259,8 @@ public final class SpawnTable implements IXmlReader { while (rs.next()) { - StatsSet spawnInfo = new StatsSet(); - int npcId = rs.getInt("npc_templateid"); + final StatsSet spawnInfo = new StatsSet(); + final int npcId = rs.getInt("npc_templateid"); // Check basic requirements first if (!checkTemplate(npcId)) @@ -310,8 +310,8 @@ public final class SpawnTable implements IXmlReader spawnDat.setHeading(spawnInfo.getInt("heading", -1)); spawnDat.setRespawnDelay(spawnInfo.getInt("respawnDelay", 0), spawnInfo.getInt("respawnRandom", 0)); spawnDat.setLocationId(spawnInfo.getInt("locId", 0)); - String territoryName = spawnInfo.getString("territoryName", ""); - String spawnName = spawnInfo.getString("spawnName", ""); + final String territoryName = spawnInfo.getString("territoryName", ""); + final String spawnName = spawnInfo.getString("spawnName", ""); spawnDat.setCustom(spawnInfo.getBoolean("isCustomSpawn", false)); if (!spawnName.isEmpty()) { @@ -479,7 +479,7 @@ public final class SpawnTable implements IXmlReader final Set set = _spawnTable.get(spawn.getId()); if (set != null) { - boolean removed = set.remove(spawn); + final boolean removed = set.remove(spawn); if (set.isEmpty()) { _spawnTable.remove(spawn.getId()); diff --git a/trunk/java/com/l2jserver/gameserver/engines/DocumentBase.java b/trunk/java/com/l2jserver/gameserver/engines/DocumentBase.java index d12f2e5c2a..2db8d2b8af 100644 --- a/trunk/java/com/l2jserver/gameserver/engines/DocumentBase.java +++ b/trunk/java/com/l2jserver/gameserver/engines/DocumentBase.java @@ -161,7 +161,7 @@ public abstract class DocumentBase Document doc = null; try { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); doc = factory.newDocumentBuilder().parse(_file); @@ -208,8 +208,8 @@ public abstract class DocumentBase if ("cond".equalsIgnoreCase(n.getNodeName())) { condition = parseCondition(n.getFirstChild(), template); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -217,7 +217,7 @@ public abstract class DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -257,7 +257,7 @@ public abstract class DocumentBase protected void attachFunc(Node n, Object template, String functionName, Condition attachCond) { - Stats stat = Stats.valueOfXml(n.getAttributes().getNamedItem("stat").getNodeValue()); + final Stats stat = Stats.valueOfXml(n.getAttributes().getNamedItem("stat").getNodeValue()); int order = -1; final Node orderNode = n.getAttributes().getNamedItem("order"); if (orderNode != null) @@ -265,7 +265,7 @@ public abstract class DocumentBase order = Integer.parseInt(orderNode.getNodeValue()); } - String valueString = n.getAttributes().getNamedItem("val").getNodeValue(); + final String valueString = n.getAttributes().getNamedItem("val").getNodeValue(); double value; if (valueString.charAt(0) == '#') { @@ -303,7 +303,7 @@ public abstract class DocumentBase final StatsSet set = new StatsSet(); for (int i = 0; i < attrs.getLength(); i++) { - Node att = attrs.item(i); + final Node att = attrs.item(i); set.set(att.getNodeName(), getValue(att.getNodeValue(), template)); } @@ -357,10 +357,10 @@ public abstract class DocumentBase { parameters = new StatsSet(); } - NamedNodeMap params = n.getAttributes(); + final NamedNodeMap params = n.getAttributes(); for (int i = 0; i < params.getLength(); i++) { - Node att = params.item(i); + final Node att = params.item(i); parameters.set(att.getNodeName(), getValue(att.getNodeValue(), template)); } } @@ -423,7 +423,7 @@ public abstract class DocumentBase protected Condition parseLogicAnd(Node n, Object template) { - ConditionLogicAnd cond = new ConditionLogicAnd(); + final ConditionLogicAnd cond = new ConditionLogicAnd(); for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) { if (n.getNodeType() == Node.ELEMENT_NODE) @@ -440,7 +440,7 @@ public abstract class DocumentBase protected Condition parseLogicOr(Node n, Object template) { - ConditionLogicOr cond = new ConditionLogicOr(); + final ConditionLogicOr cond = new ConditionLogicOr(); for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) { if (n.getNodeType() == Node.ELEMENT_NODE) @@ -471,10 +471,10 @@ public abstract class DocumentBase protected Condition parsePlayerCondition(Node n, Object template) { Condition cond = null; - NamedNodeMap attrs = n.getAttributes(); + final NamedNodeMap attrs = n.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { - Node a = attrs.item(i); + final Node a = attrs.item(i); switch (a.getNodeName().toLowerCase()) { case "races": @@ -493,16 +493,16 @@ public abstract class DocumentBase } case "level": { - int lvl = Integer.decode(getValue(a.getNodeValue(), template)); + final int lvl = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerLevel(lvl)); break; } case "levelrange": { - String[] range = getValue(a.getNodeValue(), template).split(";"); + final String[] range = getValue(a.getNodeValue(), template).split(";"); if (range.length == 2) { - int[] lvlRange = new int[2]; + final int[] lvlRange = new int[2]; lvlRange[0] = Integer.decode(getValue(a.getNodeValue(), template).split(";")[0]); lvlRange[1] = Integer.decode(getValue(a.getNodeValue(), template).split(";")[1]); cond = joinAnd(cond, new ConditionPlayerLevelRange(lvlRange)); @@ -511,161 +511,161 @@ public abstract class DocumentBase } case "resting": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerState(PlayerState.RESTING, val)); break; } case "flying": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerState(PlayerState.FLYING, val)); break; } case "moving": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerState(PlayerState.MOVING, val)); break; } case "running": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerState(PlayerState.RUNNING, val)); break; } case "standing": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerState(PlayerState.STANDING, val)); break; } case "behind": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerState(PlayerState.BEHIND, val)); break; } case "front": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerState(PlayerState.FRONT, val)); break; } case "chaotic": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerState(PlayerState.CHAOTIC, val)); break; } case "olympiad": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerState(PlayerState.OLYMPIAD, val)); break; } case "ishero": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerIsHero(val)); break; } case "transformationid": { - int id = Integer.parseInt(a.getNodeValue()); + final int id = Integer.parseInt(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerTransformationId(id)); break; } case "hp": { - int hp = Integer.decode(getValue(a.getNodeValue(), template)); + final int hp = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerHp(hp)); break; } case "mp": { - int mp = Integer.decode(getValue(a.getNodeValue(), template)); + final int mp = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerMp(mp)); break; } case "cp": { - int cp = Integer.decode(getValue(a.getNodeValue(), template)); + final int cp = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerCp(cp)); break; } case "grade": { - int expIndex = Integer.decode(getValue(a.getNodeValue(), template)); + final int expIndex = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerGrade(expIndex)); break; } case "pkcount": { - int expIndex = Integer.decode(getValue(a.getNodeValue(), template)); + final int expIndex = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerPkCount(expIndex)); break; } case "siegezone": { - int value = Integer.decode(getValue(a.getNodeValue(), null)); + final int value = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionSiegeZone(value, true)); break; } case "siegeside": { - int value = Integer.decode(getValue(a.getNodeValue(), null)); + final int value = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionPlayerSiegeSide(value)); break; } case "charges": { - int value = Integer.decode(getValue(a.getNodeValue(), template)); + final int value = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerCharges(value)); break; } case "souls": { - int value = Integer.decode(getValue(a.getNodeValue(), template)); + final int value = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerSouls(value)); break; } case "weight": { - int weight = Integer.decode(getValue(a.getNodeValue(), null)); + final int weight = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionPlayerWeight(weight)); break; } case "invsize": { - int size = Integer.decode(getValue(a.getNodeValue(), null)); + final int size = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionPlayerInvSize(size)); break; } case "isclanleader": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerIsClanLeader(val)); break; } case "ontvtevent": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerTvTEvent(val)); break; } case "pledgeclass": { - int pledgeClass = Integer.decode(getValue(a.getNodeValue(), null)); + final int pledgeClass = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionPlayerPledgeClass(pledgeClass)); break; } case "clanhall": { - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - ArrayList array = new ArrayList<>(st.countTokens()); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final ArrayList array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); array.add(Integer.decode(getValue(item, template))); } cond = joinAnd(cond, new ConditionPlayerHasClanHall(array)); @@ -673,75 +673,75 @@ public abstract class DocumentBase } case "fort": { - int fort = Integer.decode(getValue(a.getNodeValue(), null)); + final int fort = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionPlayerHasFort(fort)); break; } case "castle": { - int castle = Integer.decode(getValue(a.getNodeValue(), null)); + final int castle = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionPlayerHasCastle(castle)); break; } case "sex": { - int sex = Integer.decode(getValue(a.getNodeValue(), null)); + final int sex = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionPlayerSex(sex)); break; } case "flymounted": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerFlyMounted(val)); break; } case "vehiclemounted": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerVehicleMounted(val)); break; } case "landingzone": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerLandingZone(val)); break; } case "active_effect_id": { - int effect_id = Integer.decode(getValue(a.getNodeValue(), template)); + final int effect_id = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerActiveEffectId(effect_id)); break; } case "active_effect_id_lvl": { - String val = getValue(a.getNodeValue(), template); - int effect_id = Integer.decode(getValue(val.split(",")[0], template)); - int effect_lvl = Integer.decode(getValue(val.split(",")[1], template)); + final String val = getValue(a.getNodeValue(), template); + final int effect_id = Integer.decode(getValue(val.split(",")[0], template)); + final int effect_lvl = Integer.decode(getValue(val.split(",")[1], template)); cond = joinAnd(cond, new ConditionPlayerActiveEffectId(effect_id, effect_lvl)); break; } case "active_skill_id": { - int skill_id = Integer.decode(getValue(a.getNodeValue(), template)); + final int skill_id = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionPlayerActiveSkillId(skill_id)); break; } case "active_skill_id_lvl": { - String val = getValue(a.getNodeValue(), template); - int skill_id = Integer.decode(getValue(val.split(",")[0], template)); - int skill_lvl = Integer.decode(getValue(val.split(",")[1], template)); + final String val = getValue(a.getNodeValue(), template); + final int skill_id = Integer.decode(getValue(val.split(",")[0], template)); + final int skill_lvl = Integer.decode(getValue(val.split(",")[1], template)); cond = joinAnd(cond, new ConditionPlayerActiveSkillId(skill_id, skill_lvl)); break; } case "class_id_restriction": { - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - ArrayList array = new ArrayList<>(st.countTokens()); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final ArrayList array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); array.add(Integer.decode(getValue(item, template))); } cond = joinAnd(cond, new ConditionPlayerClassIdRestriction(array)); @@ -749,7 +749,7 @@ public abstract class DocumentBase } case "subclass": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerSubclass(val)); break; } @@ -760,11 +760,11 @@ public abstract class DocumentBase } case "instanceid": { - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - ArrayList array = new ArrayList<>(st.countTokens()); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final ArrayList array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); array.add(Integer.decode(getValue(item, template))); } cond = joinAnd(cond, new ConditionPlayerInstanceId(array)); @@ -772,23 +772,23 @@ public abstract class DocumentBase } case "agathionid": { - int agathionId = Integer.decode(a.getNodeValue()); + final int agathionId = Integer.decode(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerAgathionId(agathionId)); break; } case "cloakstatus": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionPlayerCloakStatus(val)); break; } case "haspet": { - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - ArrayList array = new ArrayList<>(st.countTokens()); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final ArrayList array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); array.add(Integer.decode(getValue(item, template))); } cond = joinAnd(cond, new ConditionPlayerHasPet(array)); @@ -888,11 +888,11 @@ public abstract class DocumentBase } case "insidezoneid": { - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - List array = new ArrayList<>(st.countTokens()); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); array.add(Integer.decode(getValue(item, template))); } cond = joinAnd(cond, new ConditionPlayerInsideZoneId(array)); @@ -951,36 +951,36 @@ public abstract class DocumentBase protected Condition parseTargetCondition(Node n, Object template) { Condition cond = null; - NamedNodeMap attrs = n.getAttributes(); + final NamedNodeMap attrs = n.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { - Node a = attrs.item(i); + final Node a = attrs.item(i); switch (a.getNodeName().toLowerCase()) { case "aggro": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionTargetAggro(val)); break; } case "siegezone": { - int value = Integer.decode(getValue(a.getNodeValue(), null)); + final int value = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionSiegeZone(value, false)); break; } case "level": { - int lvl = Integer.decode(getValue(a.getNodeValue(), template)); + final int lvl = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionTargetLevel(lvl)); break; } case "levelrange": { - String[] range = getValue(a.getNodeValue(), template).split(";"); + final String[] range = getValue(a.getNodeValue(), template).split(";"); if (range.length == 2) { - int[] lvlRange = new int[2]; + final int[] lvlRange = new int[2]; lvlRange[0] = Integer.decode(getValue(a.getNodeValue(), template).split(";")[0]); lvlRange[1] = Integer.decode(getValue(a.getNodeValue(), template).split(";")[1]); cond = joinAnd(cond, new ConditionTargetLevelRange(lvlRange)); @@ -999,11 +999,11 @@ public abstract class DocumentBase } case "class_id_restriction": { - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - List array = new ArrayList<>(st.countTokens()); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); array.add(Integer.decode(getValue(item, null))); } cond = joinAnd(cond, new ConditionTargetClassIdRestriction(array)); @@ -1011,47 +1011,47 @@ public abstract class DocumentBase } case "active_effect_id": { - int effect_id = Integer.decode(getValue(a.getNodeValue(), template)); + final int effect_id = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionTargetActiveEffectId(effect_id)); break; } case "active_effect_id_lvl": { - String val = getValue(a.getNodeValue(), template); - int effect_id = Integer.decode(getValue(val.split(",")[0], template)); - int effect_lvl = Integer.decode(getValue(val.split(",")[1], template)); + final String val = getValue(a.getNodeValue(), template); + final int effect_id = Integer.decode(getValue(val.split(",")[0], template)); + final int effect_lvl = Integer.decode(getValue(val.split(",")[1], template)); cond = joinAnd(cond, new ConditionTargetActiveEffectId(effect_id, effect_lvl)); break; } case "active_skill_id": { - int skill_id = Integer.decode(getValue(a.getNodeValue(), template)); + final int skill_id = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionTargetActiveSkillId(skill_id)); break; } case "active_skill_id_lvl": { - String val = getValue(a.getNodeValue(), template); - int skill_id = Integer.decode(getValue(val.split(",")[0], template)); - int skill_lvl = Integer.decode(getValue(val.split(",")[1], template)); + final String val = getValue(a.getNodeValue(), template); + final int skill_id = Integer.decode(getValue(val.split(",")[0], template)); + final int skill_lvl = Integer.decode(getValue(val.split(",")[1], template)); cond = joinAnd(cond, new ConditionTargetActiveSkillId(skill_id, skill_lvl)); break; } case "abnormaltype": { - AbnormalType abnormalType = AbnormalType.getAbnormalType(getValue(a.getNodeValue(), template)); + final AbnormalType abnormalType = AbnormalType.getAbnormalType(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionTargetAbnormalType(abnormalType)); break; } case "hp": { - int hp = Integer.decode(getValue(a.getNodeValue(), template)); + final int hp = Integer.decode(getValue(a.getNodeValue(), template)); cond = joinAnd(cond, new ConditionTargetHp(hp)); break; } case "mindistance": { - int distance = Integer.decode(getValue(a.getNodeValue(), null)); + final int distance = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionMinDistance(distance * distance)); break; } @@ -1063,10 +1063,10 @@ public abstract class DocumentBase case "using": { int mask = 0; - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); for (WeaponType wt : WeaponType.values()) { if (wt.name().equals(item)) @@ -1089,11 +1089,11 @@ public abstract class DocumentBase } case "npcid": { - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - List array = new ArrayList<>(st.countTokens()); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { - String item = st.nextToken().trim(); + final String item = st.nextToken().trim(); array.add(Integer.decode(getValue(item, null))); } cond = joinAnd(cond, new ConditionTargetNpcId(array)); @@ -1101,9 +1101,9 @@ public abstract class DocumentBase } case "npctype": { - String values = getValue(a.getNodeValue(), template).trim(); - String[] valuesSplit = values.split(","); - InstanceType[] types = new InstanceType[valuesSplit.length]; + final String values = getValue(a.getNodeValue(), template).trim(); + final String[] valuesSplit = values.split(","); + final InstanceType[] types = new InstanceType[valuesSplit.length]; InstanceType type; for (int j = 0; j < valuesSplit.length; j++) { @@ -1119,13 +1119,13 @@ public abstract class DocumentBase } case "weight": { - int weight = Integer.decode(getValue(a.getNodeValue(), null)); + final int weight = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionTargetWeight(weight)); break; } case "invsize": { - int size = Integer.decode(getValue(a.getNodeValue(), null)); + final int size = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionTargetInvSize(size)); break; } @@ -1142,20 +1142,20 @@ public abstract class DocumentBase protected Condition parseUsingCondition(Node n) { Condition cond = null; - NamedNodeMap attrs = n.getAttributes(); + final NamedNodeMap attrs = n.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { - Node a = attrs.item(i); + final Node a = attrs.item(i); switch (a.getNodeName().toLowerCase()) { case "kind": { int mask = 0; - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); while (st.hasMoreTokens()) { - int old = mask; - String item = st.nextToken().trim(); + final int old = mask; + final String item = st.nextToken().trim(); for (WeaponType wt : WeaponType.values()) { if (wt.name().equals(item)) @@ -1183,11 +1183,11 @@ public abstract class DocumentBase case "slot": { int mask = 0; - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); while (st.hasMoreTokens()) { - int old = mask; - String item = st.nextToken().trim(); + final int old = mask; + final String item = st.nextToken().trim(); if (ItemTable.SLOTS.containsKey(item)) { mask |= ItemTable.SLOTS.get(item); @@ -1203,15 +1203,15 @@ public abstract class DocumentBase } case "skill": { - int id = Integer.parseInt(a.getNodeValue()); + final int id = Integer.parseInt(a.getNodeValue()); cond = joinAnd(cond, new ConditionUsingSkill(id)); break; } case "slotitem": { - StringTokenizer st = new StringTokenizer(a.getNodeValue(), ";"); - int id = Integer.parseInt(st.nextToken().trim()); - int slot = Integer.parseInt(st.nextToken().trim()); + final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ";"); + final int id = Integer.parseInt(st.nextToken().trim()); + final int slot = Integer.parseInt(st.nextToken().trim()); int enchant = 0; if (st.hasMoreTokens()) { @@ -1222,7 +1222,7 @@ public abstract class DocumentBase } case "weaponchange": { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionChangeWeapon(val)); break; } @@ -1239,23 +1239,23 @@ public abstract class DocumentBase protected Condition parseGameCondition(Node n) { Condition cond = null; - NamedNodeMap attrs = n.getAttributes(); + final NamedNodeMap attrs = n.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { - Node a = attrs.item(i); + final Node a = attrs.item(i); if ("skill".equalsIgnoreCase(a.getNodeName())) { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionWithSkill(val)); } if ("night".equalsIgnoreCase(a.getNodeName())) { - boolean val = Boolean.parseBoolean(a.getNodeValue()); + final boolean val = Boolean.parseBoolean(a.getNodeValue()); cond = joinAnd(cond, new ConditionGameTime(CheckGameTime.NIGHT, val)); } if ("chance".equalsIgnoreCase(a.getNodeName())) { - int val = Integer.decode(getValue(a.getNodeValue(), null)); + final int val = Integer.decode(getValue(a.getNodeValue(), null)); cond = joinAnd(cond, new ConditionGameChance(val)); } } @@ -1268,14 +1268,14 @@ public abstract class DocumentBase protected void parseTable(Node n) { - NamedNodeMap attrs = n.getAttributes(); - String name = attrs.getNamedItem("name").getNodeValue(); + final NamedNodeMap attrs = n.getAttributes(); + final String name = attrs.getNamedItem("name").getNodeValue(); if (name.charAt(0) != '#') { throw new IllegalArgumentException("Table name must start with #"); } - StringTokenizer data = new StringTokenizer(n.getFirstChild().getNodeValue()); - List array = new ArrayList<>(data.countTokens()); + final StringTokenizer data = new StringTokenizer(n.getFirstChild().getNodeValue()); + final List array = new ArrayList<>(data.countTokens()); while (data.hasMoreTokens()) { array.add(data.nextToken()); @@ -1285,9 +1285,9 @@ public abstract class DocumentBase protected void parseBeanSet(Node n, StatsSet set, Integer level) { - String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); - String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); - char ch = value.isEmpty() ? ' ' : value.charAt(0); + final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); + final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); + final char ch = value.isEmpty() ? ' ' : value.charAt(0); if ((ch == '#') || (ch == '-') || Character.isDigit(ch)) { set.set(name, String.valueOf(getValue(value, level))); @@ -1345,7 +1345,7 @@ public abstract class DocumentBase ((ConditionLogicAnd) cond).add(c); return cond; } - ConditionLogicAnd and = new ConditionLogicAnd(); + final ConditionLogicAnd and = new ConditionLogicAnd(); and.add(cond); and.add(c); return and; diff --git a/trunk/java/com/l2jserver/gameserver/engines/DocumentEngine.java b/trunk/java/com/l2jserver/gameserver/engines/DocumentEngine.java index b355dd4b59..3f2032d367 100644 --- a/trunk/java/com/l2jserver/gameserver/engines/DocumentEngine.java +++ b/trunk/java/com/l2jserver/gameserver/engines/DocumentEngine.java @@ -63,7 +63,7 @@ public class DocumentEngine private void hashFiles(String dirname, List hash) { - File dir = new File(Config.DATAPACK_ROOT, dirname); + final File dir = new File(Config.DATAPACK_ROOT, dirname); if (!dir.exists()) { _log.warning("Dir " + dir.getAbsolutePath() + " not exists"); @@ -87,7 +87,7 @@ public class DocumentEngine _log.warning("Skill file not found."); return null; } - DocumentSkill doc = new DocumentSkill(file); + final DocumentSkill doc = new DocumentSkill(file); doc.parse(); return doc.getSkills(); } @@ -97,7 +97,7 @@ public class DocumentEngine int count = 0; for (File file : _skillFiles) { - List s = loadSkills(file); + final List s = loadSkills(file); if (s == null) { continue; @@ -117,10 +117,10 @@ public class DocumentEngine */ public List loadItems() { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (File f : _itemFiles) { - DocumentItem document = new DocumentItem(f); + final DocumentItem document = new DocumentItem(f); document.parse(); list.addAll(document.getItemList()); } diff --git a/trunk/java/com/l2jserver/gameserver/engines/items/DocumentItem.java b/trunk/java/com/l2jserver/gameserver/engines/items/DocumentItem.java index 38ee9e46d9..b5bac3f402 100644 --- a/trunk/java/com/l2jserver/gameserver/engines/items/DocumentItem.java +++ b/trunk/java/com/l2jserver/gameserver/engines/items/DocumentItem.java @@ -98,9 +98,9 @@ public final class DocumentItem extends DocumentBase protected void parseItem(Node n) throws InvocationTargetException { - int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue()); - String className = n.getAttributes().getNamedItem("type").getNodeValue(); - String itemName = n.getAttributes().getNamedItem("name").getNodeValue(); + final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue()); + final String className = n.getAttributes().getNamedItem("type").getNodeValue(); + final String itemName = n.getAttributes().getNamedItem("name").getNodeValue(); _currentItem.id = itemId; _currentItem.name = itemName; @@ -109,7 +109,7 @@ public final class DocumentItem extends DocumentBase _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); - Node first = n.getFirstChild(); + final Node first = n.getFirstChild(); for (n = first; n != null; n = n.getNextSibling()) { if ("table".equalsIgnoreCase(n.getNodeName())) @@ -136,9 +136,9 @@ public final class DocumentItem extends DocumentBase else if ("cond".equalsIgnoreCase(n.getNodeName())) { makeItem(); - Condition condition = parseCondition(n.getFirstChild(), _currentItem.item); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentItem.item); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -146,7 +146,7 @@ public final class DocumentItem extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -167,7 +167,7 @@ public final class DocumentItem extends DocumentBase } try { - Constructor c = Class.forName("com.l2jserver.gameserver.model.items.L2" + _currentItem.type).getConstructor(StatsSet.class); + final Constructor c = Class.forName("com.l2jserver.gameserver.model.items.L2" + _currentItem.type).getConstructor(StatsSet.class); _currentItem.item = (L2Item) c.newInstance(_currentItem.set); } catch (Exception e) diff --git a/trunk/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java b/trunk/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java index 16e9a2ac61..17d6006efa 100644 --- a/trunk/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java +++ b/trunk/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java @@ -139,7 +139,7 @@ public class DocumentSkill extends DocumentBase protected void parseSkill(Node n) { - NamedNodeMap attrs = n.getAttributes(); + final NamedNodeMap attrs = n.getAttributes(); int enchantLevels1 = 0; int enchantLevels2 = 0; int enchantLevels3 = 0; @@ -149,10 +149,10 @@ public class DocumentSkill extends DocumentBase int enchantLevels7 = 0; int enchantLevels8 = 0; int enchantLevels9 = 0; - int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - String skillName = attrs.getNamedItem("name").getNodeValue(); - String levels = attrs.getNamedItem("levels").getNodeValue(); - int lastLvl = Integer.parseInt(levels); + final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); + final String skillName = attrs.getNamedItem("name").getNodeValue(); + final String levels = attrs.getNamedItem("levels").getNodeValue(); + final int lastLvl = Integer.parseInt(levels); if (attrs.getNamedItem("enchantGroup1") != null) { enchantLevels1 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 1, Integer.parseInt(attrs.getNamedItem("enchantGroup1").getNodeValue())); @@ -216,7 +216,7 @@ public class DocumentSkill extends DocumentBase throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + lastLvl + " levels expected"); } - Node first = n.getFirstChild(); + final Node first = n.getFirstChild(); for (n = first; n != null; n = n.getNextSibling()) { if ("table".equalsIgnoreCase(n.getNodeName())) @@ -545,9 +545,9 @@ public class DocumentSkill extends DocumentBase { if ("cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -555,7 +555,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -603,9 +603,9 @@ public class DocumentSkill extends DocumentBase if ("enchant1cond".equalsIgnoreCase(n.getNodeName())) { foundCond = true; - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -613,7 +613,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -665,9 +665,9 @@ public class DocumentSkill extends DocumentBase { if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -675,7 +675,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -723,9 +723,9 @@ public class DocumentSkill extends DocumentBase if ("enchant2cond".equalsIgnoreCase(n.getNodeName())) { foundCond = true; - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -733,7 +733,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -785,9 +785,9 @@ public class DocumentSkill extends DocumentBase { if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -795,7 +795,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -839,9 +839,9 @@ public class DocumentSkill extends DocumentBase if ("enchant3cond".equalsIgnoreCase(n.getNodeName())) { foundCond = true; - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -849,7 +849,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -901,9 +901,9 @@ public class DocumentSkill extends DocumentBase { if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -911,7 +911,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -959,9 +959,9 @@ public class DocumentSkill extends DocumentBase if ("enchant4cond".equalsIgnoreCase(n.getNodeName())) { foundCond = true; - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -969,7 +969,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1021,9 +1021,9 @@ public class DocumentSkill extends DocumentBase { if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1031,7 +1031,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1079,9 +1079,9 @@ public class DocumentSkill extends DocumentBase if ("enchant5cond".equalsIgnoreCase(n.getNodeName())) { foundCond = true; - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1089,7 +1089,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1141,9 +1141,9 @@ public class DocumentSkill extends DocumentBase { if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1151,7 +1151,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1199,9 +1199,9 @@ public class DocumentSkill extends DocumentBase if ("enchant6cond".equalsIgnoreCase(n.getNodeName())) { foundCond = true; - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1209,7 +1209,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1261,9 +1261,9 @@ public class DocumentSkill extends DocumentBase { if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1271,7 +1271,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1319,9 +1319,9 @@ public class DocumentSkill extends DocumentBase if ("enchant7cond".equalsIgnoreCase(n.getNodeName())) { foundCond = true; - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1329,7 +1329,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1381,9 +1381,9 @@ public class DocumentSkill extends DocumentBase { if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1391,7 +1391,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1439,9 +1439,9 @@ public class DocumentSkill extends DocumentBase if ("enchant8cond".equalsIgnoreCase(n.getNodeName())) { foundCond = true; - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1449,7 +1449,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1501,9 +1501,9 @@ public class DocumentSkill extends DocumentBase { if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1511,7 +1511,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1559,9 +1559,9 @@ public class DocumentSkill extends DocumentBase if ("enchant9cond".equalsIgnoreCase(n.getNodeName())) { foundCond = true; - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1569,7 +1569,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); @@ -1621,9 +1621,9 @@ public class DocumentSkill extends DocumentBase { if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) { - Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); - Node msg = n.getAttributes().getNamedItem("msg"); - Node msgId = n.getAttributes().getNamedItem("msgId"); + final Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i)); + final Node msg = n.getAttributes().getNamedItem("msg"); + final Node msgId = n.getAttributes().getNamedItem("msgId"); if ((condition != null) && (msg != null)) { condition.setMessage(msg.getNodeValue()); @@ -1631,7 +1631,7 @@ public class DocumentSkill extends DocumentBase else if ((condition != null) && (msgId != null)) { condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null))); - Node addName = n.getAttributes().getNamedItem("addName"); + final Node addName = n.getAttributes().getNamedItem("addName"); if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) { condition.addName(); diff --git a/trunk/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java b/trunk/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java index 061685a1ac..523053e716 100644 --- a/trunk/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java +++ b/trunk/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java @@ -36,7 +36,7 @@ public class AdminCommandHandler implements IHandler 0) { _curOID = tmp_obj_ids[tmp_obj_ids.length - 1]; @@ -73,7 +73,7 @@ public class StackIDFactory extends IdFactory private int insertUntil(Integer[] tmp_obj_ids, int idx, int N, Connection con) throws SQLException { - int id = tmp_obj_ids[idx]; + final int id = tmp_obj_ids[idx]; if (id == _tempOID) { _tempOID++; @@ -93,7 +93,7 @@ public class StackIDFactory extends IdFactory { while (rs.next()) { - int badId = rs.getInt(1); + final int badId = rs.getInt(1); _log.severe("Bad ID " + badId + " in DB found by: " + check); throw new RuntimeException(); } diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java index 46bcbbc2db..c910e5a8e3 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java @@ -53,7 +53,7 @@ public class AirShipManager protected AirShipManager() { - StatsSet npcDat = new StatsSet(); + final StatsSet npcDat = new StatsSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -223,7 +223,7 @@ public class AirShipManager return; } - int dockId = ship.getDockId(); + final int dockId = ship.getDockId(); if (!_teleports.containsKey(dockId)) { return; @@ -292,7 +292,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - StatsSet info = _airShipsInfo.get(ownerId); + final StatsSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/BoatManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/BoatManager.java index f81af5aa6b..6b30568dcf 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/BoatManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/BoatManager.java @@ -59,7 +59,7 @@ public class BoatManager return null; } - StatsSet npcDat = new StatsSet(); + final StatsSet npcDat = new StatsSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java index c6cd5b3894..67d5a2c126 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java @@ -64,7 +64,7 @@ public final class CHSiegeManager { final int id = rs.getInt("clanHallId"); - StatsSet set = new StatsSet(); + final StatsSet set = new StatsSet(); set.set("id", id); set.set("name", rs.getString("name")); @@ -74,7 +74,7 @@ public final class CHSiegeManager set.set("nextSiege", rs.getLong("nextSiege")); set.set("siegeLenght", rs.getLong("siegeLenght")); set.set("scheduleConfig", rs.getString("schedule_config")); - SiegableHall hall = new SiegableHall(set); + final SiegableHall hall = new SiegableHall(set); _siegableHalls.put(id, hall); ClanHallManager.addClanHall(hall); } @@ -118,7 +118,7 @@ public final class CHSiegeManager public final ClanHallSiegeEngine getSiege(L2Character character) { - SiegableHall hall = getNearbyClanHall(character); + final SiegableHall hall = getNearbyClanHall(character); if (hall == null) { return null; @@ -134,7 +134,7 @@ public final class CHSiegeManager } else if (hall.isWaitingBattle()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); sm.addString(hall.getName()); player.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/CastleManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/CastleManager.java index 7dd670eea9..eff28f97cc 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/CastleManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/CastleManager.java @@ -225,8 +225,8 @@ public final class CastleManager implements InstanceListManager { return; } - L2PcInstance player = member.getPlayerInstance(); - int circletId = getCircletByCastleId(castleId); + final L2PcInstance player = member.getPlayerInstance(); + final int circletId = getCircletByCastleId(castleId); if (circletId != 0) { @@ -235,7 +235,7 @@ public final class CastleManager implements InstanceListManager { try { - L2ItemInstance circlet = player.getInventory().getItemByItemId(circletId); + final L2ItemInstance circlet = player.getInventory().getItemByItemId(circletId); if (circlet != null) { if (circlet.isEquipped()) @@ -293,7 +293,7 @@ public final class CastleManager implements InstanceListManager @Override public void activateInstances() { - for (final Castle castle : _castles) + for (Castle castle : _castles) { castle.activateInstance(); } diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/ClanHallAuctionManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/ClanHallAuctionManager.java index b6da11f0ff..76e55b9e96 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/ClanHallAuctionManager.java @@ -118,7 +118,7 @@ public final class ClanHallAuctionManager public final Auction getAuction(int auctionId) { - int index = getAuctionIndex(auctionId); + final int index = getAuctionIndex(auctionId); if (index >= 0) { return _auctions.get(index); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java index ae23de8a5c..c5d2e0b494 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java @@ -71,7 +71,7 @@ public final class ClanHallManager int id, ownerId, lease; while (rs.next()) { - StatsSet set = new StatsSet(); + final StatsSet set = new StatsSet(); id = rs.getInt("id"); ownerId = rs.getInt("ownerId"); @@ -86,7 +86,7 @@ public final class ClanHallManager set.set("paidUntil", rs.getLong("paidUntil")); set.set("grade", rs.getInt("Grade")); set.set("paid", rs.getBoolean("paid")); - AuctionableHall ch = new AuctionableHall(set); + final AuctionableHall ch = new AuctionableHall(set); _allAuctionableClanHalls.put(id, ch); addClanHall(ch); @@ -97,7 +97,7 @@ public final class ClanHallManager } _freeClanHall.put(id, ch); - Auction auc = ClanHallAuctionManager.getInstance().getAuction(id); + final Auction auc = ClanHallAuctionManager.getInstance().getAuction(id); if ((auc == null) && (lease > 0)) { ClanHallAuctionManager.getInstance().initNPC(id); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java index 7099bdf8cd..2869b1b61a 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java @@ -71,7 +71,7 @@ public final class CoupleManager public final Couple getCouple(int coupleId) { - int index = getCoupleIndex(coupleId); + final int index = getCoupleIndex(coupleId); if (index >= 0) { return getCouples().get(index); @@ -85,10 +85,10 @@ public final class CoupleManager { if ((player1.getPartnerId() == 0) && (player2.getPartnerId() == 0)) { - int player1id = player1.getObjectId(); - int player2id = player2.getObjectId(); + final int player1id = player1.getObjectId(); + final int player2id = player2.getObjectId(); - Couple couple = new Couple(player1, player2); + final Couple couple = new Couple(player1, player2); getCouples().add(couple); player1.setPartnerId(player2id); player2.setPartnerId(player1id); @@ -100,12 +100,12 @@ public final class CoupleManager public void deleteCouple(int coupleId) { - int index = getCoupleIndex(coupleId); - Couple couple = getCouples().get(index); + final int index = getCoupleIndex(coupleId); + final Couple couple = getCouples().get(index); if (couple != null) { - L2PcInstance player1 = L2World.getInstance().getPlayer(couple.getPlayer1Id()); - L2PcInstance player2 = L2World.getInstance().getPlayer(couple.getPlayer2Id()); + final L2PcInstance player1 = L2World.getInstance().getPlayer(couple.getPlayer1Id()); + final L2PcInstance player2 = L2World.getInstance().getPlayer(couple.getPlayer2Id()); if (player1 != null) { player1.setPartnerId(0); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java index 5d4f27d487..ab1f860ee7 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java @@ -92,18 +92,18 @@ public final class CursedWeaponsManager { try { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); - File file = new File(Config.DATAPACK_ROOT + "/cursedWeapons.xml"); + final File file = new File(Config.DATAPACK_ROOT + "/cursedWeapons.xml"); if (!file.exists()) { _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find " + file.getName()); return; } - Document doc = factory.newDocumentBuilder().parse(file); + final Document doc = factory.newDocumentBuilder().parse(file); for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) { @@ -114,11 +114,11 @@ public final class CursedWeaponsManager if ("item".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - int id = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - int skillId = Integer.parseInt(attrs.getNamedItem("skillId").getNodeValue()); - String name = attrs.getNamedItem("name").getNodeValue(); + final int id = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); + final int skillId = Integer.parseInt(attrs.getNamedItem("skillId").getNodeValue()); + final String name = attrs.getNamedItem("name").getNodeValue(); - CursedWeapon cw = new CursedWeapon(id, skillId, name); + final CursedWeapon cw = new CursedWeapon(id, skillId, name); int val; for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) @@ -284,10 +284,10 @@ public final class CursedWeaponsManager public void activate(L2PcInstance player, L2ItemInstance item) { - CursedWeapon cw = _cursedWeapons.get(item.getId()); + final CursedWeapon cw = _cursedWeapons.get(item.getId()); if (player.isCursedWeaponEquipped()) // cannot own 2 cursed swords { - CursedWeapon cw2 = _cursedWeapons.get(player.getCursedWeaponEquippedId()); + final CursedWeapon cw2 = _cursedWeapons.get(player.getCursedWeaponEquippedId()); // TODO: give the bonus level in a more appropriate manner. // The following code adds "_stageKills" levels. This will also show in the char status. // I do not have enough info to know if the bonus should be shown in the pk count, or if it @@ -308,21 +308,21 @@ public final class CursedWeaponsManager public void drop(int itemId, L2Character killer) { - CursedWeapon cw = _cursedWeapons.get(itemId); + final CursedWeapon cw = _cursedWeapons.get(itemId); cw.dropIt(killer); } public void increaseKills(int itemId) { - CursedWeapon cw = _cursedWeapons.get(itemId); + final CursedWeapon cw = _cursedWeapons.get(itemId); cw.increaseKills(); } public int getLevel(int itemId) { - CursedWeapon cw = _cursedWeapons.get(itemId); + final CursedWeapon cw = _cursedWeapons.get(itemId); return cw.getLevel(); } @@ -348,7 +348,7 @@ public final class CursedWeaponsManager cw.giveSkill(); player.setCursedWeaponEquippedId(cw.getItemId()); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java index a25558f39c..862bf8865e 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java @@ -102,7 +102,7 @@ public final class DayNightSpawnManager } spawn.stopRespawn(); - L2Npc last = spawn.getLastSpawn(); + final L2Npc last = spawn.getLastSpawn(); if (last != null) { last.deleteMe(); @@ -249,7 +249,7 @@ public final class DayNightSpawnManager if (GameTimeController.getInstance().isNight()) { - L2RaidBossInstance raidboss = (L2RaidBossInstance) spawnDat.doSpawn(); + final L2RaidBossInstance raidboss = (L2RaidBossInstance) spawnDat.doSpawn(); _bosses.put(spawnDat, raidboss); return raidboss; diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/DuelManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/DuelManager.java index f528ab246e..fd5e72d13b 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/DuelManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/DuelManager.java @@ -54,7 +54,7 @@ public final class DuelManager } // return if a player has PvPFlag - String engagedInPvP = "The duel was canceled because a duelist engaged in PvP combat."; + final String engagedInPvP = "The duel was canceled because a duelist engaged in PvP combat."; if (partyDuel) { boolean playerInPvP = false; @@ -234,7 +234,7 @@ public final class DuelManager if (reason != null) { - SystemMessage msg = SystemMessage.getSystemMessage(reason); + final SystemMessage msg = SystemMessage.getSystemMessage(reason); msg.addString(target.getName()); player.sendPacket(msg); return false; diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/FishingChampionshipManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/FishingChampionshipManager.java index 4fef7ddd1f..406d565e31 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/FishingChampionshipManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/FishingChampionshipManager.java @@ -87,7 +87,7 @@ public class FishingChampionshipManager protected void setEndOfChamp() { - Calendar finishtime = Calendar.getInstance(); + final Calendar finishtime = Calendar.getInstance(); finishtime.setTimeInMillis(_enddate); finishtime.set(Calendar.MINUTE, 0); finishtime.set(Calendar.SECOND, 0); @@ -103,11 +103,11 @@ public class FishingChampionshipManager try (Connection con = ConnectionFactory.getInstance().getConnection()) { - PreparedStatement statement = con.prepareStatement(SELECT); - ResultSet rs = statement.executeQuery(); + final PreparedStatement statement = con.prepareStatement(SELECT); + final ResultSet rs = statement.executeQuery(); while (rs.next()) { - int rewarded = rs.getInt("rewarded"); + final int rewarded = rs.getInt("rewarded"); if (rewarded == 0) { _tmpPlayers.add(new Fisher(rs.getString("player_name"), rs.getDouble("fish_length"), 0)); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/FortManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/FortManager.java index 2402af6f7a..744ef83c32 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/FortManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/FortManager.java @@ -191,7 +191,7 @@ public final class FortManager implements InstanceListManager @Override public void activateInstances() { - for (final Fort fort : _forts) + for (Fort fort : _forts) { fort.activateInstance(); } diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java index 905b3a9ce3..4beb96d08f 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java @@ -143,8 +143,8 @@ public final class FortSiegeManager for (Fort fort : FortManager.getInstance().getForts()) { - List commanderSpawns = new ArrayList<>(); - List flagSpawns = new ArrayList<>(); + final List commanderSpawns = new ArrayList<>(); + final List flagSpawns = new ArrayList<>(); for (int i = 1; i < 5; i++) { final String _spawnParams = siegeSettings.getProperty(fort.getName().replace(" ", "") + "Commander" + i, ""); @@ -156,11 +156,11 @@ public final class FortSiegeManager try { - int x = Integer.parseInt(st.nextToken()); - int y = Integer.parseInt(st.nextToken()); - int z = Integer.parseInt(st.nextToken()); - int heading = Integer.parseInt(st.nextToken()); - int npc_id = Integer.parseInt(st.nextToken()); + final int x = Integer.parseInt(st.nextToken()); + final int y = Integer.parseInt(st.nextToken()); + final int z = Integer.parseInt(st.nextToken()); + final int heading = Integer.parseInt(st.nextToken()); + final int npc_id = Integer.parseInt(st.nextToken()); commanderSpawns.add(new FortSiegeSpawn(fort.getResidenceId(), x, y, z, heading, npc_id, i)); } @@ -183,10 +183,10 @@ public final class FortSiegeManager try { - int x = Integer.parseInt(st.nextToken()); - int y = Integer.parseInt(st.nextToken()); - int z = Integer.parseInt(st.nextToken()); - int flag_id = Integer.parseInt(st.nextToken()); + final int x = Integer.parseInt(st.nextToken()); + final int y = Integer.parseInt(st.nextToken()); + final int z = Integer.parseInt(st.nextToken()); + final int flag_id = Integer.parseInt(st.nextToken()); flagSpawns.add(new CombatFlag(fort.getResidenceId(), x, y, z, 0, flag_id)); } diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java index 063387c31e..6302ceb377 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java @@ -201,7 +201,7 @@ public final class FourSepulchersManager protected void timeSelector() { timeCalculator(); - long currentTime = Calendar.getInstance().getTimeInMillis(); + final long currentTime = Calendar.getInstance().getTimeInMillis(); // if current time >= time of entry beginning and if current time < time of entry beginning + time of entry end if ((currentTime >= _coolDownTimeEnd) && (currentTime < _entryTimeEnd)) // entry time check { @@ -232,7 +232,7 @@ public final class FourSepulchersManager // phase end times calculator protected void timeCalculator() { - Calendar tmp = Calendar.getInstance(); + final Calendar tmp = Calendar.getInstance(); if (tmp.get(Calendar.MINUTE) < _newCycleMin) { tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1); @@ -253,7 +253,7 @@ public final class FourSepulchersManager LOG.warning("[" + i + "] is not inside " + _startHallSpawns); continue; } - int[] Location = _startHallSpawns.get(i); + final int[] Location = _startHallSpawns.get(i); GrandBossManager.getInstance().getZone(Location[0], Location[1], Location[2]).oustAllPlayers(); } @@ -427,7 +427,7 @@ public final class FourSepulchersManager spawnDat.setHeading(rs.getInt("heading")); spawnDat.setRespawnDelay(rs.getInt("respawn_delay")); SpawnTable.getInstance().addNewSpawn(spawnDat, false); - int keyNpcId = rs.getInt("key_npc_id"); + final int keyNpcId = rs.getInt("key_npc_id"); _mysteriousBoxSpawns.put(keyNpcId, spawnDat); } } @@ -477,7 +477,7 @@ public final class FourSepulchersManager { while (rs1.next()) { - int keyNpcId = rs1.getInt("key_npc_id"); + final int keyNpcId = rs1.getInt("key_npc_id"); ps2.setInt(1, keyNpcId); ps2.setInt(2, 1); @@ -524,7 +524,7 @@ public final class FourSepulchersManager { while (rs1.next()) { - int keyNpcId = rs1.getInt("key_npc_id"); + final int keyNpcId = rs1.getInt("key_npc_id"); ps2.setInt(1, keyNpcId); ps2.setInt(2, 2); @@ -573,7 +573,7 @@ public final class FourSepulchersManager { while (rs1.next()) { - int keyNpcId = rs1.getInt("key_npc_id"); + final int keyNpcId = rs1.getInt("key_npc_id"); ps2.setInt(1, keyNpcId); ps2.setInt(2, 5); @@ -624,7 +624,7 @@ public final class FourSepulchersManager { while (rs1.next()) { - int keyNpcId = rs1.getInt("key_npc_id"); + final int keyNpcId = rs1.getInt("key_npc_id"); ps2.setInt(1, keyNpcId); ps2.setInt(2, 6); @@ -660,7 +660,7 @@ public final class FourSepulchersManager protected void initLocationShadowSpawns() { - int locNo = Rnd.get(4); + final int locNo = Rnd.get(4); final int[] gateKeeper = { 31929, @@ -841,13 +841,13 @@ public final class FourSepulchersManager public synchronized void tryEntry(L2Npc npc, L2PcInstance player) { - Quest hostQuest = QuestManager.getInstance().getQuest(QUEST_ID); + final Quest hostQuest = QuestManager.getInstance().getQuest(QUEST_ID); if (hostQuest == null) { LOG.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find quest: " + QUEST_ID); return; } - int npcId = npc.getId(); + final int npcId = npc.getId(); switch (npcId) { // ID ok @@ -888,7 +888,7 @@ public final class FourSepulchersManager for (L2PcInstance mem : player.getParty().getMembers()) { - QuestState qs = mem.getQuestState(hostQuest.getName()); + final QuestState qs = mem.getQuestState(hostQuest.getName()); if ((qs == null) || (!qs.isStarted() && !qs.isCompleted())) { showHtmlFile(player, npcId + "-NS.htm", npc, mem); @@ -916,7 +916,7 @@ public final class FourSepulchersManager } for (L2PcInstance mem : player.getParty().getMembers()) { - QuestState qs = mem.getQuestState(hostQuest.getName()); + final QuestState qs = mem.getQuestState(hostQuest.getName()); if ((qs == null) || (!qs.isStarted() && !qs.isCompleted())) { showHtmlFile(player, npcId + "-NS.htm", npc, mem); @@ -937,7 +937,7 @@ public final class FourSepulchersManager } else { - QuestState qs = player.getQuestState(hostQuest.getName()); + final QuestState qs = player.getQuestState(hostQuest.getName()); if ((qs == null) || (!qs.isStarted() && !qs.isCompleted())) { showHtmlFile(player, npcId + "-NS.htm", npc, player); @@ -969,7 +969,7 @@ public final class FourSepulchersManager private void entry(int npcId, L2PcInstance player) { - int[] Location = _startHallSpawns.get(npcId); + final int[] Location = _startHallSpawns.get(npcId); int driftx; int drifty; @@ -996,7 +996,7 @@ public final class FourSepulchersManager mem.addItem("Quest", USED_PASS, 1, mem, true); } - L2ItemInstance hallsKey = mem.getInventory().getItemByItemId(CHAPEL_KEY); + final L2ItemInstance hallsKey = mem.getInventory().getItemByItemId(CHAPEL_KEY); if (hallsKey != null) { mem.destroyItemByItemId("Quest", CHAPEL_KEY, hallsKey.getCount(), mem, true); @@ -1030,7 +1030,7 @@ public final class FourSepulchersManager mem.addItem("Quest", USED_PASS, 1, mem, true); } - L2ItemInstance hallsKey = mem.getInventory().getItemByItemId(CHAPEL_KEY); + final L2ItemInstance hallsKey = mem.getInventory().getItemByItemId(CHAPEL_KEY); if (hallsKey != null) { mem.destroyItemByItemId("Quest", CHAPEL_KEY, hallsKey.getCount(), mem, true); @@ -1053,7 +1053,7 @@ public final class FourSepulchersManager player.addItem("Quest", USED_PASS, 1, player, true); } - L2ItemInstance hallsKey = player.getInventory().getItemByItemId(CHAPEL_KEY); + final L2ItemInstance hallsKey = player.getInventory().getItemByItemId(CHAPEL_KEY); if (hallsKey != null) { player.destroyItemByItemId("Quest", CHAPEL_KEY, hallsKey.getCount(), player, true); @@ -1072,7 +1072,7 @@ public final class FourSepulchersManager return; } - L2Spawn spawnDat = _mysteriousBoxSpawns.get(npcId); + final L2Spawn spawnDat = _mysteriousBoxSpawns.get(npcId); if (spawnDat != null) { _allMobs.add(spawnDat.doSpawn()); @@ -1194,7 +1194,7 @@ public final class FourSepulchersManager public synchronized boolean isViscountMobsAnnihilated(int npcId) { - List mobs = _viscountMobs.get(npcId); + final List mobs = _viscountMobs.get(npcId); if (mobs == null) { return true; @@ -1213,7 +1213,7 @@ public final class FourSepulchersManager public synchronized boolean isDukeMobsAnnihilated(int npcId) { - List mobs = _dukeMobs.get(npcId); + final List mobs = _dukeMobs.get(npcId); if (mobs == null) { return true; @@ -1237,7 +1237,7 @@ public final class FourSepulchersManager return; } - L2Spawn spawnDat = _keyBoxSpawns.get(activeChar.getId()); + final L2Spawn spawnDat = _keyBoxSpawns.get(activeChar.getId()); if (spawnDat != null) { spawnDat.setAmount(1); @@ -1258,7 +1258,7 @@ public final class FourSepulchersManager return; } - L2Spawn spawnDat = _executionerSpawns.get(activeChar.getId()); + final L2Spawn spawnDat = _executionerSpawns.get(activeChar.getId()); if (spawnDat != null) { spawnDat.setAmount(1); @@ -1284,12 +1284,12 @@ public final class FourSepulchersManager return; } - List monsterList = _dukeFinalMobs.get(npcId); + final List monsterList = _dukeFinalMobs.get(npcId); if (monsterList != null) { for (L2Spawn spawnDat : monsterList) { - L2SepulcherMonsterInstance mob = (L2SepulcherMonsterInstance) spawnDat.doSpawn(); + final L2SepulcherMonsterInstance mob = (L2SepulcherMonsterInstance) spawnDat.doSpawn(); spawnDat.stopRespawn(); if (mob != null) @@ -1309,7 +1309,7 @@ public final class FourSepulchersManager return; } - List monsterList = _emperorsGraveNpcs.get(npcId); + final List monsterList = _emperorsGraveNpcs.get(npcId); if (monsterList != null) { for (L2Spawn spawnDat : monsterList) @@ -1322,7 +1322,7 @@ public final class FourSepulchersManager public void locationShadowSpawns() { - int locNo = Rnd.get(4); + final int locNo = Rnd.get(4); final int[] gateKeeper = { 31929, @@ -1333,8 +1333,8 @@ public final class FourSepulchersManager for (int i = 0; i <= 3; i++) { - int keyNpcId = gateKeeper[i]; - L2Spawn spawnDat = _shadowSpawns.get(keyNpcId); + final int keyNpcId = gateKeeper[i]; + final L2Spawn spawnDat = _shadowSpawns.get(keyNpcId); spawnDat.setX(_shadowSpawnLoc[locNo][i][1]); spawnDat.setY(_shadowSpawnLoc[locNo][i][2]); spawnDat.setZ(_shadowSpawnLoc[locNo][i][3]); @@ -1350,10 +1350,10 @@ public final class FourSepulchersManager return; } - L2Spawn spawnDat = _shadowSpawns.get(npcId); + final L2Spawn spawnDat = _shadowSpawns.get(npcId); if (spawnDat != null) { - L2SepulcherMonsterInstance mob = (L2SepulcherMonsterInstance) spawnDat.doSpawn(); + final L2SepulcherMonsterInstance mob = (L2SepulcherMonsterInstance) spawnDat.doSpawn(); spawnDat.stopRespawn(); if (mob != null) @@ -1390,7 +1390,7 @@ public final class FourSepulchersManager { try { - L2DoorInstance door = DoorData.getInstance().getDoor(doorId); + final L2DoorInstance door = DoorData.getInstance().getDoor(doorId); if (door != null) { door.closeMe(); @@ -1528,8 +1528,8 @@ public final class FourSepulchersManager else if (_inEntryTime) { - NpcStringId msg1 = NpcStringId.YOU_MAY_NOW_ENTER_THE_SEPULCHER; - NpcStringId msg2 = NpcStringId.IF_YOU_PLACE_YOUR_HAND_ON_THE_STONE_STATUE_IN_FRONT_OF_EACH_SEPULCHER_YOU_WILL_BE_ABLE_TO_ENTER; + final NpcStringId msg1 = NpcStringId.YOU_MAY_NOW_ENTER_THE_SEPULCHER; + final NpcStringId msg2 = NpcStringId.IF_YOU_PLACE_YOUR_HAND_ON_THE_STONE_STATUE_IN_FRONT_OF_EACH_SEPULCHER_YOU_WILL_BE_ABLE_TO_ENTER; for (L2Spawn temp : _managers) { if (temp == null) diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java index 32eb00c011..11086baf3e 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java @@ -95,7 +95,7 @@ public final class GraciaSeedsManager break; case 2: // Conquest Complete state, if too much time is passed than change to defense state - long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -138,7 +138,7 @@ public final class GraciaSeedsManager setSoDState(2, false); } saveData(SODTYPE); - Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); + final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (esQuest == null) { _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java index d4cb093690..19f0a5cce9 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java @@ -83,20 +83,20 @@ public final class GrandBossManager implements IStorable { // Read all info from DB, and store it for AI to read and decide what to do // faster than accessing DB in real time - StatsSet info = new StatsSet(); - int bossId = rs.getInt("boss_id"); + final StatsSet info = new StatsSet(); + final int bossId = rs.getInt("boss_id"); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); info.set("heading", rs.getInt("heading")); info.set("respawn_time", rs.getLong("respawn_time")); - double HP = rs.getDouble("currentHP"); // jython doesn't recognize doubles - int true_HP = (int) HP; // so use java's ability to type cast + final double HP = rs.getDouble("currentHP"); // jython doesn't recognize doubles + final int true_HP = (int) HP; // so use java's ability to type cast info.set("currentHP", true_HP); // to convert double to int - double MP = rs.getDouble("currentMP"); - int true_MP = (int) MP; + final double MP = rs.getDouble("currentMP"); + final int true_MP = (int) MP; info.set("currentMP", true_MP); - int status = rs.getInt("status"); + final int status = rs.getInt("status"); _bossStatus.put(bossId, status); _storedInfo.put(bossId, info); _log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status + "."); @@ -135,8 +135,8 @@ public final class GrandBossManager implements IStorable { while (rs.next()) { - int id = rs.getInt("player_id"); - int zoneId = rs.getInt("zone"); + final int id = rs.getInt("player_id"); + final int zoneId = rs.getInt("zone"); zones.get(zoneId).add(id); } _log.info(getClass().getSimpleName() + ": Initialized " + _zones.size() + " Grand Boss Zones"); @@ -246,7 +246,7 @@ public final class GrandBossManager implements IStorable { for (Entry e : _zones.entrySet()) { - List list = e.getValue().getAllowedPlayers(); + final List list = e.getValue().getAllowedPlayers(); if ((list == null) || list.isEmpty()) { continue; @@ -263,7 +263,7 @@ public final class GrandBossManager implements IStorable for (Entry e : _storedInfo.entrySet()) { final L2GrandBossInstance boss = BOSSES.get(e.getKey()); - StatsSet info = e.getValue(); + final StatsSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -312,8 +312,8 @@ public final class GrandBossManager implements IStorable { try (Connection con = ConnectionFactory.getInstance().getConnection()) { - L2GrandBossInstance boss = BOSSES.get(bossId); - StatsSet info = _storedInfo.get(bossId); + final L2GrandBossInstance boss = BOSSES.get(bossId); + final StatsSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java index d8d3e3aee6..1fe497085a 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java @@ -74,8 +74,8 @@ public final class HandysBlockCheckerManager */ public synchronized void increaseArenaVotes(int arena) { - int newVotes = _arenaVotes.get(arena) + 1; - ArenaParticipantsHolder holder = _arenaPlayers[arena]; + final int newVotes = _arenaVotes.get(arena) + 1; + final ArenaParticipantsHolder holder = _arenaPlayers[arena]; if ((newVotes > (holder.getAllPlayers().size() / 2)) && !holder.getEvent().isStarted()) { @@ -149,7 +149,7 @@ public final class HandysBlockCheckerManager */ public boolean addPlayerToArena(L2PcInstance player, int arenaId) { - ArenaParticipantsHolder holder = _arenaPlayers[arenaId]; + final ArenaParticipantsHolder holder = _arenaPlayers[arenaId]; synchronized (holder) { @@ -159,7 +159,7 @@ public final class HandysBlockCheckerManager { if (_arenaPlayers[i].getAllPlayers().contains(player)) { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST); msg.addCharName(player); player.sendPacket(msg); return false; @@ -224,16 +224,16 @@ public final class HandysBlockCheckerManager */ public void removePlayer(L2PcInstance player, int arenaId, int team) { - ArenaParticipantsHolder holder = _arenaPlayers[arenaId]; + final ArenaParticipantsHolder holder = _arenaPlayers[arenaId]; synchronized (holder) { - boolean isRed = team == 0 ? true : false; + final boolean isRed = team == 0 ? true : false; holder.removePlayer(player, team); holder.broadCastPacketToTeam(new ExCubeGameRemovePlayer(player, isRed)); // End event if theres an empty team - int teamSize = isRed ? holder.getRedTeamSize() : holder.getBlueTeamSize(); + final int teamSize = isRed ? holder.getRedTeamSize() : holder.getBlueTeamSize(); if (teamSize == 0) { holder.getEvent().endEventAbnormally(); @@ -252,11 +252,11 @@ public final class HandysBlockCheckerManager */ public void changePlayerToTeam(L2PcInstance player, int arena, int team) { - ArenaParticipantsHolder holder = _arenaPlayers[arena]; + final ArenaParticipantsHolder holder = _arenaPlayers[arena]; synchronized (holder) { - boolean isFromRed = holder.getRedPlayers().contains(player); + final boolean isFromRed = holder.getRedPlayers().contains(player); if (isFromRed && (holder.getBlueTeamSize() == 6)) { @@ -269,7 +269,7 @@ public final class HandysBlockCheckerManager return; } - int futureTeam = isFromRed ? 1 : 0; + final int futureTeam = isFromRed ? 1 : 0; holder.addPlayer(player, futureTeam); if (isFromRed) @@ -331,8 +331,8 @@ public final class HandysBlockCheckerManager */ public void onDisconnect(L2PcInstance player) { - int arena = player.getBlockCheckerArena(); - int team = getHolder(arena).getPlayerTeam(player); + final int arena = player.getBlockCheckerArena(); + final int team = getHolder(arena).getPlayerTeam(player); HandysBlockCheckerManager.getInstance().removePlayer(player, arena, team); if (player.getTeam() != Team.NONE) { @@ -341,16 +341,16 @@ public final class HandysBlockCheckerManager player.setTeam(Team.NONE); // Remove the event items - PcInventory inv = player.getInventory(); + final PcInventory inv = player.getInventory(); if (inv.getItemByItemId(13787) != null) { - long count = inv.getInventoryItemCount(13787, 0); + final long count = inv.getInventoryItemCount(13787, 0); inv.destroyItemByItemId("Handys Block Checker", 13787, count, player, player); } if (inv.getItemByItemId(13788) != null) { - long count = inv.getInventoryItemCount(13788, 0); + final long count = inv.getInventoryItemCount(13788, 0); inv.destroyItemByItemId("Handys Block Checker", 13788, count, player, player); } player.setInsideZone(ZoneId.PVP, false); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java index 990798348c..61189fd911 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java @@ -177,8 +177,8 @@ public final class InstanceManager implements IXmlReader { while (rs.next()) { - int id = rs.getInt("instanceId"); - long time = rs.getLong("time"); + final int id = rs.getInt("instanceId"); + final long time = rs.getLong("time"); if (time < System.currentTimeMillis()) { deleteInstanceTime(playerObjId, id); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java index c7819a56fb..cbd761cdd0 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java @@ -69,7 +69,7 @@ public final class ItemAuctionManager _auctionIds.set(rs.getInt(1) + 1); } } - catch (final SQLException e) + catch (SQLException e) { _log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading auctions.", e); } diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/JumpManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/JumpManager.java index 93d8036640..ed7d705883 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/JumpManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/JumpManager.java @@ -105,10 +105,10 @@ public class JumpManager public void load() { _tracks.clear(); - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); - File file = new File(Config.DATAPACK_ROOT, "JumpTrack.xml"); + final File file = new File(Config.DATAPACK_ROOT, "JumpTrack.xml"); Document doc = null; if (file.exists()) @@ -122,13 +122,13 @@ public class JumpManager _log.log(Level.WARNING, "Could not parse JumpTrack.xml file: " + e.getMessage(), e); return; } - Node root = doc.getFirstChild(); + final Node root = doc.getFirstChild(); for (Node t = root.getFirstChild(); t != null; t = t.getNextSibling()) { if (t.getNodeName().equals("track")) { - Track track = new Track(); - int trackId = Integer.parseInt(t.getAttributes().getNamedItem("trackId").getNodeValue()); + final Track track = new Track(); + final int trackId = Integer.parseInt(t.getAttributes().getNamedItem("trackId").getNodeValue()); try { track.x = Integer.parseInt(t.getAttributes().getNamedItem("ToX").getNodeValue()); @@ -143,17 +143,17 @@ public class JumpManager { if (w.getNodeName().equals("way")) { - JumpWay jw = new JumpWay(); - int wayId = Integer.parseInt(w.getAttributes().getNamedItem("id").getNodeValue()); + final JumpWay jw = new JumpWay(); + final int wayId = Integer.parseInt(w.getAttributes().getNamedItem("id").getNodeValue()); for (Node j = w.getFirstChild(); j != null; j = j.getNextSibling()) { if (j.getNodeName().equals("jumpLoc")) { - NamedNodeMap attrs = j.getAttributes(); - int next = Integer.parseInt(attrs.getNamedItem("next").getNodeValue()); - int x = Integer.parseInt(attrs.getNamedItem("x").getNodeValue()); - int y = Integer.parseInt(attrs.getNamedItem("y").getNodeValue()); - int z = Integer.parseInt(attrs.getNamedItem("z").getNodeValue()); + final NamedNodeMap attrs = j.getAttributes(); + final int next = Integer.parseInt(attrs.getNamedItem("next").getNodeValue()); + final int x = Integer.parseInt(attrs.getNamedItem("x").getNodeValue()); + final int y = Integer.parseInt(attrs.getNamedItem("y").getNodeValue()); + final int z = Integer.parseInt(attrs.getNamedItem("z").getNodeValue()); jw.add(new JumpNode(x, y, z, next)); } } @@ -186,7 +186,7 @@ public class JumpManager public JumpWay getJumpWay(int trackId, int wayId) { - Track t = _tracks.get(trackId); + final Track t = _tracks.get(trackId); if (t != null) { return t.get(wayId); @@ -205,12 +205,12 @@ public class JumpManager { return; } - JumpWay jw = getJumpWay(player.getJumpTrackId(), 0); + final JumpWay jw = getJumpWay(player.getJumpTrackId(), 0); if (jw == null) { return; } - Track t = getTrack(player.getJumpTrackId()); + final Track t = getTrack(player.getJumpTrackId()); if (!((t.x == 0) && (t.y == 0) && (t.z == 0))) { player.broadcastPacket(new FlyToLocation(player, t.x, t.y, t.z, FlyType.DUMMY)); @@ -226,14 +226,14 @@ public class JumpManager return; } - JumpWay jw = getJumpWay(player.getJumpTrackId(), nextId); + final JumpWay jw = getJumpWay(player.getJumpTrackId(), nextId); if (jw == null) { player.enableAllSkills(); // unlock player skills return; } player.sendPacket(new ExFlyMove(player.getObjectId(), player.getJumpTrackId(), jw)); - JumpNode n = jw.get(0); + final JumpNode n = jw.get(0); player.setXYZ(n.getX(), n.getY(), n.getZ()); } diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/MailManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/MailManager.java index 1573dc3244..b7db5c4f38 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/MailManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/MailManager.java @@ -67,12 +67,12 @@ public final class MailManager final Message msg = new Message(rs); - int msgId = msg.getId(); + final int msgId = msg.getId(); _messages.put(msgId, msg); count++; - long expiration = msg.getExpiration(); + final long expiration = msg.getExpiration(); if (expiration < System.currentTimeMillis()) { diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java index b983bf53ea..2c1ba4b62e 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java @@ -90,19 +90,19 @@ public final class MapRegionManager implements IXmlReader castle = parseInteger(attrs, "castle"); bbs = parseInteger(attrs, "bbs"); - L2MapRegion region = new L2MapRegion(name, town, locId, castle, bbs); + final L2MapRegion region = new L2MapRegion(name, town, locId, castle, bbs); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { attrs = c.getAttributes(); if ("respawnPoint".equalsIgnoreCase(c.getNodeName())) { - int spawnX = parseInteger(attrs, "X"); - int spawnY = parseInteger(attrs, "Y"); - int spawnZ = parseInteger(attrs, "Z"); + final int spawnX = parseInteger(attrs, "X"); + final int spawnY = parseInteger(attrs, "Y"); + final int spawnZ = parseInteger(attrs, "Z"); - boolean other = parseBoolean(attrs, "isOther", false); - boolean chaotic = parseBoolean(attrs, "isChaotic", false); - boolean banish = parseBoolean(attrs, "isBanish", false); + final boolean other = parseBoolean(attrs, "isOther", false); + final boolean chaotic = parseBoolean(attrs, "isChaotic", false); + final boolean banish = parseBoolean(attrs, "isBanish", false); if (other) { @@ -161,7 +161,7 @@ public final class MapRegionManager implements IXmlReader */ public final int getMapRegionLocId(int locX, int locY) { - L2MapRegion region = getMapRegion(locX, locY); + final L2MapRegion region = getMapRegion(locX, locY); if (region != null) { return region.getLocId(); @@ -212,7 +212,7 @@ public final class MapRegionManager implements IXmlReader */ public String getClosestTownName(L2Character activeChar) { - L2MapRegion region = getMapRegion(activeChar); + final L2MapRegion region = getMapRegion(activeChar); if (region == null) { @@ -228,7 +228,7 @@ public final class MapRegionManager implements IXmlReader */ public int getAreaCastle(L2Character activeChar) { - L2MapRegion region = getMapRegion(activeChar); + final L2MapRegion region = getMapRegion(activeChar); if (region == null) { @@ -263,7 +263,7 @@ public final class MapRegionManager implements IXmlReader clanhall = ClanHallManager.getInstance().getAbstractHallByOwner(player.getClan()); if (clanhall != null) { - L2ClanHallZone zone = clanhall.getZone(); + final L2ClanHallZone zone = clanhall.getZone(); if ((zone != null) && !player.isFlyingMounted()) { if (player.getReputation() < 0) @@ -336,7 +336,7 @@ public final class MapRegionManager implements IXmlReader if (castle.getSiege().isInProgress()) { // Check if player's clan is attacker - List flags = castle.getSiege().getFlag(player.getClan()); + final List flags = castle.getSiege().getFlag(player.getClan()); if ((flags != null) && !flags.isEmpty()) { // Spawn to flag - Need more work to get player to the nearest flag @@ -350,7 +350,7 @@ public final class MapRegionManager implements IXmlReader if (fort.getSiege().isInProgress()) { // Check if player's clan is attacker - List flags = fort.getSiege().getFlag(player.getClan()); + final List flags = fort.getSiege().getFlag(player.getClan()); if ((flags != null) && !flags.isEmpty()) { // Spawn to flag - Need more work to get player to the nearest flag @@ -360,8 +360,8 @@ public final class MapRegionManager implements IXmlReader } else if ((clanhall != null) && clanhall.isSiegableHall()) { - SiegableHall sHall = (SiegableHall) clanhall; - List flags = sHall.getSiege().getFlag(player.getClan()); + final SiegableHall sHall = (SiegableHall) clanhall; + final List flags = sHall.getSiege().getFlag(player.getClan()); if ((flags != null) && !flags.isEmpty()) { return flags.get(0).getLocation(); @@ -375,7 +375,7 @@ public final class MapRegionManager implements IXmlReader { try { - L2RespawnZone zone = ZoneManager.getInstance().getZone(player, L2RespawnZone.class); + final L2RespawnZone zone = ZoneManager.getInstance().getZone(player, L2RespawnZone.class); if (zone != null) { return getRestartRegion(activeChar, zone.getRespawnPoint((L2PcInstance) activeChar)).getChaoticSpawnLoc(); @@ -409,7 +409,7 @@ public final class MapRegionManager implements IXmlReader // Checking if in an instance if (player.getInstanceId() > 0) { - Instance inst = InstanceManager.getInstance().getInstance(player.getInstanceId()); + final Instance inst = InstanceManager.getInstance().getInstance(player.getInstanceId()); if (inst != null) { loc = inst.getExitLoc(); @@ -436,7 +436,7 @@ public final class MapRegionManager implements IXmlReader // Get the nearest town try { - L2RespawnZone zone = ZoneManager.getInstance().getZone(activeChar, L2RespawnZone.class); + final L2RespawnZone zone = ZoneManager.getInstance().getZone(activeChar, L2RespawnZone.class); if (zone != null) { return getRestartRegion(activeChar, zone.getRespawnPoint((L2PcInstance) activeChar)).getSpawnLoc(); @@ -459,8 +459,8 @@ public final class MapRegionManager implements IXmlReader { try { - L2PcInstance player = ((L2PcInstance) activeChar); - L2MapRegion region = _regions.get(point); + final L2PcInstance player = ((L2PcInstance) activeChar); + final L2MapRegion region = _regions.get(point); if (region.getBannedRace().containsKey(player.getRace())) { diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java index 334767f7f3..8cb3403ea7 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java @@ -154,7 +154,7 @@ public final class MercTicketManager int npcId; int itemId; int x, y, z; - int mercPlaced[] = new int[20]; + final int mercPlaced[] = new int[20]; // start index to begin the search for the itemId corresponding to this NPC // this will help with: // a) skip unnecessary iterations in the search loop @@ -167,7 +167,7 @@ public final class MercTicketManager x = rs.getInt("x"); y = rs.getInt("y"); z = rs.getInt("z"); - Castle castle = CastleManager.getInstance().getCastle(x, y, z); + final Castle castle = CastleManager.getInstance().getCastle(x, y, z); if (castle != null) { if (mercPlaced[castle.getResidenceId() - 1] >= MERCS_MAX_PER_CASTLE[castle.getResidenceId() - 1]) @@ -188,7 +188,7 @@ public final class MercTicketManager { itemId = ITEM_IDS[i]; // create the ticket in the gameworld - L2ItemInstance dropticket = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId); + final L2ItemInstance dropticket = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId); dropticket.setItemLocation(ItemLocation.VOID); dropticket.dropMe(null, x, y, z); dropticket.setDropTime(0); // avoids it from being removed by the auto item destroyer @@ -255,12 +255,12 @@ public final class MercTicketManager */ public boolean isAtCasleLimit(int itemId) { - int castleId = getTicketCastleId(itemId); + final int castleId = getTicketCastleId(itemId); if (castleId <= 0) { return true; } - int limit = MERCS_MAX_PER_CASTLE[castleId - 1]; + final int limit = MERCS_MAX_PER_CASTLE[castleId - 1]; if (limit <= 0) { return true; @@ -290,9 +290,9 @@ public final class MercTicketManager { for (L2ItemInstance item : DROPPED_TICKETS) { - double dx = x - item.getX(); - double dy = y - item.getY(); - double dz = z - item.getZ(); + final double dx = x - item.getX(); + final double dy = y - item.getY(); + final double dz = z - item.getZ(); if (((dx * dx) + (dy * dy) + (dz * dz)) < (25 * 25)) { @@ -311,12 +311,12 @@ public final class MercTicketManager */ public int addTicket(int itemId, L2PcInstance activeChar) { - int x = activeChar.getX(); - int y = activeChar.getY(); - int z = activeChar.getZ(); - int heading = activeChar.getHeading(); + final int x = activeChar.getX(); + final int y = activeChar.getY(); + final int z = activeChar.getZ(); + final int heading = activeChar.getHeading(); - Castle castle = CastleManager.getInstance().getCastle(activeChar); + final Castle castle = CastleManager.getInstance().getCastle(activeChar); if (castle == null) { return -1; @@ -332,7 +332,7 @@ public final class MercTicketManager castle.getSiege().getSiegeGuardManager().hireMerc(x, y, z, heading, NPC_IDS[i]); // create the ticket in the gameworld - L2ItemInstance dropticket = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId); + final L2ItemInstance dropticket = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId); dropticket.setItemLocation(ItemLocation.VOID); dropticket.dropMe(null, x, y, z); dropticket.setDropTime(0); // avoids it from beeing removed by the auto item destroyer @@ -348,7 +348,7 @@ public final class MercTicketManager private void spawnMercenary(int npcId, int x, int y, int z, int despawnDelay) { - L2NpcTemplate template = NpcData.getInstance().getTemplate(npcId); + final L2NpcTemplate template = NpcData.getInstance().getTemplate(npcId); if (template != null) { final L2DefenderInstance npc = new L2DefenderInstance(template); @@ -386,7 +386,7 @@ public final class MercTicketManager */ public void removeTicket(L2ItemInstance item) { - int itemId = item.getId(); + final int itemId = item.getId(); int npcId = -1; // find the FIRST ticket itemId with spawns the saved NPC in the saved location @@ -399,7 +399,7 @@ public final class MercTicketManager } } // find the castle where this item is - Castle castle = CastleManager.getInstance().getCastleById(getTicketCastleId(itemId)); + final Castle castle = CastleManager.getInstance().getCastleById(getTicketCastleId(itemId)); if ((npcId > 0) && (castle != null)) { diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java index 61b848b265..1594ce33c6 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java @@ -420,7 +420,7 @@ public final class PetitionManager { // Create a new petition instance and add it to the list of pending petitions. final Petition newPetition = new Petition(petitioner, petitionText, petitionType); - int newPetitionId = newPetition.getId(); + final int newPetitionId = newPetition.getId(); getPendingPetitions().put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/PremiumManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/PremiumManager.java index 0498d19523..bb2edb7c47 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/PremiumManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/PremiumManager.java @@ -40,9 +40,9 @@ public class PremiumManager { try (Connection con = ConnectionFactory.getInstance().getConnection()) { - PreparedStatement statement = con.prepareStatement("SELECT premium_service,enddate FROM account_premium WHERE account_name=?"); + final PreparedStatement statement = con.prepareStatement("SELECT premium_service,enddate FROM account_premium WHERE account_name=?"); statement.setString(1, accountName); - ResultSet rset = statement.executeQuery(); + final ResultSet rset = statement.executeQuery(); while (rset.next()) { if (Config.PREMIUM_SYSTEM_ENABLED) @@ -74,12 +74,12 @@ public class PremiumManager try (Connection con = ConnectionFactory.getInstance().getConnection()) { - Calendar endDate = Calendar.getInstance(); + final Calendar endDate = Calendar.getInstance(); endDate.setTimeInMillis(System.currentTimeMillis() + remainingTime); endDate.set(Calendar.SECOND, 0); endDate.add(Calendar.MONTH, months); - PreparedStatement statement = con.prepareStatement("UPDATE account_premium SET premium_service=?,enddate=? WHERE account_name=?"); + final PreparedStatement statement = con.prepareStatement("UPDATE account_premium SET premium_service=?,enddate=? WHERE account_name=?"); statement.setInt(1, 1); statement.setLong(2, endDate.getTimeInMillis()); statement.setString(3, accountName); @@ -104,7 +104,7 @@ public class PremiumManager // TODO: Add check if account exists. XD try (Connection con = ConnectionFactory.getInstance().getConnection()) { - PreparedStatement statement = con.prepareStatement("INSERT INTO account_premium (account_name,premium_service,enddate) values(?,?,?) ON DUPLICATE KEY UPDATE premium_service = ?, enddate = ?"); + final PreparedStatement statement = con.prepareStatement("INSERT INTO account_premium (account_name,premium_service,enddate) values(?,?,?) ON DUPLICATE KEY UPDATE premium_service = ?, enddate = ?"); statement.setString(1, accountName); statement.setInt(2, 0); statement.setLong(3, 0); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java index 71052ad7cc..c21b4e4a8f 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java @@ -356,7 +356,7 @@ public class RaidBossSpawnManager continue; } - L2RaidBossInstance boss = _bosses.get(bossId); + final L2RaidBossInstance boss = _bosses.get(bossId); if (boss == null) { @@ -368,7 +368,7 @@ public class RaidBossSpawnManager updateStatus(boss, false); } - StatsSet info = _storedInfo.get(bossId); + final StatsSet info = _storedInfo.get(bossId); if (info == null) { @@ -415,7 +415,7 @@ public class RaidBossSpawnManager for (int i : _bosses.keySet()) { - L2RaidBossInstance boss = _bosses.get(i); + final L2RaidBossInstance boss = _bosses.get(i); msg[index++] = boss.getName() + ": " + boss.getRaidStatus().name(); } @@ -539,7 +539,7 @@ public class RaidBossSpawnManager { for (Integer bossId : _schedules.keySet()) { - ScheduledFuture f = _schedules.get(bossId); + final ScheduledFuture f = _schedules.get(bossId); f.cancel(true); } _schedules.clear(); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java index 46489b13da..2eb4e297de 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java @@ -145,8 +145,9 @@ public final class SiegeGuardManager { try { - int hiredCount = 0, hiredMax = MercTicketManager.getInstance().getMaxAllowedMerc(_castle.getResidenceId()); - boolean isHired = (getCastle().getOwnerId() > 0) ? true : false; + int hiredCount = 0; + final int hiredMax = MercTicketManager.getInstance().getMaxAllowedMerc(_castle.getResidenceId()); + final boolean isHired = (getCastle().getOwnerId() > 0) ? true : false; loadSiegeGuard(); for (L2Spawn spawn : _siegeGuardSpawn) { diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java index a09b39fd8d..6f0817a053 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java @@ -268,7 +268,7 @@ public final class SiegeManager public final List getSieges() { - List sieges = new ArrayList<>(); + final List sieges = new ArrayList<>(); for (Castle castle : CastleManager.getInstance().getCastles()) { sieges.add(castle.getSiege()); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/TownManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/TownManager.java index 360008891c..8e22069e07 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/TownManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/TownManager.java @@ -53,11 +53,11 @@ public final class TownManager public static final boolean townHasCastleInSiege(int townId) { - int castleIndex = getTownCastle(townId); + final int castleIndex = getTownCastle(townId); if (castleIndex > 0) { - Castle castle = CastleManager.getInstance().getCastles().get(CastleManager.getInstance().getCastleIndex(castleIndex)); + final Castle castle = CastleManager.getInstance().getCastles().get(CastleManager.getInstance().getCastleIndex(castleIndex)); if (castle != null) { return castle.getSiege().isInProgress(); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java index 7cf2448642..72738f2ed4 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java @@ -81,14 +81,14 @@ public final class WalkingManager implements IXmlReader @Override public void parseDocument(Document doc) { - Node n = doc.getFirstChild(); + final Node n = doc.getFirstChild(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { if (d.getNodeName().equals("route")) { final String routeName = parseString(d.getAttributes(), "name"); - boolean repeat = parseBoolean(d.getAttributes(), "repeat"); - String repeatStyle = d.getAttributes().getNamedItem("repeatStyle").getNodeValue(); + final boolean repeat = parseBoolean(d.getAttributes(), "repeat"); + final String repeatStyle = d.getAttributes().getNamedItem("repeatStyle").getNodeValue(); byte repeatType; if (repeatStyle.equalsIgnoreCase("back")) { @@ -116,12 +116,12 @@ public final class WalkingManager implements IXmlReader { if (r.getNodeName().equals("point")) { - NamedNodeMap attrs = r.getAttributes(); - int x = parseInteger(attrs, "X"); - int y = parseInteger(attrs, "Y"); - int z = parseInteger(attrs, "Z"); - int delay = parseInteger(attrs, "delay"); - boolean run = parseBoolean(attrs, "run"); + final NamedNodeMap attrs = r.getAttributes(); + final int x = parseInteger(attrs, "X"); + final int y = parseInteger(attrs, "Y"); + final int z = parseInteger(attrs, "Z"); + final int delay = parseInteger(attrs, "delay"); + final boolean run = parseBoolean(attrs, "run"); NpcStringId npcString = null; String chatString = null; @@ -161,15 +161,15 @@ public final class WalkingManager implements IXmlReader else if (r.getNodeName().equals("target")) { - NamedNodeMap attrs = r.getAttributes(); + final NamedNodeMap attrs = r.getAttributes(); try { - int npcId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - int x = Integer.parseInt(attrs.getNamedItem("spawnX").getNodeValue()); - int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue()); - int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue()); + final int npcId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); + final int x = Integer.parseInt(attrs.getNamedItem("spawnX").getNodeValue()); + final int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue()); + final int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue()); - NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder(); + final NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder(); holder.addRoute(routeName, new Location(x, y, z)); _routesToAttach.put(npcId, holder); } diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java index f64f6cc472..1f666a0e9e 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java @@ -209,7 +209,7 @@ public final class ZoneManager implements IXmlReader if ("node".equalsIgnoreCase(cd.getNodeName())) { attrs = cd.getAttributes(); - int[] point = new int[2]; + final int[] point = new int[2]; point[0] = parseInteger(attrs, "X"); point[1] = parseInteger(attrs, "Y"); rs.add(point); @@ -316,25 +316,25 @@ public final class ZoneManager implements IXmlReader if ("stat".equalsIgnoreCase(cd.getNodeName())) { attrs = cd.getAttributes(); - String name = attrs.getNamedItem("name").getNodeValue(); - String val = attrs.getNamedItem("val").getNodeValue(); + final String name = attrs.getNamedItem("name").getNodeValue(); + final String val = attrs.getNamedItem("val").getNodeValue(); temp.setParameter(name, val); } else if ("spawn".equalsIgnoreCase(cd.getNodeName()) && (temp instanceof L2ZoneRespawn)) { attrs = cd.getAttributes(); - int spawnX = Integer.parseInt(attrs.getNamedItem("X").getNodeValue()); - int spawnY = Integer.parseInt(attrs.getNamedItem("Y").getNodeValue()); - int spawnZ = Integer.parseInt(attrs.getNamedItem("Z").getNodeValue()); - Node val = attrs.getNamedItem("type"); + final int spawnX = Integer.parseInt(attrs.getNamedItem("X").getNodeValue()); + final int spawnY = Integer.parseInt(attrs.getNamedItem("Y").getNodeValue()); + final int spawnZ = Integer.parseInt(attrs.getNamedItem("Z").getNodeValue()); + final Node val = attrs.getNamedItem("type"); ((L2ZoneRespawn) temp).parseLoc(spawnX, spawnY, spawnZ, val == null ? null : val.getNodeValue()); } else if ("race".equalsIgnoreCase(cd.getNodeName()) && (temp instanceof L2RespawnZone)) { attrs = cd.getAttributes(); - String race = attrs.getNamedItem("name").getNodeValue(); - String point = attrs.getNamedItem("point").getNodeValue(); + final String race = attrs.getNamedItem("name").getNodeValue(); + final String point = attrs.getNamedItem("point").getNodeValue(); ((L2RespawnZone) temp).addRaceRespawnPoint(race, point); } @@ -605,7 +605,7 @@ public final class ZoneManager implements IXmlReader */ public List getSpawnTerritories(L2Object object) { - List temp = new ArrayList<>(); + final List temp = new ArrayList<>(); for (NpcSpawnTerritory territory : _spawnTerritories.values()) { if (territory.isInsideZone(object.getX(), object.getY(), object.getZ())) @@ -678,7 +678,7 @@ public final class ZoneManager implements IXmlReader double closestdis = Double.MAX_VALUE; for (T temp : (Collection) _classZones.get(type).values()) { - double distance = temp.getDistanceToZone(obj); + final double distance = temp.getDistanceToZone(obj); if (distance < closestdis) { closestdis = distance; diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java b/trunk/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java index 1ddcb9046d..a47febf78b 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java @@ -180,7 +180,7 @@ public class Lottery _isStarted = true; Broadcast.toAllOnlinePlayers("Lottery tickets are now available for Lucky Lottery #" + getId() + "."); - Calendar finishtime = Calendar.getInstance(); + final Calendar finishtime = Calendar.getInstance(); finishtime.setTimeInMillis(_enddate); finishtime.set(Calendar.MINUTE, 0); finishtime.set(Calendar.SECOND, 0); @@ -253,7 +253,7 @@ public class Lottery _log.info("Lottery: Ending lottery #" + getId() + "."); } - int[] luckynums = new int[5]; + final int[] luckynums = new int[5]; int luckynum = 0; for (int i = 0; i < 5; i++) @@ -327,14 +327,14 @@ public class Lottery for (int i = 1; i <= 16; i++) { - int val = curenchant / 2; + final int val = curenchant / 2; if (val != Math.round((double) curenchant / 2)) { count++; } - int val2 = curtype2 / 2; + final int val2 = curtype2 / 2; if (val2 != ((double) curtype2 / 2)) { @@ -369,7 +369,7 @@ public class Lottery _log.log(Level.WARNING, "Lottery: Could restore lottery data: " + e.getMessage(), e); } - long prize4 = count4 * Config.ALT_LOTTERY_2_AND_1_NUMBER_PRIZE; + final long prize4 = count4 * Config.ALT_LOTTERY_2_AND_1_NUMBER_PRIZE; long prize1 = 0; long prize2 = 0; long prize3 = 0; @@ -397,7 +397,7 @@ public class Lottery _log.info("Lottery: " + count4 + " players with ONE or TWO numbers each win " + prize4 + "."); } - long newprize = getPrize() - (prize1 + prize2 + prize3 + prize4); + final long newprize = getPrize() - (prize1 + prize2 + prize3 + prize4); if (Config.DEBUG) { _log.info("Lottery: Jackpot for next lottery is " + newprize + "."); @@ -449,13 +449,13 @@ public class Lottery public int[] decodeNumbers(int enchant, int type2) { - int res[] = new int[5]; + final int res[] = new int[5]; int id = 0; int nr = 1; while (enchant > 0) { - int val = enchant / 2; + final int val = enchant / 2; if (val != Math.round((double) enchant / 2)) { res[id++] = nr; @@ -468,7 +468,7 @@ public class Lottery while (type2 > 0) { - int val = type2 / 2; + final int val = type2 / 2; if (val != ((double) type2 / 2)) { res[id++] = nr; @@ -487,7 +487,7 @@ public class Lottery public long[] checkTicket(int id, int enchant, int type2) { - long res[] = + final long res[] = { 0, 0 @@ -512,12 +512,12 @@ public class Lottery for (int i = 1; i <= 16; i++) { - int val = curenchant / 2; + final int val = curenchant / 2; if (val != Math.round((double) curenchant / 2)) { count++; } - int val2 = curtype2 / 2; + final int val2 = curtype2 / 2; if (val2 != ((double) curtype2 / 2)) { count++; diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java b/trunk/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java index 81886f0e35..a387867f86 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java @@ -54,7 +54,7 @@ public final class FourSepulchersChangeCoolDownTimeTask implements Runnable manager.setIsFirstTimeRun(false); } - long interval = time.getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); + final long interval = time.getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); manager.setChangeEntryTimeTask(ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeEntryTimeTask(), interval)); final ScheduledFuture changeCoolDownTimeTask = manager.getChangeCoolDownTimeTask(); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/tasks/MessageDeletionTask.java b/trunk/java/com/l2jserver/gameserver/instancemanager/tasks/MessageDeletionTask.java index 6bfe33027c..a77a0b01f8 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/tasks/MessageDeletionTask.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/tasks/MessageDeletionTask.java @@ -73,7 +73,7 @@ public final class MessageDeletionTask implements Runnable final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId()); if (receiver != null) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_MAIL_WAS_RETURNED_DUE_TO_THE_EXCEEDED_WAITING_TIME); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_MAIL_WAS_RETURNED_DUE_TO_THE_EXCEEDED_WAITING_TIME); // sm.addString(msg.getReceiverName()); receiver.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java b/trunk/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java index 6690880872..9651dc24cb 100644 --- a/trunk/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java +++ b/trunk/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java @@ -96,7 +96,7 @@ public abstract class AbstractPlayerGroup */ public int getRaceCount() { - List partyRaces = new ArrayList<>(); + final List partyRaces = new ArrayList<>(); for (L2PcInstance member : getMembers()) { if (!partyRaces.contains(member.getRace())) diff --git a/trunk/java/com/l2jserver/gameserver/model/ArenaParticipantsHolder.java b/trunk/java/com/l2jserver/gameserver/model/ArenaParticipantsHolder.java index cc810b5b25..96a14cd0a9 100644 --- a/trunk/java/com/l2jserver/gameserver/model/ArenaParticipantsHolder.java +++ b/trunk/java/com/l2jserver/gameserver/model/ArenaParticipantsHolder.java @@ -58,7 +58,7 @@ public final class ArenaParticipantsHolder public List getAllPlayers() { - List all = new ArrayList<>(12); + final List all = new ArrayList<>(12); all.addAll(_redPlayers); all.addAll(_bluePlayers); return all; diff --git a/trunk/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java b/trunk/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java index e91ed95bd0..15cc0fc131 100644 --- a/trunk/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java +++ b/trunk/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java @@ -126,7 +126,7 @@ public class AutoSpawnHandler { // Register random spawn group, set various options on the // created spawn instance. - AutoSpawnInstance spawnInst = registerSpawn(rs.getInt("npcId"), rs.getInt("initialDelay"), rs.getInt("respawnDelay"), rs.getInt("despawnDelay")); + final AutoSpawnInstance spawnInst = registerSpawn(rs.getInt("npcId"), rs.getInt("initialDelay"), rs.getInt("respawnDelay"), rs.getInt("despawnDelay")); spawnInst.setSpawnCount(rs.getInt("count")); spawnInst.setBroadcast(rs.getBoolean("broadcastSpawn")); @@ -179,7 +179,7 @@ public class AutoSpawnHandler despawnDelay = DEFAULT_DESPAWN; } - AutoSpawnInstance newSpawn = new AutoSpawnInstance(npcId, initialDelay, respawnDelay, despawnDelay); + final AutoSpawnInstance newSpawn = new AutoSpawnInstance(npcId, initialDelay, respawnDelay, despawnDelay); if (spawnPoints != null) { @@ -189,7 +189,7 @@ public class AutoSpawnHandler } } - int newId = IdFactory.getInstance().getNextId(); + final int newId = IdFactory.getInstance().getNextId(); newSpawn._objectId = newId; _registeredSpawns.put(newId, newSpawn); @@ -230,7 +230,7 @@ public class AutoSpawnHandler _registeredSpawns.remove(spawnInst.getId()); // Cancel the currently associated running scheduled task. - ScheduledFuture respawnTask = _runningSpawns.remove(spawnInst._objectId); + final ScheduledFuture respawnTask = _runningSpawns.remove(spawnInst._objectId); respawnTask.cancel(false); } catch (Exception e) @@ -263,7 +263,7 @@ public class AutoSpawnHandler return; } - int objectId = spawnInst._objectId; + final int objectId = spawnInst._objectId; if (isSpawnRegistered(objectId)) { @@ -271,7 +271,7 @@ public class AutoSpawnHandler if (isActive) { - AutoSpawner rs = new AutoSpawner(objectId); + final AutoSpawner rs = new AutoSpawner(objectId); if (spawnInst._desDelay > 0) { @@ -286,7 +286,7 @@ public class AutoSpawnHandler } else { - AutoDespawner rd = new AutoDespawner(objectId); + final AutoDespawner rd = new AutoDespawner(objectId); spawnTask = _runningSpawns.remove(objectId); if (spawnTask != null) @@ -327,7 +327,7 @@ public class AutoSpawnHandler */ public final long getTimeToNextSpawn(AutoSpawnInstance spawnInst) { - int objectId = spawnInst.getObjectId(); + final int objectId = spawnInst.getObjectId(); if (!isSpawnRegistered(objectId)) { @@ -419,7 +419,7 @@ public class AutoSpawnHandler try { // Retrieve the required spawn instance for this spawn task. - AutoSpawnInstance spawnInst = _registeredSpawns.get(_objectId); + final AutoSpawnInstance spawnInst = _registeredSpawns.get(_objectId); // If the spawn is not scheduled to be active, cancel the spawn // task. @@ -428,7 +428,7 @@ public class AutoSpawnHandler return; } - Location[] locationList = spawnInst.getLocationList(); + final Location[] locationList = spawnInst.getLocationList(); // If there are no set co-ordinates, cancel the spawn task. if (locationList.length == 0) @@ -437,7 +437,7 @@ public class AutoSpawnHandler return; } - int locationCount = locationList.length; + final int locationCount = locationList.length; int locationIndex = Rnd.nextInt(locationCount); // If random spawning is disabled, the spawn at the next set of co-ordinates after the last. @@ -500,7 +500,7 @@ public class AutoSpawnHandler if (npcInst != null) { - String nearestTown = MapRegionManager.getInstance().getClosestTownName(npcInst); + final String nearestTown = MapRegionManager.getInstance().getClosestTownName(npcInst); // Announce to all players that the spawn has taken place, with the nearest town location. if (spawnInst.isBroadcasting()) @@ -512,7 +512,7 @@ public class AutoSpawnHandler // If there is no despawn time, do not create a despawn task. if (spawnInst.getDespawnDelay() > 0) { - AutoDespawner rd = new AutoDespawner(_objectId); + final AutoDespawner rd = new AutoDespawner(_objectId); ThreadPoolManager.getInstance().scheduleAi(rd, spawnInst.getDespawnDelay() - 1000); } } @@ -542,7 +542,7 @@ public class AutoSpawnHandler { try { - AutoSpawnInstance spawnInst = _registeredSpawns.get(_objectId); + final AutoSpawnInstance spawnInst = _registeredSpawns.get(_objectId); if (spawnInst == null) { diff --git a/trunk/java/com/l2jserver/gameserver/model/BlockList.java b/trunk/java/com/l2jserver/gameserver/model/BlockList.java index 06e0eac856..286cfe511f 100644 --- a/trunk/java/com/l2jserver/gameserver/model/BlockList.java +++ b/trunk/java/com/l2jserver/gameserver/model/BlockList.java @@ -109,7 +109,7 @@ public class BlockList private static HashMap loadList(int ObjId) { - HashMap list = new HashMap<>(); + final HashMap list = new HashMap<>(); try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT friendId, memo FROM character_friends WHERE charId=? AND relation=1")) { @@ -124,7 +124,7 @@ public class BlockList { continue; } - String memo = rs.getString("memo"); + final String memo = rs.getString("memo"); list.put(friendId, memo); } } @@ -183,13 +183,13 @@ public class BlockList public static boolean isBlocked(L2PcInstance listOwner, L2PcInstance target) { - BlockList blockList = listOwner.getBlockList(); + final BlockList blockList = listOwner.getBlockList(); return blockList.isBlockAll() || blockList.isInBlockList(target); } public static boolean isBlocked(L2PcInstance listOwner, int targetId) { - BlockList blockList = listOwner.getBlockList(); + final BlockList blockList = listOwner.getBlockList(); return blockList.isBlockAll() || blockList.isInBlockList(targetId); } @@ -210,11 +210,11 @@ public class BlockList return; } - String charName = CharNameTable.getInstance().getNameById(targetId); + final String charName = CharNameTable.getInstance().getNameById(targetId); if (listOwner.getFriendList().containsKey(targetId)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST); sm.addString(charName); listOwner.sendPacket(sm); return; @@ -232,7 +232,7 @@ public class BlockList sm.addString(charName); listOwner.sendPacket(sm); - L2PcInstance player = L2World.getInstance().getPlayer(targetId); + final L2PcInstance player = L2World.getInstance().getPlayer(targetId); if (player != null) { @@ -251,7 +251,7 @@ public class BlockList SystemMessage sm; - String charName = CharNameTable.getInstance().getNameById(targetId); + final String charName = CharNameTable.getInstance().getNameById(targetId); if (!listOwner.getBlockList().getBlockList().containsKey(targetId)) { @@ -294,7 +294,7 @@ public class BlockList */ public static boolean isInBlockList(int ownerId, int targetId) { - L2PcInstance player = L2World.getInstance().getPlayer(ownerId); + final L2PcInstance player = L2World.getInstance().getPlayer(ownerId); if (player != null) { return BlockList.isBlocked(player, targetId); diff --git a/trunk/java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java b/trunk/java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java index 6e660d9ab0..ea7f3c972b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java +++ b/trunk/java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java @@ -430,7 +430,7 @@ public class CharSelectInfoPackage public int getTransformationId() { - int weaponId = getPaperdollItemId(Inventory.PAPERDOLL_RHAND); + final int weaponId = getPaperdollItemId(Inventory.PAPERDOLL_RHAND); switch (weaponId) { case 8190: diff --git a/trunk/java/com/l2jserver/gameserver/model/CombatFlag.java b/trunk/java/com/l2jserver/gameserver/model/CombatFlag.java index f32a2f5045..4a29a54554 100644 --- a/trunk/java/com/l2jserver/gameserver/model/CombatFlag.java +++ b/trunk/java/com/l2jserver/gameserver/model/CombatFlag.java @@ -82,14 +82,14 @@ public class CombatFlag // Equip with the weapon _item = item; _player.getInventory().equipItem(_item); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); sm.addItemName(_item); _player.sendPacket(sm); // Refresh inventory if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(_item); _player.sendPacket(iu); } @@ -107,7 +107,7 @@ public class CombatFlag { // Reset player stats _player.setCombatFlagEquipped(false); - int slot = _player.getInventory().getSlotFromItem(_item); + final int slot = _player.getInventory().getSlotFromItem(_item); _player.getInventory().unEquipItemInBodySlot(slot); _player.destroyItem("CombatFlag", _item, null, true); _item = null; diff --git a/trunk/java/com/l2jserver/gameserver/model/CursedWeapon.java b/trunk/java/com/l2jserver/gameserver/model/CursedWeapon.java index c7ce37b350..59f36e4ddc 100644 --- a/trunk/java/com/l2jserver/gameserver/model/CursedWeapon.java +++ b/trunk/java/com/l2jserver/gameserver/model/CursedWeapon.java @@ -113,10 +113,10 @@ public class CursedWeapon implements INamable _player.storeMe(); // Destroy - L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); + final L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); if (removedItem.getCount() == 0) { iu.addRemovedItem(removedItem); @@ -174,10 +174,10 @@ public class CursedWeapon implements INamable if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) { // Destroy - L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); + final L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); if (removedItem.getCount() == 0) { iu.addRemovedItem(removedItem); @@ -208,7 +208,7 @@ public class CursedWeapon implements INamable // Delete infos from table if any CursedWeaponsManager.removeFromDb(_itemId); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DISAPPEARED); sm.addItemName(_itemId); CursedWeaponsManager.announce(sm); @@ -265,8 +265,8 @@ public class CursedWeapon implements INamable _item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy // RedSky and Earthquake - ExRedSky packet = new ExRedSky(10); - Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3); + final ExRedSky packet = new ExRedSky(10); + final Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3); Broadcast.toAllOnlinePlayers(packet); Broadcast.toAllOnlinePlayers(eq); } @@ -284,7 +284,7 @@ public class CursedWeapon implements INamable // _player.getInventory().getItemByItemId(_itemId).dropMe(_player, _player.getX(), _player.getY(), _player.getZ()); } _isDropped = true; - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_WAS_DROPPED_IN_THE_S1_REGION); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_WAS_DROPPED_IN_THE_S1_REGION); if (player != null) { sm.addZoneName(player.getX(), player.getY(), player.getZ()); // Region Name @@ -306,14 +306,14 @@ public class CursedWeapon implements INamable doTransform(); giveSkill(); - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S_OWNER_HAS_LOGGED_INTO_THE_S1_REGION); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S_OWNER_HAS_LOGGED_INTO_THE_S1_REGION); msg.addZoneName(_player.getX(), _player.getY(), _player.getZ()); msg.addItemName(_player.getCursedWeaponEquippedId()); CursedWeaponsManager.announce(msg); - CursedWeapon cw = CursedWeaponsManager.getInstance().getCursedWeapon(_player.getCursedWeaponEquippedId()); - SystemMessage msg2 = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); - int timeLeft = (int) (cw.getTimeLeft() / 60000); + final CursedWeapon cw = CursedWeaponsManager.getInstance().getCursedWeapon(_player.getCursedWeaponEquippedId()); + final SystemMessage msg2 = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); + final int timeLeft = (int) (cw.getTimeLeft() / 60000); msg2.addItemName(_player.getCursedWeaponEquippedId()); msg2.addInt(timeLeft); _player.sendPacket(msg2); @@ -456,7 +456,7 @@ public class CursedWeapon implements INamable // Refresh inventory if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItem(_item); // iu.addItems(Arrays.asList(items)); _player.sendPacket(iu); @@ -469,7 +469,7 @@ public class CursedWeapon implements INamable // Refresh player stats _player.broadcastUserInfo(); - SocialAction atk = new SocialAction(_player.getObjectId(), 17); + final SocialAction atk = new SocialAction(_player.getObjectId(), 17); _player.broadcastPacket(atk); diff --git a/trunk/java/com/l2jserver/gameserver/model/Elementals.java b/trunk/java/com/l2jserver/gameserver/model/Elementals.java index dc9bda28e1..ce8046f767 100644 --- a/trunk/java/com/l2jserver/gameserver/model/Elementals.java +++ b/trunk/java/com/l2jserver/gameserver/model/Elementals.java @@ -266,7 +266,7 @@ public final class Elementals public static byte getItemElement(int itemId) { - ElementalItems item = TABLE.get(itemId); + final ElementalItems item = TABLE.get(itemId); if (item != null) { return item._element; @@ -281,7 +281,7 @@ public final class Elementals public static int getMaxElementLevel(int itemId) { - ElementalItems item = TABLE.get(itemId); + final ElementalItems item = TABLE.get(itemId); if (item != null) { return item._type._maxLevel; @@ -311,7 +311,7 @@ public final class Elementals public static byte getElementId(String name) { - String tmp = name.toLowerCase(); + final String tmp = name.toLowerCase(); if (tmp.equals("fire")) { return FIRE; diff --git a/trunk/java/com/l2jserver/gameserver/model/L2AdminCommandAccessRight.java b/trunk/java/com/l2jserver/gameserver/model/L2AdminCommandAccessRight.java index 7a9f0b9d3e..a949e8a9d3 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2AdminCommandAccessRight.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2AdminCommandAccessRight.java @@ -57,7 +57,7 @@ public class L2AdminCommandAccessRight */ public boolean hasAccess(L2AccessLevel characterAccessLevel) { - L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(_accessLevel); + final L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(_accessLevel); return ((accessLevel.getLevel() == characterAccessLevel.getLevel()) || characterAccessLevel.hasChildAccess(accessLevel)); } diff --git a/trunk/java/com/l2jserver/gameserver/model/L2ArmorSet.java b/trunk/java/com/l2jserver/gameserver/model/L2ArmorSet.java index 02e31e59e4..26dfaa51a7 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2ArmorSet.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2ArmorSet.java @@ -274,9 +274,9 @@ public final class L2ArmorSet public boolean containShield(L2PcInstance player) { - Inventory inv = player.getInventory(); + final Inventory inv = player.getInventory(); - L2ItemInstance shieldItem = inv.getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance shieldItem = inv.getPaperdollItem(Inventory.PAPERDOLL_LHAND); return ((shieldItem != null) && _shield.contains(Integer.valueOf(shieldItem.getId()))); } diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Augmentation.java b/trunk/java/com/l2jserver/gameserver/model/L2Augmentation.java index 976fd2e4b4..8dbee6b4a0 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Augmentation.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Augmentation.java @@ -51,13 +51,13 @@ public final class L2Augmentation public AugmentationStatBoni(int augmentationId) { _active = false; - int[] stats = new int[2]; + final int[] stats = new int[2]; stats[0] = 0x0000FFFF & augmentationId; stats[1] = (augmentationId >> 16); for (int stat : stats) { - Options op = OptionData.getInstance().getOptions(stat); + final Options op = OptionData.getInstance().getOptions(stat); if (op != null) { _options.add(op); diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Clan.java b/trunk/java/com/l2jserver/gameserver/model/L2Clan.java index dec4a4a25a..05d8737803 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Clan.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Clan.java @@ -1231,12 +1231,12 @@ public class L2Clan implements IIdentifiable, INamable // Go though the recordset of this SQL query while (rset.next()) { - int id = rset.getInt("skill_id"); - int level = rset.getInt("skill_level"); + final int id = rset.getInt("skill_id"); + final int level = rset.getInt("skill_level"); // Create a L2Skill object for each record - Skill skill = SkillData.getInstance().getSkill(id, level); + final Skill skill = SkillData.getInstance().getSkill(id, level); // Add the L2Skill object to the L2Clan _skills - int subType = rset.getInt("sub_pledge_id"); + final int subType = rset.getInt("sub_pledge_id"); if (subType == -2) { @@ -1248,7 +1248,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - SubPledge subunit = _subPledges.get(subType); + final SubPledge subunit = _subPledges.get(subType); if (subunit != null) { subunit.addNewSkill(skill); @@ -1333,7 +1333,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - SubPledge subunit = getSubPledge(subType); + final SubPledge subunit = getSubPledge(subType); if (subunit != null) { oldSkill = subunit.addNewSkill(newSkill); @@ -1375,7 +1375,7 @@ public class L2Clan implements IIdentifiable, INamable _log.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); sm.addSkillName(newSkill.getId()); for (L2ClanMember temp : _members.values()) @@ -1457,7 +1457,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - SubPledge subunit = getSubPledge(player.getPledgeType()); + final SubPledge subunit = getSubPledge(player.getPledgeType()); if (subunit == null) { return; @@ -1495,7 +1495,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - SubPledge subunit = getSubPledge(player.getPledgeType()); + final SubPledge subunit = getSubPledge(player.getPledgeType()); if (subunit == null) { return; @@ -1790,11 +1790,11 @@ public class L2Clan implements IIdentifiable, INamable { while (rset.next()) { - int id = rset.getInt("sub_pledge_id"); - String name = rset.getString("name"); - int leaderId = rset.getInt("leader_id"); + final int id = rset.getInt("sub_pledge_id"); + final String name = rset.getString("name"); + final int leaderId = rset.getInt("leader_id"); // Create a SubPledge object for each record - SubPledge pledge = new SubPledge(id, name, leaderId); + final SubPledge pledge = new SubPledge(id, name, leaderId); _subPledges.put(id, pledge); } } @@ -1987,9 +1987,9 @@ public class L2Clan implements IIdentifiable, INamable // Go though the recordset of this SQL query while (rs.next()) { - int rank = rs.getInt("rank"); + final int rank = rs.getInt("rank"); // int party = rset.getInt("party"); - int privileges = rs.getInt("privs"); + final int privileges = rs.getInt("privs"); // Create a SubPledge object for each record if (rank == -1) { @@ -2256,21 +2256,21 @@ public class L2Clan implements IIdentifiable, INamable } if (target.getClanId() != 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ALREADY_A_MEMBER_OF_ANOTHER_CLAN); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ALREADY_A_MEMBER_OF_ANOTHER_CLAN); sm.addString(target.getName()); activeChar.sendPacket(sm); return false; } if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); activeChar.sendPacket(sm); return false; } if (((target.getLevel() > 40) || (target.getClassId().level() >= 2)) && (pledgeType == -1)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_MEET_THE_REQUIREMENTS_TO_JOIN_A_CLAN_ACADEMY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_MEET_THE_REQUIREMENTS_TO_JOIN_A_CLAN_ACADEMY); sm.addString(target.getName()); activeChar.sendPacket(sm); activeChar.sendPacket(SystemMessageId.IN_ORDER_TO_JOIN_THE_CLAN_ACADEMY_YOU_MUST_BE_UNAFFILIATED_WITH_A_CLAN_AND_BE_AN_UNAWAKENED_CHARACTER_LV_84_OR_BELOW_FPR_BOTH_MAIN_AND_SUBCLASS); @@ -2280,7 +2280,7 @@ public class L2Clan implements IIdentifiable, INamable { if (pledgeType == 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); sm.addString(getName()); activeChar.sendPacket(sm); } @@ -2309,7 +2309,7 @@ public class L2Clan implements IIdentifiable, INamable activeChar.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return false; } - L2Clan leaderClan = activeChar.getClan(); + final L2Clan leaderClan = activeChar.getClan(); if (leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN) @@ -2340,15 +2340,15 @@ public class L2Clan implements IIdentifiable, INamable } if (!target.isClanLeader()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER); sm.addString(target.getName()); activeChar.sendPacket(sm); return false; } - L2Clan targetClan = target.getClan(); + final L2Clan targetClan = target.getClan(); if (target.getAllyId() != 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_IS_ALREADY_A_MEMBER_OF_S2_ALLIANCE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_IS_ALREADY_A_MEMBER_OF_S2_ALLIANCE); sm.addString(targetClan.getName()); sm.addString(targetClan.getAllyName()); activeChar.sendPacket(sm); @@ -2358,7 +2358,7 @@ public class L2Clan implements IIdentifiable, INamable { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_CANNOT_JOIN_THE_ALLIANCE_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_ALLIANCE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_CANNOT_JOIN_THE_ALLIANCE_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_ALLIANCE); sm.addString(target.getClan().getName()); sm.addString(target.getClan().getAllyName()); activeChar.sendPacket(sm); @@ -2513,7 +2513,7 @@ public class L2Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (L2Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2557,7 +2557,7 @@ public class L2Clan implements IIdentifiable, INamable if (player.reduceAdena("ClanLvl", 650000, player.getTarget(), true)) { player.setSp(player.getSp() - 20000); - SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); + final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); sp.addInt(20000); player.sendPacket(sp); increaseClanLevel = true; @@ -2573,7 +2573,7 @@ public class L2Clan implements IIdentifiable, INamable if (player.reduceAdena("ClanLvl", 2500000, player.getTarget(), true)) { player.setSp(player.getSp() - 100000); - SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); + final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); sp.addInt(100000); player.sendPacket(sp); increaseClanLevel = true; @@ -2591,10 +2591,10 @@ public class L2Clan implements IIdentifiable, INamable if (player.destroyItemByItemId("ClanLvl", 1419, 1, player.getTarget(), false)) { player.setSp(player.getSp() - 350000); - SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); + final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); sp.addInt(350000); player.sendPacket(sp); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(1419); player.sendPacket(sm); increaseClanLevel = true; @@ -2611,10 +2611,10 @@ public class L2Clan implements IIdentifiable, INamable if (player.destroyItemByItemId("ClanLvl", 3874, 1, player.getTarget(), false)) { player.setSp(player.getSp() - 1000000); - SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); + final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); sp.addInt(1000000); player.sendPacket(sp); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(3874); player.sendPacket(sm); increaseClanLevel = true; @@ -2631,10 +2631,10 @@ public class L2Clan implements IIdentifiable, INamable if (player.destroyItemByItemId("ClanLvl", 3870, 1, player.getTarget(), false)) { player.setSp(player.getSp() - 2500000); - SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); + final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1); sp.addInt(2500000); player.sendPacket(sp); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(3870); player.sendPacket(sm); increaseClanLevel = true; @@ -2647,7 +2647,7 @@ public class L2Clan implements IIdentifiable, INamable if ((getReputationScore() >= Config.CLAN_LEVEL_6_COST) && (getMembersCount() >= Config.CLAN_LEVEL_6_REQUIREMENT)) { setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true); - SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); + final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_6_COST); player.sendPacket(cr); increaseClanLevel = true; @@ -2659,7 +2659,7 @@ public class L2Clan implements IIdentifiable, INamable if ((getReputationScore() >= Config.CLAN_LEVEL_7_COST) && (getMembersCount() >= Config.CLAN_LEVEL_7_REQUIREMENT)) { setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true); - SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); + final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_7_COST); player.sendPacket(cr); increaseClanLevel = true; @@ -2670,7 +2670,7 @@ public class L2Clan implements IIdentifiable, INamable if ((getReputationScore() >= Config.CLAN_LEVEL_8_COST) && (getMembersCount() >= Config.CLAN_LEVEL_8_REQUIREMENT)) { setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true); - SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); + final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_8_COST); player.sendPacket(cr); increaseClanLevel = true; @@ -2684,10 +2684,10 @@ public class L2Clan implements IIdentifiable, INamable if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false)) { setReputationScore(getReputationScore() - Config.CLAN_LEVEL_9_COST, true); - SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); + final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_9_COST); player.sendPacket(cr); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); sm.addItemName(9910); sm.addLong(150); player.sendPacket(sm); @@ -2703,10 +2703,10 @@ public class L2Clan implements IIdentifiable, INamable if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false)) { setReputationScore(getReputationScore() - Config.CLAN_LEVEL_10_COST, true); - SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); + final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_10_COST); player.sendPacket(cr); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); sm.addItemName(9911); sm.addLong(5); player.sendPacket(sm); @@ -2719,7 +2719,7 @@ public class L2Clan implements IIdentifiable, INamable if ((getReputationScore() >= Config.CLAN_LEVEL_11_COST) && (getMembersCount() >= Config.CLAN_LEVEL_11_REQUIREMENT)) { setReputationScore(getReputationScore() - Config.CLAN_LEVEL_11_COST, true); - SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); + final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_11_COST); player.sendPacket(cr); increaseClanLevel = true; @@ -2736,7 +2736,7 @@ public class L2Clan implements IIdentifiable, INamable } // the player should know that he has less sp now :p - UserInfo ui = new UserInfo(player, false); + final UserInfo ui = new UserInfo(player, false); ui.addComponentType(UserInfoType.CURRENT_HPMPCP_EXP_SP); player.sendPacket(ui); @@ -2767,7 +2767,7 @@ public class L2Clan implements IIdentifiable, INamable if (getLeader().isOnline()) { - L2PcInstance leader = getLeader().getPlayerInstance(); + final L2PcInstance leader = getLeader().getPlayerInstance(); if (level > 4) { SiegeManager.getInstance().addSiegeSkills(leader); @@ -2948,7 +2948,7 @@ public class L2Clan implements IIdentifiable, INamable return false; } - int id = skill.getId(); + final int id = skill.getId(); Skill current; if (subType == 0) { diff --git a/trunk/java/com/l2jserver/gameserver/model/L2ClanMember.java b/trunk/java/com/l2jserver/gameserver/model/L2ClanMember.java index a7a9fe3c3c..170524eaa7 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2ClanMember.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2ClanMember.java @@ -405,7 +405,7 @@ public class L2ClanMember if (_apprentice != 0) { - L2ClanMember apprentice = _clan.getClanMember(_apprentice); + final L2ClanMember apprentice = _clan.getClanMember(_apprentice); if (apprentice != null) { return apprentice.getName(); @@ -414,7 +414,7 @@ public class L2ClanMember } if (_sponsor != 0) { - L2ClanMember sponsor = _clan.getClanMember(_sponsor); + final L2ClanMember sponsor = _clan.getClanMember(_sponsor); if (sponsor != null) { return sponsor.getName(); @@ -446,7 +446,7 @@ public class L2ClanMember return pledgeClass; } - L2Clan clan = player.getClan(); + final L2Clan clan = player.getClan(); if (clan != null) { switch (clan.getLevel()) diff --git a/trunk/java/com/l2jserver/gameserver/model/L2CommandChannel.java b/trunk/java/com/l2jserver/gameserver/model/L2CommandChannel.java index d4af459d57..496ef1e629 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2CommandChannel.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2CommandChannel.java @@ -49,7 +49,7 @@ public class L2CommandChannel extends AbstractPlayerGroup public L2CommandChannel(L2PcInstance leader) { _commandLeader = leader; - L2Party party = leader.getParty(); + final L2Party party = leader.getParty(); _parties.add(party); _channelLvl = party.getLevel(); party.setCommandChannel(this); diff --git a/trunk/java/com/l2jserver/gameserver/model/L2ContactList.java b/trunk/java/com/l2jserver/gameserver/model/L2ContactList.java index 125e0ca6cf..a6c6861b21 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2ContactList.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2ContactList.java @@ -90,7 +90,7 @@ public class L2ContactList { SystemMessage sm; - int contactId = CharNameTable.getInstance().getIdByName(name); + final int contactId = CharNameTable.getInstance().getIdByName(name); if (_contacts.contains(name)) { activeChar.sendPacket(SystemMessageId.THE_NAME_ALREADY_EXISTS_ON_THE_ADDED_LIST); @@ -147,7 +147,7 @@ public class L2ContactList public void remove(String name) { - int contactId = CharNameTable.getInstance().getIdByName(name); + final int contactId = CharNameTable.getInstance().getIdByName(name); if (!_contacts.contains(name)) { @@ -169,7 +169,7 @@ public class L2ContactList ps.setInt(2, contactId); ps.execute(); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WAS_SUCCESSFULLY_DELETED_FROM_YOUR_CONTACT_LIST); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WAS_SUCCESSFULLY_DELETED_FROM_YOUR_CONTACT_LIST); sm.addString(name); activeChar.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java b/trunk/java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java index 8355868725..303c50dad1 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java @@ -93,12 +93,12 @@ public final class L2EnchantSkillLearn public boolean isMaxEnchant(int level) { - int enchantType = getEnchantRoute(level); + final int enchantType = getEnchantRoute(level); if ((enchantType < 1) || !_enchantRoutes.containsKey(enchantType)) { return false; } - int index = getEnchantIndex(level); + final int index = getEnchantIndex(level); if ((index + 1) >= EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(enchantType)).getEnchantGroupDetails().size()) { @@ -109,13 +109,13 @@ public final class L2EnchantSkillLearn public EnchantSkillHolder getEnchantSkillHolder(int level) { - int enchantType = getEnchantRoute(level); + final int enchantType = getEnchantRoute(level); if ((enchantType < 1) || !_enchantRoutes.containsKey(enchantType)) { return null; } - int index = getEnchantIndex(level); - L2EnchantSkillGroup group = EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(enchantType)); + final int index = getEnchantIndex(level); + final L2EnchantSkillGroup group = EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(enchantType)); if (index < 0) { diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Mentee.java b/trunk/java/com/l2jserver/gameserver/model/L2Mentee.java index 69615c70cd..3b1eb2d582 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Mentee.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Mentee.java @@ -48,7 +48,7 @@ public class L2Mentee public void load() { - L2PcInstance player = getPlayerInstance(); + final L2PcInstance player = getPlayerInstance(); if (player == null) // Only if player is offline { try (Connection con = ConnectionFactory.getInstance().getConnection(); diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Object.java b/trunk/java/com/l2jserver/gameserver/model/L2Object.java index 488e490bff..16af947183 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Object.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Object.java @@ -123,7 +123,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public void onAction(L2PcInstance player, boolean interact) { - IActionHandler handler = ActionHandler.getInstance().getHandler(getInstanceType()); + final IActionHandler handler = ActionHandler.getInstance().getHandler(getInstanceType()); if (handler != null) { handler.action(player, this, interact); @@ -134,7 +134,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public void onActionShift(L2PcInstance player) { - IActionShiftHandler handler = ActionShiftHandler.getInstance().getHandler(getInstanceType()); + final IActionShiftHandler handler = ActionShiftHandler.getInstance().getHandler(getInstanceType()); if (handler != null) { handler.action(player, this, true); @@ -157,7 +157,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab { assert getWorldRegion() != null; - L2WorldRegion reg = getWorldRegion(); + final L2WorldRegion reg = getWorldRegion(); synchronized (this) { @@ -620,7 +620,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return; } - L2WorldRegion newRegion = L2World.getInstance().getRegion(getLocation()); + final L2WorldRegion newRegion = L2World.getInstance().getRegion(getLocation()); if (newRegion != getWorldRegion()) { getWorldRegion().removeVisibleObject(this); @@ -806,8 +806,8 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return; } - Instance oldI = InstanceManager.getInstance().getInstance(getInstanceId()); - Instance newI = InstanceManager.getInstance().getInstance(instanceId); + final Instance oldI = InstanceManager.getInstance().getInstance(getInstanceId()); + final Instance newI = InstanceManager.getInstance().getInstance(instanceId); if (newI == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Party.java b/trunk/java/com/l2jserver/gameserver/model/L2Party.java index d67adafc5b..f716d6ecd6 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Party.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Party.java @@ -158,7 +158,7 @@ public class L2Party extends AbstractPlayerGroup */ private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) { - List availableMembers = new ArrayList<>(); + final List availableMembers = new ArrayList<>(); for (L2PcInstance member : getMembers()) { if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) @@ -617,8 +617,8 @@ public class L2Party extends AbstractPlayerGroup else { // Swap party members - L2PcInstance temp = getLeader(); - int p1 = getMembers().indexOf(player); + final L2PcInstance temp = getLeader(); + final int p1 = getMembers().indexOf(player); getMembers().set(0, player); getMembers().set(p1, temp); @@ -635,7 +635,7 @@ public class L2Party extends AbstractPlayerGroup } if (player.isInPartyMatchRoom()) { - PartyMatchRoom room = PartyMatchRoomList.getInstance().getPlayerRoom(player); + final PartyMatchRoom room = PartyMatchRoomList.getInstance().getPlayerRoom(player); room.changeLeader(player); } } @@ -678,7 +678,7 @@ public class L2Party extends AbstractPlayerGroup return; } - L2PcInstance target = getActualLooter(player, item.getId(), false, player); + final L2PcInstance target = getActualLooter(player, item.getId(), false, player); target.addItem("Party", item, player, true); // Send messages to other party members about reward @@ -686,7 +686,7 @@ public class L2Party extends AbstractPlayerGroup { if (item.getCount() > 1) { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2); msg.addString(target.getName()); msg.addItemName(item); msg.addLong(item.getCount()); @@ -694,7 +694,7 @@ public class L2Party extends AbstractPlayerGroup } else { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2); msg.addString(target.getName()); msg.addItemName(item); broadcastToPartyMembers(target, msg); @@ -718,7 +718,7 @@ public class L2Party extends AbstractPlayerGroup return; } - L2PcInstance looter = getActualLooter(player, itemId, spoil, target); + final L2PcInstance looter = getActualLooter(player, itemId, spoil, target); looter.addItem(spoil ? "Sweeper Party" : "Party", itemId, itemCount, target, true); @@ -727,7 +727,7 @@ public class L2Party extends AbstractPlayerGroup { if (itemCount > 1) { - SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2_S_BY_USING_SWEEPER) : SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2); + final SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2_S_BY_USING_SWEEPER) : SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2); msg.addString(looter.getName()); msg.addItemName(itemId); msg.addLong(itemCount); @@ -735,7 +735,7 @@ public class L2Party extends AbstractPlayerGroup } else { - SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_BY_USING_SWEEPER) : SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2); + final SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_BY_USING_SWEEPER) : SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2); msg.addString(looter.getName()); msg.addItemName(itemId); broadcastToPartyMembers(looter, msg); @@ -778,7 +778,7 @@ public class L2Party extends AbstractPlayerGroup { // Now we can actually distribute the adena reward // (Total adena splitted by the number of party members that are in range and must be rewarded) - long count = adena / toReward.size(); + final long count = adena / toReward.size(); for (L2PcInstance member : toReward) { member.addAdena("Party", count, player, true); @@ -837,7 +837,7 @@ public class L2Party extends AbstractPlayerGroup // Add the XP/SP points to the requested party member long addexp = Math.round(member.calcStat(Stats.EXPSP_RATE, xpReward * preCalculation, null, null)); - int addsp = (int) member.calcStat(Stats.EXPSP_RATE, spReward * preCalculation, null, null); + final int addsp = (int) member.calcStat(Stats.EXPSP_RATE, spReward * preCalculation, null, null); addexp = calculateExpSpPartyCutoff(member.getActingPlayer(), topLvl, addexp, addsp, useVitalityRate); if (addexp > 0) @@ -928,7 +928,7 @@ public class L2Party extends AbstractPlayerGroup for (L2PcInstance member : members) { - int sqLevel = member.getLevel() * member.getLevel(); + final int sqLevel = member.getLevel() * member.getLevel(); if ((sqLevel * 100) >= (sqLevelSum * Config.PARTY_XP_CUTOFF_PERCENT)) { validMembers.add(member); @@ -956,7 +956,7 @@ public class L2Party extends AbstractPlayerGroup for (L2PcInstance member : members) { - int sqLevel = member.getLevel() * member.getLevel(); + final int sqLevel = member.getLevel() * member.getLevel(); if (sqLevel >= (sqLevelSum / (members.size() * members.size()))) { validMembers.add(member); @@ -1092,7 +1092,7 @@ public class L2Party extends AbstractPlayerGroup { broadcastPacket(new ExSetPartyLooting(1, _changeRequestDistributionType)); _distributionType = _changeRequestDistributionType; - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PARTY_LOOT_WAS_CHANGED_TO_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PARTY_LOOT_WAS_CHANGED_TO_S1); sm.addSystemString(_changeRequestDistributionType.getSysStringId()); broadcastPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/model/L2PetData.java b/trunk/java/com/l2jserver/gameserver/model/L2PetData.java index f88ef20b35..02d5f72503 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2PetData.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2PetData.java @@ -202,7 +202,7 @@ public class L2PetData } // formula usable for skill that have 10 or more skill levels - int maxLvl = SkillData.getInstance().getMaxLevel(temp.getSkillId()); + final int maxLvl = SkillData.getInstance().getMaxLevel(temp.getSkillId()); if (lvl > maxLvl) { lvl = maxLvl; diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Radar.java b/trunk/java/com/l2jserver/gameserver/model/L2Radar.java index 02d080449f..ae6966a5d4 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Radar.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Radar.java @@ -40,7 +40,7 @@ public final class L2Radar // Add a marker to player's radar public void addMarker(int x, int y, int z) { - RadarMarker newMarker = new RadarMarker(x, y, z); + final RadarMarker newMarker = new RadarMarker(x, y, z); _markers.add(newMarker); _player.sendPacket(new RadarControl(2, 2, x, y, z)); @@ -50,7 +50,7 @@ public final class L2Radar // Remove a marker from player's radar public void removeMarker(int x, int y, int z) { - RadarMarker newMarker = new RadarMarker(x, y, z); + final RadarMarker newMarker = new RadarMarker(x, y, z); _markers.remove(newMarker); _player.sendPacket(new RadarControl(1, 1, x, y, z)); diff --git a/trunk/java/com/l2jserver/gameserver/model/L2RecipeList.java b/trunk/java/com/l2jserver/gameserver/model/L2RecipeList.java index c29977eae6..160171fcb4 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2RecipeList.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2RecipeList.java @@ -97,8 +97,8 @@ public class L2RecipeList */ public void addRecipe(L2RecipeInstance recipe) { - int len = _recipes.length; - L2RecipeInstance[] tmp = new L2RecipeInstance[len + 1]; + final int len = _recipes.length; + final L2RecipeInstance[] tmp = new L2RecipeInstance[len + 1]; System.arraycopy(_recipes, 0, tmp, 0, len); tmp[len] = recipe; _recipes = tmp; @@ -110,8 +110,8 @@ public class L2RecipeList */ public void addStatUse(L2RecipeStatInstance statUse) { - int len = _statUse.length; - L2RecipeStatInstance[] tmp = new L2RecipeStatInstance[len + 1]; + final int len = _statUse.length; + final L2RecipeStatInstance[] tmp = new L2RecipeStatInstance[len + 1]; System.arraycopy(_statUse, 0, tmp, 0, len); tmp[len] = statUse; _statUse = tmp; @@ -123,8 +123,8 @@ public class L2RecipeList */ public void addAltStatChange(L2RecipeStatInstance statChange) { - int len = _altStatChange.length; - L2RecipeStatInstance[] tmp = new L2RecipeStatInstance[len + 1]; + final int len = _altStatChange.length; + final L2RecipeStatInstance[] tmp = new L2RecipeStatInstance[len + 1]; System.arraycopy(_altStatChange, 0, tmp, 0, len); tmp[len] = statChange; _altStatChange = tmp; diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Request.java b/trunk/java/com/l2jserver/gameserver/model/L2Request.java index 0f17477837..e7bf148b00 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Request.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Request.java @@ -101,7 +101,7 @@ public class L2Request } if (partner.getRequest().isProcessingRequest()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); sm.addString(partner.getName()); _player.sendPacket(sm); return false; diff --git a/trunk/java/com/l2jserver/gameserver/model/L2SiegeClan.java b/trunk/java/com/l2jserver/gameserver/model/L2SiegeClan.java index 1aa52bf16b..eadefb00e8 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2SiegeClan.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2SiegeClan.java @@ -48,7 +48,7 @@ public class L2SiegeClan public boolean removeFlag(L2Npc flag) { - boolean ret = _flag.remove(flag); + final boolean ret = _flag.remove(flag); flag.deleteMe(); return ret; } diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Spawn.java b/trunk/java/com/l2jserver/gameserver/model/L2Spawn.java index cbdaafde96..f4fd736043 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Spawn.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Spawn.java @@ -146,7 +146,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable return; } - String className = "com.l2jserver.gameserver.model.actor.instance." + _template.getType() + "Instance"; + final String className = "com.l2jserver.gameserver.model.actor.instance." + _template.getType() + "Instance"; // Create the generic constructor of L2Npc managed by this L2Spawn _constructor = Class.forName(className).asSubclass(L2Npc.class).getConstructor(L2NpcTemplate.class); @@ -543,7 +543,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable } // Call the constructor of the L2Npc - L2Npc npc = _constructor.newInstance(_template); + final L2Npc npc = _constructor.newInstance(_template); npc.setInstanceId(getInstanceId()); // Must be done before object is spawned into visible world if (isSummonSpawn) { @@ -579,7 +579,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable // New method if (isTerritoryBased()) { - int[] p = _spawnTerritory.getRandomPoint(); + final int[] p = _spawnTerritory.getRandomPoint(); newlocx = p[0]; newlocy = p[1]; newlocz = p[2]; @@ -747,8 +747,8 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable _log.warning("respawn delay is negative for spawn:" + this); } - int minDelay = delay - randomInterval; - int maxDelay = delay + randomInterval; + final int minDelay = delay - randomInterval; + final int maxDelay = delay + randomInterval; _respawnMinDelay = Math.max(10, minDelay) * 1000; _respawnMaxDelay = Math.max(10, maxDelay) * 1000; diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Territory.java b/trunk/java/com/l2jserver/gameserver/model/L2Territory.java index 5b576697bf..d699e32c96 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Territory.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Territory.java @@ -100,16 +100,16 @@ public class L2Territory public boolean isIntersect(int x, int y, Point p1, Point p2) { - double dy1 = p1._y - y; - double dy2 = p2._y - y; + final double dy1 = p1._y - y; + final double dy2 = p2._y - y; if (Math.abs(Math.signum(dy1) - Math.signum(dy2)) <= 1e-6) { return false; } - double dx1 = p1._x - x; - double dx2 = p2._x - x; + final double dx1 = p1._x - x; + final double dx2 = p2._x - x; if ((dx1 >= 0) && (dx2 >= 0)) { @@ -121,7 +121,7 @@ public class L2Territory return false; } - double dx0 = (dy1 * (p1._x - p2._x)) / (p1._y - p2._y); + final double dx0 = (dy1 * (p1._x - p2._x)) / (p1._y - p2._y); return dx0 <= dx1; } @@ -131,8 +131,8 @@ public class L2Territory int intersect_count = 0; for (int i = 0; i < _points.size(); i++) { - Point p1 = _points.get(i > 0 ? i - 1 : _points.size() - 1); - Point p2 = _points.get(i); + final Point p1 = _points.get(i > 0 ? i - 1 : _points.size() - 1); + final Point p2 = _points.get(i); if (isIntersect(x, y, p1, p2)) { @@ -148,7 +148,7 @@ public class L2Territory if (_procMax > 0) { int pos = 0; - int rnd = Rnd.nextInt(_procMax); + final int rnd = Rnd.nextInt(_procMax); for (Point p1 : _points) { pos += p1._proc; @@ -161,17 +161,17 @@ public class L2Territory } for (int i = 0; i < 100; i++) { - int x = Rnd.get(_xMin, _xMax); - int y = Rnd.get(_yMin, _yMax); + final int x = Rnd.get(_xMin, _xMax); + final int y = Rnd.get(_yMin, _yMax); if (isInside(x, y)) { double curdistance = 0; int zmin = _zMin; for (Point p1 : _points) { - double dx = p1._x - x; - double dy = p1._y - y; - double distance = Math.sqrt((dx * dx) + (dy * dy)); + final double dx = p1._x - x; + final double dy = p1._y - y; + final double distance = Math.sqrt((dx * dx) + (dy * dy)); if ((curdistance == 0) || (distance < curdistance)) { curdistance = distance; diff --git a/trunk/java/com/l2jserver/gameserver/model/L2World.java b/trunk/java/com/l2jserver/gameserver/model/L2World.java index 0658432aef..73be097c15 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2World.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2World.java @@ -279,7 +279,7 @@ public final class L2World } // Get all visible objects contained in the _visibleObjects of L2WorldRegions // in a circular area of 2000 units - List visibles = getVisibleObjects(object, 2000); + final List visibles = getVisibleObjects(object, 2000); if (Config.DEBUG) { _log.finest("objects in range:" + visibles.size()); @@ -404,7 +404,7 @@ public final class L2World */ public List getVisibleObjects(L2Object object) { - L2WorldRegion reg = object.getWorldRegion(); + final L2WorldRegion reg = object.getWorldRegion(); if (reg == null) { @@ -517,7 +517,7 @@ public final class L2World */ public List getVisiblePlayable(L2Object object) { - L2WorldRegion reg = object.getWorldRegion(); + final L2WorldRegion reg = object.getWorldRegion(); if (reg == null) { return null; @@ -528,8 +528,8 @@ public final class L2World for (L2WorldRegion regi : reg.getSurroundingRegions()) { // Create an Iterator to go through the visible L2Object of the L2WorldRegion - Map _allpls = regi.getVisiblePlayable(); - Collection _playables = _allpls.values(); + final Map _allpls = regi.getVisiblePlayable(); + final Collection _playables = _allpls.values(); // Go through visible object of the selected region for (L2Playable _object : _playables) { diff --git a/trunk/java/com/l2jserver/gameserver/model/L2WorldRegion.java b/trunk/java/com/l2jserver/gameserver/model/L2WorldRegion.java index a77c0c4f98..143890b6c0 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2WorldRegion.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2WorldRegion.java @@ -237,7 +237,7 @@ public final class L2WorldRegion if (o instanceof L2Attackable) { c++; - L2Attackable mob = (L2Attackable) o; + final L2Attackable mob = (L2Attackable) o; // Set target to null and cancel Attack or Cast mob.setTarget(null); @@ -482,9 +482,9 @@ public final class L2WorldRegion { if (obj instanceof L2Npc) { - L2Npc target = (L2Npc) obj; + final L2Npc target = (L2Npc) obj; target.deleteMe(); - L2Spawn spawn = target.getSpawn(); + final L2Spawn spawn = target.getSpawn(); if (spawn != null) { spawn.stopRespawn(); diff --git a/trunk/java/com/l2jserver/gameserver/model/MacroList.java b/trunk/java/com/l2jserver/gameserver/model/MacroList.java index e5e757f458..5184a2ba01 100644 --- a/trunk/java/com/l2jserver/gameserver/model/MacroList.java +++ b/trunk/java/com/l2jserver/gameserver/model/MacroList.java @@ -188,23 +188,23 @@ public class MacroList implements IRestorable { while (rset.next()) { - int id = rset.getInt("id"); - int icon = rset.getInt("icon"); - String name = rset.getString("name"); - String descr = rset.getString("descr"); - String acronym = rset.getString("acronym"); - List commands = new ArrayList<>(); - StringTokenizer st1 = new StringTokenizer(rset.getString("commands"), ";"); + final int id = rset.getInt("id"); + final int icon = rset.getInt("icon"); + final String name = rset.getString("name"); + final String descr = rset.getString("descr"); + final String acronym = rset.getString("acronym"); + final List commands = new ArrayList<>(); + final StringTokenizer st1 = new StringTokenizer(rset.getString("commands"), ";"); while (st1.hasMoreTokens()) { - StringTokenizer st = new StringTokenizer(st1.nextToken(), ","); + final StringTokenizer st = new StringTokenizer(st1.nextToken(), ","); if (st.countTokens() < 3) { continue; } - MacroType type = MacroType.values()[Integer.parseInt(st.nextToken())]; - int d1 = Integer.parseInt(st.nextToken()); - int d2 = Integer.parseInt(st.nextToken()); + final MacroType type = MacroType.values()[Integer.parseInt(st.nextToken())]; + final int d1 = Integer.parseInt(st.nextToken()); + final int d2 = Integer.parseInt(st.nextToken()); String cmd = ""; if (st.hasMoreTokens()) { diff --git a/trunk/java/com/l2jserver/gameserver/model/MobGroup.java b/trunk/java/com/l2jserver/gameserver/model/MobGroup.java index 5b4186b49c..9f352ed8f2 100644 --- a/trunk/java/com/l2jserver/gameserver/model/MobGroup.java +++ b/trunk/java/com/l2jserver/gameserver/model/MobGroup.java @@ -78,7 +78,7 @@ public final class MobGroup { try { - L2ControllableMobAI mobGroupAI = (L2ControllableMobAI) getMobs().get(0).getAI(); + final L2ControllableMobAI mobGroupAI = (L2ControllableMobAI) getMobs().get(0).getAI(); switch (mobGroupAI.getAlternateAI()) { @@ -136,12 +136,12 @@ public final class MobGroup { for (int i = 0; i < getMaxMobCount(); i++) { - L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + final L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); - int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; - int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; - int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE); - int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE); + final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; + final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; + final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE); + final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE); spawn.setX(x + (signX * randX)); spawn.setY(y + (signY * randY)); @@ -178,11 +178,11 @@ public final class MobGroup if (!mobInst.isDead()) { - int x = player.getX() + Rnd.nextInt(50); - int y = player.getY() + Rnd.nextInt(50); + final int x = player.getX() + Rnd.nextInt(50); + final int y = player.getY() + Rnd.nextInt(50); mobInst.teleToLocation(new Location(x, y, player.getZ()), true); - L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); + final L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); ai.follow(player); } } @@ -197,7 +197,7 @@ public final class MobGroup return null; } - int choice = Rnd.nextInt(getActiveMobCount()); + final int choice = Rnd.nextInt(getActiveMobCount()); return getMobs().get(choice); } @@ -261,7 +261,7 @@ public final class MobGroup continue; } - L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); + final L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); ai.setAlternateAI(L2ControllableMobAI.AI_NORMAL); ai.setIntention(CtrlIntention.AI_INTENTION_ACTIVE); } @@ -278,7 +278,7 @@ public final class MobGroup continue; } - L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); + final L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); ai.forceAttack(target); } } @@ -294,7 +294,7 @@ public final class MobGroup continue; } - L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); + final L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); ai.stop(); } } @@ -310,12 +310,12 @@ public final class MobGroup continue; } - int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; - int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; - int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE); - int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE); + final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; + final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; + final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE); + final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE); - L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); + final L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); ai.move(activeChar.getX() + (signX * randX), activeChar.getY() + (signY * randY), activeChar.getZ()); } } @@ -331,7 +331,7 @@ public final class MobGroup continue; } - L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); + final L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); ai.follow(character); } } @@ -347,7 +347,7 @@ public final class MobGroup continue; } - L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); + final L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); ai.setAlternateAI(L2ControllableMobAI.AI_CAST); } } @@ -363,14 +363,14 @@ public final class MobGroup continue; } - L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); + final L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); ai.setNotMoving(enabled); } } protected void removeDead() { - List deadMobs = new LinkedList<>(); + final List deadMobs = new LinkedList<>(); for (L2ControllableMobInstance mobInst : getMobs()) { if ((mobInst != null) && mobInst.isDead()) @@ -406,7 +406,7 @@ public final class MobGroup continue; } - L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); + final L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI(); ai.forceAttackGroup(otherGrp); ai.setIntention(CtrlIntention.AI_INTENTION_ACTIVE); } diff --git a/trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java b/trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java index 987dd563a3..29d5175ec1 100644 --- a/trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java +++ b/trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java @@ -84,7 +84,7 @@ public class PartyMatchRoom implements IIdentifiable { for (L2PcInstance _member : _members) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LEFT_THE_PARTY_ROOM); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LEFT_THE_PARTY_ROOM); sm.addCharName(player); _member.sendPacket(sm); _member.sendPacket(new ExManagePartyRoomMember(player, this, 2)); @@ -94,7 +94,7 @@ public class PartyMatchRoom implements IIdentifiable public void changeLeader(L2PcInstance newLeader) { // Get current leader - L2PcInstance oldLeader = _members.get(0); + final L2PcInstance oldLeader = _members.get(0); // Remove new leader _members.remove(newLeader); // Move him to first position diff --git a/trunk/java/com/l2jserver/gameserver/model/ShortCuts.java b/trunk/java/com/l2jserver/gameserver/model/ShortCuts.java index 5a30e46624..55bd569de0 100644 --- a/trunk/java/com/l2jserver/gameserver/model/ShortCuts.java +++ b/trunk/java/com/l2jserver/gameserver/model/ShortCuts.java @@ -123,7 +123,7 @@ public class ShortCuts implements IRestorable deleteShortCutFromDb(old); if (old.getType() == ShortcutType.ITEM) { - L2ItemInstance item = _owner.getInventory().getItemByObjectId(old.getId()); + final L2ItemInstance item = _owner.getInventory().getItemByObjectId(old.getId()); if ((item != null) && (item.getItemType() == EtcItemType.SHOT)) { @@ -161,7 +161,7 @@ public class ShortCuts implements IRestorable for (int shotId : _owner.getAutoSoulShot()) { - L2ItemInstance item = _owner.getInventory().getItemByObjectId(shotId); + final L2ItemInstance item = _owner.getInventory().getItemByObjectId(shotId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getDefaultAction() == null)) { continue; @@ -240,11 +240,11 @@ public class ShortCuts implements IRestorable { while (rset.next()) { - int slot = rset.getInt("slot"); - int page = rset.getInt("page"); - int type = rset.getInt("type"); - int id = rset.getInt("shortcut_id"); - int level = rset.getInt("level"); + final int slot = rset.getInt("slot"); + final int page = rset.getInt("page"); + final int type = rset.getInt("type"); + final int id = rset.getInt("shortcut_id"); + final int level = rset.getInt("level"); _shortCuts.put(slot + (page * MAX_SHORTCUTS_PER_BAR), new Shortcut(slot, page, ShortcutType.values()[type], id, level, 1)); } @@ -261,7 +261,7 @@ public class ShortCuts implements IRestorable { if (sc.getType() == ShortcutType.ITEM) { - L2ItemInstance item = _owner.getInventory().getItemByObjectId(sc.getId()); + final L2ItemInstance item = _owner.getInventory().getItemByObjectId(sc.getId()); if (item == null) { deleteShortCut(sc.getSlot(), sc.getPage()); @@ -288,7 +288,7 @@ public class ShortCuts implements IRestorable { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/trunk/java/com/l2jserver/gameserver/model/StatsSet.java b/trunk/java/com/l2jserver/gameserver/model/StatsSet.java index 6867a06e9b..884f50cdfd 100644 --- a/trunk/java/com/l2jserver/gameserver/model/StatsSet.java +++ b/trunk/java/com/l2jserver/gameserver/model/StatsSet.java @@ -91,7 +91,7 @@ public class StatsSet implements IParserAdvUtils @Override public boolean getBoolean(String key) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("Boolean value required, but not specified"); @@ -119,7 +119,7 @@ public class StatsSet implements IParserAdvUtils @Override public boolean getBoolean(String key, boolean defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -141,7 +141,7 @@ public class StatsSet implements IParserAdvUtils @Override public byte getByte(String key) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("Byte value required, but not specified"); @@ -163,7 +163,7 @@ public class StatsSet implements IParserAdvUtils @Override public byte getByte(String key, byte defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -184,22 +184,22 @@ public class StatsSet implements IParserAdvUtils public byte[] getByteArray(String key, String splitOn) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("Byte value required, but not specified"); } if (val instanceof Number) { - byte[] result = + final byte[] result = { ((Number) val).byteValue() }; return result; } int c = 0; - String[] vals = ((String) val).split(splitOn); - byte[] result = new byte[vals.length]; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; for (String v : vals) { try @@ -216,7 +216,7 @@ public class StatsSet implements IParserAdvUtils public List getByteList(String key, String splitOn) { - List result = new ArrayList<>(); + final List result = new ArrayList<>(); for (Byte i : getByteArray(key, splitOn)) { result.add(i); @@ -227,7 +227,7 @@ public class StatsSet implements IParserAdvUtils @Override public short getShort(String key) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("Short value required, but not specified"); @@ -249,7 +249,7 @@ public class StatsSet implements IParserAdvUtils @Override public short getShort(String key, short defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -295,7 +295,7 @@ public class StatsSet implements IParserAdvUtils @Override public int getInt(String key, int defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -316,22 +316,22 @@ public class StatsSet implements IParserAdvUtils public int[] getIntArray(String key, String splitOn) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("Integer value required, but not specified"); } if (val instanceof Number) { - int[] result = + final int[] result = { ((Number) val).intValue() }; return result; } int c = 0; - String[] vals = ((String) val).split(splitOn); - int[] result = new int[vals.length]; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; for (String v : vals) { try @@ -348,7 +348,7 @@ public class StatsSet implements IParserAdvUtils public List getIntegerList(String key, String splitOn) { - List result = new ArrayList<>(); + final List result = new ArrayList<>(); for (int i : getIntArray(key, splitOn)) { result.add(i); @@ -359,7 +359,7 @@ public class StatsSet implements IParserAdvUtils @Override public long getLong(String key) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("Long value required, but not specified"); @@ -381,7 +381,7 @@ public class StatsSet implements IParserAdvUtils @Override public long getLong(String key, long defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -403,7 +403,7 @@ public class StatsSet implements IParserAdvUtils @Override public float getFloat(String key) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("Float value required, but not specified"); @@ -425,7 +425,7 @@ public class StatsSet implements IParserAdvUtils @Override public float getFloat(String key, float defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -447,7 +447,7 @@ public class StatsSet implements IParserAdvUtils @Override public double getDouble(String key) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("Double value required, but not specified"); @@ -469,7 +469,7 @@ public class StatsSet implements IParserAdvUtils @Override public double getDouble(String key, double defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -491,7 +491,7 @@ public class StatsSet implements IParserAdvUtils @Override public String getString(String key) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("String value required, but not specified"); @@ -502,7 +502,7 @@ public class StatsSet implements IParserAdvUtils @Override public String getString(String key, String defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -513,7 +513,7 @@ public class StatsSet implements IParserAdvUtils @Override public Duration getDuration(String key) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("String value required, but not specified"); @@ -524,7 +524,7 @@ public class StatsSet implements IParserAdvUtils @Override public Duration getDuration(String key, Duration defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -536,7 +536,7 @@ public class StatsSet implements IParserAdvUtils @SuppressWarnings("unchecked") public > T getEnum(String key, Class enumClass) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); @@ -559,7 +559,7 @@ public class StatsSet implements IParserAdvUtils @SuppressWarnings("unchecked") public > T getEnum(String key, Class enumClass, T defaultValue) { - Object val = _set.get(key); + final Object val = _set.get(key); if (val == null) { return defaultValue; @@ -581,7 +581,7 @@ public class StatsSet implements IParserAdvUtils @SuppressWarnings("unchecked") public final A getObject(String name, Class type) { - Object obj = _set.get(name); + final Object obj = _set.get(name); if ((obj == null) || !type.isAssignableFrom(obj.getClass())) { return null; @@ -592,7 +592,7 @@ public class StatsSet implements IParserAdvUtils public SkillHolder getSkillHolder(String key) { - Object obj = _set.get(key); + final Object obj = _set.get(key); if ((obj == null) || !(obj instanceof SkillHolder)) { return null; @@ -604,7 +604,7 @@ public class StatsSet implements IParserAdvUtils @SuppressWarnings("unchecked") public List getMinionList(String key) { - Object obj = _set.get(key); + final Object obj = _set.get(key); if ((obj == null) || !(obj instanceof List)) { return Collections.emptyList(); diff --git a/trunk/java/com/l2jserver/gameserver/model/TradeList.java b/trunk/java/com/l2jserver/gameserver/model/TradeList.java index 3e42f7c4f7..c1cd794871 100644 --- a/trunk/java/com/l2jserver/gameserver/model/TradeList.java +++ b/trunk/java/com/l2jserver/gameserver/model/TradeList.java @@ -125,7 +125,7 @@ public class TradeList final List list = new LinkedList<>(); for (TradeItem item : _items) { - int el[] = new int[6]; + final int el[] = new int[6]; for (int i = 0; i < 6; i++) { el[i] = item.getElementDefAttr((byte) i); @@ -215,14 +215,14 @@ public class TradeList return null; } - L2Object o = L2World.getInstance().findObject(objectId); + final L2Object o = L2World.getInstance().findObject(objectId); if (!(o instanceof L2ItemInstance)) { _log.warning(_owner.getName() + ": Trying to add something other than an item!"); return null; } - L2ItemInstance item = (L2ItemInstance) o; + final L2ItemInstance item = (L2ItemInstance) o; if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { _log.warning(_owner.getName() + ": Attempt to add a restricted item!"); @@ -262,7 +262,7 @@ public class TradeList } } - TradeItem titem = new TradeItem(item, count, price); + final TradeItem titem = new TradeItem(item, count, price); _items.add(titem); // If Player has already confirmed this trade, invalidate the confirmation @@ -290,7 +290,7 @@ public class TradeList return null; } - L2Item item = ItemTable.getInstance().getTemplate(itemId); + final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { _log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); @@ -314,7 +314,7 @@ public class TradeList return null; } - TradeItem titem = new TradeItem(item, count, price, enchantLevel, attackAttribute, attackAttributeValue, defenseAttributes, appearanceId); + final TradeItem titem = new TradeItem(item, count, price, enchantLevel, attackAttribute, attackAttributeValue, defenseAttributes, appearanceId); _items.add(titem); // If Player has already confirmed this trade, invalidate the confirmation @@ -344,7 +344,7 @@ public class TradeList // If Partner has already confirmed this trade, invalidate the confirmation if (_partner != null) { - TradeList partnerList = _partner.getActiveTradeList(); + final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); @@ -376,7 +376,7 @@ public class TradeList { for (TradeItem titem : _items) { - L2ItemInstance item = _owner.getInventory().getItemByObjectId(titem.getObjectId()); + final L2ItemInstance item = _owner.getInventory().getItemByObjectId(titem.getObjectId()); if ((item == null) || (titem.getCount() < 1)) { removeItem(titem.getObjectId(), -1, -1); @@ -419,7 +419,7 @@ public class TradeList // If Partner has already confirmed this trade, proceed exchange if (_partner != null) { - TradeList partnerList = _partner.getActiveTradeList(); + final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); @@ -498,7 +498,7 @@ public class TradeList // Check for Item validity for (TradeItem titem : _items) { - L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer"); + final L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer"); if ((item == null) || (item.getCount() < 1)) { _log.warning(_owner.getName() + ": Invalid Item in TradeList"); @@ -520,12 +520,12 @@ public class TradeList { for (TradeItem titem : _items) { - L2ItemInstance oldItem = _owner.getInventory().getItemByObjectId(titem.getObjectId()); + final L2ItemInstance oldItem = _owner.getInventory().getItemByObjectId(titem.getObjectId()); if (oldItem == null) { return false; } - L2ItemInstance newItem = _owner.getInventory().transferItem("Trade", titem.getObjectId(), titem.getCount(), partner.getInventory(), _owner, _partner); + final L2ItemInstance newItem = _owner.getInventory().transferItem("Trade", titem.getObjectId(), titem.getCount(), partner.getInventory(), _owner, _partner); if (newItem == null) { return false; @@ -573,7 +573,7 @@ public class TradeList { continue; } - L2Item template = ItemTable.getInstance().getTemplate(item.getItem().getId()); + final L2Item template = ItemTable.getInstance().getTemplate(item.getItem().getId()); if (template == null) { continue; @@ -604,7 +604,7 @@ public class TradeList { continue; } - L2Item template = ItemTable.getInstance().getTemplate(item.getItem().getId()); + final L2Item template = ItemTable.getInstance().getTemplate(item.getItem().getId()); if (template == null) { continue; @@ -637,8 +637,8 @@ public class TradeList else { // Prepare inventory update packet - InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items partnerList.TransferItems(getOwner(), partnerIU, ownerIU); @@ -757,7 +757,7 @@ public class TradeList } // Check if requested item is available for manipulation - L2ItemInstance oldItem = _owner.checkItemManipulation(item.getObjectId(), item.getCount(), "sell"); + final L2ItemInstance oldItem = _owner.checkItemManipulation(item.getObjectId(), item.getCount(), "sell"); if ((oldItem == null) || !oldItem.isTradeable()) { // private store sell invalid item - disable it @@ -765,7 +765,7 @@ public class TradeList return 2; } - L2Item template = ItemTable.getInstance().getTemplate(item.getItemId()); + final L2Item template = ItemTable.getInstance().getTemplate(item.getItemId()); if (template == null) { continue; @@ -824,7 +824,7 @@ public class TradeList } // Check if requested item is available for manipulation - L2ItemInstance oldItem = _owner.checkItemManipulation(item.getObjectId(), item.getCount(), "sell"); + final L2ItemInstance oldItem = _owner.checkItemManipulation(item.getObjectId(), item.getCount(), "sell"); if (oldItem == null) { // should not happens - validation already done @@ -834,7 +834,7 @@ public class TradeList } // Proceed with item transfer - L2ItemInstance newItem = ownerInventory.transferItem("PrivateStore", item.getObjectId(), item.getCount(), playerInventory, _owner, player); + final L2ItemInstance newItem = ownerInventory.transferItem("PrivateStore", item.getObjectId(), item.getCount(), playerInventory, _owner, player); if (newItem == null) { ok = false; @@ -964,7 +964,7 @@ public class TradeList break; } - long _totalPrice = totalPrice + (item.getCount() * item.getPrice()); + final long _totalPrice = totalPrice + (item.getCount() * item.getPrice()); // check for overflow of the total price if ((MAX_ADENA < _totalPrice) || (_totalPrice < 0)) { @@ -1008,7 +1008,7 @@ public class TradeList } // Proceed with item transfer - L2ItemInstance newItem = playerInventory.transferItem("PrivateStore", objectId, item.getCount(), ownerInventory, player, _owner); + final L2ItemInstance newItem = playerInventory.transferItem("PrivateStore", objectId, item.getCount(), ownerInventory, player, _owner); if (newItem == null) { continue; diff --git a/trunk/java/com/l2jserver/gameserver/model/UIKeysSettings.java b/trunk/java/com/l2jserver/gameserver/model/UIKeysSettings.java index 47a8a742d5..b924da7795 100644 --- a/trunk/java/com/l2jserver/gameserver/model/UIKeysSettings.java +++ b/trunk/java/com/l2jserver/gameserver/model/UIKeysSettings.java @@ -188,12 +188,12 @@ public class UIKeysSettings { while (rs.next()) { - int cat = rs.getInt("cat"); - int cmd = rs.getInt("cmd"); - int key = rs.getInt("key"); - int tgKey1 = rs.getInt("tgKey1"); - int tgKey2 = rs.getInt("tgKey2"); - int show = rs.getInt("show"); + final int cat = rs.getInt("cat"); + final int cmd = rs.getInt("cmd"); + final int key = rs.getInt("key"); + final int tgKey1 = rs.getInt("tgKey1"); + final int tgKey2 = rs.getInt("tgKey2"); + final int show = rs.getInt("show"); UIData.addKey(_storedKeys, cat, new ActionKey(cat, cmd, key, tgKey1, tgKey2, show)); } } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Attackable.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Attackable.java index 74a96f5dd1..f88db01b74 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Attackable.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Attackable.java @@ -351,7 +351,7 @@ public class L2Attackable extends L2Npc // Delayed notification EventDispatcher.getInstance().notifyEventAsyncDelayed(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this, _onKillDelay); // if killer have stat hpRestoreOnKill - int hpRestore = (int) killer.getStat().calcStat(Stats.HP_RESTORE_ON_KILL, 0, null, null); + final int hpRestore = (int) killer.getStat().calcStat(Stats.HP_RESTORE_ON_KILL, 0, null, null); if (hpRestore > 0) { double amount = (killer.getMaxHp() * hpRestore) / 100; @@ -479,7 +479,7 @@ public class L2Attackable extends L2Npc // If this attacker have servitor, get Exp Penalty applied for the servitor. float penalty = 1; - Optional summon = attacker.getServitors().values().stream().filter(s -> ((L2ServitorInstance) s).getExpMultiplier() > 1).findFirst(); + final Optional summon = attacker.getServitors().values().stream().filter(s -> ((L2ServitorInstance) s).getExpMultiplier() > 1).findFirst(); if (summon.isPresent()) { penalty = ((L2ServitorInstance) summon.get()).getExpMultiplier(); @@ -511,7 +511,7 @@ public class L2Attackable extends L2Npc exp *= penalty; // Check for an over-hit enabled strike - L2Character overhitAttacker = getOverhitAttacker(); + final L2Character overhitAttacker = getOverhitAttacker(); if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); @@ -623,7 +623,7 @@ public class L2Attackable extends L2Npc // Check for an over-hit enabled strike // (When in party, the over-hit exp bonus is given to the whole party and splitted proportionally through the party members) - L2Character overhitAttacker = getOverhitAttacker(); + final L2Character overhitAttacker = getOverhitAttacker(); if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); @@ -760,7 +760,7 @@ public class L2Attackable extends L2Npc if (target == null) // whole aggrolist { - L2Character mostHated = getMostHated(); + final L2Character mostHated = getMostHated(); if (mostHated == null) // makes target passive for a moment more { ((L2AttackableAI) getAI()).setGlobalAggro(-25); @@ -783,7 +783,7 @@ public class L2Attackable extends L2Npc return; } - AggroInfo ai = _aggroList.get(target); + final AggroInfo ai = _aggroList.get(target); if (ai == null) { _log.info("Target " + target + " not present in aggro list of " + this); @@ -810,7 +810,7 @@ public class L2Attackable extends L2Npc { return; } - AggroInfo ai = _aggroList.get(target); + final AggroInfo ai = _aggroList.get(target); if (ai != null) { ai.stopHate(); @@ -862,7 +862,7 @@ public class L2Attackable extends L2Npc L2Character mostHated = null; L2Character secondMostHated = null; int maxHate = 0; - List result = new ArrayList<>(); + final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed // Go through the aggroList of the L2Attackable @@ -901,7 +901,7 @@ public class L2Attackable extends L2Npc return null; } - List result = new ArrayList<>(); + final List result = new ArrayList<>(); for (AggroInfo ai : _aggroList.values()) { if (ai == null) @@ -934,7 +934,7 @@ public class L2Attackable extends L2Npc if (ai.getAttacker() instanceof L2PcInstance) { - L2PcInstance act = (L2PcInstance) ai.getAttacker(); + final L2PcInstance act = (L2PcInstance) ai.getAttacker(); if (act.isInvisible() || ai.getAttacker().isInvul() || act.isSpawnProtected()) { // Remove Object Should Use This Method and Can be Blocked While Interacting @@ -986,7 +986,7 @@ public class L2Attackable extends L2Npc return; } - L2PcInstance player = mainDamageDealer.getActingPlayer(); + final L2PcInstance player = mainDamageDealer.getActingPlayer(); // Don't drop anything if the last attacker or owner isn't L2PcInstance if (player == null) @@ -1001,12 +1001,12 @@ public class L2Attackable extends L2Npc _sweepItems.set(npcTemplate.calculateDrops(DropListScope.CORPSE, this, player)); } - Collection deathItems = npcTemplate.calculateDrops(DropListScope.DEATH, this, player); + final Collection deathItems = npcTemplate.calculateDrops(DropListScope.DEATH, this, player); if (deathItems != null) { for (ItemHolder drop : deathItems) { - L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); + final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active if (isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) { @@ -1033,7 +1033,7 @@ public class L2Attackable extends L2Npc if (Config.L2JMOD_CHAMPION_ENABLE && isChampion() && ((Config.L2JMOD_CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.L2JMOD_CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) { int champqty = Rnd.get(Config.L2JMOD_CHAMPION_REWARD_QTY); - ItemHolder item = new ItemHolder(Config.L2JMOD_CHAMPION_REWARD_ID, ++champqty); + final ItemHolder item = new ItemHolder(Config.L2JMOD_CHAMPION_REWARD_ID, ++champqty); if ((player.getLevel() <= getLevel()) && (Rnd.get(100) < Config.L2JMOD_CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE)) { @@ -1081,7 +1081,7 @@ public class L2Attackable extends L2Npc return; } - L2PcInstance player = lastAttacker.getActingPlayer(); + final L2PcInstance player = lastAttacker.getActingPlayer(); // Don't drop anything if the last attacker or owner isn't L2PcInstance if (player == null) @@ -1242,7 +1242,7 @@ public class L2Attackable extends L2Npc { // Calculate the over-hit damage // Ex: mob had 10 HP left, over-hit skill did 50 damage total, over-hit damage is 40 - double overhitDmg = -(getCurrentHp() - damage); + final double overhitDmg = -(getCurrentHp() - damage); if (overhitDmg < 0) { // we didn't killed the mob with the over-hit strike. (it wasn't really an over-hit strike) @@ -1366,7 +1366,7 @@ public class L2Attackable extends L2Npc { if (diff > 5) // formula revised May 07 { - double pow = Math.pow((double) 5 / 6, diff - 5); + final double pow = Math.pow((double) 5 / 6, diff - 5); xp = xp * pow; sp = sp * pow; } @@ -1381,7 +1381,7 @@ public class L2Attackable extends L2Npc sp = 0; } } - int[] tmp = + final int[] tmp = { (int) xp, (int) sp @@ -1402,10 +1402,10 @@ public class L2Attackable extends L2Npc // Get the overhit exp bonus according to the above over-hit damage percentage // (1/1 basis - 13% of over-hit damage, 13% of extra exp is given, and so on...) - double overhitExp = ((overhitPercentage / 100) * normalExp); + final double overhitExp = ((overhitPercentage / 100) * normalExp); // Return the rounded ammount of exp points to be added to the player's normal exp reward - long bonusOverhit = Math.round(overhitExp); + final long bonusOverhit = Math.round(overhitExp); return bonusOverhit; } diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java index 101d789223..476254caf5 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java @@ -438,7 +438,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe @Override public final boolean isInsideZone(ZoneId zone) { - Instance instance = InstanceManager.getInstance().getInstance(getInstanceId()); + final Instance instance = InstanceManager.getInstance().getInstance(getInstanceId()); switch (zone) { case PVP: @@ -588,7 +588,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void broadcastPacket(L2GameServerPacket mov) { mov.setInvisible(isInvisible()); - Collection plrs = getKnownList().getKnownPlayers().values(); + final Collection plrs = getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if (player != null) @@ -609,7 +609,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void broadcastPacket(L2GameServerPacket mov, int radiusInKnownlist) { mov.setInvisible(isInvisible()); - Collection plrs = getKnownList().getKnownPlayers().values(); + final Collection plrs = getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if ((player != null) && isInsideRadius(player, radiusInKnownlist, false, false)) @@ -624,8 +624,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ protected boolean needHpUpdate() { - double currentHp = getCurrentHp(); - double maxHp = getMaxHp(); + final double currentHp = getCurrentHp(); + final double maxHp = getMaxHp(); if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) { @@ -641,7 +641,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - double doubleMulti = currentHp / _hpUpdateInterval; + final double doubleMulti = currentHp / _hpUpdateInterval; int intMulti = (int) doubleMulti; _hpUpdateDecCheck = _hpUpdateInterval * (doubleMulti < intMulti ? intMulti-- : intMulti); @@ -671,7 +671,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Create the Server->Client packet StatusUpdate with current HP - StatusUpdate su = new StatusUpdate(this); + final StatusUpdate su = new StatusUpdate(this); su.addAttribute(StatusUpdate.MAX_HP, getMaxHp()); su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp()); @@ -822,7 +822,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { return true; } - L2Weapon weaponItem = getActiveWeaponItem(); + final L2Weapon weaponItem = getActiveWeaponItem(); if ((weaponItem == null) || !weaponItem.isRange()) { @@ -959,7 +959,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Check if attacker's weapon can attack if (getActiveWeaponItem() != null) { - L2Weapon wpn = getActiveWeaponItem(); + final L2Weapon wpn = getActiveWeaponItem(); if (!wpn.isAttackWeapon() && !isGM()) { if (wpn.getItemType() == WeaponType.FISHINGROD) @@ -1019,13 +1019,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe target.getKnownList().addKnownObject(this); - L2Weapon weaponItem = getActiveWeaponItem(); + final L2Weapon weaponItem = getActiveWeaponItem(); final int timeAtk = calculateTimeBetweenAttacks(); final int timeToHit = timeAtk / 2; - Attack attack = new Attack(this, target, isChargedShot(ShotType.SOULSHOTS), (weaponItem != null) ? weaponItem.getItemGrade().ordinal() : 0); + final Attack attack = new Attack(this, target, isChargedShot(ShotType.SOULSHOTS), (weaponItem != null) ? weaponItem.getItemGrade().ordinal() : 0); setHeading(Util.calculateHeadingFrom(this, target)); - int reuse = calculateReuseTime(weaponItem); + final int reuse = calculateReuseTime(weaponItem); boolean hitted = false; switch (getAttackType()) @@ -1162,7 +1162,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe boolean crit1 = false; // Calculate if hit is missed or not - boolean miss1 = Formulas.calcHitMiss(this, target); + final boolean miss1 = Formulas.calcHitMiss(this, target); // Consume arrows reduceArrowCount(false); @@ -1231,7 +1231,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe boolean crit1 = false; // Calculate if hit is missed or not - boolean miss1 = Formulas.calcHitMiss(this, target); + final boolean miss1 = Formulas.calcHitMiss(this, target); // Consume bolts reduceArrowCount(true); @@ -1258,7 +1258,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(SystemMessageId.YOUR_CROSSBOW_IS_PREPARING_TO_FIRE); // Send a Server->Client packet SetupGauge - SetupGauge sg = new SetupGauge(SetupGauge.RED, sAtk + reuse); + final SetupGauge sg = new SetupGauge(SetupGauge.RED, sAtk + reuse); sendPacket(sg); } @@ -1301,8 +1301,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe boolean crit2 = false; // Calculate if hits are missed or not - boolean miss1 = Formulas.calcHitMiss(this, target); - boolean miss2 = Formulas.calcHitMiss(this, target); + final boolean miss1 = Formulas.calcHitMiss(this, target); + final boolean miss2 = Formulas.calcHitMiss(this, target); // Check if hit 1 isn't missed if (!miss1) @@ -1369,8 +1369,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // double angleChar; - int maxRadius = getStat().getPhysicalAttackRange(); - int maxAngleDiff = getStat().getPhysicalAttackAngle(); + final int maxRadius = getStat().getPhysicalAttackRange(); + final int maxAngleDiff = getStat().getPhysicalAttackAngle(); // o1 x: 83420 y: 148158 (Giran) // o2 x: 83379 y: 148081 (Giran) @@ -1397,13 +1397,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // angleChar = Util.convertHeadingToDegree(getHeading()); // H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599). - int attackRandomCountMax = (int) getStat().calcStat(Stats.ATTACK_COUNT_MAX, 1, null, null); + final int attackRandomCountMax = (int) getStat().calcStat(Stats.ATTACK_COUNT_MAX, 1, null, null); int attackcount = 0; // if (angleChar <= 0) angleChar += 360; double attackpercent = 85; L2Character temp; - Collection objs = getKnownList().getKnownObjects().values(); + final Collection objs = getKnownList().getKnownObjects().values(); for (L2Object obj : objs) { @@ -1497,7 +1497,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe boolean crit1 = false; // Calculate if hit is missed or not - boolean miss1 = Formulas.calcHitMiss(this, target); + final boolean miss1 = Formulas.calcHitMiss(this, target); // Check if hit isn't missed if (!miss1) @@ -1616,7 +1616,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Set the target of the skill in function of Skill Type and Target Type L2Character target = null; // Get all possible targets of the skill in a table in function of the skill target type - L2Object[] targets = skill.getTargetList(this); + final L2Object[] targets = skill.getTargetList(this); boolean doit = false; @@ -1747,7 +1747,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Identifier of the skill - int magicId = skill.getId(); + final int magicId = skill.getId(); // Get the Base Casting Time of the Skills. int skillTime = (skill.getHitTime() + skill.getCoolTime()); @@ -1816,7 +1816,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe reuseDelay = (int) (skill.getReuseDelay() * calcStat(Stats.DANCE_REUSE, 1, null, null)); } - boolean skillMastery = Formulas.calcSkillMastery(this, skill); + final boolean skillMastery = Formulas.calcSkillMastery(this, skill); // Skill reuse check if ((reuseDelay > 30000) && !skillMastery) @@ -1825,11 +1825,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Check if this skill consume mp on start casting - int initmpcons = getStat().getMpInitialConsume(skill); + final int initmpcons = getStat().getMpInitialConsume(skill); if (initmpcons > 0) { getStatus().reduceMp(initmpcons); - StatusUpdate su = new StatusUpdate(this); + final StatusUpdate su = new StatusUpdate(this); su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp()); sendPacket(su); } @@ -1941,7 +1941,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe ThreadPoolManager.getInstance().scheduleEffect(new FlyToLocationTask(this, target, skill), 50); } - MagicUseTask mut = new MagicUseTask(this, targets, skill, skillTime, simultaneously); + final MagicUseTask mut = new MagicUseTask(this, targets, skill, skillTime, simultaneously); // launch the magic in skillTime milliseconds if (skillTime > 0) @@ -1959,7 +1959,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (simultaneously) { - Future future = _skillCast2; + final Future future = _skillCast2; if (future != null) { future.cancel(true); @@ -1972,7 +1972,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - Future future = _skillCast; + final Future future = _skillCast; if (future != null) { future.cancel(true); @@ -2055,7 +2055,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // prevent casting signets to peace zone if (skill.isChanneling() && (skill.getChannelingSkillId() > 0)) { - L2WorldRegion region = getWorldRegion(); + final L2WorldRegion region = getWorldRegion(); if (region == null) { return false; @@ -2063,7 +2063,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe boolean canCast = true; if ((skill.getTargetType() == L2TargetType.GROUND) && isPlayer()) { - Location wp = getActingPlayer().getCurrentSkillWorldPosition(); + final Location wp = getActingPlayer().getCurrentSkillWorldPosition(); if (!region.checkEffectRangeInsidePeaceZone(skill, wp.getX(), wp.getY(), wp.getZ())) { canCast = false; @@ -2075,7 +2075,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } if (!canCast) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); sm.addSkillName(skill); sendPacket(sm); return false; @@ -2085,7 +2085,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Check if the caster's weapon is limited to use only its own skills if (getActiveWeaponItem() != null) { - L2Weapon wep = getActiveWeaponItem(); + final L2Weapon wep = getActiveWeaponItem(); if (wep.useWeaponSkillsOnly() && !isGM() && wep.hasSkills()) { boolean found = false; @@ -2113,7 +2113,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if ((skill.getItemConsumeId() > 0) && (getInventory() != null)) { // Get the L2ItemInstance consumed by the spell - L2ItemInstance requiredItems = getInventory().getItemByItemId(skill.getItemConsumeId()); + final L2ItemInstance requiredItems = getInventory().getItemByItemId(skill.getItemConsumeId()); // Check if the caster owns enough consumed Item to cast if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount())) @@ -2121,7 +2121,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Checked: when a summon skill failed, server show required consume item count if (skill.hasEffectType(L2EffectType.SUMMON)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SUMMONING_A_SERVITOR_COSTS_S2_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SUMMONING_A_SERVITOR_COSTS_S2_S1); sm.addItemName(skill.getItemConsumeId()); sm.addInt(skill.getItemConsumeCount()); sendPacket(sm); @@ -2920,7 +2920,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else if (isNpc()) { - Collection plrs = getKnownList().getKnownPlayers().values(); + final Collection plrs = getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if ((player == null) || !isVisibleFor(player)) @@ -3530,7 +3530,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Select the Calculator of the affected state in the Calculator set - int stat = function.getStat().ordinal(); + final int stat = function.getStat().ordinal(); if (_calculators[stat] == null) { @@ -3601,7 +3601,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Select the Calculator of the affected state in the Calculator set - int stat = function.getStat().ordinal(); + final int stat = function.getStat().ordinal(); synchronized (this) { @@ -3760,7 +3760,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (isSummon()) { - L2Summon summon = (L2Summon) this; + final L2Summon summon = (L2Summon) this; if (summon.getOwner() != null) { summon.updateAndBroadcastStatus(1); @@ -3768,8 +3768,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - boolean broadcastFull = true; - StatusUpdate su = new StatusUpdate(this); + final boolean broadcastFull = true; + final StatusUpdate su = new StatusUpdate(this); UserInfo info = null; if (isPlayer()) { @@ -3883,7 +3883,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (broadcastFull) { - Collection plrs = getKnownList().getKnownPlayers().values(); + final Collection plrs = getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if ((player == null) || !isVisibleFor(player)) @@ -3914,7 +3914,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final int getXdestination() { - MoveData m = _move; + final MoveData m = _move; if (m != null) { @@ -3929,7 +3929,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final int getYdestination() { - MoveData m = _move; + final MoveData m = _move; if (m != null) { @@ -3944,7 +3944,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final int getZdestination() { - MoveData m = _move; + final MoveData m = _move; if (m != null) { @@ -3975,7 +3975,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final boolean isOnGeodataPath() { - MoveData m = _move; + final MoveData m = _move; if (m == null) { return false; @@ -4109,7 +4109,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean updatePosition() { // Get movement data - MoveData m = _move; + final MoveData m = _move; if (m == null) { @@ -4130,7 +4130,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m._yAccurate = getY(); } - int gameTicks = GameTimeController.getInstance().getGameTicks(); + final int gameTicks = GameTimeController.getInstance().getGameTicks(); // Check if the position has already been calculated if (m._moveTimestamp == gameTicks) @@ -4138,8 +4138,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return false; } - int xPrev = getX(); - int yPrev = getY(); + final int xPrev = getX(); + final int yPrev = getY(); int zPrev = getZ(); // the z coordinate may be modified by coordinate synchronizations double dx, dy, dz; @@ -4162,7 +4162,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if ((Config.COORD_SYNCHRONIZE == 2) && !isFloating && !m.disregardingGeodata && ((GameTimeController.getInstance().getGameTicks() % 10) == 0 // once a second to reduce possible cpu load ) && GeoData.getInstance().hasGeo(xPrev, yPrev)) { - int geoHeight = GeoData.getInstance().getSpawnHeight(xPrev, yPrev, zPrev); + final int geoHeight = GeoData.getInstance().getSpawnHeight(xPrev, yPrev, zPrev); dz = m._zDestination - geoHeight; // quite a big difference, compare to validatePosition packet if (isPlayer() && (Math.abs(getActingPlayer().getClientZ() - geoHeight) > 200) && (Math.abs(getActingPlayer().getClientZ() - geoHeight) < 1500)) @@ -4234,7 +4234,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe getAI().notifyEvent(CtrlEvent.EVT_ARRIVED); } - catch (final Throwable e) + catch (Throwable e) { _log.log(Level.WARNING, "", e); } @@ -4408,7 +4408,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void moveToLocation(int x, int y, int z, int offset) { // Get the Move Speed of the L2Charcater - double speed = getMoveSpeed(); + final double speed = getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { return; @@ -4436,7 +4436,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // distance in a click can easily be over 3000 if (isInsideZone(ZoneId.WATER) && (distance > 700)) { - double divider = 700 / distance; + final double divider = 700 / distance; x = curX + (int) (divider * dx); y = curY + (int) (divider * dy); z = curZ + (int) (divider * dz); @@ -4498,7 +4498,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Create and Init a MoveData object - MoveData m = new MoveData(); + final MoveData m = new MoveData(); // GEODATA MOVEMENT CHECKS AND PATHFINDING m.onGeodataPathIndex = -1; // Initialize not on geodata path @@ -4513,12 +4513,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m.disregardingGeodata = true; } - double originalDistance = distance; - int originalX = x; - int originalY = y; - int originalZ = z; - int gtx = (originalX - L2World.MAP_MIN_X) >> 4; - int gty = (originalY - L2World.MAP_MIN_Y) >> 4; + final double originalDistance = distance; + final int originalX = x; + final int originalY = y; + final int originalZ = z; + final int gtx = (originalX - L2World.MAP_MIN_X) >> 4; + final int gty = (originalY - L2World.MAP_MIN_Y) >> 4; // Movement checks: // When pathfinding enabled, for all characters except monsters returning home (could be changed later to teleport if pathfinding fails) @@ -4560,7 +4560,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } return; } - Location destiny = GeoData.getInstance().moveCheck(curX, curY, curZ, x, y, z, getInstanceId()); + final Location destiny = GeoData.getInstance().moveCheck(curX, curY, curZ, x, y, z, getInstanceId()); // location different if destination wasn't reached (or just z coord is different) x = destiny.getX(); y = destiny.getY(); @@ -4659,7 +4659,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Caclulate the Nb of ticks between the current position and the destination // One tick added for rounding reasons - int ticksToMove = 1 + (int) ((GameTimeController.TICKS_PER_SECOND * distance) / speed); + final int ticksToMove = 1 + (int) ((GameTimeController.TICKS_PER_SECOND * distance) / speed); m._xDestination = x; m._yDestination = y; m._zDestination = z; // this is what was requested from client @@ -4701,7 +4701,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Move Speed of the L2Charcater - double speed = getMoveSpeed(); + final double speed = getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { // Cancel the move action @@ -4709,14 +4709,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return false; } - MoveData md = _move; + final MoveData md = _move; if (md == null) { return false; } // Create and Init a MoveData object - MoveData m = new MoveData(); + final MoveData m = new MoveData(); // Update MoveData object m.onGeodataPathIndex = md.onGeodataPathIndex + 1; // next segment @@ -4738,9 +4738,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m._yDestination = md.geoPath.get(m.onGeodataPathIndex).getY(); m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); } - double dx = (m._xDestination - super.getX()); - double dy = (m._yDestination - super.getY()); - double distance = Math.sqrt((dx * dx) + (dy * dy)); + final double dx = (m._xDestination - super.getX()); + final double dy = (m._yDestination - super.getY()); + final double distance = Math.sqrt((dx * dx) + (dy * dy)); // Calculate and set the heading of the L2Character if (distance != 0) { @@ -4749,7 +4749,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Caclulate the Nb of ticks between the current position and the destination // One tick added for rounding reasons - int ticksToMove = 1 + (int) ((GameTimeController.TICKS_PER_SECOND * distance) / speed); + final int ticksToMove = 1 + (int) ((GameTimeController.TICKS_PER_SECOND * distance) / speed); m._heading = 0; // initial value for coordinate sync @@ -4772,7 +4772,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // to destination by GameTimeController // Send a Server->Client packet CharMoveToLocation to the actor and all L2PcInstance in its _knownPlayers - MoveToLocation msg = new MoveToLocation(this); + final MoveToLocation msg = new MoveToLocation(this); broadcastPacket(msg); return true; @@ -4780,7 +4780,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean validateMovementHeading(int heading) { - MoveData m = _move; + final MoveData m = _move; if (m == null) { @@ -4943,7 +4943,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (getLevel() > (target.getLevel() + 8)) { - Skill skill = CommonSkill.RAID_CURSE2.getSkill(); + final Skill skill = CommonSkill.RAID_CURSE2.getSkill(); if (skill != null) { @@ -4964,14 +4964,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If L2Character target is a L2PcInstance, send a system message if (target.isPlayer()) { - L2PcInstance enemy = target.getActingPlayer(); + final L2PcInstance enemy = target.getActingPlayer(); enemy.getAI().clientStartAutoAttack(); } if (!miss && (damage > 0)) { - L2Weapon weapon = getActiveWeaponItem(); - boolean isBow = ((weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW))); + final L2Weapon weapon = getActiveWeaponItem(); + final boolean isBow = ((weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW))); int reflectedDamage = 0; if (!isBow && !target.isInvul()) // Do not reflect if weapon is of type bow or target is invunlerable @@ -4980,7 +4980,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!target.isRaid() || (getActingPlayer() == null) || (getActingPlayer().getLevel() <= (target.getLevel() + 8))) { // Reduce HP of the target and calculate reflection damage to reduce HP of attacker if necessary - double reflectPercent = target.getStat().calcStat(Stats.REFLECT_DAMAGE_PERCENT, 0, null, null); + final double reflectPercent = target.getStat().calcStat(Stats.REFLECT_DAMAGE_PERCENT, 0, null, null); if (reflectPercent > 0) { reflectedDamage = (int) ((reflectPercent / 100.) * damage); @@ -4992,7 +4992,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Reflect resistance - double reflectResistance = target.getStat().calcStat(Stats.REFLECT_DAMAGE_RESISTANCE, 0, null, null); + final double reflectResistance = target.getStat().calcStat(Stats.REFLECT_DAMAGE_RESISTANCE, 0, null, null); if (reflectResistance > 0) { reflectedDamage -= reflectResistance; @@ -5017,7 +5017,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (absorbPercent > 0) { - int maxCanAbsorb = (int) (getMaxRecoverableHp() - getCurrentHp()); + final int maxCanAbsorb = (int) (getMaxRecoverableHp() - getCurrentHp()); int absorbDamage = (int) ((absorbPercent / 100.) * damage); if (absorbDamage > maxCanAbsorb) @@ -5036,7 +5036,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (absorbPercent > 0) { - int maxCanAbsorb = (int) (getMaxRecoverableMp() - getCurrentMp()); + final int maxCanAbsorb = (int) (getMaxRecoverableMp() - getCurrentMp()); int absorbDamage = (int) ((absorbPercent / 100.) * damage); if (absorbDamage > maxCanAbsorb) @@ -5060,7 +5060,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe getAI().clientStartAutoAttack(); if (isSummon()) { - L2PcInstance owner = ((L2Summon) this).getOwner(); + final L2PcInstance owner = ((L2Summon) this).getOwner(); if (owner != null) { owner.getAI().clientStartAutoAttack(); @@ -5167,7 +5167,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (player.isInOlympiadMode() && (player.getTarget() != null) && player.getTarget().isPlayable()) { L2PcInstance target = null; - L2Object object = player.getTarget(); + final L2Object object = player.getTarget(); if ((object != null) && object.isPlayable()) { target = object.getActingPlayer(); @@ -5258,7 +5258,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isInActiveRegion() { - L2WorldRegion region = getWorldRegion(); + final L2WorldRegion region = getWorldRegion(); return ((region != null) && (region.isActive())); } @@ -5365,7 +5365,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Skill removeSkill(int skillId, boolean cancelEffect) { // Remove the skill from the L2Character _skills - Skill oldSkill = _skills.remove(skillId); + final Skill oldSkill = _skills.remove(skillId); // Remove all its Func objects from the L2Character calculator set if (oldSkill != null) { @@ -5468,7 +5468,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onMagicLaunchedTimer(MagicUseTask mut) { final Skill skill = mut.getSkill(); - L2Object[] targets = mut.getTargets(); + final L2Object[] targets = mut.getTargets(); if ((skill == null) || (targets == null)) { @@ -5625,7 +5625,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else if (isPlayable() && tgt.isAttackable()) { - L2Character target = (L2Character) tgt; + final L2Character target = (L2Character) tgt; if (skill.getEffectPoint() > 0) { ((L2Attackable) target).reduceHate(this, skill.getEffectPoint()); @@ -5643,7 +5643,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe boolean isSendStatus = false; // Consume MP of the L2Character and Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform - double mpConsume = getStat().getMpConsume(skill); + final double mpConsume = getStat().getMpConsume(skill); if (mpConsume > 0) { @@ -5662,7 +5662,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Consume HP if necessary and Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (skill.getHpConsume() > 0) { - double consumeHp = skill.getHpConsume(); + final double consumeHp = skill.getHpConsume(); if (consumeHp >= getCurrentHp()) { @@ -5784,8 +5784,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If there is a queued skill, launch it and wipe the queue. if (isPlayer()) { - L2PcInstance currPlayer = getActingPlayer(); - SkillUseHolder queuedSkill = currPlayer.getQueuedSkill(); + final L2PcInstance currPlayer = getActingPlayer(); + final SkillUseHolder queuedSkill = currPlayer.getQueuedSkill(); currPlayer.setCurrentSkill(null, false, false); @@ -5820,7 +5820,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { try { - L2Weapon activeWeapon = getActiveWeaponItem(); + final L2Weapon activeWeapon = getActiveWeaponItem(); // Check if the toggle skill effects are already in progress on the L2Character if (skill.isToggle() && isAffectedBySkill(skill.getId())) @@ -5849,7 +5849,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!Config.RAID_DISABLE_CURSE && ((target.isRaid() && target.giveRaidCurse() && (getLevel() > (target.getLevel() + 8))) || (!skill.isBad() && (targetsAttackTarget != null) && targetsAttackTarget.isRaid() && targetsAttackTarget.giveRaidCurse() && targetsAttackTarget.getAttackByList().contains(target) && (getLevel() > (targetsAttackTarget.getLevel() + 8))) || (!skill.isBad() && (targetsCastTarget != null) && targetsCastTarget.isRaid() && targetsCastTarget.giveRaidCurse() && targetsCastTarget.getAttackByList().contains(target) && (getLevel() > (targetsCastTarget.getLevel() + 8))))) { final CommonSkill curse = skill.isMagic() ? CommonSkill.RAID_CURSE : CommonSkill.RAID_CURSE2; - Skill curseSkill = curse.getSkill(); + final Skill curseSkill = curse.getSkill(); if (curseSkill != null) { abortAttack(); @@ -5901,7 +5901,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Launch the magic skill and calculate its effects skill.activateSkill(this, targets); - L2PcInstance player = getActingPlayer(); + final L2PcInstance player = getActingPlayer(); if (player != null) { for (L2Object target : targets) @@ -5923,7 +5923,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else if (target.isSummon() && ((L2Character) target).hasAI()) { - L2PcInstance owner = ((L2Summon) target).getOwner(); + final L2PcInstance owner = ((L2Summon) target).getOwner(); if (owner != null) { owner.getAI().clientStartAutoAttack(); @@ -5975,7 +5975,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Mobs in range 1000 see spell - Collection objs = player.getKnownList().getKnownObjects().values(); + final Collection objs = player.getKnownList().getKnownObjects().values(); for (L2Object spMob : objs) { if ((spMob != null) && spMob.isNpc()) @@ -6014,12 +6014,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (attackable.hasAI() && (attackable.getAI().getIntention() == AI_INTENTION_ATTACK)) { - L2Object npcTarget = attackable.getTarget(); + final L2Object npcTarget = attackable.getTarget(); for (L2Object skillTarget : targets) { if ((npcTarget == skillTarget) || (npcMob == skillTarget)) { - L2Character originalCaster = isSummon() ? this : player; + final L2Character originalCaster = isSummon() ? this : player; attackable.addDamageHate(originalCaster, 0, (skillEffectPoint * 150) / (attackable.getLevel() + 7)); } } @@ -6060,7 +6060,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isBehind(L2Object target) { - double angleChar, angleTarget, angleDiff, maxAngleDiff = 60; + double angleChar, angleTarget, angleDiff; + final double maxAngleDiff = 60; if (target == null) { @@ -6069,7 +6070,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (target instanceof L2Character) { - L2Character target1 = (L2Character) target; + final L2Character target1 = (L2Character) target; angleChar = Util.calculateAngleFrom(this, target1); angleTarget = Util.convertHeadingToDegree(target1.getHeading()); angleDiff = angleChar - angleTarget; @@ -6100,7 +6101,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isInFrontOf(L2Character target) { - double angleChar, angleTarget, angleDiff, maxAngleDiff = 60; + double angleChar, angleTarget, angleDiff; + final double maxAngleDiff = 60; if (target == null) { return false; @@ -6149,7 +6151,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isInFrontOfTarget() { - L2Object target = getTarget(); + final L2Object target = getTarget(); if (target instanceof L2Character) { return isInFrontOf((L2Character) target); @@ -6193,7 +6195,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final double getRandomDamageMultiplier() { - L2Weapon activeWeapon = getActiveWeaponItem(); + final L2Weapon activeWeapon = getActiveWeaponItem(); int random; if (activeWeapon != null) @@ -6516,7 +6518,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { // Weight Limit = (CON Modifier*69000) * Skills // Source http://l2p.bravehost.com/weightlimit.html (May 2007) - double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT); + final double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT); return (int) calcStat(Stats.WEIGHT_LIMIT, baseLoad, this, null); } return 0; @@ -6560,7 +6562,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (miss && target.isPlayer()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK); sm.addPcName(target.getActingPlayer()); sm.addCharName(this); target.sendPacket(sm); @@ -6625,7 +6627,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return; } - Collection objs = getKnownList().getKnownObjects().values(); + final Collection objs = getKnownList().getKnownObjects().values(); for (L2Object npc : objs) { if ((npc != null) && npc.isNpc()) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Decoy.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Decoy.java index 22b063fde0..88f0e1c95b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Decoy.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Decoy.java @@ -59,7 +59,7 @@ public abstract class L2Decoy extends L2Character @Override public void updateAbnormalVisualEffects() { - Collection plrs = getKnownList().getKnownPlayers().values(); + final Collection plrs = getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Npc.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Npc.java index dff120073d..8fd6fc7342 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Npc.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Npc.java @@ -277,7 +277,7 @@ public class L2Npc extends L2Character public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all L2PcInstance in the _KnownPlayers of the L2NpcInstance - long now = System.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; @@ -295,11 +295,11 @@ public class L2Npc extends L2Character return; } - int minWait = isMob() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION; - int maxWait = isMob() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION; + final int minWait = isMob() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION; + final int maxWait = isMob() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION; // Calculate the delay before the next animation - int interval = Rnd.get(minWait, maxWait) * 1000; + final int interval = Rnd.get(minWait, maxWait) * 1000; // Create a RandomAnimation Task that will be launched after the calculated delay _rAniTask = new RandomAnimationTask(this); @@ -436,7 +436,7 @@ public class L2Npc extends L2Character public void updateAbnormalVisualEffects() { // Send a Server->Client packet NpcInfo with state of abnormal effect to all L2PcInstance in the _KnownPlayers of the L2NpcInstance - Collection plrs = getKnownList().getKnownPlayers().values(); + final Collection plrs = getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if ((player == null) || !isVisibleFor(player)) @@ -595,7 +595,7 @@ public class L2Npc extends L2Character // Get castle this NPC belongs to (excluding L2Attackable) if (_castleIndex < 0) { - L2TownZone town = TownManager.getTown(getX(), getY(), getZ()); + final L2TownZone town = TownManager.getTown(getX(), getY(), getZ()); if (town != null) { @@ -648,7 +648,7 @@ public class L2Npc extends L2Character */ public final Castle getCastle(long maxDistance) { - int index = CastleManager.getInstance().findNearestCastleIndex(this, maxDistance); + final int index = CastleManager.getInstance().findNearestCastleIndex(this, maxDistance); if (index < 0) { @@ -666,7 +666,7 @@ public class L2Npc extends L2Character // Get Fort this NPC belongs to (excluding L2Attackable) if (_fortIndex < 0) { - Fort fort = FortManager.getInstance().getFort(getX(), getY(), getZ()); + final Fort fort = FortManager.getInstance().getFort(getX(), getY(), getZ()); if (fort != null) { _fortIndex = FortManager.getInstance().getFortIndex(fort.getResidenceId()); @@ -693,7 +693,7 @@ public class L2Npc extends L2Character */ public final Fort getFort(long maxDistance) { - int index = FortManager.getInstance().findNearestFortIndex(this, maxDistance); + final int index = FortManager.getInstance().findNearestFortIndex(this, maxDistance); if (index < 0) { @@ -739,7 +739,7 @@ public class L2Npc extends L2Character } else { - IBypassHandler handler = BypassHandler.getInstance().getHandler(command); + final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); if (handler != null) { handler.useBypass(command, player, this); @@ -768,7 +768,7 @@ public class L2Npc extends L2Character public L2Weapon getActiveWeaponItem() { // Get the weapon identifier equipped in the right hand of the L2NpcInstance - int weaponId = getTemplate().getRHandId(); + final int weaponId = getTemplate().getRHandId(); if (weaponId < 1) { @@ -776,7 +776,7 @@ public class L2Npc extends L2Character } // Get the weapon item equipped in the right hand of the L2NpcInstance - L2Item item = ItemTable.getInstance().getTemplate(getTemplate().getRHandId()); + final L2Item item = ItemTable.getInstance().getTemplate(getTemplate().getRHandId()); if (!(item instanceof L2Weapon)) { @@ -802,14 +802,14 @@ public class L2Npc extends L2Character public L2Weapon getSecondaryWeaponItem() { // Get the weapon identifier equipped in the right hand of the L2NpcInstance - int weaponId = getTemplate().getLHandId(); + final int weaponId = getTemplate().getLHandId(); if (weaponId < 1) { return null; } // Get the weapon item equipped in the right hand of the L2NpcInstance - L2Item item = ItemTable.getInstance().getTemplate(getTemplate().getLHandId()); + final L2Item item = ItemTable.getInstance().getTemplate(getTemplate().getLHandId()); if (!(item instanceof L2Weapon)) { @@ -855,7 +855,7 @@ public class L2Npc extends L2Character pom = npcId + "-" + val; } - String temp = "html/default/" + pom + ".htm"; + final String temp = "html/default/" + pom + ".htm"; if (!Config.LAZY_CACHE) { @@ -960,7 +960,7 @@ public class L2Npc extends L2Character return; } - int npcId = getTemplate().getId(); + final int npcId = getTemplate().getId(); String filename; switch (npcId) @@ -1350,7 +1350,7 @@ public class L2Npc extends L2Character public void showNoTeachHtml(L2PcInstance player) { - int npcId = getId(); + final int npcId = getId(); String html = ""; if (this instanceof L2WarehouseInstance) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Playable.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Playable.java index e0212ebae7..1b1814774f 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Playable.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Playable.java @@ -149,7 +149,7 @@ public abstract class L2Playable extends L2Character } if (isPlayer()) { - L2PcInstance activeChar = getActingPlayer(); + final L2PcInstance activeChar = getActingPlayer(); if (activeChar.hasCharmOfCourage()) { @@ -176,7 +176,7 @@ public abstract class L2Playable extends L2Character } // Notify Quest of L2Playable's death - L2PcInstance actingPlayer = getActingPlayer(); + final L2PcInstance actingPlayer = getActingPlayer(); if (!actingPlayer.isNotifyQuestOfDeathEmpty()) { @@ -197,7 +197,7 @@ public abstract class L2Playable extends L2Character if (killer != null) { - L2PcInstance player = killer.getActingPlayer(); + final L2PcInstance player = killer.getActingPlayer(); if (player != null) { diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Summon.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Summon.java index 045fd37203..9a276c7b41 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Summon.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Summon.java @@ -123,7 +123,7 @@ public abstract class L2Summon extends L2Playable { player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player))); } - L2Party party = getOwner().getParty(); + final L2Party party = getOwner().getParty(); if (party != null) { party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this)); @@ -330,7 +330,7 @@ public abstract class L2Summon extends L2Playable continue; } - AggroInfo info = ((L2Attackable) TgMob).getAggroList().get(this); + final AggroInfo info = ((L2Attackable) TgMob).getAggroList().get(this); if (info != null) { ((L2Attackable) TgMob).addDamageHate(owner, info.getDamage(), info.getHate()); @@ -448,7 +448,7 @@ public abstract class L2Summon extends L2Playable } stopAllEffects(); - L2WorldRegion oldRegion = getWorldRegion(); + final L2WorldRegion oldRegion = getWorldRegion(); decayMe(); if (oldRegion != null) { @@ -810,7 +810,7 @@ public abstract class L2Summon extends L2Playable super.reduceCurrentHp(damage, attacker, skill); if ((getOwner() != null) && (attacker != null)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); sm.addNpcName(this); sm.addCharName(attacker); sm.addInt((int) damage); @@ -880,7 +880,7 @@ public abstract class L2Summon extends L2Playable { broadcastNpcInfo(val); } - L2Party party = getOwner().getParty(); + final L2Party party = getOwner().getParty(); if (party != null) { party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this)); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java index fd2858cb84..43d8bdb922 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java @@ -151,7 +151,7 @@ public abstract class L2Vehicle extends L2Character getStat().setRotationSpeed(point.getRotationSpeed()); } - MoveData m = new MoveData(); + final MoveData m = new MoveData(); m.disregardingGeodata = false; m.onGeodataPathIndex = -1; m._xDestination = point.getX(); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java index 211a7a38e4..da8d9d8965 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java @@ -57,7 +57,7 @@ public final class L2AuctioneerInstance extends L2Npc @Override public void onBypassFeedback(L2PcInstance player, String command) { - int condition = validateCondition(player); + final int condition = validateCondition(player); if (condition <= COND_ALL_FALSE) { // TODO: html @@ -66,7 +66,7 @@ public final class L2AuctioneerInstance extends L2Npc } else if (condition == COND_BUSY_BECAUSE_OF_SIEGE) { - String filename = "html/auction/auction-busy.htm"; + final String filename = "html/auction/auction-busy.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%objectId%", String.valueOf(getObjectId())); @@ -75,8 +75,8 @@ public final class L2AuctioneerInstance extends L2Npc } else if (condition == COND_REGULAR) { - StringTokenizer st = new StringTokenizer(command, " "); - String actualCommand = st.nextToken(); // Get actual command + final StringTokenizer st = new StringTokenizer(command, " "); + final String actualCommand = st.nextToken(); // Get actual command String val = ""; if (st.countTokens() >= 1) @@ -93,17 +93,17 @@ public final class L2AuctioneerInstance extends L2Npc try { - int days = Integer.parseInt(val); + final int days = Integer.parseInt(val); try { - SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); long bid = 0; if (st.countTokens() >= 1) { bid = Math.min(Long.parseLong(st.nextToken()), MAX_ADENA); } - Auction a = new Auction(player.getClan().getHideoutId(), player.getClan(), days * 86400000L, bid, ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getName()); + final Auction a = new Auction(player.getClan().getHideoutId(), player.getClan(), days * 86400000L, bid, ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getName()); if (_pendingAuctions.get(a.getId()) != null) { _pendingAuctions.remove(a.getId()); @@ -111,7 +111,7 @@ public final class L2AuctioneerInstance extends L2Npc _pendingAuctions.put(a.getId(), a); - String filename = "html/auction/AgitSale3.htm"; + final String filename = "html/auction/AgitSale3.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%x%", val); @@ -138,7 +138,7 @@ public final class L2AuctioneerInstance extends L2Npc { try { - Auction a = _pendingAuctions.get(player.getClan().getHideoutId()); + final Auction a = _pendingAuctions.get(player.getClan().getHideoutId()); a.confirmAuction(); _pendingAuctions.remove(player.getClan().getHideoutId()); } @@ -162,16 +162,16 @@ public final class L2AuctioneerInstance extends L2Npc try { - SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); - int auctionId = Integer.parseInt(val); + final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + final int auctionId = Integer.parseInt(val); if (Config.DEBUG) { _log.warning("auction test started"); } - String filename = "html/auction/AgitAuctionInfo.htm"; - Auction a = ClanHallAuctionManager.getInstance().getAuction(auctionId); + final String filename = "html/auction/AgitAuctionInfo.htm"; + final Auction a = ClanHallAuctionManager.getInstance().getAuction(auctionId); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); @@ -214,7 +214,7 @@ public final class L2AuctioneerInstance extends L2Npc try { - int auctionId = Integer.parseInt(val); + final int auctionId = Integer.parseInt(val); try { long bid = 0; @@ -257,7 +257,7 @@ public final class L2AuctioneerInstance extends L2Npc try { - String filename = "html/auction/AgitBid1.htm"; + final String filename = "html/auction/AgitBid1.htm"; long minimumBid = ClanHallAuctionManager.getInstance().getAuction(Integer.parseInt(val)).getHighestBidderMaxBid(); if (minimumBid == 0) @@ -282,13 +282,13 @@ public final class L2AuctioneerInstance extends L2Npc } else if (actualCommand.equalsIgnoreCase("list")) { - List auctions = ClanHallAuctionManager.getInstance().getAuctions(); - SimpleDateFormat format = new SimpleDateFormat("yy/MM/dd"); + final List auctions = ClanHallAuctionManager.getInstance().getAuctions(); + final SimpleDateFormat format = new SimpleDateFormat("yy/MM/dd"); /** Limit for make new page, prevent client crash **/ int limit = 15; int start; int i = 1; - double npage = Math.ceil((float) auctions.size() / limit); + final double npage = Math.ceil((float) auctions.size() / limit); if (val.isEmpty()) { @@ -305,7 +305,7 @@ public final class L2AuctioneerInstance extends L2Npc _log.warning("cmd list: auction test started"); } - StringBuilder items = new StringBuilder(); + final StringBuilder items = new StringBuilder(); items.append("
Account Status: Premium
Rate XP: x" + (Config.RATE_XP * Config.PREMIUM_RATE_XP) + "
"); for (int j = 1; j <= npage; j++) { @@ -362,7 +362,7 @@ public final class L2AuctioneerInstance extends L2Npc } items.append("
"); - String filename = "html/auction/AgitAuctionList.htm"; + final String filename = "html/auction/AgitAuctionList.htm"; final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); @@ -393,12 +393,12 @@ public final class L2AuctioneerInstance extends L2Npc } String biders = ""; - Map bidders = ClanHallAuctionManager.getInstance().getAuction(auctionId).getBidders(); + final Map bidders = ClanHallAuctionManager.getInstance().getAuction(auctionId).getBidders(); for (Bidder b : bidders.values()) { biders += "
" + b.getClanName() + "" + b.getName() + "" + b.getTimeBid().get(Calendar.YEAR) + "/" + (b.getTimeBid().get(Calendar.MONTH) + 1) + "/" + b.getTimeBid().get(Calendar.DATE) + "" + b.getBid() + "
"); if (color) { @@ -556,7 +556,7 @@ public class Hero for (int i = ((page - 1) * perpage); i < heroFights.size(); i++) { breakat = i; - StatsSet fight = heroFights.get(i); + final StatsSet fight = heroFights.get(i); StringUtil.append(fList, "
"); if (color) { @@ -630,7 +630,7 @@ public class Hero for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) { - L2ItemInstance equippedItem = player.getInventory().getPaperdollItem(i); + final L2ItemInstance equippedItem = player.getInventory().getPaperdollItem(i); if ((equippedItem != null) && equippedItem.isHeroItem()) { player.getInventory().unEquipItemInSlot(i); @@ -666,12 +666,12 @@ public class Hero for (StatsSet hero : newHeroes) { - int charId = hero.getInt(Olympiad.CHAR_ID); + final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - StatsSet oldHero = COMPLETE_HEROS.get(charId); - int count = oldHero.getInt(COUNT); + final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); oldHero.set(CLAIMED, false); @@ -679,7 +679,7 @@ public class Hero } else { - StatsSet newHero = new StatsSet(); + final StatsSet newHero = new StatsSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -731,8 +731,8 @@ public class Hero { if (rset.next()) { - int clanId = rset.getInt("clanid"); - int allyId = rset.getInt("allyId"); + final int clanId = rset.getInt("clanid"); + final int allyId = rset.getInt("allyId"); String clanName = ""; String allyName = ""; diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java b/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java index 0335526efd..cb02f041a3 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java @@ -409,7 +409,7 @@ public final class Instance { if (door != null) { - L2WorldRegion region = door.getWorldRegion(); + final L2WorldRegion region = door.getWorldRegion(); door.decayMe(); if (region != null) @@ -453,11 +453,11 @@ public final class Instance public void loadInstanceTemplate(String filename) { Document doc = null; - File xml = new File(Config.DATAPACK_ROOT, "instances/" + filename); + final File xml = new File(Config.DATAPACK_ROOT, "instances/" + filename); try { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setIgnoringComments(true); doc = factory.newDocumentBuilder().parse(xml); @@ -493,7 +493,7 @@ public final class Instance { _allowRandomWalk = Boolean.parseBoolean(a.getNodeValue()); } - Node first = n.getFirstChild(); + final Node first = n.getFirstChild(); for (n = first; n != null; n = n.getNextSibling()) { switch (n.getNodeName().toLowerCase()) @@ -562,15 +562,15 @@ public final class Instance if ("door".equalsIgnoreCase(d.getNodeName())) { doorId = Integer.parseInt(d.getAttributes().getNamedItem("doorId").getNodeValue()); - StatsSet set = new StatsSet(); + final StatsSet set = new StatsSet(); set.add(DoorData.getInstance().getDoorTemplate(doorId)); for (Node bean = d.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if ("set".equalsIgnoreCase(bean.getNodeName())) { - NamedNodeMap attrs = bean.getAttributes(); - String setname = attrs.getNamedItem("name").getNodeValue(); - String value = attrs.getNamedItem("val").getNodeValue(); + final NamedNodeMap attrs = bean.getAttributes(); + final String setname = attrs.getNamedItem("name").getNodeValue(); + final String value = attrs.getNamedItem("val").getNodeValue(); set.set(setname, value); } } @@ -585,8 +585,8 @@ public final class Instance { if ("group".equalsIgnoreCase(group.getNodeName())) { - String spawnGroup = group.getAttributes().getNamedItem("name").getNodeValue(); - List manualSpawn = new ArrayList<>(); + final String spawnGroup = group.getAttributes().getNamedItem("name").getNodeValue(); + final List manualSpawn = new ArrayList<>(); for (Node d = group.getFirstChild(); d != null; d = d.getNextSibling()) { int npcId = 0, x = 0, y = 0, z = 0, heading = 0, respawn = 0, respawnRandom = 0, delay = -1; @@ -686,9 +686,9 @@ public final class Instance } case "exitpoint": { - int x = Integer.parseInt(n.getAttributes().getNamedItem("x").getNodeValue()); - int y = Integer.parseInt(n.getAttributes().getNamedItem("y").getNodeValue()); - int z = Integer.parseInt(n.getAttributes().getNamedItem("z").getNodeValue()); + final int x = Integer.parseInt(n.getAttributes().getNamedItem("x").getNodeValue()); + final int y = Integer.parseInt(n.getAttributes().getNamedItem("y").getNodeValue()); + final int z = Integer.parseInt(n.getAttributes().getNamedItem("z").getNodeValue()); _exitLocation = new Location(x, y, z); break; } @@ -701,9 +701,9 @@ public final class Instance { try { - int x = Integer.parseInt(loc.getAttributes().getNamedItem("x").getNodeValue()); - int y = Integer.parseInt(loc.getAttributes().getNamedItem("y").getNodeValue()); - int z = Integer.parseInt(loc.getAttributes().getNamedItem("z").getNodeValue()); + final int x = Integer.parseInt(loc.getAttributes().getNamedItem("x").getNodeValue()); + final int y = Integer.parseInt(loc.getAttributes().getNamedItem("y").getNodeValue()); + final int z = Integer.parseInt(loc.getAttributes().getNamedItem("z").getNodeValue()); _enterLocations.add(new Location(x, y, z)); } catch (Exception e) @@ -806,7 +806,7 @@ public final class Instance else if (_players.isEmpty() && (_emptyDestroyTime > 0)) { - Long emptyTimeLeft = (_lastLeft + _emptyDestroyTime) - System.currentTimeMillis(); + final Long emptyTimeLeft = (_lastLeft + _emptyDestroyTime) - System.currentTimeMillis(); if (emptyTimeLeft <= 0) { interval = 0; @@ -837,7 +837,7 @@ public final class Instance { timeLeft = remaining / 60000; interval = 300000; - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_DUNGEON_WILL_EXPIRE_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_DUNGEON_WILL_EXPIRE_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES); sm.addString(Integer.toString(timeLeft)); Broadcast.toPlayersInInstance(sm, getId()); remaining = remaining - 300000; @@ -846,7 +846,7 @@ public final class Instance { timeLeft = remaining / 60000; interval = 60000; - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_DUNGEON_WILL_EXPIRE_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_DUNGEON_WILL_EXPIRE_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES); sm.addString(Integer.toString(timeLeft)); Broadcast.toPlayersInInstance(sm, getId()); remaining = remaining - 60000; diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/L2Event.java b/trunk/java/com/l2jserver/gameserver/model/entity/L2Event.java index 520026d17d..4a8eca596a 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/L2Event.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/L2Event.java @@ -202,7 +202,7 @@ public class L2Event { SpawnTable.getInstance().forEachSpawn(spawn -> { - L2Npc npc = spawn.getLastSpawn(); + final L2Npc npc = spawn.getLastSpawn(); if ((npc != null) && npc.isEventMob()) { npc.deleteMe(); @@ -289,9 +289,9 @@ public class L2Event player.getPoly().setPolyInfo(null, "1"); player.decayMe(); player.spawnMe(player.getX(), player.getY(), player.getZ()); - CharInfo info1 = new CharInfo(player); + final CharInfo info1 = new CharInfo(player); player.broadcastPacket(info1); - UserInfo info2 = new UserInfo(player); + final UserInfo info2 = new UserInfo(player); player.sendPacket(info2); player.stopTransformation(true); @@ -305,7 +305,7 @@ public class L2Event player.setEventStatus(null); _registeredPlayers.remove(player); - int teamId = getPlayerTeamId(player); + final int teamId = getPlayerTeamId(player); if (_teams.containsKey(teamId)) { _teams.get(teamId).remove(player); @@ -379,7 +379,7 @@ public class L2Event _eventInfo = br.readLine(); } - List temp = new LinkedList<>(); + final List temp = new LinkedList<>(); for (L2PcInstance player : L2World.getInstance().getPlayers()) { if (!player.isOnline()) diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Message.java b/trunk/java/com/l2jserver/gameserver/model/entity/Message.java index f88dc03127..9cd62898d5 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Message.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Message.java @@ -218,7 +218,7 @@ public class Message public static final PreparedStatement getStatement(Message msg, Connection con) throws SQLException { - PreparedStatement stmt = con.prepareStatement("INSERT INTO messages (messageId, senderId, receiverId, subject, content, expiration, reqAdena, hasAttachments, isUnread, isDeletedBySender, isDeletedByReceiver, sendBySystem, isReturned, itemId, enchantLvl, elementals) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); + final PreparedStatement stmt = con.prepareStatement("INSERT INTO messages (messageId, senderId, receiverId, subject, content, expiration, reqAdena, hasAttachments, isUnread, isDeletedBySender, isDeletedByReceiver, sendBySystem, isReturned, itemId, enchantLvl, elementals) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); stmt.setInt(1, msg._messageId); stmt.setInt(2, msg._senderId); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Siege.java b/trunk/java/com/l2jserver/gameserver/model/entity/Siege.java index 99a956e4bf..2faf218792 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Siege.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Siege.java @@ -99,38 +99,38 @@ public class Siege implements Siegable try { - long timeRemaining = _siegeEndDate.getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); + final long timeRemaining = _siegeEndDate.getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (timeRemaining > 3600000) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HOUR_S_UNTIL_CASTLE_SIEGE_CONCLUSION); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HOUR_S_UNTIL_CASTLE_SIEGE_CONCLUSION); sm.addInt(2); announceToPlayer(sm, true); ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 3600000); // Prepare task for 1 hr left. } else if ((timeRemaining <= 3600000) && (timeRemaining > 600000)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION); sm.addInt((int) timeRemaining / 60000); announceToPlayer(sm, true); ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left. } else if ((timeRemaining <= 600000) && (timeRemaining > 300000)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION); sm.addInt((int) timeRemaining / 60000); announceToPlayer(sm, true); ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left. } else if ((timeRemaining <= 300000) && (timeRemaining > 10000)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION); sm.addInt((int) timeRemaining / 60000); announceToPlayer(sm, true); ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down } else if ((timeRemaining <= 10000) && (timeRemaining > 0)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_CASTLE_SIEGE_WILL_END_IN_S1_SECOND_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_CASTLE_SIEGE_WILL_END_IN_S1_SECOND_S); sm.addInt((int) timeRemaining / 1000); announceToPlayer(sm, true); ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down @@ -169,7 +169,7 @@ public class Siege implements Siegable { if (!getIsTimeRegistrationOver()) { - long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); + final long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (regTimeRemaining > 0) { _scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), regTimeRemaining); @@ -178,14 +178,14 @@ public class Siege implements Siegable endTimeRegistration(true); } - long timeRemaining = getSiegeDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); + final long timeRemaining = getSiegeDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (timeRemaining > 86400000) { _scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 86400000); // Prepare task for 24 before siege start to end registration } else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED); sm.addCastleId(getCastle().getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = true; @@ -256,7 +256,7 @@ public class Siege implements Siegable if (getCastle().getOwnerId() > 0) { - L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId()); + final L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId()); sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE); sm.addString(clan.getName()); sm.addCastleId(getCastle().getResidenceId()); @@ -274,7 +274,7 @@ public class Siege implements Siegable { if (member != null) { - L2PcInstance player = member.getPlayerInstance(); + final L2PcInstance player = member.getPlayerInstance(); if ((player != null) && player.isNoble()) { Hero.getInstance().setCastleTaken(player.getObjectId(), getCastle().getResidenceId()); @@ -400,7 +400,7 @@ public class Siege implements Siegable (getAttackerClans().size() == 1 // Only 1 attacker )) { - L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); @@ -408,7 +408,7 @@ public class Siege implements Siegable } if (getCastle().getOwnerId() > 0) { - int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); + final int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); if (getDefenderClans().isEmpty()) // If defender doesn't exist (Pc vs Npc) // and only an alliance attacks { @@ -428,7 +428,7 @@ public class Siege implements Siegable } if (allinsamealliance) { - L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); @@ -446,7 +446,7 @@ public class Siege implements Siegable } } - L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); @@ -529,7 +529,7 @@ public class Siege implements Siegable _siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength()); ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(getCastle().getResidenceId()); Broadcast.toAllOnlinePlayers(sm); @@ -548,7 +548,7 @@ public class Siege implements Siegable { for (L2SiegeClan siegeClans : getDefenderClans()) { - L2Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId()); + final L2Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) { member.sendPacket(message); @@ -559,7 +559,7 @@ public class Siege implements Siegable { for (L2SiegeClan siegeClans : getAttackerClans()) { - L2Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId()); + final L2Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) { if (member != null) @@ -612,7 +612,7 @@ public class Siege implements Siegable } final int relation = member.getRelation(player); - Integer oldrelation = member.getKnownList().getKnownRelations().get(player.getObjectId()); + final Integer oldrelation = member.getKnownList().getKnownRelations().get(player.getObjectId()); if ((oldrelation == null) || (oldrelation != relation)) { final RelationChanged rc = new RelationChanged(); @@ -679,7 +679,7 @@ public class Siege implements Siegable } final int relation = member.getRelation(player); - Integer oldrelation = member.getKnownList().getKnownRelations().get(player.getObjectId()); + final Integer oldrelation = member.getKnownList().getKnownRelations().get(player.getObjectId()); if ((oldrelation == null) || (oldrelation != relation)) { final RelationChanged rc = new RelationChanged(); @@ -819,7 +819,7 @@ public class Siege implements Siegable @Override public List getAttackersInZone() { - List players = new ArrayList<>(); + final List players = new ArrayList<>(); L2Clan clan; for (L2SiegeClan siegeclan : getAttackerClans()) { @@ -848,7 +848,7 @@ public class Siege implements Siegable */ public List getOwnersInZone() { - List players = new ArrayList<>(); + final List players = new ArrayList<>(); L2Clan clan; for (L2SiegeClan siegeclan : getDefenderClans()) { @@ -873,7 +873,7 @@ public class Siege implements Siegable */ public List getSpectatorsInZone() { - List players = new ArrayList<>(); + final List players = new ArrayList<>(); for (L2PcInstance player : getCastle().getZone().getPlayersInside()) { @@ -1193,7 +1193,7 @@ public class Siege implements Siegable { if (getIsRegistrationOver()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); sm.addCastleId(getCastle().getResidenceId()); player.sendPacket(sm); } @@ -1518,7 +1518,7 @@ public class Siege implements Siegable } } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); sm.addCastleId(getCastle().getResidenceId()); Broadcast.toAllOnlinePlayers(sm); @@ -1596,7 +1596,7 @@ public class Siege implements Siegable continue; } - double distance = ct.calculateDistance(spawn, true, true); + final double distance = ct.calculateDistance(spawn, true, true); if (distance < distanceClosest) { @@ -1757,7 +1757,7 @@ public class Siege implements Siegable { if (clan != null) { - L2SiegeClan sc = getAttackerClan(clan); + final L2SiegeClan sc = getAttackerClan(clan); if (sc != null) { return sc.getFlag(); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/TvTEvent.java b/trunk/java/com/l2jserver/gameserver/model/entity/TvTEvent.java index b2017821cf..f34f48150b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/TvTEvent.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/TvTEvent.java @@ -175,7 +175,7 @@ public class TvTEvent setState(EventState.STARTING); // Randomize and balance team distribution - Map allParticipants = new HashMap<>(); + final Map allParticipants = new HashMap<>(); allParticipants.putAll(_teams[0].getParticipatedPlayers()); allParticipants.putAll(_teams[1].getParticipatedPlayers()); _teams[0].cleanMe(); @@ -196,11 +196,12 @@ public class TvTEvent } } - int balance[] = + final int balance[] = { 0, 0 - }, priority = 0, highestLevelPlayerId; + }; + int priority = 0, highestLevelPlayerId; L2PcInstance highestLevelPlayer; // TODO: allParticipants should be sorted by level instead of using highestLevelPcInstanceOf for every fetch while (!allParticipants.isEmpty()) @@ -346,7 +347,7 @@ public class TvTEvent setState(EventState.REWARDING); // Get team which has more points - TvTEventTeam team = _teams[_teams[0].getPoints() > _teams[1].getPoints() ? 0 : 1]; + final TvTEventTeam team = _teams[_teams[0].getPoints() > _teams[1].getPoints() ? 0 : 1]; rewardTeam(team); // Notify to scripts. @@ -370,7 +371,7 @@ public class TvTEvent // Iterate over all tvt event rewards for (int[] reward : Config.TVT_EVENT_REWARDS) { - PcInventory inv = playerInstance.getInventory(); + final PcInventory inv = playerInstance.getInventory(); // Check for stackable item, non stackabe items need to be added one by one if (ItemTable.getInstance().getTemplate(reward[0]).isStackable()) @@ -496,7 +497,7 @@ public class TvTEvent public static boolean removeParticipant(int playerObjectId) { // Get the teamId of the player - byte teamId = getParticipantTeamId(playerObjectId); + final byte teamId = getParticipantTeamId(playerObjectId); // Check if the player is participant if (teamId != -1) @@ -532,8 +533,8 @@ public class TvTEvent public static String getParticipationFee() { - int itemId = Config.TVT_EVENT_PARTICIPATION_FEE[0]; - int itemNum = Config.TVT_EVENT_PARTICIPATION_FEE[1]; + final int itemId = Config.TVT_EVENT_PARTICIPATION_FEE[0]; + final int itemNum = Config.TVT_EVENT_PARTICIPATION_FEE[1]; if ((itemId == 0) || (itemNum == 0)) { @@ -645,7 +646,7 @@ public class TvTEvent return; } - byte teamId = getParticipantTeamId(playerInstance.getObjectId()); + final byte teamId = getParticipantTeamId(playerInstance.getObjectId()); if (teamId == -1) { @@ -691,8 +692,8 @@ public class TvTEvent return true; } - byte playerTeamId = getParticipantTeamId(playerInstance.getObjectId()); - byte targetedPlayerTeamId = getParticipantTeamId(targetedPlayerObjectId); + final byte playerTeamId = getParticipantTeamId(playerInstance.getObjectId()); + final byte targetedPlayerTeamId = getParticipantTeamId(targetedPlayerObjectId); if (((playerTeamId != -1) && (targetedPlayerTeamId == -1)) || ((playerTeamId == -1) && (targetedPlayerTeamId != -1))) { @@ -801,7 +802,7 @@ public class TvTEvent return; } - byte killedTeamId = getParticipantTeamId(killedPlayerInstance.getObjectId()); + final byte killedTeamId = getParticipantTeamId(killedPlayerInstance.getObjectId()); if (killedTeamId == -1) { @@ -835,15 +836,15 @@ public class TvTEvent return; } - byte killerTeamId = getParticipantTeamId(killerPlayerInstance.getObjectId()); + final byte killerTeamId = getParticipantTeamId(killerPlayerInstance.getObjectId()); if ((killerTeamId != -1) && (killedTeamId != -1) && (killerTeamId != killedTeamId)) { - TvTEventTeam killerTeam = _teams[killerTeamId]; + final TvTEventTeam killerTeam = _teams[killerTeamId]; killerTeam.increasePoints(); - CreatureSay cs = new CreatureSay(killerPlayerInstance.getObjectId(), ChatType.WHISPER, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!"); + final CreatureSay cs = new CreatureSay(killerPlayerInstance.getObjectId(), ChatType.WHISPER, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!"); for (L2PcInstance playerInstance : _teams[killerTeamId].getParticipatedPlayers().values()) { @@ -875,7 +876,7 @@ public class TvTEvent { for (Entry e : Config.TVT_EVENT_MAGE_BUFFS.entrySet()) { - Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue()); + final Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue()); if (skill != null) { skill.applyEffects(playerInstance, playerInstance); @@ -889,7 +890,7 @@ public class TvTEvent { for (Entry e : Config.TVT_EVENT_FIGHTER_BUFFS.entrySet()) { - Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue()); + final Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue()); if (skill != null) { skill.applyEffects(playerInstance, playerInstance); diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/TvTEventTeleporter.java b/trunk/java/com/l2jserver/gameserver/model/entity/TvTEventTeleporter.java index 67b22ff0a4..b6aa5e0171 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/TvTEventTeleporter.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/TvTEventTeleporter.java @@ -48,7 +48,7 @@ public class TvTEventTeleporter implements Runnable _coordinates = coordinates; _adminRemove = adminRemove; - long delay = (TvTEvent.isStarted() ? Config.TVT_EVENT_RESPAWN_TELEPORT_DELAY : Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY) * 1000; + final long delay = (TvTEvent.isStarted() ? Config.TVT_EVENT_RESPAWN_TELEPORT_DELAY : Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY) * 1000; ThreadPoolManager.getInstance().scheduleGeneral(this, fastSchedule ? 0 : delay); } @@ -69,7 +69,7 @@ public class TvTEventTeleporter implements Runnable return; } - L2Summon summon = _playerInstance.getPet(); + final L2Summon summon = _playerInstance.getPet(); if (summon != null) { @@ -88,7 +88,7 @@ public class TvTEventTeleporter implements Runnable _playerInstance.setDuelState(DuelState.INTERRUPTED); } - int TvTInstance = TvTEvent.getTvTEventInstance(); + final int TvTInstance = TvTEvent.getTvTEventInstance(); if (TvTInstance != 0) { if (TvTEvent.isStarted() && !_adminRemove) @@ -111,7 +111,7 @@ public class TvTEventTeleporter implements Runnable if (TvTEvent.isStarted() && !_adminRemove) { - int teamId = TvTEvent.getParticipantTeamId(_playerInstance.getObjectId()) + 1; + final int teamId = TvTEvent.getParticipantTeamId(_playerInstance.getObjectId()) + 1; switch (teamId) { case 0: diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/TvTManager.java b/trunk/java/com/l2jserver/gameserver/model/entity/TvTManager.java index 60917c98cc..f6a778cc2f 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/TvTManager.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/TvTManager.java @@ -71,7 +71,7 @@ public class TvTManager { try { - Calendar currentTime = Calendar.getInstance(); + final Calendar currentTime = Calendar.getInstance(); Calendar nextStartTime = null; Calendar testStartTime = null; for (String timeOfDay : Config.TVT_EVENT_INTERVAL) @@ -79,7 +79,7 @@ public class TvTManager // Creating a Calendar object from the specified interval value testStartTime = Calendar.getInstance(); testStartTime.setLenient(true); - String[] splitTimeOfDay = timeOfDay.split(":"); + final String[] splitTimeOfDay = timeOfDay.split(":"); testStartTime.set(Calendar.HOUR_OF_DAY, Integer.parseInt(splitTimeOfDay[0])); testStartTime.set(Calendar.MINUTE, Integer.parseInt(splitTimeOfDay[1])); // If the date is in the past, make it the next day (Example: Checking for "1:00", when the time is 23:57.) @@ -189,7 +189,7 @@ public class TvTManager @Override public void run() { - int delay = (int) Math.round((_startTime - System.currentTimeMillis()) / 1000.0); + final int delay = (int) Math.round((_startTime - System.currentTimeMillis()) / 1000.0); if (delay > 0) { diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java b/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java index df70aa06a8..250d211f29 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java @@ -110,7 +110,7 @@ public final class AuctionableHall extends ClanHall */ private final void initialyzeTask(boolean forced) { - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_paidUntil > currentTime) { ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _paidUntil - currentTime); @@ -142,7 +142,7 @@ public final class AuctionableHall extends ClanHall { try { - long _time = System.currentTimeMillis(); + final long _time = System.currentTimeMillis(); if (isFree()) { @@ -155,7 +155,7 @@ public final class AuctionableHall extends ClanHall return; } - L2Clan Clan = ClanTable.getInstance().getClan(getOwnerId()); + final L2Clan Clan = ClanTable.getInstance().getClan(getOwnerId()); if (ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= getLease()) { if (_paidUntil != 0) @@ -193,7 +193,7 @@ public final class AuctionableHall extends ClanHall else { updateDb(); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(getLease()); Clan.broadcastToOnlineMembers(sm); if ((_time + (3600000 * 24)) <= (_paidUntil + _chRate)) diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java index ce3a2c515a..d72d01f85e 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java @@ -102,7 +102,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable while (rset.next()) { final int id = rset.getInt("attacker_id"); - L2SiegeClan clan = new L2SiegeClan(id, SiegeClanType.ATTACKER); + final L2SiegeClan clan = new L2SiegeClan(id, SiegeClanType.ATTACKER); _attackers.put(id, clan); } } @@ -200,7 +200,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable public List getFlag(L2Clan clan) { List result = null; - L2SiegeClan sClan = getAttackerClan(clan); + final L2SiegeClan sClan = getAttackerClan(clan); if (sClan != null) { result = sClan.getFlag(); @@ -291,7 +291,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable _hall.free(); _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); @@ -309,7 +309,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable _hall.updateNextSiege(); _siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getSiegeDate().getTimeInMillis()); _hall.updateSiegeStatus(SiegeStatus.WAITING_BATTLE); - 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; @@ -345,11 +345,11 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable @Override public void endSiege() { - SystemMessage end = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); + final SystemMessage end = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); end.addString(_hall.getName()); Broadcast.toAllOnlinePlayers(end); - L2Clan winner = getWinner(); + final L2Clan winner = getWinner(); SystemMessage finalMsg = null; if (_missionAccomplished && (winner != null)) { diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java b/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java index a56fe6cd32..70dd44fb27 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java @@ -62,7 +62,7 @@ public final class SiegableHall extends ClanHall { super(set); _siegeLength = set.getLong("siegeLenght"); - String[] rawSchConfig = set.getString("scheduleConfig").split(";"); + final String[] rawSchConfig = set.getString("scheduleConfig").split(";"); if (rawSchConfig.length == 5) { for (int i = 0; i < 5; i++) @@ -83,7 +83,7 @@ public final class SiegableHall extends ClanHall } _nextSiege = Calendar.getInstance(); - long nextSiege = set.getLong("nextSiege"); + final long nextSiege = set.getLong("nextSiege"); if ((nextSiege - System.currentTimeMillis()) < 0) { updateNextSiege(); @@ -184,7 +184,7 @@ public final class SiegableHall extends ClanHall public final void updateNextSiege() { - Calendar c = Calendar.getInstance(); + final Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, _scheduleConfig[0]); c.add(Calendar.MONTH, _scheduleConfig[1]); c.add(Calendar.YEAR, _scheduleConfig[2]); diff --git a/trunk/java/com/l2jserver/gameserver/model/event/LongTimeEvent.java b/trunk/java/com/l2jserver/gameserver/model/event/LongTimeEvent.java index 346d176c0d..6595d59868 100644 --- a/trunk/java/com/l2jserver/gameserver/model/event/LongTimeEvent.java +++ b/trunk/java/com/l2jserver/gameserver/model/event/LongTimeEvent.java @@ -95,7 +95,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStart(), delay); _log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -111,23 +111,23 @@ public class LongTimeEvent extends Quest */ private void loadConfig() { - File configFile = new File(Config.DATAPACK_ROOT.getPath() + "/scripts/events/" + getName() + "/config.xml"); + final File configFile = new File(Config.DATAPACK_ROOT.getPath() + "/scripts/events/" + getName() + "/config.xml"); try { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db = dbf.newDocumentBuilder(); - Document doc = db.parse(configFile); + final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + final DocumentBuilder db = dbf.newDocumentBuilder(); + final Document doc = db.parse(configFile); if (!doc.getDocumentElement().getNodeName().equalsIgnoreCase("event")) { throw new NullPointerException("WARNING!!! " + getName() + " event: bad config file!"); } _eventName = doc.getDocumentElement().getAttributes().getNamedItem("name").getNodeValue(); - String period = doc.getDocumentElement().getAttributes().getNamedItem("active").getNodeValue(); + final String period = doc.getDocumentElement().getAttributes().getNamedItem("active").getNodeValue(); _eventPeriod = DateRange.parse(period, new SimpleDateFormat("dd MM yyyy", Locale.US)); if (doc.getDocumentElement().getAttributes().getNamedItem("dropPeriod") != null) { - String dropPeriod = doc.getDocumentElement().getAttributes().getNamedItem("dropPeriod").getNodeValue(); + final String dropPeriod = doc.getDocumentElement().getAttributes().getNamedItem("dropPeriod").getNodeValue(); _dropPeriod = DateRange.parse(dropPeriod, new SimpleDateFormat("dd MM yyyy", Locale.US)); // Check if drop period is within range of event period if (!_eventPeriod.isWithinRange(_dropPeriod.getStartDate()) || !_eventPeriod.isWithinRange(_dropPeriod.getEndDate())) @@ -145,11 +145,11 @@ public class LongTimeEvent extends Quest throw new NullPointerException("WARNING!!! " + getName() + " event: illegal event period"); } - Date today = new Date(); + final Date today = new Date(); if (_eventPeriod.getStartDate().after(today) || _eventPeriod.isWithinRange(today)) { - Node first = doc.getDocumentElement().getFirstChild(); + final Node first = doc.getDocumentElement().getFirstChild(); for (Node n = first; n != null; n = n.getNextSibling()) { // Loading droplist @@ -161,10 +161,10 @@ public class LongTimeEvent extends Quest { try { - int itemId = Integer.parseInt(d.getAttributes().getNamedItem("item").getNodeValue()); - int minCount = Integer.parseInt(d.getAttributes().getNamedItem("min").getNodeValue()); - int maxCount = Integer.parseInt(d.getAttributes().getNamedItem("max").getNodeValue()); - String chance = d.getAttributes().getNamedItem("chance").getNodeValue(); + final int itemId = Integer.parseInt(d.getAttributes().getNamedItem("item").getNodeValue()); + final int minCount = Integer.parseInt(d.getAttributes().getNamedItem("min").getNodeValue()); + final int maxCount = Integer.parseInt(d.getAttributes().getNamedItem("max").getNodeValue()); + final String chance = d.getAttributes().getNamedItem("chance").getNodeValue(); int finalChance = 0; if (!chance.isEmpty() && chance.endsWith("%")) @@ -208,11 +208,11 @@ public class LongTimeEvent extends Quest { try { - int npcId = Integer.parseInt(d.getAttributes().getNamedItem("npc").getNodeValue()); - int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue()); - int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue()); - int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue()); - int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0; + final int npcId = Integer.parseInt(d.getAttributes().getNamedItem("npc").getNodeValue()); + final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue()); + final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue()); + final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue()); + final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0; if (NpcData.getInstance().getTemplate(npcId) == null) { @@ -236,8 +236,8 @@ public class LongTimeEvent extends Quest { if (d.getNodeName().equalsIgnoreCase("add")) { - String msgType = d.getAttributes().getNamedItem("type").getNodeValue(); - String msgText = d.getAttributes().getNamedItem("text").getNodeValue(); + final String msgType = d.getAttributes().getNamedItem("type").getNodeValue(); + final String msgText = d.getAttributes().getNamedItem("text").getNodeValue(); if ((msgType != null) && (msgText != null)) { if (msgType.equalsIgnoreCase("onEnd")) @@ -266,7 +266,7 @@ public class LongTimeEvent extends Quest */ protected void startEvent() { - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Add drop if (_dropList != null) { @@ -280,7 +280,7 @@ public class LongTimeEvent extends Quest } // Add spawns - Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - currentTime; + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - currentTime; if (_spawnList != null) { for (NpcSpawn spawn : _spawnList) diff --git a/trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java b/trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java index 183e8ef6c7..b8bc934203 100644 --- a/trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java +++ b/trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java @@ -1832,7 +1832,7 @@ public abstract class AbstractScript implements INamable public L2TrapInstance addTrap(int trapId, int x, int y, int z, int heading, Skill skill, int instanceId) { final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(trapId); - L2TrapInstance trap = new L2TrapInstance(npcTemplate, instanceId, -1); + final L2TrapInstance trap = new L2TrapInstance(npcTemplate, instanceId, -1); trap.setCurrentHp(trap.getMaxHp()); trap.setCurrentMp(trap.getMaxMp()); trap.setIsInvul(true); @@ -2127,7 +2127,7 @@ public abstract class AbstractScript implements INamable // If item for reward is gold, send message of gold reward to client if (item.getId() == Inventory.ADENA_ID) { - SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA); + final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA); smsg.addLong(count); player.sendPacket(smsg); } @@ -2136,14 +2136,14 @@ public abstract class AbstractScript implements INamable { if (count > 1) { - SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); + final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); smsg.addItemName(item); smsg.addLong(count); player.sendPacket(smsg); } else { - SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1); + final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1); smsg.addItemName(item); player.sendPacket(smsg); } @@ -2233,7 +2233,7 @@ public abstract class AbstractScript implements INamable item.updateElementAttrBonus(player); } - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(item); player.sendPacket(iu); } @@ -2326,7 +2326,7 @@ public abstract class AbstractScript implements INamable } // Give the item to player - L2ItemInstance item = player.addItem("Quest", itemId, amountToGive, npc, true); + final L2ItemInstance item = player.addItem("Quest", itemId, amountToGive, npc, true); if (item != null) { // limit reached (if there is no limit, this block doesn't execute) @@ -2362,7 +2362,7 @@ public abstract class AbstractScript implements INamable */ protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim) { - List items = item.calculateDrops(victim, player); + final List items = item.calculateDrops(victim, player); if ((items == null) || items.isEmpty()) { return false; @@ -2394,7 +2394,7 @@ public abstract class AbstractScript implements INamable */ protected static boolean giveItems(L2PcInstance player, ItemHolder item, long limit) { - long maxToGive = limit - player.getInventory().getInventoryItemCount(item.getId(), -1); + final long maxToGive = limit - player.getInventory().getInventoryItemCount(item.getId(), -1); if (maxToGive <= 0) { return false; @@ -2405,7 +2405,7 @@ public abstract class AbstractScript implements INamable protected static boolean giveItems(L2PcInstance player, ItemHolder item, long limit, boolean playSound) { - boolean drop = giveItems(player, item, limit); + final boolean drop = giveItems(player, item, limit); if (drop && playSound) { playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -2431,7 +2431,7 @@ public abstract class AbstractScript implements INamable protected static boolean giveItems(L2PcInstance player, List items, long limit, boolean playSound) { - boolean drop = giveItems(player, items, limit); + final boolean drop = giveItems(player, items, limit); if (drop && playSound) { playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -2463,7 +2463,7 @@ public abstract class AbstractScript implements INamable { if (limit != null) { - Long longLimit = limit.apply(item.getId()); + final Long longLimit = limit.apply(item.getId()); // null -> no limit specified for that item id. This trick is to avoid limit.apply() be called twice (once for the null check) if (longLimit != null) { @@ -2482,7 +2482,7 @@ public abstract class AbstractScript implements INamable protected static boolean giveItems(L2PcInstance player, List items, Function limit, boolean playSound) { - boolean drop = giveItems(player, items, limit); + final boolean drop = giveItems(player, items, limit); if (drop && playSound) { playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -2509,7 +2509,7 @@ public abstract class AbstractScript implements INamable protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim, int limit, boolean playSound) { - boolean drop = giveItems(player, item, victim, limit); + final boolean drop = giveItems(player, item, victim, limit); if (drop && playSound) { playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -2548,7 +2548,7 @@ public abstract class AbstractScript implements INamable protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim, Function limit, boolean playSound) { - boolean drop = giveItems(player, item, victim, limit); + final boolean drop = giveItems(player, item, victim, limit); if (drop && playSound) { playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -2566,7 +2566,7 @@ public abstract class AbstractScript implements INamable */ protected static Map> distributeItems(Collection players, Collection items, Function limit, boolean playSound) { - Map> rewardedCounts = calculateDistribution(players, items, limit); + final Map> rewardedCounts = calculateDistribution(players, items, limit); // now give the calculated items to the players giveItems(rewardedCounts, playSound); return rewardedCounts; @@ -2608,8 +2608,8 @@ public abstract class AbstractScript implements INamable */ protected static Map distributeItems(Collection players, ItemHolder item, long limit, boolean playSound) { - Map> distribution = distributeItems(players, Collections.singletonList(item), limit, playSound); - Map returnMap = new HashMap<>(); + final Map> distribution = distributeItems(players, Collections.singletonList(item), limit, playSound); + final Map returnMap = new HashMap<>(); for (Entry> entry : distribution.entrySet()) { for (Entry entry2 : entry.getValue().entrySet()) @@ -2682,13 +2682,13 @@ public abstract class AbstractScript implements INamable if (smartDrop) { toDrop = new GroupedGeneralDropItem(items.getChance(), items.getDropCalculationStrategy(), items.getKillerChanceModifierStrategy(), items.getPreciseStrategy()); - List dropItems = new LinkedList<>(items.getItems()); + final List dropItems = new LinkedList<>(items.getItems()); ITEM_LOOP: for (Iterator it = dropItems.iterator(); it.hasNext();) { - GeneralDropItem item = it.next(); + final GeneralDropItem item = it.next(); for (L2PcInstance player : players) { - int itemId = item.getItemId(); + final int itemId = item.getItemId(); if (player.getInventory().getInventoryItemCount(itemId, -1, true) < avoidNull(limit, itemId)) { // we can give this item to this player @@ -2748,7 +2748,7 @@ public abstract class AbstractScript implements INamable */ private static Map> calculateDistribution(Collection players, Collection items, Function limit) { - Map> rewardedCounts = new HashMap<>(); + final Map> rewardedCounts = new HashMap<>(); for (L2PcInstance player : players) { rewardedCounts.put(player, new HashMap()); @@ -2757,17 +2757,17 @@ public abstract class AbstractScript implements INamable { long equaldist = item.getCount() / players.size(); long randomdist = item.getCount() % players.size(); - List toDist = new ArrayList<>(players); + final List toDist = new ArrayList<>(players); do // this must happen at least once in order to get away already full players (and then equaldist can become nonzero) { for (Iterator it = toDist.iterator(); it.hasNext();) { - L2PcInstance player = it.next(); + final L2PcInstance player = it.next(); if (!rewardedCounts.get(player).containsKey(item.getId())) { rewardedCounts.get(player).put(item.getId(), 0L); } - long maxGive = avoidNull(limit, item.getId()) - player.getInventory().getInventoryItemCount(item.getId(), -1, true) - rewardedCounts.get(player).get(item.getId()); + final long maxGive = avoidNull(limit, item.getId()) - player.getInventory().getInventoryItemCount(item.getId(), -1, true) - rewardedCounts.get(player).get(item.getId()); long toGive = equaldist; if (equaldist >= maxGive) { @@ -2793,9 +2793,9 @@ public abstract class AbstractScript implements INamable // we don't have any player left continue NEXT_ITEM; } - L2PcInstance player = toDist.get(getRandom(toDist.size())); + final L2PcInstance player = toDist.get(getRandom(toDist.size())); // avoid null return - long maxGive = avoidNull(limit, item.getId()) - limit.apply(item.getId()) - player.getInventory().getInventoryItemCount(item.getId(), -1, true) - rewardedCounts.get(player).get(item.getId()); + final long maxGive = avoidNull(limit, item.getId()) - limit.apply(item.getId()) - player.getInventory().getInventoryItemCount(item.getId(), -1, true) - rewardedCounts.get(player).get(item.getId()); if (maxGive > 0) { // we can add an item to player @@ -2818,7 +2818,7 @@ public abstract class AbstractScript implements INamable */ private static long avoidNull(Function function, T arg) { - Long longLimit = function.apply(arg); + final Long longLimit = function.apply(arg); return longLimit == null ? Long.MAX_VALUE : longLimit; } @@ -2831,7 +2831,7 @@ public abstract class AbstractScript implements INamable { for (Entry> entry : rewardedCounts.entrySet()) { - L2PcInstance player = entry.getKey(); + final L2PcInstance player = entry.getKey(); boolean playPlayerSound = false; for (Entry item : entry.getValue().entrySet()) { diff --git a/trunk/java/com/l2jserver/gameserver/model/fishing/L2Fishing.java b/trunk/java/com/l2jserver/gameserver/model/fishing/L2Fishing.java index fd541700ab..496aebb4be 100644 --- a/trunk/java/com/l2jserver/gameserver/model/fishing/L2Fishing.java +++ b/trunk/java/com/l2jserver/gameserver/model/fishing/L2Fishing.java @@ -225,7 +225,7 @@ public class L2Fishing implements Runnable finally { _thinking = false; - ExFishingHpRegen efhr = new ExFishingHpRegen(_fisher, _time, _fishCurHp, _mode, 0, _anim, 0, _deceptiveMode); + final ExFishingHpRegen efhr = new ExFishingHpRegen(_fisher, _time, _fishCurHp, _mode, 0, _anim, 0, _deceptiveMode); if (_anim != 0) { _fisher.broadcastPacket(efhr); @@ -271,7 +271,7 @@ public class L2Fishing implements Runnable else { // Reeling failed, Damage: $s1 - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_REEL_THAT_FISH_IN_FURTHER_AND_IT_REGAINS_S1_HP); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_REEL_THAT_FISH_IN_FURTHER_AND_IT_REGAINS_S1_HP); sm.addInt(dmg); _fisher.sendPacket(sm); _goodUse = 2; @@ -283,7 +283,7 @@ public class L2Fishing implements Runnable if (_deceptiveMode == 0) { // Reeling failed, Damage: $s1 - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_REEL_THAT_FISH_IN_FURTHER_AND_IT_REGAINS_S1_HP); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_REEL_THAT_FISH_IN_FURTHER_AND_IT_REGAINS_S1_HP); sm.addInt(dmg); _fisher.sendPacket(sm); _goodUse = 2; @@ -341,7 +341,7 @@ public class L2Fishing implements Runnable else { // Pumping failed, Regained: $s1 - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_DO_ANYTHING_WITH_THE_FISH_AND_IT_REGAINS_S1_HP); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_DO_ANYTHING_WITH_THE_FISH_AND_IT_REGAINS_S1_HP); sm.addInt(dmg); _fisher.sendPacket(sm); _goodUse = 2; @@ -353,7 +353,7 @@ public class L2Fishing implements Runnable if (_deceptiveMode == 0) { // Pumping failed, Regained: $s1 - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_DO_ANYTHING_WITH_THE_FISH_AND_IT_REGAINS_S1_HP); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_DO_ANYTHING_WITH_THE_FISH_AND_IT_REGAINS_S1_HP); sm.addInt(dmg); _fisher.sendPacket(sm); _goodUse = 2; diff --git a/trunk/java/com/l2jserver/gameserver/model/holders/NpcRoutesHolder.java b/trunk/java/com/l2jserver/gameserver/model/holders/NpcRoutesHolder.java index 8a09df5f66..4e5f45619e 100644 --- a/trunk/java/com/l2jserver/gameserver/model/holders/NpcRoutesHolder.java +++ b/trunk/java/com/l2jserver/gameserver/model/holders/NpcRoutesHolder.java @@ -56,7 +56,7 @@ public final class NpcRoutesHolder { if (npc.getSpawn() != null) { - String key = getUniqueKey(npc.getSpawn().getLocation()); + final String key = getUniqueKey(npc.getSpawn().getLocation()); return _correspondences.containsKey(key) ? _correspondences.get(key) : ""; } return ""; diff --git a/trunk/java/com/l2jserver/gameserver/model/holders/PunishmentHolder.java b/trunk/java/com/l2jserver/gameserver/model/holders/PunishmentHolder.java index e8d43cd023..6af1e4f646 100644 --- a/trunk/java/com/l2jserver/gameserver/model/holders/PunishmentHolder.java +++ b/trunk/java/com/l2jserver/gameserver/model/holders/PunishmentHolder.java @@ -50,7 +50,7 @@ public final class PunishmentHolder */ public void stopPunishment(PunishmentTask task) { - String key = String.valueOf(task.getKey()); + final String key = String.valueOf(task.getKey()); if (_holder.containsKey(key)) { task.stopPunishment(); diff --git a/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java b/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java index d31361190c..ef2b3ce8e4 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java @@ -91,7 +91,7 @@ public final class ItemAuction _itemInfo = new ItemInfo(item); L2World.getInstance().removeObject(item); - for (final ItemAuctionBid bid : _auctionBids) + for (ItemAuctionBid bid : _auctionBids) { if ((_highestBid == null) || (_highestBid.getLastBid() < bid.getLastBid())) { @@ -206,7 +206,7 @@ public final class ItemAuction ps.setByte(7, _auctionState.getStateId()); ps.execute(); } - catch (final SQLException e) + catch (SQLException e) { _log.log(Level.WARNING, "", e); } @@ -320,7 +320,7 @@ public final class ItemAuction onPlayerBid(player, bid); updatePlayerBid(bid, false); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_A_BID_FOR_THE_AUCTION_OF_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_A_BID_FOR_THE_AUCTION_OF_S1); sm.addLong(newBid); player.sendPacket(sm); return; diff --git a/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java b/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java index 3b32256fc4..9537022f6a 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java @@ -126,7 +126,7 @@ public final class ItemAuctionInstance throw new IllegalArgumentException("Item with id " + itemId + " not found"); } - for (final AuctionItem tmp : _items) + for (AuctionItem tmp : _items) { if (tmp.getAuctionItemId() == auctionItemId) { @@ -153,7 +153,7 @@ public final class ItemAuctionInstance } } } - catch (final IllegalArgumentException e) + catch (IllegalArgumentException e) { _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading auction item", e); } @@ -185,14 +185,14 @@ public final class ItemAuctionInstance ItemAuctionManager.deleteAuction(auctionId); } } - catch (final SQLException e) + catch (SQLException e) { _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading auction: " + auctionId, e); } } } } - catch (final SQLException e) + catch (SQLException e) { _log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading auctions.", e); return; @@ -294,7 +294,7 @@ public final class ItemAuctionInstance // just to make sure we won't skip any auction because of little different times final long currentTime = System.currentTimeMillis(); - for (final ItemAuction auction : auctions) + for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) { @@ -308,7 +308,7 @@ public final class ItemAuctionInstance } } - for (final ItemAuction auction : auctions) + for (ItemAuction auction : auctions) { if ((auction.getStartingTime() > currentTime) && (currentAuction != auction)) { @@ -358,7 +358,7 @@ public final class ItemAuctionInstance { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); - for (final ItemAuction auction : getAuctions()) + for (ItemAuction auction : getAuctions()) { if (auction.getAuctionState() != ItemAuctionState.CREATED) { @@ -400,7 +400,7 @@ public final class ItemAuctionInstance { runImpl(); } - catch (final Exception e) + catch (Exception e) { _log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed scheduling auction " + _auction.getAuctionId(), e); } diff --git a/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionState.java b/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionState.java index a8e5b56392..deb06db965 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionState.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionState.java @@ -41,7 +41,7 @@ public enum ItemAuctionState public static final ItemAuctionState stateForStateId(final byte stateId) { - for (final ItemAuctionState state : ItemAuctionState.values()) + for (ItemAuctionState state : ItemAuctionState.values()) { if (state.getStateId() == stateId) { diff --git a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java index 9acf5f9b86..fdda9d7aa4 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java @@ -267,7 +267,7 @@ public abstract class Inventory extends ItemContainer if (item.getItemType() == WeaponType.BOW) { - L2ItemInstance arrow = inventory.getPaperdollItem(PAPERDOLL_LHAND); + final L2ItemInstance arrow = inventory.getPaperdollItem(PAPERDOLL_LHAND); if (arrow != null) { @@ -276,7 +276,7 @@ public abstract class Inventory extends ItemContainer } else if (item.getItemType() == WeaponType.CROSSBOW) { - L2ItemInstance bolts = inventory.getPaperdollItem(PAPERDOLL_LHAND); + final L2ItemInstance bolts = inventory.getPaperdollItem(PAPERDOLL_LHAND); if (bolts != null) { @@ -285,7 +285,7 @@ public abstract class Inventory extends ItemContainer } else if (item.getItemType() == WeaponType.FISHINGROD) { - L2ItemInstance lure = inventory.getPaperdollItem(PAPERDOLL_LHAND); + final L2ItemInstance lure = inventory.getPaperdollItem(PAPERDOLL_LHAND); if (lure != null) { @@ -304,7 +304,7 @@ public abstract class Inventory extends ItemContainer if (item.getItemType() == WeaponType.BOW) { - L2ItemInstance arrow = inventory.findArrowForBow(item.getItem()); + final L2ItemInstance arrow = inventory.findArrowForBow(item.getItem()); if (arrow != null) { @@ -313,7 +313,7 @@ public abstract class Inventory extends ItemContainer } else if (item.getItemType() == WeaponType.CROSSBOW) { - L2ItemInstance bolts = inventory.findBoltForCrossBow(item.getItem()); + final L2ItemInstance bolts = inventory.findBoltForCrossBow(item.getItem()); if (bolts != null) { @@ -364,7 +364,7 @@ public abstract class Inventory extends ItemContainer final L2PcInstance player = (L2PcInstance) inventory.getOwner(); Skill enchant4Skill, itemSkill; - L2Item it = item.getItem(); + final L2Item it = item.getItem(); boolean update = false; boolean updateTimeStamp = false; @@ -442,7 +442,7 @@ public abstract class Inventory extends ItemContainer { if (!player.hasSkillReuse(itemSkill.getReuseHashCode())) { - int equipDelay = item.getEquipReuseDelay(); + final int equipDelay = item.getEquipReuseDelay(); if (equipDelay > 0) { player.addTimeStamp(itemSkill, equipDelay); @@ -494,7 +494,7 @@ public abstract class Inventory extends ItemContainer final L2PcInstance player = (L2PcInstance) inventory.getOwner(); Skill enchant4Skill, itemSkill; - L2Item it = item.getItem(); + final L2Item it = item.getItem(); boolean update = false; boolean updateTimeStamp = false; @@ -541,7 +541,7 @@ public abstract class Inventory extends ItemContainer { if (!player.hasSkillReuse(itemSkill.getReuseHashCode())) { - int equipDelay = item.getEquipReuseDelay(); + final int equipDelay = item.getEquipReuseDelay(); if (equipDelay > 0) { player.addTimeStamp(itemSkill, equipDelay); @@ -609,7 +609,7 @@ public abstract class Inventory extends ItemContainer { if (!player.hasSkillReuse(itemSkill.getReuseHashCode())) { - int equipDelay = item.getEquipReuseDelay(); + final int equipDelay = item.getEquipReuseDelay(); if (equipDelay > 0) { player.addTimeStamp(itemSkill, equipDelay); @@ -734,7 +734,7 @@ public abstract class Inventory extends ItemContainer final L2ArmorSet visualArmorSet = ArmorSetsData.getInstance().getSet(chestItem.getVisualId()); if ((visualArmorSet != null) && visualArmorSet.isVisual()) { - int pieces = visualArmorSet.getVisualPiecesCount(player); + final int pieces = visualArmorSet.getVisualPiecesCount(player); if (pieces >= visualArmorSet.getMinimumPieces()) { addSkills(player, item, visualArmorSet.getSkills(), visualArmorSet.getPiecesCount(player)); @@ -753,7 +753,7 @@ public abstract class Inventory extends ItemContainer { for (SkillHolder holder : shieldSkills) { - Skill itemSkill = holder.getSkill(); + final Skill itemSkill = holder.getSkill(); if (itemSkill != null) { player.removeSkill(itemSkill, false, itemSkill.isPassive()); @@ -853,7 +853,7 @@ public abstract class Inventory extends ItemContainer protected static boolean removeArmorsetBonus(L2PcInstance player, L2ArmorSet armorSet) { - boolean remove = armorSet != null; + final boolean remove = armorSet != null; final List skills = armorSet != null ? armorSet.getSkills() : null; final List shieldSkill = armorSet != null ? armorSet.getShieldSkills() : null; // shield skill final List enchantSkills = armorSet != null ? armorSet.getEnchantSkills() : null; // enchant +6 skill @@ -1192,7 +1192,7 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance getPaperdollItemByL2ItemId(int slot) { - int index = getPaperdollIndex(slot); + final int index = getPaperdollIndex(slot); if (index == -1) { return null; @@ -1207,7 +1207,7 @@ public abstract class Inventory extends ItemContainer */ public int getPaperdollItemId(int slot) { - L2ItemInstance item = _paperdoll[slot]; + final L2ItemInstance item = _paperdoll[slot]; if (item != null) { return item.getId(); @@ -1292,7 +1292,7 @@ public abstract class Inventory extends ItemContainer */ public synchronized L2ItemInstance setPaperdollItem(int slot, L2ItemInstance item) { - L2ItemInstance old = _paperdoll[slot]; + final L2ItemInstance old = _paperdoll[slot]; if (old != item) { if (old != null) @@ -1305,7 +1305,7 @@ public abstract class Inventory extends ItemContainer int mask = 0; for (int i = 0; i < PAPERDOLL_TOTALSLOTS; i++) { - L2ItemInstance pi = _paperdoll[i]; + final L2ItemInstance pi = _paperdoll[i]; if (pi != null) { mask |= pi.getItem().getItemMask(); @@ -1456,7 +1456,7 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance[] unEquipItemInBodySlotAndRecord(int slot) { - Inventory.ChangeRecorder recorder = newRecorder(); + final Inventory.ChangeRecorder recorder = newRecorder(); try { @@ -1487,7 +1487,7 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance[] unEquipItemInSlotAndRecord(int slot) { - Inventory.ChangeRecorder recorder = newRecorder(); + final Inventory.ChangeRecorder recorder = newRecorder(); try { @@ -1599,7 +1599,7 @@ public abstract class Inventory extends ItemContainer } if (pdollSlot >= 0) { - L2ItemInstance old = setPaperdollItem(pdollSlot, null); + final L2ItemInstance old = setPaperdollItem(pdollSlot, null); if (old != null) { if (getOwner() instanceof L2PcInstance) @@ -1620,7 +1620,7 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance[] equipItemAndRecord(L2ItemInstance item) { - Inventory.ChangeRecorder recorder = newRecorder(); + final Inventory.ChangeRecorder recorder = newRecorder(); try { @@ -1646,7 +1646,7 @@ public abstract class Inventory extends ItemContainer if (getOwner() instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) getOwner(); + final L2PcInstance player = (L2PcInstance) getOwner(); if (!player.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem()) { @@ -1654,10 +1654,10 @@ public abstract class Inventory extends ItemContainer } } - int targetSlot = item.getItem().getBodyPart(); + final int targetSlot = item.getItem().getBodyPart(); // Check if player is using Formal Wear and item isn't Wedding Bouquet. - L2ItemInstance formal = getPaperdollItem(PAPERDOLL_CHEST); + final L2ItemInstance formal = getPaperdollItem(PAPERDOLL_CHEST); if ((item.getId() != 21163) && (formal != null) && (formal.getItem().getBodyPart() == L2Item.SLOT_ALLDRESS)) { // only chest target can pass this @@ -1684,7 +1684,7 @@ public abstract class Inventory extends ItemContainer } case L2Item.SLOT_L_HAND: { - L2ItemInstance rh = getPaperdollItem(PAPERDOLL_RHAND); + final L2ItemInstance rh = getPaperdollItem(PAPERDOLL_RHAND); if ((rh != null) && (rh.getItem().getBodyPart() == L2Item.SLOT_LR_HAND) && !(((rh.getItemType() == WeaponType.BOW) && (item.getItemType() == EtcItemType.ARROW)) || ((rh.getItemType() == WeaponType.CROSSBOW) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) { setPaperdollItem(PAPERDOLL_RHAND, null); @@ -1748,7 +1748,7 @@ public abstract class Inventory extends ItemContainer case L2Item.SLOT_LEGS: { // handle full armor - L2ItemInstance chest = getPaperdollItem(PAPERDOLL_CHEST); + final L2ItemInstance chest = getPaperdollItem(PAPERDOLL_CHEST); if ((chest != null) && (chest.getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR)) { setPaperdollItem(PAPERDOLL_CHEST, null); @@ -1767,7 +1767,7 @@ public abstract class Inventory extends ItemContainer setPaperdollItem(PAPERDOLL_HEAD, item); break; case L2Item.SLOT_HAIR: - L2ItemInstance hair = getPaperdollItem(PAPERDOLL_HAIR); + final L2ItemInstance hair = getPaperdollItem(PAPERDOLL_HAIR); if ((hair != null) && (hair.getItem().getBodyPart() == L2Item.SLOT_HAIRALL)) { setPaperdollItem(PAPERDOLL_DHAIR, null); @@ -1780,7 +1780,7 @@ public abstract class Inventory extends ItemContainer setPaperdollItem(PAPERDOLL_HAIR, item); break; case L2Item.SLOT_HAIR2: - L2ItemInstance hair2 = getPaperdollItem(PAPERDOLL_HAIR); + final L2ItemInstance hair2 = getPaperdollItem(PAPERDOLL_HAIR); if ((hair2 != null) && (hair2.getItem().getBodyPart() == L2Item.SLOT_HAIRALL)) { setPaperdollItem(PAPERDOLL_HAIR, null); @@ -1937,7 +1937,7 @@ public abstract class Inventory extends ItemContainer if (getOwner() instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) getOwner(); + final L2PcInstance player = (L2PcInstance) getOwner(); if (!player.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem()) { diff --git a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java index 55bc099bad..fb0fec93e5 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java @@ -223,12 +223,12 @@ public abstract class ItemContainer */ public L2ItemInstance addItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) { - L2ItemInstance olditem = getItemByItemId(item.getId()); + final L2ItemInstance olditem = getItemByItemId(item.getId()); // If stackable item is found in inventory just add to current quantity if ((olditem != null) && olditem.isStackable()) { - long count = item.getCount(); + final long count = item.getCount(); olditem.changeCount(process, count, actor, reference); olditem.setLastChange(L2ItemInstance.MODIFIED); @@ -238,7 +238,7 @@ public abstract class ItemContainer item = olditem; // Updates database - float adenaRate = Config.RATE_DROP_AMOUNT_MULTIPLIER.getOrDefault(Inventory.ADENA_ID, 1f); + final float adenaRate = Config.RATE_DROP_AMOUNT_MULTIPLIER.getOrDefault(Inventory.ADENA_ID, 1f); if ((item.getId() == Inventory.ADENA_ID) && (count < (10000 * adenaRate))) { // Small adena changes won't be saved to database all the time @@ -290,7 +290,7 @@ public abstract class ItemContainer item.setLastChange(L2ItemInstance.MODIFIED); // Updates database // If Adena drop rate is not present it will be x1. - float adenaRate = Config.RATE_DROP_AMOUNT_MULTIPLIER.getOrDefault(Inventory.ADENA_ID, 1f); + final float adenaRate = Config.RATE_DROP_AMOUNT_MULTIPLIER.getOrDefault(Inventory.ADENA_ID, 1f); if ((itemId == Inventory.ADENA_ID) && (count < (10000 * adenaRate))) { // Small adena changes won't be saved to database all the time @@ -309,7 +309,7 @@ public abstract class ItemContainer { for (int i = 0; i < count; i++) { - L2Item template = ItemTable.getInstance().getTemplate(itemId); + final L2Item template = ItemTable.getInstance().getTemplate(itemId); if (template == null) { _log.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); @@ -356,7 +356,7 @@ public abstract class ItemContainer return null; } - L2ItemInstance sourceitem = getItemByObjectId(objectId); + final L2ItemInstance sourceitem = getItemByObjectId(objectId); if (sourceitem == null) { return null; @@ -541,7 +541,7 @@ public abstract class ItemContainer return null; } - boolean removed = removeItem(item); + final boolean removed = removeItem(item); if (!removed) { return null; @@ -568,7 +568,7 @@ public abstract class ItemContainer */ public L2ItemInstance destroyItem(String process, int objectId, long count, L2PcInstance actor, Object reference) { - L2ItemInstance item = getItemByObjectId(objectId); + final L2ItemInstance item = getItemByObjectId(objectId); if (item == null) { return null; @@ -587,7 +587,7 @@ public abstract class ItemContainer */ public L2ItemInstance destroyItemByItemId(String process, int itemId, long count, L2PcInstance actor, Object reference) { - L2ItemInstance item = getItemByItemId(itemId); + final L2ItemInstance item = getItemByItemId(itemId); if (item == null) { return null; @@ -725,7 +725,7 @@ public abstract class ItemContainer L2World.getInstance().storeObject(item); - L2PcInstance owner = getOwner() == null ? null : getOwner().getActingPlayer(); + final L2PcInstance owner = getOwner() == null ? null : getOwner().getActingPlayer(); // If stackable item is found in inventory just add to current quantity if (item.isStackable() && (getItemByItemId(item.getId()) != null)) diff --git a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcFreight.java b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcFreight.java index 052abdf09e..101928d233 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcFreight.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcFreight.java @@ -71,7 +71,7 @@ public class PcFreight extends ItemContainer @Override public boolean validateCapacity(long slots) { - int curSlots = _owner == null ? Config.ALT_FREIGHT_SLOTS : Config.ALT_FREIGHT_SLOTS + (int) _owner.getStat().calcStat(Stats.FREIGHT_LIM, 0, null, null); + final int curSlots = _owner == null ? Config.ALT_FREIGHT_SLOTS : Config.ALT_FREIGHT_SLOTS + (int) _owner.getStat().calcStat(Stats.FREIGHT_LIM, 0, null, null); return ((getSize() + slots) <= curSlots); } diff --git a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java index 01187a287f..b1e5a33734 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java @@ -141,7 +141,7 @@ public class PcInventory extends Inventory public L2ItemInstance[] getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable) { - List list = new LinkedList<>(); + final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { if (item == null) @@ -186,7 +186,7 @@ public class PcInventory extends Inventory public L2ItemInstance[] getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable) { - List list = new LinkedList<>(); + final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { if (item == null) @@ -237,7 +237,7 @@ public class PcInventory extends Inventory */ public L2ItemInstance[] getAllItemsByItemId(int itemId, boolean includeEquipped) { - List list = new LinkedList<>(); + final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { if (item == null) @@ -272,7 +272,7 @@ public class PcInventory extends Inventory */ public L2ItemInstance[] getAllItemsByItemId(int itemId, int enchantment, boolean includeEquipped) { - List list = new LinkedList<>(); + final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { if (item == null) @@ -296,7 +296,7 @@ public class PcInventory extends Inventory */ public L2ItemInstance[] getAvailableItems(boolean allowAdena, boolean allowNonTradeable, boolean feightable) { - List list = new LinkedList<>(); + final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { if ((item == null) || !item.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(item.getId())) @@ -324,7 +324,7 @@ public class PcInventory extends Inventory */ public L2ItemInstance[] getAugmentedItems() { - List list = new LinkedList<>(); + final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { if ((item != null) && item.isAugmented()) @@ -341,7 +341,7 @@ public class PcInventory extends Inventory */ public L2ItemInstance[] getElementItems() { - List list = new LinkedList<>(); + final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { if ((item != null) && (item.getElementals() != null)) @@ -359,12 +359,12 @@ public class PcInventory extends Inventory */ public TradeItem[] getAvailableItems(TradeList tradeList) { - List list = new LinkedList<>(); + final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { if ((item != null) && item.isAvailable(getOwner(), false, false)) { - TradeItem adjItem = tradeList.adjustAvailableItem(item); + final TradeItem adjItem = tradeList.adjustAvailableItem(item); if (adjItem != null) { list.add(adjItem); @@ -398,7 +398,7 @@ public class PcInventory extends Inventory } if (notAllEquipped) { - L2ItemInstance adjItem = getItemByItemId(item.getItem().getId()); + final L2ItemInstance adjItem = getItemByItemId(item.getItem().getId()); item.setObjectId(adjItem.getObjectId()); item.setEnchant(adjItem.getEnchantLevel()); @@ -542,7 +542,7 @@ public class PcInventory extends Inventory // Send inventory update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); playerIU.addItem(item); actor.sendPacket(playerIU); } @@ -575,7 +575,7 @@ public class PcInventory extends Inventory @Override public L2ItemInstance addItem(String process, int itemId, long count, L2PcInstance actor, Object reference) { - L2ItemInstance item = super.addItem(process, itemId, count, actor, reference); + final L2ItemInstance item = super.addItem(process, itemId, count, actor, reference); if (item != null) { if ((item.getId() == ADENA_ID) && !item.equals(_adena)) @@ -597,7 +597,7 @@ public class PcInventory extends Inventory // Send inventory update packet if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate playerIU = new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); playerIU.addItem(item); actor.sendPacket(playerIU); } @@ -630,7 +630,7 @@ public class PcInventory extends Inventory @Override public L2ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, L2PcInstance actor, Object reference) { - L2ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference); if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId()))) { @@ -720,7 +720,7 @@ public class PcInventory extends Inventory @Override public L2ItemInstance destroyItem(String process, int objectId, long count, L2PcInstance actor, Object reference) { - L2ItemInstance item = getItemByObjectId(objectId); + final L2ItemInstance item = getItemByObjectId(objectId); if (item == null) { return null; @@ -740,7 +740,7 @@ public class PcInventory extends Inventory @Override public L2ItemInstance destroyItemByItemId(String process, int itemId, long count, L2PcInstance actor, Object reference) { - L2ItemInstance item = getItemByItemId(itemId); + final L2ItemInstance item = getItemByItemId(itemId); if (item == null) { return null; @@ -791,7 +791,7 @@ public class PcInventory extends Inventory @Override public L2ItemInstance dropItem(String process, int objectId, long count, L2PcInstance actor, Object reference) { - L2ItemInstance item = super.dropItem(process, objectId, count, actor, reference); + final L2ItemInstance item = super.dropItem(process, objectId, count, actor, reference); if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId()))) { @@ -879,7 +879,7 @@ public class PcInventory extends Inventory public static int[][] restoreVisibleInventory(int objectId) { - int[][] paperdoll = new int[Inventory.PAPERDOLL_TOTALSLOTS][4]; + final int[][] paperdoll = new int[Inventory.PAPERDOLL_TOTALSLOTS][4]; try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT object_id,item_id,loc_data,enchant_level FROM items WHERE owner_id=? AND loc='PAPERDOLL'")) { @@ -888,7 +888,7 @@ public class PcInventory extends Inventory { while (invdata.next()) { - int slot = invdata.getInt("loc_data"); + final int slot = invdata.getInt("loc_data"); final ItemVariables vars = new ItemVariables(invdata.getInt("object_id")); paperdoll[slot][0] = invdata.getInt("object_id"); paperdoll[slot][1] = invdata.getInt("item_id"); @@ -927,7 +927,7 @@ public class PcInventory extends Inventory } } - boolean inventoryStatusOK = validateCapacity(requiredSlots) && validateWeight(lootWeight); + final boolean inventoryStatusOK = validateCapacity(requiredSlots) && validateWeight(lootWeight); if (!inventoryStatusOK && sendMessage) { _owner.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); diff --git a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java index 46ec6b8eae..699bb88f34 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java @@ -63,7 +63,7 @@ public class PcRefund extends ItemContainer { if (getSize() > 12) { - L2ItemInstance removedItem = _items.remove(0); + final L2ItemInstance removedItem = _items.remove(0); if (removedItem != null) { ItemTable.getInstance().destroyItem("ClearRefund", removedItem, getOwner(), null); diff --git a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java index f7757a6c4b..d30122fc27 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java @@ -86,7 +86,7 @@ public class PetInventory extends Inventory public boolean validateWeight(L2ItemInstance item, long count) { int weight = 0; - L2Item template = ItemTable.getInstance().getTemplate(item.getId()); + final L2Item template = ItemTable.getInstance().getTemplate(item.getId()); if (template == null) { return false; diff --git a/trunk/java/com/l2jserver/gameserver/model/items/L2Armor.java b/trunk/java/com/l2jserver/gameserver/model/items/L2Armor.java index a7c48aecc2..111bb80602 100644 --- a/trunk/java/com/l2jserver/gameserver/model/items/L2Armor.java +++ b/trunk/java/com/l2jserver/gameserver/model/items/L2Armor.java @@ -44,7 +44,7 @@ public final class L2Armor extends L2Item super(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); - int _bodyPart = getBodyPart(); + final int _bodyPart = getBodyPart(); if ((_bodyPart == L2Item.SLOT_NECK) || ((_bodyPart & L2Item.SLOT_L_EAR) != 0) || ((_bodyPart & L2Item.SLOT_L_FINGER) != 0) || ((_bodyPart & L2Item.SLOT_R_BRACELET) != 0) || ((_bodyPart & L2Item.SLOT_L_BRACELET) != 0)) { _type1 = L2Item.TYPE1_WEAPON_RING_EARRING_NECKLACE; @@ -60,10 +60,10 @@ public final class L2Armor extends L2Item _type2 = L2Item.TYPE2_SHIELD_ARMOR; } - String skill = set.getString("enchant4_skill", null); + final String skill = set.getString("enchant4_skill", null); if (skill != null) { - String[] info = skill.split("-"); + final String[] info = skill.split("-"); if ((info != null) && (info.length == 2)) { diff --git a/trunk/java/com/l2jserver/gameserver/model/items/L2EtcItem.java b/trunk/java/com/l2jserver/gameserver/model/items/L2EtcItem.java index faf074f957..5665185990 100644 --- a/trunk/java/com/l2jserver/gameserver/model/items/L2EtcItem.java +++ b/trunk/java/com/l2jserver/gameserver/model/items/L2EtcItem.java @@ -78,10 +78,10 @@ public final class L2EtcItem extends L2Item _isBlessed = set.getBoolean("blessed", false); // Extractable - String capsuled_items = set.getString("capsuled_items", null); + final String capsuled_items = set.getString("capsuled_items", null); if (capsuled_items != null) { - String[] split = capsuled_items.split(";"); + final String[] split = capsuled_items.split(";"); _extractableItems = new ArrayList<>(split.length); for (String part : split) { @@ -89,21 +89,21 @@ public final class L2EtcItem extends L2Item { continue; } - String[] data = part.split(","); + final String[] data = part.split(","); if ((data.length != 4) && (data.length != 6)) { _log.info(StringUtil.concat("> Couldnt parse ", part, " in capsuled_items! item ", toString())); continue; } - int itemId = Integer.parseInt(data[0]); - int min = Integer.parseInt(data[1]); - int max = Integer.parseInt(data[2]); + final int itemId = Integer.parseInt(data[0]); + final int min = Integer.parseInt(data[1]); + final int max = Integer.parseInt(data[2]); if (max < min) { _log.info(StringUtil.concat("> Max amount < Min amount in ", part, ", item ", toString())); continue; } - double chance = Double.parseDouble(data[3]); + final double chance = Double.parseDouble(data[3]); int minEnchant = 0; int maxEnchant = 0; if (data.length == 6) diff --git a/trunk/java/com/l2jserver/gameserver/model/items/L2Item.java b/trunk/java/com/l2jserver/gameserver/model/items/L2Item.java index f99c622964..f8839951fc 100644 --- a/trunk/java/com/l2jserver/gameserver/model/items/L2Item.java +++ b/trunk/java/com/l2jserver/gameserver/model/items/L2Item.java @@ -219,7 +219,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable String skills = set.getString("item_skill", null); if (skills != null) { - String[] skillsSplit = skills.split(";"); + final String[] skillsSplit = skills.split(";"); _skillHolder = new SkillHolder[skillsSplit.length]; int used = 0; @@ -227,9 +227,9 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable { try { - String[] skillSplit = element.split("-"); - int id = Integer.parseInt(skillSplit[0]); - int level = Integer.parseInt(skillSplit[1]); + final String[] skillSplit = element.split("-"); + final int id = Integer.parseInt(skillSplit[0]); + final int level = Integer.parseInt(skillSplit[1]); if (id == 0) { @@ -255,7 +255,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable // this is only loading? just don't leave a null or use a collection? if (used != _skillHolder.length) { - SkillHolder[] skillHolder = new SkillHolder[used]; + final SkillHolder[] skillHolder = new SkillHolder[used]; System.arraycopy(_skillHolder, 0, skillHolder, 0, used); _skillHolder = skillHolder; } @@ -264,7 +264,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable skills = set.getString("unequip_skill", null); if (skills != null) { - String[] info = skills.split("-"); + final String[] info = skills.split("-"); if ((info != null) && (info.length == 2)) { int id = 0; @@ -289,7 +289,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable skills = set.getString("equip_skill", null); if (skills != null) { - String[] info = skills.split("-"); + final String[] info = skills.split("-"); if ((info != null) && (info.length == 2)) { int id = 0; @@ -562,7 +562,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable else { elm = element; - Elementals[] array = new Elementals[_elementals.length + 1]; + final Elementals[] array = new Elementals[_elementals.length + 1]; System.arraycopy(_elementals, 0, array, 0, _elementals.length); array[_elementals.length] = elm; _elementals = array; @@ -733,7 +733,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable final List funcs = new ArrayList<>(_funcTemplates.size()); for (FuncTemplate t : _funcTemplates) { - AbstractFunction f = t.getFunc(player, player, item, item); + final AbstractFunction f = t.getFunc(player, player, item, item); if (f != null) { funcs.add(f); @@ -869,15 +869,15 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable if (sendMessage) { - String msg = preCondition.getMessage(); - int msgId = preCondition.getMessageId(); + final String msg = preCondition.getMessage(); + final int msgId = preCondition.getMessageId(); if (msg != null) { activeChar.sendMessage(msg); } else if (msgId != 0) { - SystemMessage sm = SystemMessage.getSystemMessage(msgId); + final SystemMessage sm = SystemMessage.getSystemMessage(msgId); if (preCondition.isAddName()) { sm.addItemName(_itemId); diff --git a/trunk/java/com/l2jserver/gameserver/model/items/L2Weapon.java b/trunk/java/com/l2jserver/gameserver/model/items/L2Weapon.java index 9c7ab51243..192bb80052 100644 --- a/trunk/java/com/l2jserver/gameserver/model/items/L2Weapon.java +++ b/trunk/java/com/l2jserver/gameserver/model/items/L2Weapon.java @@ -88,7 +88,7 @@ public final class L2Weapon extends L2Item _rndDam = set.getInt("random_damage", 0); _mpConsume = set.getInt("mp_consume", 0); _baseAttackRange = set.getInt("attack_range", 40); - String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle if ((damgeRange.length > 1) && Util.isDigit(damgeRange[3])) { _baseAttackAngle = Integer.parseInt(damgeRange[3]); @@ -98,18 +98,18 @@ public final class L2Weapon extends L2Item _baseAttackAngle = 120; } - String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(","); + final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(","); _reducedSoulshotChance = (reduced_soulshots.length == 2) ? Integer.parseInt(reduced_soulshots[0]) : 0; _reducedSoulshot = (reduced_soulshots.length == 2) ? Integer.parseInt(reduced_soulshots[1]) : 0; - String[] reduced_mpconsume = set.getString("reduced_mp_consume", "").split(","); + final String[] reduced_mpconsume = set.getString("reduced_mp_consume", "").split(","); _reducedMpConsumeChance = (reduced_mpconsume.length == 2) ? Integer.parseInt(reduced_mpconsume[0]) : 0; _reducedMpConsume = (reduced_mpconsume.length == 2) ? Integer.parseInt(reduced_mpconsume[1]) : 0; String skill = set.getString("enchant4_skill", null); if (skill != null) { - String[] info = skill.split("-"); + final String[] info = skill.split("-"); if ((info != null) && (info.length == 2)) { @@ -135,7 +135,7 @@ public final class L2Weapon extends L2Item skill = set.getString("onmagic_skill", null); if (skill != null) { - String[] info = skill.split("-"); + final String[] info = skill.split("-"); final int chance = set.getInt("onmagic_chance", 100); if ((info != null) && (info.length == 2)) { @@ -162,7 +162,7 @@ public final class L2Weapon extends L2Item skill = set.getString("oncrit_skill", null); if (skill != null) { - String[] info = skill.split("-"); + final String[] info = skill.split("-"); final int chance = set.getInt("oncrit_chance", 100); if ((info != null) && (info.length == 2)) { @@ -431,7 +431,7 @@ public final class L2Weapon extends L2Item // notify quests of a skill use if (caster instanceof L2PcInstance) { - L2Character[] targets = + final L2Character[] targets = { target }; @@ -449,7 +449,7 @@ public final class L2Weapon extends L2Item } if (caster.isPlayer()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); sm.addSkillName(onMagicSkill); caster.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java b/trunk/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java index 634e2671aa..e497533f41 100644 --- a/trunk/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java @@ -264,7 +264,7 @@ public final class L2ItemInstance extends L2Object { assert getWorldRegion() != null; - L2WorldRegion oldregion = getWorldRegion(); + final L2WorldRegion oldregion = getWorldRegion(); // Create a server->client GetItem packet to pick up the L2ItemInstance player.broadcastPacket(new GetItem(this, player.getObjectId())); @@ -276,7 +276,7 @@ public final class L2ItemInstance extends L2Object } // if this item is a mercenary ticket, remove the spawns! - int itemId = getId(); + final int itemId = getId(); if (MercTicketManager.getInstance().getTicketCastleId(itemId) > 0) { @@ -310,7 +310,7 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) { - LogRecord record = new LogRecord(Level.INFO, "SETOWNER:" + process); + final LogRecord record = new LogRecord(Level.INFO, "SETOWNER:" + process); record.setLoggerName("item"); record.setParameters(new Object[] { @@ -335,7 +335,7 @@ public final class L2ItemInstance extends L2Object { referenceName = (String) reference; } - String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); + final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); @@ -454,8 +454,8 @@ public final class L2ItemInstance extends L2Object { return; } - long old = getCount(); - long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; + final long old = getCount(); + final long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; if ((count > 0) && (getCount() > (max - count))) { @@ -477,7 +477,7 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - LogRecord record = new LogRecord(Level.INFO, "CHANGE:" + process); + final LogRecord record = new LogRecord(Level.INFO, "CHANGE:" + process); record.setLoggerName("item"); record.setParameters(new Object[] { @@ -503,7 +503,7 @@ public final class L2ItemInstance extends L2Object { referenceName = (String) reference; } - String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); + final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); @@ -976,7 +976,7 @@ public final class L2ItemInstance extends L2Object { if (rs.next()) { - int aug_attributes = rs.getInt(1); + final int aug_attributes = rs.getInt(1); if (aug_attributes != -1) { _augmentation = new L2Augmentation(rs.getInt("augAttributes")); @@ -989,8 +989,8 @@ public final class L2ItemInstance extends L2Object { while (rs.next()) { - byte elem_type = rs.getByte(1); - int elem_value = rs.getInt(2); + final byte elem_type = rs.getByte(1); + final int elem_value = rs.getInt(2); if ((elem_type != -1) && (elem_value != -1)) { applyAttribute(elem_type, elem_value); @@ -1115,7 +1115,7 @@ public final class L2ItemInstance extends L2Object } else if (getItem().getElementals() != null) { - Elementals elm = getItem().getElemental(element); + final Elementals elm = getItem().getElemental(element); if (elm != null) { return elm.getValue(); @@ -1123,7 +1123,7 @@ public final class L2ItemInstance extends L2Object } else if (_elementals != null) { - Elementals elm = getElemental(element); + final Elementals elm = getElemental(element); if (elm != null) { return elm.getValue(); @@ -1149,7 +1149,7 @@ public final class L2ItemInstance extends L2Object else { elm = new Elementals(element, value); - Elementals[] array = new Elementals[_elementals.length + 1]; + final Elementals[] array = new Elementals[_elementals.length + 1]; System.arraycopy(_elementals, 0, array, 0, _elementals.length); array[_elementals.length] = elm; _elementals = array; @@ -1166,7 +1166,7 @@ public final class L2ItemInstance extends L2Object } else { - Elementals elm = getElemental(element); + final Elementals elm = getElemental(element); if (elm != null) { elm.setValue(value); @@ -1231,7 +1231,7 @@ public final class L2ItemInstance extends L2Object } _elementals = array; - String query = (element != -1) ? "DELETE FROM item_elementals WHERE itemId = ? AND elemType = ?" : "DELETE FROM item_elementals WHERE itemId = ?"; + final String query = (element != -1) ? "DELETE FROM item_elementals WHERE itemId = ? AND elemType = ?" : "DELETE FROM item_elementals WHERE itemId = ?"; try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(query)) { @@ -1370,8 +1370,8 @@ public final class L2ItemInstance extends L2Object // unequip if (isEquipped()) { - L2ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); - InventoryUpdate iu = new InventoryUpdate(); + final L2ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); + final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance item : unequiped) { item.unChargeAllShots(); @@ -1387,7 +1387,7 @@ public final class L2ItemInstance extends L2Object player.getInventory().destroyItem("L2ItemInstance", this, player, null); // send update - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addRemovedItem(this); player.sendPacket(iu); @@ -1412,7 +1412,7 @@ public final class L2ItemInstance extends L2Object } if (getItemLocation() != ItemLocation.WAREHOUSE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); player.sendPacket(iu); } @@ -1524,7 +1524,7 @@ public final class L2ItemInstance extends L2Object _log.log(Level.SEVERE, "Could not restore an item owned by " + ownerId + " from DB:", e); return null; } - L2Item item = ItemTable.getInstance().getTemplate(item_id); + final L2Item item = ItemTable.getInstance().getTemplate(item_id); if (item == null) { _log.severe("Item item_id=" + item_id + " not known, object_id=" + objectId); @@ -1593,7 +1593,7 @@ public final class L2ItemInstance extends L2Object if (_dropper != null) { - Location dropDest = GeoData.getInstance().moveCheck(_dropper.getX(), _dropper.getY(), _dropper.getZ(), _x, _y, _z, _dropper.getInstanceId()); + final Location dropDest = GeoData.getInstance().moveCheck(_dropper.getX(), _dropper.getY(), _dropper.getZ(), _x, _y, _z, _dropper.getInstanceId()); _x = dropDest.getX(); _y = dropDest.getY(); _z = dropDest.getZ(); @@ -1863,13 +1863,13 @@ public final class L2ItemInstance extends L2Object public void endOfLife() { - L2PcInstance player = getActingPlayer(); + final L2PcInstance player = getActingPlayer(); if (player != null) { if (isEquipped()) { - L2ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); - InventoryUpdate iu = new InventoryUpdate(); + final L2ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); + final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance item : unequiped) { item.unChargeAllShots(); @@ -1885,7 +1885,7 @@ public final class L2ItemInstance extends L2Object player.getInventory().destroyItem("L2ItemInstance", this, player, null); // send update - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addRemovedItem(this); player.sendPacket(iu); @@ -2048,7 +2048,7 @@ public final class L2ItemInstance extends L2Object public int getOlyEnchantLevel() { - L2PcInstance player = getActingPlayer(); + final L2PcInstance player = getActingPlayer(); int enchant = getEnchantLevel(); if (player == null) @@ -2141,9 +2141,9 @@ public final class L2ItemInstance extends L2Object { if (command.startsWith("Quest")) { - String questName = command.substring(6); + final String questName = command.substring(6); String event = null; - int idx = questName.indexOf(' '); + final int idx = questName.indexOf(' '); if (idx > 0) { event = questName.substring(idx).trim(); @@ -2190,7 +2190,7 @@ public final class L2ItemInstance extends L2Object */ public int[] getEnchantOptions() { - EnchantOptions op = EnchantItemOptionsData.getInstance().getOptions(this); + final EnchantOptions op = EnchantItemOptionsData.getInstance().getOptions(this); if (op != null) { return op.getOptions(); diff --git a/trunk/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java b/trunk/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java index 74dbe1a98d..f06a556c71 100644 --- a/trunk/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/trunk/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -275,7 +275,7 @@ public abstract class AbstractOlympiadGame player.disableAutoShotsAll(); // Discharge any active shots - L2ItemInstance item = player.getActiveWeaponInstance(); + final L2ItemInstance item = player.getActiveWeaponInstance(); if (item != null) { item.unChargeAllShots(); diff --git a/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java b/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java index b3c622378b..292ad4d1c0 100644 --- a/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java +++ b/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java @@ -201,7 +201,7 @@ public class Olympiad extends ListenersContainer { _log.log(Level.INFO, "Olympiad System: failed to load data from database, trying to load from file."); - Properties OlympiadProperties = new Properties(); + final Properties OlympiadProperties = new Properties(); try (InputStream is = new FileInputStream(Config.OLYMPIAD_CONFIG_FILE)) { @@ -319,7 +319,7 @@ public class Olympiad extends ListenersContainer public void loadNoblesRank() { NOBLES_RANK.clear(); - Map tmpPlace = new HashMap<>(); + final Map tmpPlace = new HashMap<>(); try (Connection con = ConnectionFactory.getInstance().getConnection(); Statement statement = con.createStatement(); ResultSet rset = statement.executeQuery(GET_ALL_CLASSIFIED_NOBLESS)) @@ -405,7 +405,7 @@ public class Olympiad extends ListenersContainer @Override public void run() { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_GAMES_HAS_NOW_ENDED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_GAMES_HAS_NOW_ENDED); sm.addInt(_currentCycle); Broadcast.toAllOnlinePlayers(sm); @@ -426,7 +426,7 @@ public class Olympiad extends ListenersContainer saveOlympiadStatus(); updateMonthlyData(); - Calendar validationEnd = Calendar.getInstance(); + final Calendar validationEnd = Calendar.getInstance(); _validationEnd = validationEnd.getTimeInMillis() + VALIDATION_PERIOD; loadNoblesRank(); @@ -464,14 +464,14 @@ public class Olympiad extends ListenersContainer synchronized (this) { - long milliToStart = getMillisToCompBegin(); + final long milliToStart = getMillisToCompBegin(); - double numSecs = (milliToStart / 1000) % 60; + final double numSecs = (milliToStart / 1000) % 60; double countDown = ((milliToStart / 1000.) - numSecs) / 60; - int numMins = (int) Math.floor(countDown % 60); + final int numMins = (int) Math.floor(countDown % 60); countDown = (countDown - numMins) / 60; - int numHours = (int) Math.floor(countDown % 24); - int numDays = (int) Math.floor((countDown - numHours) / 24); + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); _log.info("Olympiad System: Competition Period Starts in " + numDays + " days, " + numHours + " hours and " + numMins + " mins."); @@ -497,7 +497,7 @@ public class Olympiad extends ListenersContainer _gameAnnouncer = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new OlympiadAnnouncer(), 30000, 500); } - long regEnd = getMillisToCompEnd() - 600000; + final long regEnd = getMillisToCompEnd() - 600000; if (regEnd > 0) { ThreadPoolManager.getInstance().scheduleGeneral(() -> Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.THE_OLYMPIAD_REGISTRATION_PERIOD_HAS_ENDED)), regEnd); @@ -577,12 +577,12 @@ public class Olympiad extends ListenersContainer protected void setNewOlympiadEnd() { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_GAMES_HAS_STARTED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_GAMES_HAS_STARTED); sm.addInt(_currentCycle); Broadcast.toAllOnlinePlayers(sm); - Calendar currentTime = Calendar.getInstance(); + final Calendar currentTime = Calendar.getInstance(); currentTime.add(Calendar.MONTH, 1); currentTime.set(Calendar.DAY_OF_MONTH, 1); currentTime.set(Calendar.AM_PM, Calendar.AM); @@ -591,7 +591,7 @@ public class Olympiad extends ListenersContainer currentTime.set(Calendar.SECOND, 0); _olympiadEnd = currentTime.getTimeInMillis(); - Calendar nextChange = Calendar.getInstance(); + final Calendar nextChange = Calendar.getInstance(); _nextWeeklyChange = nextChange.getTimeInMillis() + WEEKLY_PERIOD; scheduleWeeklyChange(); } @@ -654,7 +654,7 @@ public class Olympiad extends ListenersContainer resetWeeklyMatches(); _log.info("Olympiad System: Reset weekly matches to nobles"); - Calendar nextChange = Calendar.getInstance(); + final Calendar nextChange = Calendar.getInstance(); _nextWeeklyChange = nextChange.getTimeInMillis() + WEEKLY_PERIOD; }, getMillisToWeekChange(), WEEKLY_PERIOD); } @@ -723,25 +723,25 @@ public class Olympiad extends ListenersContainer { for (Entry entry : NOBLES.entrySet()) { - StatsSet nobleInfo = entry.getValue(); + final StatsSet nobleInfo = entry.getValue(); if (nobleInfo == null) { continue; } - int charId = entry.getKey(); - int classId = nobleInfo.getInt(CLASS_ID); - int points = nobleInfo.getInt(POINTS); - int compDone = nobleInfo.getInt(COMP_DONE); - int compWon = nobleInfo.getInt(COMP_WON); - int compLost = nobleInfo.getInt(COMP_LOST); - int compDrawn = nobleInfo.getInt(COMP_DRAWN); - int compDoneWeek = nobleInfo.getInt(COMP_DONE_WEEK); - int compDoneWeekClassed = nobleInfo.getInt(COMP_DONE_WEEK_CLASSED); - int compDoneWeekNonClassed = nobleInfo.getInt(COMP_DONE_WEEK_NON_CLASSED); - int compDoneWeekTeam = nobleInfo.getInt(COMP_DONE_WEEK_TEAM); - boolean toSave = nobleInfo.getBoolean("to_save"); + final int charId = entry.getKey(); + final int classId = nobleInfo.getInt(CLASS_ID); + final int points = nobleInfo.getInt(POINTS); + final int compDone = nobleInfo.getInt(COMP_DONE); + final int compWon = nobleInfo.getInt(COMP_WON); + final int compLost = nobleInfo.getInt(COMP_LOST); + final int compDrawn = nobleInfo.getInt(COMP_DRAWN); + final int compDoneWeek = nobleInfo.getInt(COMP_DONE_WEEK); + final int compDoneWeekClassed = nobleInfo.getInt(COMP_DONE_WEEK_CLASSED); + final int compDoneWeekNonClassed = nobleInfo.getInt(COMP_DONE_WEEK_NON_CLASSED); + final int compDoneWeekTeam = nobleInfo.getInt(COMP_DONE_WEEK_TEAM); + final boolean toSave = nobleInfo.getBoolean("to_save"); try (PreparedStatement ps = con.prepareStatement(toSave ? OLYMPIAD_SAVE_NOBLES : OLYMPIAD_UPDATE_NOBLES)) { @@ -856,17 +856,17 @@ public class Olympiad extends ListenersContainer _logResults.info("Noble,charid,classid,compDone,points"); for (Entry entry : NOBLES.entrySet()) { - StatsSet nobleInfo = entry.getValue(); + final StatsSet nobleInfo = entry.getValue(); if (nobleInfo == null) { continue; } - int charId = entry.getKey(); - int classId = nobleInfo.getInt(CLASS_ID); - String charName = nobleInfo.getString(CHAR_NAME); - int points = nobleInfo.getInt(POINTS); - int compDone = nobleInfo.getInt(COMP_DONE); + final int charId = entry.getKey(); + final int classId = nobleInfo.getInt(CLASS_ID); + final String charName = nobleInfo.getString(CHAR_NAME); + final int points = nobleInfo.getInt(POINTS); + final int compDone = nobleInfo.getInt(COMP_DONE); record = new LogRecord(Level.INFO, charName); record.setParameters(new Object[] @@ -883,7 +883,7 @@ public class Olympiad extends ListenersContainer PreparedStatement ps = con.prepareStatement(OLYMPIAD_GET_HEROS)) { StatsSet hero; - List soulHounds = new ArrayList<>(); + final List soulHounds = new ArrayList<>(); for (int element : HERO_IDS) { ps.setInt(1, element); @@ -927,7 +927,7 @@ public class Olympiad extends ListenersContainer case 1: { hero = new StatsSet(); - StatsSet winner = soulHounds.get(0); + final StatsSet winner = soulHounds.get(0); hero.set(CLASS_ID, winner.getInt(CLASS_ID)); hero.set(CHAR_ID, winner.getInt(CHAR_ID)); hero.set(CHAR_NAME, winner.getString(CHAR_NAME)); @@ -946,14 +946,14 @@ public class Olympiad extends ListenersContainer { hero = new StatsSet(); StatsSet winner; - StatsSet hero1 = soulHounds.get(0); - StatsSet hero2 = soulHounds.get(1); - int hero1Points = hero1.getInt(POINTS); - int hero2Points = hero2.getInt(POINTS); - int hero1Comps = hero1.getInt(COMP_DONE); - int hero2Comps = hero2.getInt(COMP_DONE); - int hero1Wins = hero1.getInt(COMP_WON); - int hero2Wins = hero2.getInt(COMP_WON); + final StatsSet hero1 = soulHounds.get(0); + final StatsSet hero2 = soulHounds.get(1); + final int hero1Points = hero1.getInt(POINTS); + final int hero2Points = hero2.getInt(POINTS); + final int hero1Comps = hero1.getInt(COMP_DONE); + final int hero2Comps = hero2.getInt(COMP_DONE); + final int hero1Wins = hero1.getInt(COMP_WON); + final int hero2Wins = hero2.getInt(COMP_WON); if (hero1Points > hero2Points) { @@ -1011,7 +1011,7 @@ public class Olympiad extends ListenersContainer public List getClassLeaderBoard(int classId) { final List names = new ArrayList<>(); - String query = Config.ALT_OLY_SHOW_MONTHLY_WINNERS ? ((classId == 132) ? GET_EACH_CLASS_LEADER_SOULHOUND : GET_EACH_CLASS_LEADER) : ((classId == 132) ? GET_EACH_CLASS_LEADER_CURRENT_SOULHOUND : GET_EACH_CLASS_LEADER_CURRENT); + final String query = Config.ALT_OLY_SHOW_MONTHLY_WINNERS ? ((classId == 132) ? GET_EACH_CLASS_LEADER_SOULHOUND : GET_EACH_CLASS_LEADER) : ((classId == 132) ? GET_EACH_CLASS_LEADER_CURRENT_SOULHOUND : GET_EACH_CLASS_LEADER_CURRENT); try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(query)) { diff --git a/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java b/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java index b401eab54e..00510d13f2 100644 --- a/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java @@ -91,7 +91,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame continue; } - Participant[] result = new Participant[2]; + final Participant[] result = new Participant[2]; result[0] = new Participant(playerOne, 1); result[1] = new Participant(playerTwo, 2); @@ -323,8 +323,8 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame boolean tie = false; int winside = 0; - List list1 = new ArrayList<>(1); - List list2 = new ArrayList<>(1); + final List list1 = new ArrayList<>(1); + final List list2 = new ArrayList<>(1); final boolean _pOneCrash = ((_playerOne.getPlayer() == null) || _playerOne.isDisconnected()); final boolean _pTwoCrash = ((_playerTwo.getPlayer() == null) || _playerTwo.isDisconnected()); @@ -361,7 +361,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame if (Config.ALT_OLY_LOG_FIGHTS) { - LogRecord record = new LogRecord(Level.INFO, _playerOne.getName() + " default"); + final LogRecord record = new LogRecord(Level.INFO, _playerOne.getName() + " default"); record.setParameters(new Object[] { _playerOne.getName(), @@ -400,7 +400,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame if (Config.ALT_OLY_LOG_FIGHTS) { - LogRecord record = new LogRecord(Level.INFO, _playerTwo.getName() + " default"); + final LogRecord record = new LogRecord(Level.INFO, _playerTwo.getName() + " default"); record.setParameters(new Object[] { _playerOne.getName(), @@ -463,7 +463,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame if (Config.ALT_OLY_LOG_FIGHTS) { - LogRecord record = new LogRecord(Level.INFO, _playerTwo.getName() + " crash"); + final LogRecord record = new LogRecord(Level.INFO, _playerTwo.getName() + " crash"); record.setParameters(new Object[] { _playerOne.getName(), @@ -501,7 +501,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame if (Config.ALT_OLY_LOG_FIGHTS) { - LogRecord record = new LogRecord(Level.INFO, _playerOne.getName() + " crash"); + final LogRecord record = new LogRecord(Level.INFO, _playerOne.getName() + " crash"); record.setParameters(new Object[] { _playerOne.getName(), @@ -534,7 +534,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame if (Config.ALT_OLY_LOG_FIGHTS) { - LogRecord record = new LogRecord(Level.INFO, "both crash"); + final LogRecord record = new LogRecord(Level.INFO, "both crash"); record.setParameters(new Object[] { _playerOne.getName(), @@ -584,7 +584,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - long _fightTime = (System.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) @@ -706,7 +706,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame if (Config.ALT_OLY_LOG_FIGHTS) { - LogRecord record = new LogRecord(Level.INFO, winner); + final LogRecord record = new LogRecord(Level.INFO, winner); record.setParameters(new Object[] { _playerOne.getName(), diff --git a/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java b/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java index 7569127eb3..cb4116d326 100644 --- a/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java +++ b/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java @@ -185,7 +185,7 @@ public final class OlympiadGameTask implements Runnable { if (_countDown > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_TO_THE_OLYMPIAD_STADIUM_IN_S1_SECOND_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_TO_THE_OLYMPIAD_STADIUM_IN_S1_SECOND_S); sm.addInt(_countDown); _game.broadcastPacket(sm); } @@ -216,7 +216,7 @@ public final class OlympiadGameTask implements Runnable { if (_countDown > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S); sm.addInt(_countDown); _zone.broadcastPacket(sm); } @@ -238,7 +238,7 @@ public final class OlympiadGameTask implements Runnable { if (_countDown > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S); sm.addInt(_countDown); _zone.broadcastPacket(sm); } @@ -295,7 +295,7 @@ public final class OlympiadGameTask implements Runnable { if (_countDown > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_BACK_TO_TOWN_IN_S1_SECOND_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_BACK_TO_TOWN_IN_S1_SECOND_S); sm.addInt(_countDown); _game.broadcastPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTeams.java b/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTeams.java index b70d1c83b9..238587681b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTeams.java +++ b/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTeams.java @@ -106,8 +106,8 @@ public class OlympiadGameTeams extends AbstractOlympiadGame List teamOne = null; List teamTwo = null; L2PcInstance player; - List teamOnePlayers = new ArrayList<>(MAX_TEAM_SIZE); - List teamTwoPlayers = new ArrayList<>(MAX_TEAM_SIZE); + final List teamOnePlayers = new ArrayList<>(MAX_TEAM_SIZE); + final List teamTwoPlayers = new ArrayList<>(MAX_TEAM_SIZE); while (list.size() > 1) { @@ -158,9 +158,9 @@ public class OlympiadGameTeams extends AbstractOlympiadGame continue; } - Participant[] t1 = new Participant[teamOnePlayers.size()]; - Participant[] t2 = new Participant[teamTwoPlayers.size()]; - Participant[][] result = new Participant[2][]; + final Participant[] t1 = new Participant[teamOnePlayers.size()]; + final Participant[] t2 = new Participant[teamTwoPlayers.size()]; + final Participant[][] result = new Participant[2][]; for (int i = 0; i < t1.length; i++) { @@ -565,8 +565,8 @@ public class OlympiadGameTeams extends AbstractOlympiadGame boolean tie = false; int winside = 0; - List list1 = new ArrayList<>(3); - List list2 = new ArrayList<>(3); + final List list1 = new ArrayList<>(3); + final List list2 = new ArrayList<>(3); final boolean tOneCrash = teamOneAllDisconnected(); final boolean tTwoCrash = teamTwoAllDisconnected(); @@ -586,7 +586,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame { par = _teamOne[i]; points = par.getStats().getInt(POINTS) / getDivider(); - int val = Math.min(par.getStats().getInt(POINTS) / 3, Config.ALT_OLY_MAX_POINTS); + final int val = Math.min(par.getStats().getInt(POINTS) / 3, Config.ALT_OLY_MAX_POINTS); removePointsFromParticipant(par, val); list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, points - val, -val)); } @@ -598,7 +598,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame { par = _teamTwo[i]; points = par.getStats().getInt(POINTS) / getDivider(); - int val = Math.min(par.getStats().getInt(POINTS) / 3, Config.ALT_OLY_MAX_POINTS); + final int val = Math.min(par.getStats().getInt(POINTS) / 3, Config.ALT_OLY_MAX_POINTS); removePointsFromParticipant(par, val); list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, points - val, -val)); } diff --git a/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java b/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java index de2860d377..e01d675d9e 100644 --- a/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java +++ b/trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java @@ -122,7 +122,7 @@ public class OlympiadManager { if (showMessage) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_WAITING_LIST_FOR_THE_3_VS_3_CLASS_IRRELEVANT_TEAM_MATCH); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_WAITING_LIST_FOR_THE_3_VS_3_CLASS_IRRELEVANT_TEAM_MATCH); sm.addPcName(noble); player.sendPacket(sm); } @@ -297,7 +297,7 @@ public class OlympiadManager } int teamPoints = 0; - List team = new ArrayList<>(party.getMemberCount()); + final List team = new ArrayList<>(party.getMemberCount()); for (L2PcInstance noble : party.getMembers()) { if (!checkNoble(noble, player)) @@ -376,7 +376,7 @@ public class OlympiadManager return false; } - Integer objId = Integer.valueOf(noble.getObjectId()); + final Integer objId = Integer.valueOf(noble.getObjectId()); if (_nonClassBasedRegisters.remove(objId)) { if (Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0) @@ -560,7 +560,7 @@ public class OlympiadManager final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_BEEN_REMOVED_FROM_THE_OLYMPIAD_WAITING_LIST); for (int objectId : _team) { - L2PcInstance teamMember = L2World.getInstance().getPlayer(objectId); + final L2PcInstance teamMember = L2World.getInstance().getPlayer(objectId); if (teamMember != null) { teamMember.sendPacket(sm); diff --git a/trunk/java/com/l2jserver/gameserver/model/options/Options.java b/trunk/java/com/l2jserver/gameserver/model/options/Options.java index 2321531fa7..15d7903697 100644 --- a/trunk/java/com/l2jserver/gameserver/model/options/Options.java +++ b/trunk/java/com/l2jserver/gameserver/model/options/Options.java @@ -72,7 +72,7 @@ public class Options final List funcs = new ArrayList<>(_funcs.size()); for (FuncTemplate fuctionTemplate : _funcs) { - AbstractFunction fuction = fuctionTemplate.getFunc(player, player, item, this); + final AbstractFunction fuction = fuctionTemplate.getFunc(player, player, item, this); if (fuction != null) { funcs.add(fuction); @@ -141,7 +141,7 @@ public class Options public List getActivationsSkills(OptionsSkillType type) { - List temp = new ArrayList<>(); + final List temp = new ArrayList<>(); for (OptionsSkillHolder holder : _activationSkills) { if (holder.getSkillType() == type) diff --git a/trunk/java/com/l2jserver/gameserver/model/quest/Quest.java b/trunk/java/com/l2jserver/gameserver/model/quest/Quest.java index 72461233de..339e4636ba 100644 --- a/trunk/java/com/l2jserver/gameserver/model/quest/Quest.java +++ b/trunk/java/com/l2jserver/gameserver/model/quest/Quest.java @@ -876,7 +876,7 @@ public class Quest extends AbstractScript implements IIdentifiable */ public final void notifyEnterZone(L2Character character, L2ZoneType zone) { - L2PcInstance player = character.getActingPlayer(); + final L2PcInstance player = character.getActingPlayer(); String res = null; try { @@ -902,7 +902,7 @@ public class Quest extends AbstractScript implements IIdentifiable */ public final void notifyExitZone(L2Character character, L2ZoneType zone) { - L2PcInstance player = character.getActingPlayer(); + final L2PcInstance player = character.getActingPlayer(); String res = null; try { @@ -1462,7 +1462,7 @@ public class Quest extends AbstractScript implements IIdentifiable } if ((player != null) && player.getAccessLevel().isGm()) { - String res = "Script error" + Util.getStackTrace(t) + ""; + final String res = "Script error" + Util.getStackTrace(t) + ""; return showResult(player, res); } return false; @@ -1538,11 +1538,11 @@ public class Quest extends AbstractScript implements IIdentifiable while (rs.next()) { // Get the ID of the quest and its state - String questId = rs.getString("name"); - String statename = rs.getString("value"); + final String questId = rs.getString("name"); + final String statename = rs.getString("value"); // Search quest associated with the ID - Quest q = QuestManager.getInstance().getQuest(questId); + final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { _log.finer("Unknown quest " + questId + " for player " + player.getName()); @@ -1569,11 +1569,11 @@ public class Quest extends AbstractScript implements IIdentifiable { while (rs.next()) { - String questId = rs.getString("name"); - String var = rs.getString("var"); - String value = rs.getString("value"); + final String questId = rs.getString("name"); + final String var = rs.getString("var"); + final String value = rs.getString("value"); // Get the QuestState saved in the loop before - QuestState qs = player.getQuestState(questId); + final QuestState qs = player.getQuestState(questId); if (qs == null) { _log.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); @@ -2407,7 +2407,7 @@ public class Quest extends AbstractScript implements IIdentifiable // normal cases...if the player is not in a party, check the player's state QuestState temp = null; - L2Party party = player.getParty(); + final L2Party party = player.getParty(); // if this player is not in a party, just check if this player instance matches the conditions itself if ((party == null) || (party.getMembers().isEmpty())) { @@ -2420,7 +2420,7 @@ public class Quest extends AbstractScript implements IIdentifiable } // if the player is in a party, gather a list of all matching party members (possibly including this player) - List candidates = new ArrayList<>(); + final List candidates = new ArrayList<>(); // get the target for enforcing distance limitations. L2Object target = player.getTarget(); if (target == null) @@ -2467,7 +2467,7 @@ public class Quest extends AbstractScript implements IIdentifiable // normal cases...if the player is not in a party check the player's state QuestState temp = null; - L2Party party = player.getParty(); + final L2Party party = player.getParty(); // if this player is not in a party, just check if this player instance matches the conditions itself if ((party == null) || (party.getMembers().isEmpty())) { @@ -2482,7 +2482,7 @@ public class Quest extends AbstractScript implements IIdentifiable // if the player is in a party, gather a list of all matching party members (possibly // including this player) - List candidates = new ArrayList<>(); + final List candidates = new ArrayList<>(); // get the target for enforcing distance limitations. L2Object target = player.getTarget(); @@ -2684,8 +2684,8 @@ public class Quest extends AbstractScript implements IIdentifiable */ public String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) { - boolean questwindow = !filename.endsWith(".html"); - int questId = getId(); + final boolean questwindow = !filename.endsWith(".html"); + final int questId = getId(); // Create handler to file linked to the quest String content = getHtm(player.getHtmlPrefix(), filename); @@ -2700,7 +2700,7 @@ public class Quest extends AbstractScript implements IIdentifiable if (questwindow && (questId > 0) && (questId < 20000) && (questId != 999)) { - NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); + final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); npcReply.setHtml(content); npcReply.replace("%playername%", player.getName()); player.sendPacket(npcReply); diff --git a/trunk/java/com/l2jserver/gameserver/model/quest/QuestState.java b/trunk/java/com/l2jserver/gameserver/model/quest/QuestState.java index 8189636ddf..5b13b725e6 100644 --- a/trunk/java/com/l2jserver/gameserver/model/quest/QuestState.java +++ b/trunk/java/com/l2jserver/gameserver/model/quest/QuestState.java @@ -242,7 +242,7 @@ public final class QuestState val = ""; } - String old = _vars.put(var, val); + final String old = _vars.put(var, val); if (old != null) { Quest.updateQuestVarInDb(this, var, val); @@ -385,7 +385,7 @@ public final class QuestState return null; } - String old = _vars.remove(var); + final String old = _vars.remove(var); if (old != null) { Quest.deleteQuestVarInDb(this, var); diff --git a/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java b/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java index 9477c6426c..6e113a78ee 100644 --- a/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java +++ b/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java @@ -294,7 +294,7 @@ public final class Skill implements IIdentifiable final String rideState = set.getString("rideState", null); if (rideState != null) { - String[] state = rideState.split(";"); + final String[] state = rideState.split(";"); if (state.length > 0) { _rideState = new HashSet<>(state.length); @@ -316,7 +316,7 @@ public final class Skill implements IIdentifiable { try { - String[] valuesSplit = affectLimit.split("-"); + final String[] valuesSplit = affectLimit.split("-"); _affectLimit[0] = Integer.parseInt(valuesSplit[0]); _affectLimit[1] = Integer.parseInt(valuesSplit[1]); } @@ -378,7 +378,7 @@ public final class Skill implements IIdentifiable _excludedFromCheck = set.getBoolean("excludedFromCheck", false); _simultaneousCast = set.getBoolean("simultaneousCast", false); - String capsuled_items = set.getString("capsuled_items_skill", null); + final String capsuled_items = set.getString("capsuled_items_skill", null); if (capsuled_items != null) { if (capsuled_items.isEmpty()) @@ -389,8 +389,8 @@ public final class Skill implements IIdentifiable _extractableItems = parseExtractableSkill(_id, _level, capsuled_items); } - String alchemyTransmuteIngredients = set.getString("alchemyTransmuteIngredients", null); - String alchemyTransmuteProducts = set.getString("alchemyTransmuteProduction", null); + final String alchemyTransmuteIngredients = set.getString("alchemyTransmuteIngredients", null); + final String alchemyTransmuteProducts = set.getString("alchemyTransmuteProduction", null); if ((alchemyTransmuteIngredients != null) && (alchemyTransmuteProducts != null)) { _transmutedItems = parseAlchemySkill(_id, _level, alchemyTransmuteIngredients, alchemyTransmuteProducts); @@ -1043,7 +1043,7 @@ public final class Skill implements IIdentifiable L2Character target = null; // Get the L2Objcet targeted by the user of the skill at this moment - L2Object objTarget = activeChar.getTarget(); + final L2Object objTarget = activeChar.getTarget(); // If the L2Object targeted is a L2Character, it becomes the L2Character target if (objTarget instanceof L2Character) { @@ -1099,7 +1099,7 @@ public final class Skill implements IIdentifiable public L2Object getFirstOfTargetList(L2Character activeChar) { - L2Object[] targets = getTargetList(activeChar, true); + final L2Object[] targets = getTargetList(activeChar, true); if (targets.length == 0) { return null; @@ -1261,7 +1261,7 @@ public final class Skill implements IIdentifiable final List funcs = new ArrayList<>(_funcTemplates.size()); for (FuncTemplate t : _funcTemplates) { - AbstractFunction f = t.getFunc(player, null, this, this); // skill is owner + final AbstractFunction f = t.getFunc(player, null, this, this); // skill is owner if (f != null) { funcs.add(f); @@ -1287,7 +1287,7 @@ public final class Skill implements IIdentifiable */ public boolean hasEffects(EffectScope effectScope) { - List effects = _effectLists.get(effectScope); + final List effects = _effectLists.get(effectScope); return (effects != null) && !effects.isEmpty(); } @@ -1404,7 +1404,7 @@ public final class Skill implements IIdentifiable applyEffectScope(EffectScope.GENERAL, info, instant, addContinuousEffects); - EffectScope pvpOrPveEffectScope = effector.isPlayable() && effected.isAttackable() ? EffectScope.PVE : effector.isPlayable() && effected.isPlayable() ? EffectScope.PVP : null; + final EffectScope pvpOrPveEffectScope = effector.isPlayable() && effected.isAttackable() ? EffectScope.PVE : effector.isPlayable() && effected.isPlayable() ? EffectScope.PVP : null; applyEffectScope(pvpOrPveEffectScope, info, instant, addContinuousEffects); applyEffectScope(EffectScope.CHANNELING, info, instant, addContinuousEffects); @@ -1541,7 +1541,7 @@ public final class Skill implements IIdentifiable final BuffInfo info = new BuffInfo(caster, target, this); applyEffectScope(EffectScope.GENERAL, info, true, false); - EffectScope pvpOrPveEffectScope = caster.isPlayable() && target.isAttackable() ? EffectScope.PVE : caster.isPlayable() && target.isPlayable() ? EffectScope.PVP : null; + final EffectScope pvpOrPveEffectScope = caster.isPlayable() && target.isAttackable() ? EffectScope.PVE : caster.isPlayable() && target.isPlayable() ? EffectScope.PVP : null; applyEffectScope(pvpOrPveEffectScope, info, true, false); applyEffectScope(EffectScope.CHANNELING, info, true, false); @@ -1775,7 +1775,7 @@ public final class Skill implements IIdentifiable { final String[] ingrLists = alchemyTransmuteIngredients.split(";"); final String[] prodLists = alchemyTransmuteProducts.split(";"); - List ingridients = new ArrayList<>(); + final List ingridients = new ArrayList<>(); ItemHolder product = null; String[] ingrData; @@ -1856,7 +1856,7 @@ public final class Skill implements IIdentifiable { if (_effectTypes == null) { - Set effectTypesSet = new HashSet<>(); + final Set effectTypesSet = new HashSet<>(); for (List effectList : _effectLists.values()) { if (effectList != null) @@ -1872,7 +1872,7 @@ public final class Skill implements IIdentifiable } } - Byte[] effectTypesArray = effectTypesSet.toArray(new Byte[effectTypesSet.size()]); + final Byte[] effectTypesArray = effectTypesSet.toArray(new Byte[effectTypesSet.size()]); Arrays.sort(effectTypesArray); _effectTypes = effectTypesArray; } diff --git a/trunk/java/com/l2jserver/gameserver/model/stats/Calculator.java b/trunk/java/com/l2jserver/gameserver/model/stats/Calculator.java index f26cc7eac0..f5221c5f7e 100644 --- a/trunk/java/com/l2jserver/gameserver/model/stats/Calculator.java +++ b/trunk/java/com/l2jserver/gameserver/model/stats/Calculator.java @@ -77,8 +77,8 @@ public final class Calculator return false; } - AbstractFunction[] funcs1 = c1._functions; - AbstractFunction[] funcs2 = c2._functions; + final AbstractFunction[] funcs1 = c1._functions; + final AbstractFunction[] funcs2 = c2._functions; if (funcs1 == funcs2) { @@ -121,8 +121,8 @@ public final class Calculator */ public synchronized void addFunc(AbstractFunction function) { - AbstractFunction[] funcs = _functions; - AbstractFunction[] tmp = new AbstractFunction[funcs.length + 1]; + final AbstractFunction[] funcs = _functions; + final AbstractFunction[] tmp = new AbstractFunction[funcs.length + 1]; final int order = function.getOrder(); int i; @@ -148,8 +148,8 @@ public final class Calculator */ public synchronized void removeFunc(AbstractFunction function) { - AbstractFunction[] funcs = _functions; - AbstractFunction[] tmp = new AbstractFunction[funcs.length - 1]; + final AbstractFunction[] funcs = _functions; + final AbstractFunction[] tmp = new AbstractFunction[funcs.length - 1]; int i; @@ -185,7 +185,7 @@ public final class Calculator */ public synchronized List removeOwner(Object owner) { - List modifiedStats = new ArrayList<>(); + final List modifiedStats = new ArrayList<>(); for (AbstractFunction func : _functions) { if (func.getFuncOwner() == owner) diff --git a/trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java b/trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java index fa5da328b5..e9f0297845 100644 --- a/trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java +++ b/trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java @@ -114,7 +114,7 @@ public final class Formulas */ public static Calculator[] getStdNPCCalculators() { - Calculator[] std = new Calculator[Stats.NUM_STATS]; + final Calculator[] std = new Calculator[Stats.NUM_STATS]; if (!Config.IGNORE_NPC_STAT_FORMULAS) { @@ -251,9 +251,9 @@ public final class Formulas if (cha.isPlayer()) { - L2PcInstance player = cha.getActingPlayer(); + final L2PcInstance player = cha.getActingPlayer(); - double siegeModifier = calcSiegeRegenModifier(player); + final double siegeModifier = calcSiegeRegenModifier(player); if (siegeModifier > 0) { hpRegenMultiplier *= siegeModifier; @@ -261,12 +261,12 @@ public final class Formulas if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0)) { - L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class); - int posChIndex = zone == null ? -1 : zone.getResidenceId(); - int clanHallIndex = player.getClan().getHideoutId(); + final L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class); + final int posChIndex = zone == null ? -1 : zone.getResidenceId(); + final int clanHallIndex = player.getClan().getHideoutId(); if ((clanHallIndex > 0) && (clanHallIndex == posChIndex)) { - ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex); + final ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex); if (clansHall != null) { if (clansHall.getFunction(ClanHall.FUNC_RESTORE_HP) != null) @@ -279,12 +279,12 @@ public final class Formulas if (player.isInsideZone(ZoneId.CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0)) { - L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class); - int posCastleIndex = zone == null ? -1 : zone.getResidenceId(); - int castleIndex = player.getClan().getCastleId(); + final L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class); + final int posCastleIndex = zone == null ? -1 : zone.getResidenceId(); + final int castleIndex = player.getClan().getCastleId(); if ((castleIndex > 0) && (castleIndex == posCastleIndex)) { - Castle castle = CastleManager.getInstance().getCastleById(castleIndex); + final Castle castle = CastleManager.getInstance().getCastleById(castleIndex); if (castle != null) { if (castle.getFunction(Castle.FUNC_RESTORE_HP) != null) @@ -297,12 +297,12 @@ public final class Formulas if (player.isInsideZone(ZoneId.FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0)) { - L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class); - int posFortIndex = zone == null ? -1 : zone.getResidenceId(); - int fortIndex = player.getClan().getFortId(); + final L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class); + final int posFortIndex = zone == null ? -1 : zone.getResidenceId(); + final int fortIndex = player.getClan().getFortId(); if ((fortIndex > 0) && (fortIndex == posFortIndex)) { - Fort fort = FortManager.getInstance().getFortById(fortIndex); + final Fort fort = FortManager.getInstance().getFortById(fortIndex); if (fort != null) { if (fort.getFunction(Fort.FUNC_RESTORE_HP) != null) @@ -316,8 +316,8 @@ public final class Formulas // Mother Tree effect is calculated at last if (player.isInsideZone(ZoneId.MOTHER_TREE)) { - L2MotherTreeZone zone = ZoneManager.getInstance().getZone(player, L2MotherTreeZone.class); - int hpBonus = zone == null ? 0 : zone.getHpRegenBonus(); + final L2MotherTreeZone zone = ZoneManager.getInstance().getZone(player, L2MotherTreeZone.class); + final int hpBonus = zone == null ? 0 : zone.getHpRegenBonus(); hpRegenBonus += hpBonus; } @@ -359,24 +359,24 @@ public final class Formulas if (cha.isPlayer()) { - L2PcInstance player = cha.getActingPlayer(); + final L2PcInstance player = cha.getActingPlayer(); // Mother Tree effect is calculated at last' if (player.isInsideZone(ZoneId.MOTHER_TREE)) { - L2MotherTreeZone zone = ZoneManager.getInstance().getZone(player, L2MotherTreeZone.class); - int mpBonus = zone == null ? 0 : zone.getMpRegenBonus(); + final L2MotherTreeZone zone = ZoneManager.getInstance().getZone(player, L2MotherTreeZone.class); + final int mpBonus = zone == null ? 0 : zone.getMpRegenBonus(); mpRegenBonus += mpBonus; } if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0)) { - L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class); - int posChIndex = zone == null ? -1 : zone.getResidenceId(); - int clanHallIndex = player.getClan().getHideoutId(); + final L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class); + final int posChIndex = zone == null ? -1 : zone.getResidenceId(); + final int clanHallIndex = player.getClan().getHideoutId(); if ((clanHallIndex > 0) && (clanHallIndex == posChIndex)) { - ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex); + final ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex); if (clansHall != null) { if (clansHall.getFunction(ClanHall.FUNC_RESTORE_MP) != null) @@ -389,12 +389,12 @@ public final class Formulas if (player.isInsideZone(ZoneId.CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0)) { - L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class); - int posCastleIndex = zone == null ? -1 : zone.getResidenceId(); - int castleIndex = player.getClan().getCastleId(); + final L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class); + final int posCastleIndex = zone == null ? -1 : zone.getResidenceId(); + final int castleIndex = player.getClan().getCastleId(); if ((castleIndex > 0) && (castleIndex == posCastleIndex)) { - Castle castle = CastleManager.getInstance().getCastleById(castleIndex); + final Castle castle = CastleManager.getInstance().getCastleById(castleIndex); if (castle != null) { if (castle.getFunction(Castle.FUNC_RESTORE_MP) != null) @@ -407,12 +407,12 @@ public final class Formulas if (player.isInsideZone(ZoneId.FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0)) { - L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class); - int posFortIndex = zone == null ? -1 : zone.getResidenceId(); - int fortIndex = player.getClan().getFortId(); + final L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class); + final int posFortIndex = zone == null ? -1 : zone.getResidenceId(); + final int fortIndex = player.getClan().getFortId(); if ((fortIndex > 0) && (fortIndex == posFortIndex)) { - Fort fort = FortManager.getInstance().getFortById(fortIndex); + final Fort fort = FortManager.getInstance().getFortById(fortIndex); if (fort != null) { if (fort.getFunction(Fort.FUNC_RESTORE_MP) != null) @@ -482,13 +482,13 @@ public final class Formulas return 0; } - Siege siege = SiegeManager.getInstance().getSiege(activeChar.getX(), activeChar.getY(), activeChar.getZ()); + final Siege siege = SiegeManager.getInstance().getSiege(activeChar.getX(), activeChar.getY(), activeChar.getZ()); if ((siege == null) || !siege.isInProgress()) { return 0; } - L2SiegeClan siegeClan = siege.getAttackerClan(activeChar.getClan().getId()); + final L2SiegeClan siegeClan = siege.getAttackerClan(activeChar.getClan().getId()); if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, activeChar, siegeClan.getFlag().get(0), true)) { return 0; @@ -516,10 +516,10 @@ public final class Formulas final boolean isPvP = attacker.isPlayable() && target.isPlayable(); final boolean isPvE = attacker.isPlayable() && target.isAttackable(); - double power = skill.getPower(isPvP, isPvE); + final double power = skill.getPower(isPvP, isPvE); double damage = 0; - double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10% (TODO: values are unconfirmed, possibly custom, remove or update when confirmed); - double ssboost = ss ? 1.458 : 1; + final double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10% (TODO: values are unconfirmed, possibly custom, remove or update when confirmed); + final double ssboost = ss ? 1.458 : 1; double pvpBonus = 1; if (isPvP) @@ -531,23 +531,23 @@ public final class Formulas } // Initial damage - double baseMod = ((77 * (power + (attacker.getPAtk(target) * ssboost))) / defence); + final double baseMod = ((77 * (power + (attacker.getPAtk(target) * ssboost))) / defence); // Critical - double criticalMod = (attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill)); - double criticalModPos = 1 + ((attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, skill) - 1) / 2); - double criticalVulnMod = (target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill)); - double criticalAddMod = ((attacker.getStat().calcStat(Stats.CRITICAL_DAMAGE_ADD, 0) * 6.1 * 77) / defence); - double criticalAddVuln = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, skill); + final double criticalMod = (attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill)); + final double criticalModPos = 1 + ((attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, skill) - 1) / 2); + final double criticalVulnMod = (target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill)); + final double criticalAddMod = ((attacker.getStat().calcStat(Stats.CRITICAL_DAMAGE_ADD, 0) * 6.1 * 77) / defence); + final double criticalAddVuln = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, skill); // Trait, elements - double weaponTraitMod = calcWeaponTraitBonus(attacker, target); - double generalTraitMod = calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false); - double attributeMod = calcAttributeBonus(attacker, target, skill); - double weaponMod = attacker.getRandomDamageMultiplier(); + final double weaponTraitMod = calcWeaponTraitBonus(attacker, target); + final double generalTraitMod = calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false); + final double attributeMod = calcAttributeBonus(attacker, target, skill); + final double weaponMod = attacker.getRandomDamageMultiplier(); double penaltyMod = 1; if ((target instanceof L2Attackable) && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) { - int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; + final int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; if (lvlDiff >= Config.NPC_SKILL_DMG_PENALTY.size()) { penaltyMod *= Config.NPC_SKILL_DMG_PENALTY.get(Config.NPC_SKILL_DMG_PENALTY.size() - 1); @@ -607,11 +607,11 @@ public final class Formulas } } - boolean isPvP = attacker.isPlayable() && target.isPlayer(); - boolean isPvE = attacker.isPlayable() && target.isAttackable(); + final boolean isPvP = attacker.isPlayable() && target.isPlayer(); + final boolean isPvE = attacker.isPlayable() && target.isAttackable(); double damage = 0; - double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10% (TODO: values are unconfirmed, possibly custom, remove or update when confirmed) - double ssboost = ss ? 1.458 : 1; + final double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10% (TODO: values are unconfirmed, possibly custom, remove or update when confirmed) + final double ssboost = ss ? 1.458 : 1; double pvpBonus = 1; if (isPvP) @@ -623,22 +623,22 @@ public final class Formulas } // Initial damage - double baseMod = ((77 * (skill.getPower(isPvP, isPvE) + attacker.getPAtk(target))) / defence) * ssboost; + final double baseMod = ((77 * (skill.getPower(isPvP, isPvE) + attacker.getPAtk(target))) / defence) * ssboost; // Critical - double criticalMod = (attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill)); - double criticalModPos = 1 + ((attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, skill) - 1) / 2); - double criticalVulnMod = (target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill)); - double criticalAddMod = ((attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, target, skill) * 6.1 * 77) / defence); - double criticalAddVuln = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, skill); + final double criticalMod = (attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill)); + final double criticalModPos = 1 + ((attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, skill) - 1) / 2); + final double criticalVulnMod = (target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill)); + final double criticalAddMod = ((attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, target, skill) * 6.1 * 77) / defence); + final double criticalAddVuln = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, skill); // Trait, elements - double generalTraitMod = calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false); - double attributeMod = calcAttributeBonus(attacker, target, skill); - double weaponMod = attacker.getRandomDamageMultiplier(); // 1? + final double generalTraitMod = calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false); + final double attributeMod = calcAttributeBonus(attacker, target, skill); + final double weaponMod = attacker.getRandomDamageMultiplier(); // 1? double penaltyMod = 1; if (target.isAttackable() && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) { - int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; + final int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; if (lvlDiff >= Config.NPC_SKILL_DMG_PENALTY.size()) { penaltyMod *= Config.NPC_SKILL_DMG_PENALTY.get(Config.NPC_SKILL_DMG_PENALTY.size() - 1); @@ -694,7 +694,7 @@ public final class Formulas { final boolean isPvP = attacker.isPlayable() && target.isPlayable(); final boolean isPvE = attacker.isPlayable() && target.isAttackable(); - double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10% + final double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10% double damage = attacker.getPAtk(target); double defence = target.getPDef(attacker); @@ -835,7 +835,7 @@ public final class Formulas } if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) { - int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; + final int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; if (skill != null) { if (lvlDiff >= Config.NPC_SKILL_DMG_PENALTY.size()) @@ -967,7 +967,7 @@ public final class Formulas } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); sm.addCharName(target); sm.addSkillName(skill); attacker.sendPacket(sm); @@ -994,7 +994,7 @@ public final class Formulas // PvP bonuses for damage if (isPvP) { - Stats stat = skill.isMagic() ? Stats.PVP_MAGICAL_DMG : Stats.PVP_PHYS_SKILL_DMG; + final Stats stat = skill.isMagic() ? Stats.PVP_MAGICAL_DMG : Stats.PVP_PHYS_SKILL_DMG; damage *= attacker.calcStat(stat, 1, null, null); } @@ -1005,7 +1005,7 @@ public final class Formulas damage *= attacker.calcStat(Stats.PVE_MAGICAL_DMG, 1, null, null); if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) { - int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; + final int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; if (lvlDiff >= Config.NPC_SKILL_DMG_PENALTY.size()) { damage *= Config.NPC_SKILL_DMG_PENALTY.get(Config.NPC_SKILL_DMG_PENALTY.size() - 1); @@ -1038,7 +1038,7 @@ public final class Formulas return 1; } - int mAtk = attacker.getCubicPower(); + final int mAtk = attacker.getCubicPower(); final boolean isPvP = target.isPlayable(); final boolean isPvE = target.isAttackable(); @@ -1046,7 +1046,7 @@ public final class Formulas double damage = 91 * ((mAtk + skill.getPower(isPvP, isPvE)) / mDef); // Failure calculation - L2PcInstance owner = attacker.getOwner(); + final L2PcInstance owner = attacker.getOwner(); if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(owner, target, skill)) { if (calcMagicSuccess(owner, target, skill) && ((target.getLevel() - skill.getMagicLevel()) <= 9)) @@ -1063,7 +1063,7 @@ public final class Formulas } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); sm.addCharName(target); sm.addSkillName(skill); owner.sendPacket(sm); @@ -1074,13 +1074,13 @@ public final class Formulas { if (skill.hasEffectType(L2EffectType.HP_DRAIN)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN); sm.addCharName(owner); target.sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC); sm.addCharName(owner); target.sendPacket(sm); } @@ -1098,7 +1098,7 @@ public final class Formulas damage *= attacker.getOwner().calcStat(Stats.PVE_MAGICAL_DMG, 1, null, null); if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getOwner() != null) && ((target.getLevel() - attacker.getOwner().getLevel()) >= 2)) { - int lvlDiff = target.getLevel() - attacker.getOwner().getLevel() - 1; + final int lvlDiff = target.getLevel() - attacker.getOwner().getLevel() - 1; if (lvlDiff >= Config.NPC_SKILL_DMG_PENALTY.size()) { damage *= Config.NPC_SKILL_DMG_PENALTY.get(Config.NPC_SKILL_DMG_PENALTY.size() - 1); @@ -1163,7 +1163,7 @@ public final class Formulas } if (Config.ALT_GAME_CANCEL_BOW && target.isAttackingNow()) { - L2Weapon wpn = target.getActiveWeaponItem(); + final L2Weapon wpn = target.getActiveWeaponItem(); if ((wpn != null) && (wpn.getItemType() == WeaponType.BOW)) { init = 15; @@ -1261,7 +1261,7 @@ public final class Formulas return 0; } - L2Item item = target.getSecondaryWeaponItem(); + final L2Item item = target.getSecondaryWeaponItem(); if ((item == null) || !(item instanceof L2Armor) || (((L2Armor) item).getItemType() == ArmorType.SIGIL)) { return 0; @@ -1273,7 +1273,7 @@ public final class Formulas return 0; } - int degreeside = (int) target.calcStat(Stats.SHIELD_DEFENCE_ANGLE, 0, null, null) + 120; + final int degreeside = (int) target.calcStat(Stats.SHIELD_DEFENCE_ANGLE, 0, null, null) + 120; if ((degreeside < 360) && (!target.isFacing(attacker, degreeside))) { return 0; @@ -1282,7 +1282,7 @@ public final class Formulas byte shldSuccess = SHIELD_DEFENSE_FAILED; // if attacker // if attacker use bow and target wear shield, shield block rate is multiplied by 1.3 (30%) - L2Weapon at_weapon = attacker.getActiveWeaponItem(); + final L2Weapon at_weapon = attacker.getActiveWeaponItem(); if ((at_weapon != null) && (at_weapon.getItemType() == WeaponType.BOW)) { shldRate *= 1.3; @@ -1299,7 +1299,7 @@ public final class Formulas if (sendSysMsg && target.isPlayer()) { - L2PcInstance enemy = target.getActingPlayer(); + final L2PcInstance enemy = target.getActingPlayer(); switch (shldSuccess) { @@ -1334,7 +1334,7 @@ public final class Formulas defence = target.getMDef(actor, skill); } - double attack = 2 * actor.getMAtk(target, skill) * calcGeneralTraitBonus(actor, target, skill.getTraitType(), false); + final double attack = 2 * actor.getMAtk(target, skill) * calcGeneralTraitBonus(actor, target, skill.getTraitType(), false); double d = (attack - defence) / (attack + defence); if (skill.isDebuff() && target.isDebuffBlocked()) @@ -1348,9 +1348,9 @@ public final class Formulas public static double calcLvlBonusMod(L2Character attacker, L2Character target, Skill skill) { - int attackerLvl = skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel(); - double skillLvlBonusRateMod = 1 + (skill.getLvlBonusRate() / 100.); - double lvlMod = 1 + ((attackerLvl - target.getLevel()) / 100.); + final int attackerLvl = skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel(); + final double skillLvlBonusRateMod = 1 + (skill.getLvlBonusRate() / 100.); + final double lvlMod = 1 + ((attackerLvl - target.getLevel()) / 100.); return skillLvlBonusRateMod * lvlMod; } @@ -1421,7 +1421,7 @@ public final class Formulas if (skill.isMagic()) { - double mAtk = attacker.getMAtk(null, null); + final double mAtk = attacker.getMAtk(null, null); double val = 0; if (attacker.isChargedShot(ShotType.BLESSED_SPIRITSHOTS)) { @@ -1486,20 +1486,20 @@ public final class Formulas } // Calculate BaseRate. - double baseRate = skill.getPower(); - double statMod = skill.getBasicProperty().calcBonus(target); + final double baseRate = skill.getPower(); + final double statMod = skill.getBasicProperty().calcBonus(target); double rate = (baseRate / statMod); // Resist Modifier. - double resMod = calcGeneralTraitBonus(attacker.getOwner(), target, skill.getTraitType(), false); + final double resMod = calcGeneralTraitBonus(attacker.getOwner(), target, skill.getTraitType(), false); rate *= resMod; // Lvl Bonus Modifier. - double lvlBonusMod = calcLvlBonusMod(attacker.getOwner(), target, skill); + final double lvlBonusMod = calcLvlBonusMod(attacker.getOwner(), target, skill); rate *= lvlBonusMod; // Element Modifier. - double elementMod = calcAttributeBonus(attacker.getOwner(), target, skill); + final double elementMod = calcAttributeBonus(attacker.getOwner(), target, skill); rate *= elementMod; // Add Matk/Mdef Bonus (TODO: Pending) @@ -1531,12 +1531,12 @@ public final class Formulas } // FIXME: Fix this LevelMod Formula. - int lvlDifference = (target.getLevel() - (skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel())); - double lvlModifier = Math.pow(1.3, lvlDifference); + final int lvlDifference = (target.getLevel() - (skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel())); + final double lvlModifier = Math.pow(1.3, lvlDifference); float targetModifier = 1; if (target.isAttackable() && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_MAGIC_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 3)) { - int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 2; + final int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 2; if (lvlDiff >= Config.NPC_SKILL_CHANCE_PENALTY.size()) { targetModifier = Config.NPC_SKILL_CHANCE_PENALTY.get(Config.NPC_SKILL_CHANCE_PENALTY.size() - 1); @@ -1548,7 +1548,7 @@ public final class Formulas } // general magic resist final double resModifier = target.calcStat(Stats.MAGIC_SUCCESS_RES, 1, null, skill); - int rate = 100 - Math.round((float) (lvlModifier * targetModifier * resModifier)); + final int rate = 100 - Math.round((float) (lvlModifier * targetModifier * resModifier)); if (attacker.isDebug()) { @@ -1571,7 +1571,7 @@ public final class Formulas double mDef = target.getMDef(attacker, skill); final boolean isPvP = attacker.isPlayable() && target.isPlayable(); final boolean isPvE = attacker.isPlayable() && target.isAttackable(); - double mp = target.getMaxMp(); + final double mp = target.getMaxMp(); switch (shld) { @@ -1621,7 +1621,7 @@ public final class Formulas damage *= attacker.calcStat(Stats.PVE_MAGICAL_DMG, 1, null, null); if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) { - int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; + final int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1; if (lvlDiff >= Config.NPC_SKILL_DMG_PENALTY.size()) { damage *= Config.NPC_SKILL_DMG_PENALTY.get(Config.NPC_SKILL_DMG_PENALTY.size() - 1); @@ -1638,7 +1638,7 @@ public final class Formulas { if (attacker.isPlayer()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC); sm.addCharName(target); sm.addCharName(attacker); attacker.sendPacket(sm); @@ -1647,7 +1647,7 @@ public final class Formulas if (target.isPlayer()) { - SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_S_MAGIC); + final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_S_MAGIC); sm2.addCharName(target); sm2.addCharName(attacker); target.sendPacket(sm2); @@ -1691,13 +1691,13 @@ public final class Formulas { if (activeChar.isPlayer()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DODGED_THE_ATTACK); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DODGED_THE_ATTACK); sm.addString(target.getName()); activeChar.getActingPlayer().sendPacket(sm); } if (target.isPlayer()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DODGED_C1_S_ATTACK); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DODGED_C1_S_ATTACK); sm.addString(activeChar.getName()); target.getActingPlayer().sendPacket(sm); } @@ -1868,7 +1868,7 @@ public final class Formulas } } - int attribute_diff = attack_attribute - defence_attribute; + final int attribute_diff = attack_attribute - defence_attribute; double min; double max; if (attribute_diff >= 300) @@ -1992,15 +1992,15 @@ public final class Formulas public static boolean calcBlowSuccess(L2Character activeChar, L2Character target, Skill skill) { - double dexMod = BaseStats.DEX.calcBonus(activeChar); + final double dexMod = BaseStats.DEX.calcBonus(activeChar); // Apply DEX Mod. - double blowChance = skill.getBlowChance(); + final double blowChance = skill.getBlowChance(); // Apply Position Bonus (TODO: values are unconfirmed, possibly custom, remove or update when confirmed). - double sideMod = (activeChar.isInFrontOfTarget()) ? 1 : (activeChar.isBehindTarget()) ? 2 : 1.5; + final double sideMod = (activeChar.isInFrontOfTarget()) ? 1 : (activeChar.isBehindTarget()) ? 2 : 1.5; // Apply all mods. - double baseRate = blowChance * dexMod * sideMod; + final double baseRate = blowChance * dexMod * sideMod; // Apply blow rates - double rate = activeChar.calcStat(Stats.BLOW_RATE, baseRate, target, null); + final double rate = activeChar.calcStat(Stats.BLOW_RATE, baseRate, target, null); // Debug if (activeChar.isDebug()) { @@ -2023,12 +2023,12 @@ public final class Formulas case "buff": { // Resist Modifier. - int cancelMagicLvl = skill.getMagicLevel(); + final int cancelMagicLvl = skill.getMagicLevel(); final double vuln = target.calcStat(Stats.CANCEL_VULN, 0, target, null); final double prof = activeChar.calcStat(Stats.CANCEL_PROF, 0, target, null); - double resMod = 1 + (((vuln + prof) * -1) / 100); - double finalRate = rate / resMod; + final double resMod = 1 + (((vuln + prof) * -1) / 100); + final double finalRate = rate / resMod; if (activeChar.isDebug()) { @@ -2052,7 +2052,7 @@ public final class Formulas } for (int i = buffs.size() - 1; i >= 0; i--) // reverse order { - BuffInfo info = buffs.get(i); + final BuffInfo info = buffs.get(i); if (!info.getSkill().canBeStolen() || (!calcCancelSuccess(info, cancelMagicLvl, (int) finalRate, skill))) { continue; @@ -2070,7 +2070,7 @@ public final class Formulas final List debuffs = new ArrayList<>(target.getEffectList().getDebuffs()); for (int i = debuffs.size() - 1; i >= 0; i--) { - BuffInfo info = debuffs.get(i); + final BuffInfo info = debuffs.get(i); if (info.getSkill().isDebuff() && info.getSkill().canBeDispeled() && (Rnd.get(100) <= rate)) { canceled.add(info); @@ -2121,10 +2121,10 @@ public final class Formulas // Debuffs Duration Affected by Resistances. if ((caster != null) && (target != null) && skill.isDebuff()) { - double statMod = skill.getBasicProperty().calcBonus(target); - double resMod = calcGeneralTraitBonus(caster, target, skill.getTraitType(), false); - double lvlBonusMod = calcLvlBonusMod(caster, target, skill); - double elementMod = calcAttributeBonus(caster, target, skill); + final double statMod = skill.getBasicProperty().calcBonus(target); + final double resMod = calcGeneralTraitBonus(caster, target, skill.getTraitType(), false); + final double lvlBonusMod = calcLvlBonusMod(caster, target, skill); + final double elementMod = calcAttributeBonus(caster, target, skill); time = (int) Math.ceil(Util.constrain(((time * resMod * lvlBonusMod * elementMod) / statMod), (time * 0.5), time)); } return time; @@ -2161,7 +2161,7 @@ public final class Formulas */ public static int calculateKarmaLost(L2PcInstance player, long exp) { - double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel()); + final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel()); if (exp > 0) // Received exp { exp /= Config.RATE_KARMA_LOST; @@ -2249,7 +2249,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { final TraitType type = attacker.getAttackType().getTraitType(); - double result = target.getStat().getDefenceTraits()[type.getId()] - 1.0; + final double result = target.getStat().getDefenceTraits()[type.getId()] - 1.0; return 1.0 - result; } diff --git a/trunk/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchant.java b/trunk/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchant.java index 4f6579b880..314e0739ac 100644 --- a/trunk/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchant.java +++ b/trunk/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchant.java @@ -43,7 +43,7 @@ public class FuncEnchant extends AbstractFunction return value; } - L2ItemInstance item = (L2ItemInstance) getFuncOwner(); + final L2ItemInstance item = (L2ItemInstance) getFuncOwner(); int enchant = item.getEnchantLevel(); if (enchant <= 0) { diff --git a/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncHenna.java b/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncHenna.java index 079667c500..4ab820f61b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncHenna.java +++ b/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncHenna.java @@ -51,7 +51,7 @@ public class FuncHenna extends AbstractFunction @Override public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) { - L2PcInstance pc = effector.getActingPlayer(); + final L2PcInstance pc = effector.getActingPlayer(); double value = initVal; if (pc != null) { diff --git a/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkMod.java b/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkMod.java index b284340ec6..951be52ad0 100644 --- a/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkMod.java +++ b/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkMod.java @@ -45,8 +45,8 @@ public class FuncMAtkMod extends AbstractFunction public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) { // Level Modifier^2 * INT Modifier^2 - double lvlMod = effector.isPlayer() ? BaseStats.INT.calcBonus(effector.getActingPlayer()) : BaseStats.INT.calcBonus(effector); - double intMod = effector.isPlayer() ? effector.getActingPlayer().getLevelMod() : effector.getLevelMod(); + final double lvlMod = effector.isPlayer() ? BaseStats.INT.calcBonus(effector.getActingPlayer()) : BaseStats.INT.calcBonus(effector); + final double intMod = effector.isPlayer() ? effector.getActingPlayer().getLevelMod() : effector.getLevelMod(); return initVal * Math.pow(lvlMod, 2) * Math.pow(intMod, 2) * BaseStats.CHA.calcBonus(effector); } } \ No newline at end of file diff --git a/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMDefMod.java b/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMDefMod.java index 89965af312..6a3eae5d85 100644 --- a/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMDefMod.java +++ b/trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMDefMod.java @@ -49,7 +49,7 @@ public class FuncMDefMod extends AbstractFunction double value = initVal; if (effector.isPlayer()) { - L2PcInstance p = effector.getActingPlayer(); + final L2PcInstance p = effector.getActingPlayer(); if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_LFINGER)) { value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_LFINGER) : Inventory.PAPERDOLL_LFINGER); diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java b/trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java index 2c4e74ab2e..cf48964d72 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java @@ -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); diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java b/trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java index 1a64d6592a..1a79e83a6a 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java @@ -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 getPlayersInside() { - List players = new ArrayList<>(); + final List players = new ArrayList<>(); for (L2Character ch : _characterList.values()) { if ((ch != null) && ch.isPlayer()) diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboid.java b/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboid.java index fb9b99bc3b..b9304a0965 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboid.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboid.java @@ -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[] { diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinder.java b/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinder.java index 24d7c0fadc..6fc56f2108 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinder.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinder.java @@ -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); } } diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneNPoly.java b/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneNPoly.java index 62f9617c0f..14a1523189 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneNPoly.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/form/ZoneNPoly.java @@ -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); diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java index 1920bea0c0..8908b8786c 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java @@ -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 npcKnownPlayers = npc.getKnownList().getKnownPlayers(); + final Map 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); diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2ClanHallZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2ClanHallZone.java index 27ebc06267..568cd50d64 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2ClanHallZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2ClanHallZone.java @@ -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); } diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2DamageZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2DamageZone.java index 4f999aac7f..591fc3e24d 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2DamageZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2DamageZone.java @@ -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) { diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java index ea1036d42c..127b91e3f5 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java @@ -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 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())) diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java index 973b5add10..f8051d880d 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java @@ -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); diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java index 65de12de25..70dfde4800 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java @@ -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) { diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java index ba41a691ac..cdb4631506 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java @@ -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) { diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2PeaceZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2PeaceZone.java index 3b5a72c8fb..634276331c 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2PeaceZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2PeaceZone.java @@ -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)) diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java index db6811ef03..0f1d521b11 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java @@ -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) diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2WaterZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2WaterZone.java index 65e0700c90..18014575db 100644 --- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2WaterZone.java +++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2WaterZone.java @@ -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 plrs = character.getKnownList().getKnownPlayers().values(); + final Collection plrs = character.getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { @@ -83,7 +83,7 @@ public class L2WaterZone extends L2ZoneType } else if (character.isNpc()) { - Collection plrs = character.getKnownList().getKnownPlayers().values(); + final Collection plrs = character.getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if (character.getRunSpeed() == 0) diff --git a/trunk/java/com/l2jserver/gameserver/network/GameCrypt.java b/trunk/java/com/l2jserver/gameserver/network/GameCrypt.java index da511206fd..a25ba3b1f1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/GameCrypt.java +++ b/trunk/java/com/l2jserver/gameserver/network/GameCrypt.java @@ -43,7 +43,7 @@ public class GameCrypt int temp = 0; for (int i = 0; i < size; i++) { - int temp2 = raw[offset + i] & 0xFF; + final int temp2 = raw[offset + i] & 0xFF; raw[offset + i] = (byte) (temp2 ^ _inKey[i & 15] ^ temp); temp = temp2; } @@ -72,7 +72,7 @@ public class GameCrypt int temp = 0; for (int i = 0; i < size; i++) { - int temp2 = raw[offset + i] & 0xFF; + final int temp2 = raw[offset + i] & 0xFF; temp = temp2 ^ _outKey[i & 15] ^ temp; raw[offset + i] = (byte) temp; } diff --git a/trunk/java/com/l2jserver/gameserver/network/L2GameClient.java b/trunk/java/com/l2jserver/gameserver/network/L2GameClient.java index 31e5ef4c07..24daf57260 100644 --- a/trunk/java/com/l2jserver/gameserver/network/L2GameClient.java +++ b/trunk/java/com/l2jserver/gameserver/network/L2GameClient.java @@ -153,7 +153,7 @@ public final class L2GameClient extends MMOClient> i public byte[] enableCrypt() { - byte[] key = BlowFishKeygen.getRandomKey(); + final byte[] key = BlowFishKeygen.getRandomKey(); _crypt.setKey(key); return key; } @@ -299,7 +299,7 @@ public final class L2GameClient extends MMOClient> i */ public byte markToDeleteChar(int charslot) { - int objid = getObjectIdForSlot(charslot); + final int objid = getObjectIdForSlot(charslot); if (objid < 0) { @@ -313,10 +313,10 @@ public final class L2GameClient extends MMOClient> i byte answer = 0; try (ResultSet rs = statement.executeQuery()) { - int clanId = rs.next() ? rs.getInt(1) : 0; + final int clanId = rs.next() ? rs.getInt(1) : 0; if (clanId != 0) { - L2Clan clan = ClanTable.getInstance().getClan(clanId); + final L2Clan clan = ClanTable.getInstance().getClan(clanId); if (clan == null) { @@ -349,7 +349,7 @@ public final class L2GameClient extends MMOClient> i } } - LogRecord record = new LogRecord(Level.WARNING, "Delete"); + final LogRecord record = new LogRecord(Level.WARNING, "Delete"); record.setParameters(new Object[] { objid, @@ -688,7 +688,7 @@ public final class L2GameClient extends MMOClient> i @Override protected void onForcedDisconnection() { - LogRecord record = new LogRecord(Level.WARNING, "Disconnected abnormally"); + final LogRecord record = new LogRecord(Level.WARNING, "Disconnected abnormally"); record.setParameters(new Object[] { this @@ -941,7 +941,7 @@ public final class L2GameClient extends MMOClient> i { try { - L2PcInstance player = getActiveChar(); + final L2PcInstance player = getActiveChar(); if ((player != null) && player.isOnline()) // safety precaution { saveCharToDisk(); @@ -978,7 +978,7 @@ public final class L2GameClient extends MMOClient> i return true; } - Logger _logAudit = Logger.getLogger("audit"); + final Logger _logAudit = Logger.getLogger("audit"); _logAudit.log(Level.INFO, "AUDIT: Client " + toString() + " kicked for reason: " + punishment); closeNow(); return false; diff --git a/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java b/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java index 723792f56c..3bdeee9b2f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java +++ b/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java @@ -107,10 +107,10 @@ public final class L2GamePacketHandler implements IPacketHandler, return null; } - int opcode = buf.get() & 0xFF; + final int opcode = buf.get() & 0xFF; ReceivablePacket msg = null; - GameClientState state = client.getState(); + final GameClientState state = client.getState(); switch (state) { @@ -815,7 +815,7 @@ public final class L2GamePacketHandler implements IPacketHandler, msg = new RequestExPledgeCrestLarge(); break; case 0x11: - int id9 = buf.getInt(); + final int id9 = buf.getInt(); switch (id9) { // @TODO: : RequestExSetPledgeCrestLarge is now chunked, each case is a different chunk @@ -1026,7 +1026,7 @@ public final class L2GamePacketHandler implements IPacketHandler, msg = new RequestResetNickname(); break; case 0x4e: - int id4 = buf.getInt(); + final int id4 = buf.getInt(); switch (id4) { case 0x00: @@ -1194,7 +1194,7 @@ public final class L2GamePacketHandler implements IPacketHandler, msg = new CannotMoveAnymoreInShuttle(); break; case 0x80: - int id5 = buf.getInt(); + final int id5 = buf.getInt(); switch (id5) { case 0x01: @@ -1348,7 +1348,7 @@ public final class L2GamePacketHandler implements IPacketHandler, break; case 0x93: { - int id6 = buf.getInt(); + final int id6 = buf.getInt(); switch (id6) { case 0x02: @@ -1748,9 +1748,9 @@ public final class L2GamePacketHandler implements IPacketHandler, return; } - int size = buf.remaining(); + final int size = buf.remaining(); _log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + " on State: " + state.name() + " Client: " + client.toString()); - byte[] array = new byte[size]; + final byte[] array = new byte[size]; buf.get(array); _log.warning(Util.printData(array, size)); } @@ -1763,9 +1763,9 @@ public final class L2GamePacketHandler implements IPacketHandler, return; } - int size = buf.remaining(); + final int size = buf.remaining(); _log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + ":0x" + Integer.toHexString(id2) + " on State: " + state.name() + " Client: " + client.toString()); - byte[] array = new byte[size]; + final byte[] array = new byte[size]; buf.get(array); _log.warning(Util.printData(array, size)); } diff --git a/trunk/java/com/l2jserver/gameserver/network/NpcStringId.java b/trunk/java/com/l2jserver/gameserver/network/NpcStringId.java index 5370f75852..2614a64c4c 100644 --- a/trunk/java/com/l2jserver/gameserver/network/NpcStringId.java +++ b/trunk/java/com/l2jserver/gameserver/network/NpcStringId.java @@ -36245,7 +36245,7 @@ public final class NpcStringId { final Field[] fields = NpcStringId.class.getDeclaredFields(); - for (final Field field : fields) + for (Field field : fields) { final int mod = field.getModifiers(); if (Modifier.isStatic(mod) && Modifier.isPublic(mod) && field.getType().equals(NpcStringId.class) && field.isAnnotationPresent(ClientString.class)) @@ -36259,7 +36259,7 @@ public final class NpcStringId field.set(null, nsId); VALUES.put(nsId.getId(), nsId); } - catch (final Exception e) + catch (Exception e) { _log.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); } @@ -36309,7 +36309,7 @@ public final class NpcStringId { return (NpcStringId) NpcStringId.class.getField(name).get(null); } - catch (final Exception e) + catch (Exception e) { return null; } @@ -36317,7 +36317,7 @@ public final class NpcStringId public static final void reloadLocalisations() { - for (final NpcStringId nsId : VALUES.values()) + for (NpcStringId nsId : VALUES.values()) { if (nsId != null) { @@ -36342,7 +36342,7 @@ public final class NpcStringId NamedNodeMap nnmb; NpcStringId nsId; String text; - for (final String lang : languages) + for (String lang : languages) { file = new File(Config.DATAPACK_ROOT, "/lang/" + lang + "/ns/NpcStringLocalisation.xml"); if (!file.isFile()) @@ -36405,7 +36405,7 @@ public final class NpcStringId } } } - catch (final Exception e) + catch (Exception e) { _log.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } diff --git a/trunk/java/com/l2jserver/gameserver/network/SystemMessageId.java b/trunk/java/com/l2jserver/gameserver/network/SystemMessageId.java index b1f5d487e6..3adcad7c72 100644 --- a/trunk/java/com/l2jserver/gameserver/network/SystemMessageId.java +++ b/trunk/java/com/l2jserver/gameserver/network/SystemMessageId.java @@ -15187,21 +15187,21 @@ public final class SystemMessageId { final Field[] fields = SystemMessageId.class.getDeclaredFields(); - for (final Field field : fields) + for (Field field : fields) { - int mod = field.getModifiers(); + final int mod = field.getModifiers(); if (Modifier.isStatic(mod) && Modifier.isPublic(mod) && field.getType().equals(SystemMessageId.class) && field.isAnnotationPresent(ClientString.class)) { try { final ClientString annotation = field.getAnnotationsByType(ClientString.class)[0]; - SystemMessageId smId = new SystemMessageId(annotation.id()); + final SystemMessageId smId = new SystemMessageId(annotation.id()); smId.setName(field.getName()); smId.setParamCount(parseMessageParameters(field.getName())); field.set(null, smId); VALUES.put(smId.getId(), smId); } - catch (final Exception e) + catch (Exception e) { _log.log(Level.WARNING, "SystemMessageId: Failed field access for '" + field.getName() + "'", e); } @@ -15246,7 +15246,7 @@ public final class SystemMessageId { return (SystemMessageId) SystemMessageId.class.getField(name).get(null); } - catch (final Exception e) + catch (Exception e) { return null; } @@ -15254,7 +15254,7 @@ public final class SystemMessageId public static final void reloadLocalisations() { - for (final SystemMessageId smId : VALUES.values()) + for (SystemMessageId smId : VALUES.values()) { if (smId != null) { @@ -15279,7 +15279,7 @@ public final class SystemMessageId NamedNodeMap nnmb; SystemMessageId smId; String text; - for (final String lang : languages) + for (String lang : languages) { file = new File(Config.DATAPACK_ROOT, "/lang/" + lang + "/sm/SystemMessageLocalisation.xml"); if (!file.isFile()) @@ -15342,7 +15342,7 @@ public final class SystemMessageId } } } - catch (final Exception e) + catch (Exception e) { _log.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java index e9d4f715e2..c3f7ccd90e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java @@ -43,7 +43,7 @@ public final class AllyDismiss extends L2GameClientPacket { return; } - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -53,7 +53,7 @@ public final class AllyDismiss extends L2GameClientPacket player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION); return; } - L2Clan leaderClan = player.getClan(); + final L2Clan leaderClan = player.getClan(); if (leaderClan.getAllyId() == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); @@ -64,7 +64,7 @@ public final class AllyDismiss extends L2GameClientPacket player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return; } - L2Clan clan = ClanTable.getInstance().getClanByName(_clanName); + final L2Clan clan = ClanTable.getInstance().getClanByName(_clanName); if (clan == null) { player.sendPacket(SystemMessageId.THAT_CLAN_DOES_NOT_EXIST); @@ -81,7 +81,7 @@ public final class AllyDismiss extends L2GameClientPacket return; } - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000L), L2Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java index 233fd3feb5..1179df0af4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java @@ -35,7 +35,7 @@ public final class AllyLeave extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -50,7 +50,7 @@ public final class AllyLeave extends L2GameClientPacket player.sendPacket(SystemMessageId.ONLY_THE_CLAN_LEADER_MAY_APPLY_FOR_WITHDRAWAL_FROM_THE_ALLIANCE); return; } - L2Clan clan = player.getClan(); + final L2Clan clan = player.getClan(); if (clan.getAllyId() == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); @@ -62,7 +62,7 @@ public final class AllyLeave extends L2GameClientPacket return; } - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java index 392556c2dc..6b90387a7b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java @@ -48,8 +48,8 @@ public class AnswerCoupleAction extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getActiveChar(); - L2PcInstance target = L2World.getInstance().getPlayer(_charObjId); + final L2PcInstance activeChar = getActiveChar(); + final L2PcInstance target = L2World.getInstance().getPlayer(_charObjId); if ((activeChar == null) || (target == null)) { return; @@ -82,7 +82,7 @@ public class AnswerCoupleAction extends L2GameClientPacket } else if (_answer == -1) // refused { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_COUPLE_ACTIONS_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_COUPLE_ACTIONS_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(activeChar); target.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerJoinPartyRoom.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerJoinPartyRoom.java index 04a12bed79..76ab662f9d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerJoinPartyRoom.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerJoinPartyRoom.java @@ -54,7 +54,7 @@ public final class AnswerJoinPartyRoom extends L2GameClientPacket return; } - L2PcInstance partner = player.getActiveRequester(); + final L2PcInstance partner = player.getActiveRequester(); if (partner == null) { // Partner hasn't been found, cancel the invitation @@ -80,7 +80,7 @@ public final class AnswerJoinPartyRoom extends L2GameClientPacket // If answer is positive, join the requester's PartyRoom. if ((_answer == 1) && !partner.isRequestExpired()) { - PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(partner.getPartyRoom()); + final PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(partner.getPartyRoom()); if (room == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerPartyLootModification.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerPartyLootModification.java index 340a471e27..b2da47887f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerPartyLootModification.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerPartyLootModification.java @@ -39,12 +39,12 @@ public class AnswerPartyLootModification extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2Party party = activeChar.getParty(); + final L2Party party = activeChar.getParty(); if (party != null) { party.answerLootChangeRequest(activeChar, _answer == 1); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java index 6d2bc1233a..779eb9ba3b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java @@ -45,7 +45,7 @@ public final class AnswerTradeRequest extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -58,7 +58,7 @@ public final class AnswerTradeRequest extends L2GameClientPacket return; } - L2PcInstance partner = player.getActiveRequester(); + final L2PcInstance partner = player.getActiveRequester(); if (partner == null) { // Trade partner not found, cancel trade @@ -90,7 +90,7 @@ public final class AnswerTradeRequest extends L2GameClientPacket } else { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DENIED_YOUR_REQUEST_TO_TRADE); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DENIED_YOUR_REQUEST_TO_TRADE); msg.addString(player.getName()); partner.sendPacket(msg); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java index 2944038308..c4dde5218b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java @@ -43,7 +43,7 @@ public final class Appearing extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AuthLogin.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AuthLogin.java index 076d5cfddc..08a85eb441 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AuthLogin.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AuthLogin.java @@ -61,7 +61,7 @@ public final class AuthLogin extends L2GameClientPacket client.close((L2GameServerPacket) null); return; } - SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2); + final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2); if (Config.DEBUG) { _log.info("user:" + _loginName); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java index d7620035a6..46d5fdfb77 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java @@ -44,9 +44,9 @@ public class BrEventRankerList extends L2GameClientPacket protected void runImpl() { // TODO count, bestScore, myScore - int count = 0; - int bestScore = 0; - int myScore = 0; + final int count = 0; + final int bestScore = 0; + final int myScore = 0; getClient().sendPacket(new ExBrLoadEventTopRankers(_eventId, _day, count, bestScore, myScore)); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/BypassUserCmd.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/BypassUserCmd.java index 58f7d8dc1e..06b5a66c5a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/BypassUserCmd.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/BypassUserCmd.java @@ -41,13 +41,13 @@ public class BypassUserCmd extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - IUserCommandHandler handler = UserCommandHandler.getInstance().getHandler(_command); + final IUserCommandHandler handler = UserCommandHandler.getInstance().getHandler(_command); if (handler == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymore.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymore.java index 0dccda46ea..ffc5038ade 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -48,7 +48,7 @@ public final class CannotMoveAnymore extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java index 22ad70e238..475c73f778 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java @@ -48,7 +48,7 @@ public final class CannotMoveAnymoreInVehicle extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -59,7 +59,7 @@ public final class CannotMoveAnymoreInVehicle extends L2GameClientPacket { player.setInVehiclePosition(new Location(_x, _y, _z)); player.setHeading(_heading); - StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId); + final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId); player.broadcastPacket(msg); } } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java index 2db49d33a1..986fcd83b8 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java @@ -260,7 +260,7 @@ public final class CharacterCreate extends L2GameClientPacket initNewChar(getClient(), newChar); - LogRecord record = new LogRecord(Level.INFO, "Created new character"); + final LogRecord record = new LogRecord(Level.INFO, "Created new character"); record.setParameters(new Object[] { newChar, @@ -292,7 +292,7 @@ public final class CharacterCreate extends L2GameClientPacket if (Config.CUSTOM_STARTING_LOC) { - Location createLoc = new Location(Config.CUSTOM_STARTING_LOC_X, Config.CUSTOM_STARTING_LOC_Y, Config.CUSTOM_STARTING_LOC_Z); + final Location createLoc = new Location(Config.CUSTOM_STARTING_LOC_X, Config.CUSTOM_STARTING_LOC_Y, Config.CUSTOM_STARTING_LOC_Z); newChar.setXYZInvisible(createLoc.getX(), createLoc.getY(), createLoc.getZ()); } else if (Config.FACTION_SYSTEM_ENABLED) @@ -301,7 +301,7 @@ public final class CharacterCreate extends L2GameClientPacket } else { - Location createLoc = template.getCreationPoint(); + final Location createLoc = template.getCreationPoint(); newChar.setXYZInvisible(createLoc.getX(), createLoc.getY(), createLoc.getZ()); } newChar.setTitle(""); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java index 2d8eee6dee..be2a13034d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java @@ -62,7 +62,7 @@ public final class CharacterDelete extends L2GameClientPacket try { - byte answer = getClient().markToDeleteChar(_charSlot); + final byte answer = getClient().markToDeleteChar(_charSlot); switch (answer) { @@ -87,7 +87,7 @@ public final class CharacterDelete extends L2GameClientPacket _log.log(Level.SEVERE, "Error:", e); } - CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1); + final CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1); sendPacket(cl); getClient().setCharSelection(cl.getCharInfo()); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java index e3cca738ed..7ef55d4808 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java @@ -49,7 +49,7 @@ public final class CharacterRestore extends L2GameClientPacket } getClient().markRestoredChar(_charSlot); - CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1); + final CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1); sendPacket(cl); getClient().setCharSelection(cl.getCharInfo()); final CharSelectInfoPackage charInfo = getClient().getCharSelection(_charSlot); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java index 6652bd46da..e6e21a8a2f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java @@ -184,7 +184,7 @@ public class CharacterSelect extends L2GameClientPacket client.getActiveCharLock().unlock(); } - LogRecord record = new LogRecord(Level.INFO, "Logged in"); + final LogRecord record = new LogRecord(Level.INFO, "Logged in"); record.setParameters(new Object[] { client diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java index 46d8def22e..02ce012019 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java @@ -76,14 +76,14 @@ public final class DlgAnswer extends L2GameClientPacket } else if (activeChar.removeAction(PlayerAction.ADMIN_COMMAND)) { - String cmd = activeChar.getAdminConfirmCmd(); + final String cmd = activeChar.getAdminConfirmCmd(); activeChar.setAdminConfirmCmd(null); if (_answer == 0) { return; } - String command = cmd.split(" ")[0]; - IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command); + final String command = cmd.split(" ")[0]; + final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command); if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) { if (Config.GMAUDIT) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java index e6d3517f9d..e1f6a1dfee 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java @@ -38,7 +38,7 @@ public final class EndScenePlayer extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java index b115cbc416..e80b8de157 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java @@ -146,7 +146,7 @@ public class EnterWorld extends L2GameClientPacket return; } - String[] adress = new String[5]; + final String[] adress = new String[5]; for (int i = 0; i < 5; i++) { adress[i] = tracert[i][0] + "." + tracert[i][1] + "." + tracert[i][2] + "." + tracert[i][3]; @@ -331,7 +331,7 @@ public class EnterWorld extends L2GameClientPacket notifySponsorOrApprentice(activeChar); - AuctionableHall clanHall = ClanHallManager.getInstance().getClanHallByOwner(activeChar.getClan()); + final AuctionableHall clanHall = ClanHallManager.getInstance().getClanHallByOwner(activeChar.getClan()); if (clanHall != null) { @@ -488,7 +488,7 @@ public class EnterWorld extends L2GameClientPacket sm.addString(activeChar.getName()); for (int id : activeChar.getFriendList().keySet()) { - L2Object obj = L2World.getInstance().findObject(id); + final L2Object obj = L2World.getInstance().findObject(id); if (obj != null) { obj.sendPacket(sm); @@ -518,7 +518,7 @@ public class EnterWorld extends L2GameClientPacket } else if (Config.SERVER_NEWS) { - String serverNews = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/servnews.htm"); + final String serverNews = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/servnews.htm"); if (serverNews != null) { sendPacket(new NpcHtmlMessage(serverNews)); @@ -576,7 +576,7 @@ public class EnterWorld extends L2GameClientPacket } 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); } @@ -616,7 +616,7 @@ public class EnterWorld extends L2GameClientPacket L2ClassMasterInstance.showQuestionMark(activeChar); - int birthday = activeChar.checkBirthDay(); + final int birthday = activeChar.checkBirthDay(); if (birthday == 0) { activeChar.sendPacket(SystemMessageId.HAPPY_BIRTHDAY_ALEGRIA_HAS_SENT_YOU_A_BIRTHDAY_GIFT); @@ -667,7 +667,7 @@ public class EnterWorld extends L2GameClientPacket private void engage(L2PcInstance cha) { - int chaId = cha.getObjectId(); + final int chaId = cha.getObjectId(); for (Couple cl : CoupleManager.getInstance().getCouples()) { @@ -698,7 +698,7 @@ public class EnterWorld extends L2GameClientPacket */ private void notifyPartner(L2PcInstance cha, int partnerId) { - int objId = cha.getPartnerId(); + final int objId = cha.getPartnerId(); if (objId != 0) { final L2PcInstance partner = L2World.getInstance().getPlayer(objId); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java index fb30839234..10325466ec 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java @@ -70,11 +70,11 @@ public class GameGuardReply extends L2GameClientPacket @Override protected void runImpl() { - L2GameClient client = getClient(); + final L2GameClient client = getClient(); try { - MessageDigest md = MessageDigest.getInstance("SHA"); - byte[] result = md.digest(_reply); + final MessageDigest md = MessageDigest.getInstance("SHA"); + final byte[] result = md.digest(_reply); if (Arrays.equals(result, VALID)) { client.setGameGuardOk(true); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/Logout.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/Logout.java index 5522b0c4b3..7854298923 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/Logout.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/Logout.java @@ -89,7 +89,7 @@ public final class Logout extends L2GameClientPacket // Remove player from Boss Zone player.removeFromBossZone(); - LogRecord record = new LogRecord(Level.INFO, "Disconnected"); + final LogRecord record = new LogRecord(Level.INFO, "Disconnected"); record.setParameters(new Object[] { getClient() diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java index 2d72eba222..a96bdac031 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -68,7 +68,7 @@ public class MoveBackwardToLocation extends L2GameClientPacket { if (Config.L2WALKER_PROTECTION) { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is trying to use L2Walker and got kicked.", Config.DEFAULT_PUNISH); } } @@ -77,7 +77,7 @@ public class MoveBackwardToLocation extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -119,7 +119,7 @@ public class MoveBackwardToLocation extends L2GameClientPacket activeChar.abortCast(); activeChar.setTarget(null); activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - JumpWay jw = JumpManager.getInstance().new JumpWay(); + final JumpWay jw = JumpManager.getInstance().new JumpWay(); jw.add(JumpManager.getInstance().new JumpNode(_targetX, _targetY, _targetZ, -1)); activeChar.sendPacket(new ExFlyMove(activeChar.getObjectId(), -1, jw)); activeChar.setXYZ(_targetX, _targetY, _targetZ); @@ -135,8 +135,8 @@ public class MoveBackwardToLocation extends L2GameClientPacket return; } - double dx = _targetX - activeChar.getX(); - double dy = _targetY - activeChar.getY(); + final double dx = _targetX - activeChar.getX(); + final double dy = _targetY - activeChar.getY(); // Can't move if character is confused, or trying to move a huge distance if (activeChar.isOutOfControl() || (((dx * dx) + (dy * dy)) > 98010000)) // 9900*9900 { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java index 14f95312c5..254a3f51b4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java @@ -91,7 +91,7 @@ public class MultiSellChoose extends L2GameClientPacket return; } - PreparedListContainer list = player.getMultiSell(); + final PreparedListContainer list = player.getMultiSell(); if ((list == null) || (list.getListId() != _listId)) { player.setMultiSell(null); @@ -159,7 +159,7 @@ public class MultiSellChoose extends L2GameClientPacket return; } - ArrayList ingredientsList = new ArrayList<>(entry.getIngredients().size()); + final ArrayList ingredientsList = new ArrayList<>(entry.getIngredients().size()); // Generate a list of distinct ingredients and counts in order to check if the correct item-counts // are possessed by the player boolean newIng; @@ -170,7 +170,7 @@ public class MultiSellChoose extends L2GameClientPacket // whenever they need to be applied. Uniqueness of items is thus judged by item id AND enchantment level for (int i = ingredientsList.size(); --i >= 0;) { - Ingredient ex = ingredientsList.get(i); + final Ingredient ex = ingredientsList.get(i); // if the item was already added in the list, merely increment the count // this happens if 1 list entry has the same ingredient twice (example 2 swords = 1 dual) if ((ex.getItemId() == e.getItemId()) && (ex.getEnchantLevel() == e.getEnchantLevel())) @@ -217,7 +217,7 @@ public class MultiSellChoose extends L2GameClientPacket final long required = ((Config.ALT_BLACKSMITH_USE_RECIPES || !e.getMaintainIngredient()) ? (e.getItemCount() * _amount) : e.getItemCount()); if (inv.getInventoryItemCount(e.getItemId(), (list.getMaintainEnchantment() || (e.getEnchantLevel() > 0)) ? e.getEnchantLevel() : -1, false) < required) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S2_S1_S); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S2_S1_S); sm.addItemName(e.getTemplate()); sm.addLong(required); player.sendPacket(sm); @@ -226,7 +226,7 @@ public class MultiSellChoose extends L2GameClientPacket } } - List augmentation = new ArrayList<>(); + final List augmentation = new ArrayList<>(); Elementals[] elemental = null; /** All ok, remove items and add final product */ @@ -278,7 +278,7 @@ public class MultiSellChoose extends L2GameClientPacket if (list.getMaintainEnchantment() || (e.getEnchantLevel() > 0)) { // loop through this list and remove (one by one) each item until the required amount is taken. - L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantLevel(), false); + final L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantLevel(), false); for (int i = 0; i < (e.getItemCount() * _amount); i++) { if (inventoryContents[i].isAugmented()) @@ -336,7 +336,7 @@ public class MultiSellChoose extends L2GameClientPacket // choice 1. Small number of items exchanged. No sorting. for (int i = 1; i <= (e.getItemCount() * _amount); i++) { - L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), false); + final L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), false); itemToTake = inventoryContents[0]; // get item with the LOWEST enchantment level from the inventory... diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/NotifyExitBeautyShop.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/NotifyExitBeautyShop.java index eb356c0f18..d80e574553 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/NotifyExitBeautyShop.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/NotifyExitBeautyShop.java @@ -44,7 +44,7 @@ public class NotifyExitBeautyShop extends L2GameClientPacket return; } - UserInfo userInfo = new UserInfo(activeChar, false); + final UserInfo userInfo = new UserInfo(activeChar, false); userInfo.addComponentType(UserInfoType.APPAREANCE); sendPacket(userInfo); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/ObserverReturn.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/ObserverReturn.java index 5f3308fc48..4fb13a1602 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/ObserverReturn.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/ObserverReturn.java @@ -36,7 +36,7 @@ public final class ObserverReturn extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/ProtocolVersion.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/ProtocolVersion.java index ac9aa2d7c9..8e79e2141e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/ProtocolVersion.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/ProtocolVersion.java @@ -58,14 +58,14 @@ public final class ProtocolVersion extends L2GameClientPacket } else if (!Config.PROTOCOL_LIST.contains(_version)) { - LogRecord record = new LogRecord(Level.WARNING, "Wrong protocol"); + final LogRecord record = new LogRecord(Level.WARNING, "Wrong protocol"); record.setParameters(new Object[] { _version, getClient() }); _logAccounting.log(record); - KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 0); + final KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 0); getClient().setProtocolOk(false); getClient().close(pk); } @@ -76,7 +76,7 @@ public final class ProtocolVersion extends L2GameClientPacket _log.fine("Client Protocol Revision is ok: " + _version); } - KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 1); + final KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 1); getClient().sendPacket(pk); getClient().setProtocolOk(true); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireAbilityList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireAbilityList.java index 4038df758a..a2c6b24b9d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireAbilityList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireAbilityList.java @@ -42,7 +42,7 @@ public class RequestAcquireAbilityList extends L2GameClientPacket readD(); // Total size for (int i = 0; i < 3; i++) { - int size = readD(); + final int size = readD(); for (int j = 0; j < size; j++) { _skills.add(new SkillHolder(readD(), readD())); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java index adea60c960..0ca9db9aff 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -196,7 +196,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket } final L2Clan clan = activeChar.getClan(); - int repCost = s.getLevelUpSp(); + final int repCost = s.getLevelUpSp(); if (clan.getReputationScore() >= repCost) { if (Config.LIFE_CRYSTAL_NEEDED) @@ -645,7 +645,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket if (levelUpSp > 0) { player.setSp(player.getSp() - levelUpSp); - UserInfo ui = new UserInfo(player); + final UserInfo ui = new UserInfo(player); ui.addComponentType(UserInfoType.CURRENT_HPMPCP_EXP_SP); player.sendPacket(ui); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java index 6b4f7d6789..1bdad13c1e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java @@ -128,7 +128,7 @@ public final class RequestActionUse extends L2GameClientPacket // Don't allow to do some action if player is transformed if (activeChar.isTransformed()) { - int[] allowedActions = activeChar.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST; + final int[] allowedActions = activeChar.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST; if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0)) { sendPacket(ActionFailed.STATIC_PACKET); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java index 5a62a6f7fa..ec8368de5f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java @@ -37,7 +37,7 @@ public class RequestAllCastleInfo extends L2GameClientPacket @Override protected void runImpl() { - L2GameClient client = getClient(); + final L2GameClient client = getClient(); if (client != null) { client.sendPacket(new ExShowCastleInfo()); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java index 995b75ea43..f5893a72e2 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java @@ -37,7 +37,7 @@ public class RequestAllFortressInfo extends L2GameClientPacket @Override protected void runImpl() { - L2GameClient client = getClient(); + final L2GameClient client = getClient(); if (client != null) { client.sendPacket(ExShowFortressInfo.STATIC_PACKET); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java index f140736e8b..04dc9bc661 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java @@ -77,7 +77,7 @@ public final class RequestAllyInfo extends L2GameClientPacket activeChar.sendPacket(sm); sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFORMATION); - for (final ClanInfo aci : ai.getAllies()) + for (ClanInfo aci : ai.getAllies()) { activeChar.sendPacket(sm); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinAlly.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinAlly.java index 3c325ac73d..6b363f670f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinAlly.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinAlly.java @@ -37,13 +37,13 @@ public final class RequestAnswerJoinAlly extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2PcInstance requestor = activeChar.getRequest().getPartner(); + final L2PcInstance requestor = activeChar.getRequest().getPartner(); if (requestor == null) { return; @@ -61,7 +61,7 @@ public final class RequestAnswerJoinAlly extends L2GameClientPacket return; // hax } - L2Clan clan = requestor.getClan(); + final L2Clan clan = requestor.getClan(); // we must double check this cause of hack if (clan.checkAllyJoinCondition(requestor, activeChar)) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java index fcbc6d67dc..6ea7bd29bc 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java @@ -68,7 +68,7 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket { case -1: // Party disable by player client config { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_PARTY_REQUESTS_AND_CANNOT_RECEIVE_A_PARTY_REQUEST); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_PARTY_REQUESTS_AND_CANNOT_RECEIVE_A_PARTY_REQUEST); sm.addPcName(player); requestor.sendPacket(sm); break; @@ -84,7 +84,7 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket { if (requestor.getParty().getMemberCount() >= 7) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PARTY_IS_FULL); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PARTY_IS_FULL); player.sendPacket(sm); requestor.sendPacket(sm); return; @@ -125,7 +125,7 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket if (room != null) { room.addMember(player); - ExManagePartyRoomMember packet = new ExManagePartyRoomMember(player, room, 1); + final ExManagePartyRoomMember packet = new ExManagePartyRoomMember(player, room, 1); for (L2PcInstance member : room.getPartyMembers()) { if (member != null) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index c50ad88bf3..bf11ed5d67 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java @@ -49,13 +49,13 @@ public final class RequestAnswerJoinPledge extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2PcInstance requestor = activeChar.getRequest().getPartner(); + final L2PcInstance requestor = activeChar.getRequest().getPartner(); if (requestor == null) { return; @@ -77,7 +77,7 @@ public final class RequestAnswerJoinPledge extends L2GameClientPacket return; // hax } - RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket(); + final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket(); final L2Clan clan = requestor.getClan(); // we must double check this cause during response time conditions can be changed, i.e. another player could join clan if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType())) @@ -99,7 +99,7 @@ public final class RequestAnswerJoinPledge extends L2GameClientPacket activeChar.setClanPrivileges(activeChar.getClan().getRankPrivs(activeChar.getPowerGrade())); activeChar.sendPacket(SystemMessageId.ENTERED_THE_CLAN); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN); sm.addString(activeChar.getName()); clan.broadcastToOnlineMembers(sm); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java index 41db4ca3a4..6d644fb3f0 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java @@ -37,7 +37,7 @@ public final class RequestBookMarkSlotInfo extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); player.sendPacket(new ExGetBookMarkInfoPacket(player)); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java index 6b02f01721..a1c832115a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java @@ -54,7 +54,7 @@ public final class RequestBuyItem extends L2GameClientPacket protected void readImpl() { _listId = readD(); - int size = readD(); + final int size = readD(); if ((size <= 0) || (size > Config.MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != _buf.remaining())) { return; @@ -63,8 +63,8 @@ public final class RequestBuyItem extends L2GameClientPacket _items = new ArrayList<>(size); for (int i = 0; i < size; i++) { - int itemId = readD(); - long count = readQ(); + final int itemId = readD(); + final long count = readQ(); if ((itemId < 1) || (count < 1)) { _items = null; @@ -77,7 +77,7 @@ public final class RequestBuyItem extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -102,7 +102,7 @@ public final class RequestBuyItem extends L2GameClientPacket return; } - L2Object target = player.getTarget(); + final L2Object target = player.getTarget(); L2Character merchant = null; if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST)) { @@ -248,7 +248,7 @@ public final class RequestBuyItem extends L2GameClientPacket // Proceed the purchase for (ItemHolder i : _items) { - Product product = buyList.getProductByItemId(i.getId()); + final Product product = buyList.getProductByItemId(i.getId()); if (product == null) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id " + _listId + " and item_id " + i.getId(), Config.DEFAULT_PUNISH); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java index 0906623fdf..6b858ec0b1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java @@ -133,9 +133,9 @@ public final class RequestBypassToServer extends L2GameClientPacket { if (_command.startsWith("admin_")) { - String command = _command.split(" ")[0]; + final String command = _command.split(" ")[0]; - IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command); + final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command); if (ach == null) { @@ -157,7 +157,7 @@ public final class RequestBypassToServer extends L2GameClientPacket if (AdminData.getInstance().requireConfirm(command)) { activeChar.setAdminConfirmCmd(_command); - ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S13); + final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S13); dlg.addString("Are you sure you want execute command " + _command.substring(6) + " ?"); activeChar.addAction(PlayerAction.ADMIN_COMMAND); activeChar.sendPacket(dlg); @@ -182,7 +182,7 @@ public final class RequestBypassToServer extends L2GameClientPacket } else if (_command.startsWith("npc_")) { - int endOfId = _command.indexOf('_', 5); + final int endOfId = _command.indexOf('_', 5); String id; if (endOfId > 0) { @@ -194,7 +194,7 @@ public final class RequestBypassToServer extends L2GameClientPacket } if (Util.isDigit(id)) { - L2Object object = L2World.getInstance().findObject(Integer.parseInt(id)); + final L2Object object = L2World.getInstance().findObject(Integer.parseInt(id)); if ((object != null) && object.isNpc() && (endOfId > 0) && activeChar.isInsideRadius(object, L2Npc.INTERACTION_DISTANCE, false, false)) { @@ -206,7 +206,7 @@ public final class RequestBypassToServer extends L2GameClientPacket } else if (_command.startsWith("item_")) { - int endOfId = _command.indexOf('_', 5); + final int endOfId = _command.indexOf('_', 5); String id; if (endOfId > 0) { @@ -233,11 +233,11 @@ public final class RequestBypassToServer extends L2GameClientPacket } else if (_command.startsWith("_match")) { - String params = _command.substring(_command.indexOf("?") + 1); - StringTokenizer st = new StringTokenizer(params, "&"); - int heroclass = Integer.parseInt(st.nextToken().split("=")[1]); - int heropage = Integer.parseInt(st.nextToken().split("=")[1]); - int heroid = Hero.getInstance().getHeroByClass(heroclass); + final String params = _command.substring(_command.indexOf("?") + 1); + final StringTokenizer st = new StringTokenizer(params, "&"); + final int heroclass = Integer.parseInt(st.nextToken().split("=")[1]); + final int heropage = Integer.parseInt(st.nextToken().split("=")[1]); + final int heroid = Hero.getInstance().getHeroByClass(heroclass); if (heroid > 0) { Hero.getInstance().showHeroFights(activeChar, heroclass, heroid, heropage); @@ -245,11 +245,11 @@ public final class RequestBypassToServer extends L2GameClientPacket } else if (_command.startsWith("_diary")) { - String params = _command.substring(_command.indexOf("?") + 1); - StringTokenizer st = new StringTokenizer(params, "&"); - int heroclass = Integer.parseInt(st.nextToken().split("=")[1]); - int heropage = Integer.parseInt(st.nextToken().split("=")[1]); - int heroid = Hero.getInstance().getHeroByClass(heroclass); + final String params = _command.substring(_command.indexOf("?") + 1); + final StringTokenizer st = new StringTokenizer(params, "&"); + final int heroclass = Integer.parseInt(st.nextToken().split("=")[1]); + final int heropage = Integer.parseInt(st.nextToken().split("=")[1]); + final int heroid = Hero.getInstance().getHeroByClass(heroclass); if (heroid > 0) { Hero.getInstance().showHeroDiary(activeChar, heroclass, heroid, heropage); @@ -257,7 +257,7 @@ public final class RequestBypassToServer extends L2GameClientPacket } else if (_command.startsWith("_olympiad?command")) { - int arenaId = Integer.parseInt(_command.split("=")[2]); + final int arenaId = Integer.parseInt(_command.split("=")[2]); final IBypassHandler handler = BypassHandler.getInstance().getHandler("arenachange"); if (handler != null) { @@ -304,7 +304,7 @@ public final class RequestBypassToServer extends L2GameClientPacket { if (bypassOriginId > 0) { - L2Object bypassOrigin = activeChar.getKnownList().getKnownObjects().get(bypassOriginId); + final L2Object bypassOrigin = activeChar.getKnownList().getKnownObjects().get(bypassOriginId); if ((bypassOrigin != null) && bypassOrigin.isInstanceTypes(InstanceType.L2Character)) { handler.useBypass(_command, activeChar, (L2Character) bypassOrigin); @@ -331,7 +331,7 @@ public final class RequestBypassToServer extends L2GameClientPacket if (activeChar.isGM()) { - StringBuilder sb = new StringBuilder(200); + final StringBuilder sb = new StringBuilder(200); sb.append(""); sb.append("Bypass error: " + e + ""); sb.append("Bypass command: " + _command + ""); @@ -356,14 +356,14 @@ public final class RequestBypassToServer extends L2GameClientPacket */ private static void comeHere(L2PcInstance activeChar) { - L2Object obj = activeChar.getTarget(); + final L2Object obj = activeChar.getTarget(); if (obj == null) { return; } if (obj instanceof L2Npc) { - L2Npc temp = (L2Npc) obj; + final L2Npc temp = (L2Npc) obj; temp.setTarget(activeChar); temp.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, activeChar.getLocation()); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 928f636335..ef655efe69 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -65,7 +65,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket return; } - Message msg = MailManager.getInstance().getMessage(_msgId); + final Message msg = MailManager.getInstance().getMessage(_msgId); if (msg == null) { return; @@ -165,7 +165,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket } // Proceed to the transfer - InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); for (L2ItemInstance item : attachments.getItems()) { if (item == null) @@ -173,7 +173,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket continue; } - long count = item.getCount(); + final long count = item.getCount(); final L2ItemInstance newItem = attachments.transferItem(attachments.getName(), item.getObjectId(), count, activeChar.getInventory(), activeChar, null); if (newItem == null) { @@ -191,7 +191,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket playerIU.addNewItem(newItem); } } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); activeChar.sendPacket(sm); @@ -215,7 +215,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId()); if (receiver != null) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL); sm.addCharName(activeChar); receiver.sendPacket(sm); receiver.sendPacket(new ExChangePostState(true, _msgId, Message.DELETED)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAbilityPoint.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAbilityPoint.java index ac8476cad8..6d3c63e8cb 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAbilityPoint.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAbilityPoint.java @@ -59,10 +59,10 @@ public class RequestChangeAbilityPoint extends L2GameClientPacket return; } - long spRequired = AbilityPointsData.getInstance().getPrice(activeChar.getAbilityPoints()); + final long spRequired = AbilityPointsData.getInstance().getPrice(activeChar.getAbilityPoints()); if (spRequired > activeChar.getSp()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S1_SP_TO_CONVERT_TO1_ABILITY_POINT); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S1_SP_TO_CONVERT_TO1_ABILITY_POINT); sm.addLong(spRequired); activeChar.sendPacket(sm); return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java index 54b221b123..7a41e91a50 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java @@ -64,7 +64,7 @@ public class RequestChangeAttributeItem extends L2GameClientPacket } request.setProcessing(true); - L2ItemInstance item = player.getInventory().getItemByObjectId(_itemOID); + final L2ItemInstance item = player.getInventory().getItemByObjectId(_itemOID); if (player.getPrivateStoreType() != PrivateStoreType.NONE) { @@ -93,12 +93,12 @@ public class RequestChangeAttributeItem extends L2GameClientPacket player.sendPacket(new ExChangeAttributeItemList(player, _attributeOID)); return; } - L2ItemInstance attribute = player.getInventory().getItemByObjectId(_attributeOID); + final L2ItemInstance attribute = player.getInventory().getItemByObjectId(_attributeOID); player.getInventory().destroyItem("ChangingAttribute", _attributeOID, 1, player, null); if (Rnd.get(100) < Config.CHANGE_CHANCE_ELEMENT) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_S2_ATTRIBUTE_HAS_SUCCESSFULLY_CHANGED_TO_S3_ATTRIBUTE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_S2_ATTRIBUTE_HAS_SUCCESSFULLY_CHANGED_TO_S3_ATTRIBUTE); sm.addItemName(item); sm.addElemental(item.getAttackElementType()); sm.addElemental(_newAttributeID); @@ -121,7 +121,7 @@ public class RequestChangeAttributeItem extends L2GameClientPacket // send packets player.sendPacket(new ExStorageMaxCount(player)); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(item); if (player.getInventory().getItemByObjectId(_attributeOID) == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePartyLeader.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePartyLeader.java index 188393fe49..e9b7a812bd 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePartyLeader.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePartyLeader.java @@ -39,13 +39,13 @@ public final class RequestChangePartyLeader extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2Party party = activeChar.getParty(); + final L2Party party = activeChar.getParty(); if ((party != null) && party.isLeader(activeChar)) { party.changePartyLeader(_name); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java index 123af5d515..0261272b7f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java @@ -42,7 +42,7 @@ public final class RequestChangePetName extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java index c044cdbf9e..7bf60019f1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -52,17 +52,17 @@ public final class RequestConfirmGemStone extends AbstractRefinePacket { return; } - L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId); + final L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId); if (targetItem == null) { return; } - L2ItemInstance refinerItem = activeChar.getInventory().getItemByObjectId(_refinerItemObjId); + final L2ItemInstance refinerItem = activeChar.getInventory().getItemByObjectId(_refinerItemObjId); if (refinerItem == null) { return; } - L2ItemInstance gemStoneItem = activeChar.getInventory().getItemByObjectId(_gemstoneItemObjId); + final L2ItemInstance gemStoneItem = activeChar.getInventory().getItemByObjectId(_gemstoneItemObjId); if (gemStoneItem == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java index 0aa13d279e..a66a21cf58 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java @@ -48,7 +48,7 @@ public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -60,7 +60,7 @@ public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket return; } - Castle castle = CastleManager.getInstance().getCastleById(_castleId); + final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if (castle == null) { return; @@ -72,7 +72,7 @@ public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket return; } - L2Clan clan = ClanTable.getInstance().getClan(_clanId); + final L2Clan clan = ClanTable.getInstance().getClan(_clanId); if (clan == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java index 72d935f745..1248d48b8c 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -61,7 +61,7 @@ public final class RequestCrystallizeItem extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { @@ -87,7 +87,7 @@ public final class RequestCrystallizeItem extends L2GameClientPacket return; } - int skillLevel = activeChar.getSkillLevel(CommonSkill.CRYSTALLIZE.getId()); + final int skillLevel = activeChar.getSkillLevel(CommonSkill.CRYSTALLIZE.getId()); if (skillLevel <= 0) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); @@ -99,10 +99,10 @@ public final class RequestCrystallizeItem extends L2GameClientPacket return; } - PcInventory inventory = activeChar.getInventory(); + final PcInventory inventory = activeChar.getInventory(); if (inventory != null) { - L2ItemInstance item = inventory.getItemByObjectId(_objectId); + final L2ItemInstance item = inventory.getItemByObjectId(_objectId); if (item == null) { activeChar.sendPacket(ActionFailed.STATIC_PACKET); @@ -206,8 +206,8 @@ public final class RequestCrystallizeItem extends L2GameClientPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); - InventoryUpdate iu = new InventoryUpdate(); + final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); + final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance item : unequiped) { iu.addModifiedItem(item); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java index 847f4e51f1..e9ffd0f95f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java @@ -42,14 +42,14 @@ public class RequestCursedWeaponList extends L2GameClientPacket @Override protected void runImpl() { - L2Character activeChar = getClient().getActiveChar(); + final L2Character activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } // send a ExCursedWeaponList :p - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (int id : CursedWeaponsManager.getInstance().getCursedWeaponsIds()) { list.add(id); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java index 7396295c8a..598d98c352 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java @@ -45,13 +45,13 @@ public final class RequestCursedWeaponLocation extends L2GameClientPacket @Override protected void runImpl() { - L2Character activeChar = getClient().getActiveChar(); + final L2Character activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (CursedWeapon cw : CursedWeaponsManager.getInstance().getCursedWeapons()) { if (!cw.isActive()) @@ -59,7 +59,7 @@ public final class RequestCursedWeaponLocation extends L2GameClientPacket continue; } - Location pos = cw.getWorldPosition(); + final Location pos = cw.getWorldPosition(); if (pos != null) { list.add(new CursedWeaponInfo(pos, cw.getItemId(), cw.isActivated() ? 1 : 0)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java index 983ac29ddc..8d3467cdd3 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java @@ -39,7 +39,7 @@ public final class RequestDeleteBookMarkSlot extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 2dc927fb8f..c964eb88dc 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -41,7 +41,7 @@ public final class RequestDeleteReceivedPost extends L2GameClientPacket @Override protected void readImpl() { - int count = readD(); + final int count = readD(); if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) { return; @@ -71,7 +71,7 @@ public final class RequestDeleteReceivedPost extends L2GameClientPacket for (int msgId : _msgIds) { - Message msg = MailManager.getInstance().getMessage(msgId); + final Message msg = MailManager.getInstance().getMessage(msgId); if (msg == null) { continue; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java index 7c817239f0..237d6782cd 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -41,7 +41,7 @@ public final class RequestDeleteSentPost extends L2GameClientPacket @Override protected void readImpl() { - int count = readD(); + final int count = readD(); if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) { return; @@ -71,7 +71,7 @@ public final class RequestDeleteSentPost extends L2GameClientPacket for (int msgId : _msgIds) { - Message msg = MailManager.getInstance().getMessage(msgId); + final Message msg = MailManager.getInstance().getMessage(msgId); if (msg == null) { continue; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java index 5f9499d12c..892ad5363b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java @@ -58,7 +58,7 @@ public final class RequestDestroyItem extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -87,7 +87,7 @@ public final class RequestDestroyItem extends L2GameClientPacket return; } - L2ItemInstance itemToRemove = activeChar.getInventory().getItemByObjectId(_objectId); + final L2ItemInstance itemToRemove = activeChar.getInventory().getItemByObjectId(_objectId); // if we can't find the requested item, its actually a cheat if (itemToRemove == null) @@ -115,7 +115,7 @@ public final class RequestDestroyItem extends L2GameClientPacket } } - int itemId = itemToRemove.getId(); + final int itemId = itemToRemove.getId(); if ((!activeChar.canOverrideCond(PcCondOverride.DESTROY_ALL_ITEMS) && !itemToRemove.isDestroyable()) || CursedWeaponsManager.getInstance().isCursed(itemId)) { @@ -175,21 +175,21 @@ public final class RequestDestroyItem extends L2GameClientPacket { if (itemToRemove.getEnchantLevel() > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); sm.addInt(itemToRemove.getEnchantLevel()); sm.addItemName(itemToRemove); activeChar.sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm.addItemName(itemToRemove); activeChar.sendPacket(sm); } - L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); + final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { iu.addModifiedItem(itm); @@ -197,7 +197,7 @@ public final class RequestDestroyItem extends L2GameClientPacket activeChar.sendPacket(iu); } - L2ItemInstance removedItem = activeChar.getInventory().destroyItem("Destroy", itemToRemove, count, activeChar, null); + final L2ItemInstance removedItem = activeChar.getInventory().destroyItem("Destroy", itemToRemove, count, activeChar, null); if (removedItem == null) { @@ -206,7 +206,7 @@ public final class RequestDestroyItem extends L2GameClientPacket if (!Config.FORCE_INVENTORY_UPDATE) { - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); if (removedItem.getCount() == 0) { iu.addRemovedItem(removedItem); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissAlly.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissAlly.java index 18e0172e79..d88015d12c 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissAlly.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissAlly.java @@ -38,7 +38,7 @@ public final class RequestDismissAlly extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java index 9d1f4433e8..c49301be51 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java @@ -50,7 +50,7 @@ public class RequestDismissPartyRoom extends L2GameClientPacket return; } - PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid); + final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid); if (_room == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java index fea95239f3..9da4389308 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java @@ -61,7 +61,7 @@ public final class RequestDropItem extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if ((activeChar == null) || activeChar.isDead()) { return; @@ -72,7 +72,7 @@ public final class RequestDropItem extends L2GameClientPacket return; } - L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId); + final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !activeChar.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && activeChar.havePetInvItems()) || activeChar.isInsideZone(ZoneId.NO_ITEM_DROP)) { @@ -190,8 +190,8 @@ public final class RequestDropItem extends L2GameClientPacket if (item.isEquipped()) { - L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - InventoryUpdate iu = new InventoryUpdate(); + final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); + final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { itm.unChargeAllShots(); @@ -200,11 +200,11 @@ public final class RequestDropItem extends L2GameClientPacket activeChar.sendPacket(iu); activeChar.broadcastUserInfo(); - ItemList il = new ItemList(activeChar, true); + final ItemList il = new ItemList(activeChar, true); activeChar.sendPacket(il); } - L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); + final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); if (Config.DEBUG) { @@ -215,13 +215,13 @@ public final class RequestDropItem extends L2GameClientPacket if (activeChar.isGM()) { - String target = (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"); + final String target = (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"); GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", "Drop", target, "(id: " + dropedItem.getId() + " name: " + dropedItem.getItemName() + " objId: " + dropedItem.getObjectId() + " x: " + activeChar.getX() + " y: " + activeChar.getY() + " z: " + activeChar.getZ() + ")"); } if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { - String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; + final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; _log.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelAnswerStart.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelAnswerStart.java index c0047f5fe9..6b5e267dba 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelAnswerStart.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelAnswerStart.java @@ -46,13 +46,13 @@ public final class RequestDuelAnswerStart extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - L2PcInstance requestor = player.getActiveRequester(); + final L2PcInstance requestor = player.getActiveRequester(); if (requestor == null) { return; @@ -98,7 +98,7 @@ public final class RequestDuelAnswerStart extends L2GameClientPacket } else if (_response == -1) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_DUEL_REQUESTS_AND_CANNOT_RECEIVE_A_DUEL_REQUEST); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_DUEL_REQUESTS_AND_CANNOT_RECEIVE_A_DUEL_REQUEST); sm.addPcName(player); requestor.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java index 4d14d56b71..4c0947799b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java @@ -47,9 +47,9 @@ public final class RequestDuelStart extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); - L2PcInstance targetChar = L2World.getInstance().getPlayer(_player); - boolean isPartyDuel = _partyDuel == 1 ? true : false; + final L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance targetChar = L2World.getInstance().getPlayer(_player); + final boolean isPartyDuel = _partyDuel == 1 ? true : false; if ((activeChar == null) || (targetChar == null)) { return; @@ -64,7 +64,7 @@ public final class RequestDuelStart extends L2GameClientPacket } if (!activeChar.isInsideRadius(targetChar, 250, false, false)) { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_TOO_FAR_AWAY_TO_RECEIVE_A_DUEL_CHALLENGE); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_TOO_FAR_AWAY_TO_RECEIVE_A_DUEL_CHALLENGE); msg.addString(targetChar.getName()); activeChar.sendPacket(msg); return; @@ -102,7 +102,7 @@ public final class RequestDuelStart extends L2GameClientPacket return; } } - L2PcInstance partyLeader = targetChar.getParty().getLeader(); // snatch party leader of targetChar's party + final L2PcInstance partyLeader = targetChar.getParty().getLeader(); // snatch party leader of targetChar's party for (L2PcInstance temp : targetChar.getParty().getMembers()) { @@ -135,7 +135,7 @@ public final class RequestDuelStart extends L2GameClientPacket } else { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); msg.addString(partyLeader.getName()); activeChar.sendPacket(msg); } @@ -164,7 +164,7 @@ public final class RequestDuelStart extends L2GameClientPacket } else { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); msg.addString(targetChar.getName()); activeChar.sendPacket(msg); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java index 520662ab0f..fb63a61e90 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java @@ -188,7 +188,7 @@ public final class RequestEnchantItem extends L2GameClientPacket case SUCCESS: { Skill enchant4Skill = null; - L2Item it = item.getItem(); + final L2Item it = item.getItem(); // Increase enchant level only if scroll's base template has chance, some armors can success over +20 but they shouldn't have increased. if (scrollTemplate.getChance(activeChar, item) > 0) { @@ -210,7 +210,7 @@ public final class RequestEnchantItem extends L2GameClientPacket if (Config.LOG_ITEM_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "Success"); + final LogRecord record = new LogRecord(Level.INFO, "Success"); record.setParameters(new Object[] { activeChar, @@ -223,17 +223,17 @@ public final class RequestEnchantItem extends L2GameClientPacket } // announce the success - int minEnchantAnnounce = item.isArmor() ? 6 : 7; - int maxEnchantAnnounce = item.isArmor() ? 0 : 15; + final int minEnchantAnnounce = item.isArmor() ? 6 : 7; + final int maxEnchantAnnounce = item.isArmor() ? 0 : 15; if ((item.getEnchantLevel() == minEnchantAnnounce) || (item.getEnchantLevel() == maxEnchantAnnounce)) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_SUCCESSFULLY_ENCHANTED_A_S2_S3); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_SUCCESSFULLY_ENCHANTED_A_S2_S3); sm.addCharName(activeChar); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); activeChar.broadcastPacket(sm); - Skill skill = CommonSkill.FIREWORK.getSkill(); + final Skill skill = CommonSkill.FIREWORK.getSkill(); if (skill != null) { activeChar.broadcastPacket(new MagicSkillUse(activeChar, activeChar, skill.getId(), skill.getLevel(), skill.getHitTime(), skill.getReuseDelay())); @@ -262,7 +262,7 @@ public final class RequestEnchantItem extends L2GameClientPacket if (Config.LOG_ITEM_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "Safe Fail"); + final LogRecord record = new LogRecord(Level.INFO, "Safe Fail"); record.setParameters(new Object[] { activeChar, @@ -281,19 +281,19 @@ public final class RequestEnchantItem extends L2GameClientPacket { if (item.getEnchantLevel() > 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); activeChar.sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm.addItemName(item); activeChar.sendPacket(sm); } - L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); + final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); for (L2ItemInstance itm : unequiped) { iu.addModifiedItem(itm); @@ -314,7 +314,7 @@ public final class RequestEnchantItem extends L2GameClientPacket if (Config.LOG_ITEM_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "Blessed Fail"); + final LogRecord record = new LogRecord(Level.INFO, "Blessed Fail"); record.setParameters(new Object[] { activeChar, @@ -337,7 +337,7 @@ public final class RequestEnchantItem extends L2GameClientPacket if (Config.LOG_ITEM_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "Blessed Fail"); + final LogRecord record = new LogRecord(Level.INFO, "Blessed Fail"); record.setParameters(new Object[] { activeChar, @@ -361,7 +361,7 @@ public final class RequestEnchantItem extends L2GameClientPacket if (Config.LOG_ITEM_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "Unable to destroy"); + final LogRecord record = new LogRecord(Level.INFO, "Unable to destroy"); record.setParameters(new Object[] { activeChar, @@ -397,7 +397,7 @@ public final class RequestEnchantItem extends L2GameClientPacket if (Config.LOG_ITEM_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "Fail"); + final LogRecord record = new LogRecord(Level.INFO, "Fail"); record.setParameters(new Object[] { activeChar, diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java index 9969616c5e..e79509e5ee 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java @@ -52,7 +52,7 @@ public class RequestEx2ndPasswordReq extends L2GameClientPacket return; } - SecondaryPasswordAuth secondAuth = getClient().getSecondaryAuth(); + final SecondaryPasswordAuth secondAuth = getClient().getSecondaryAuth(); boolean success = false; if ((_changePass == 0) && !secondAuth.passwordExist()) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java index 27fc829f9e..85432d55bc 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java @@ -41,10 +41,10 @@ public final class RequestExAcceptJoinMPCC extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player != null) { - L2PcInstance requestor = player.getActiveRequester(); + final L2PcInstance requestor = player.getActiveRequester(); SystemMessage sm; if (requestor == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAddContactToContactList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAddContactToContactList.java index 46c221d0d1..83a2dcd860 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAddContactToContactList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAddContactToContactList.java @@ -56,7 +56,7 @@ public class RequestExAddContactToContactList extends L2GameClientPacket return; } - boolean charAdded = activeChar.getContactList().add(_name); + final boolean charAdded = activeChar.getContactList().add(_name); activeChar.sendPacket(new ExConfirmAddingContact(_name, charAdded)); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java index fc05657bc3..e07e32d723 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java @@ -65,7 +65,7 @@ public final class RequestExAskJoinMPCC extends L2GameClientPacket // activeChar is in a Party? if (activeChar.isInParty()) { - L2Party activeParty = activeChar.getParty(); + final L2Party activeParty = activeChar.getParty(); // activeChar is PartyLeader? && activeChars Party is already in a CommandChannel? if (activeParty.getLeader().equals(activeChar)) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 390e0f9414..e884b691f4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -48,7 +48,7 @@ public final class RequestExCubeGameChangeTeam extends L2GameClientPacket { return; } - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); switch (_team) { @@ -60,7 +60,7 @@ public final class RequestExCubeGameChangeTeam extends L2GameClientPacket case -1: // Remove Player (me) { - int team = HandysBlockCheckerManager.getInstance().getHolder(_arena).getPlayerTeam(player); + final int team = HandysBlockCheckerManager.getInstance().getHolder(_arena).getPlayerTeam(player); // client sends two times this packet if click on exit // client did not send this packet on restart if (team > -1) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 8a7bcb5b7f..3d897bba46 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -44,7 +44,7 @@ public final class RequestExCubeGameReadyAnswer extends L2GameClientPacket @Override public void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index e76001e054..e67b04ae44 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -139,7 +139,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket { elementToAdd = Elementals.getOppositeElement(elementToAdd); } - byte opositeElement = Elementals.getOppositeElement(elementToAdd); + final byte opositeElement = Elementals.getOppositeElement(elementToAdd); final Elementals oldElement = item.getElemental(elementToAdd); final int elementValue = oldElement == null ? 0 : oldElement.getValue(); @@ -305,7 +305,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket } boolean success = false; - ElementalItemType stoneType = Elementals.getItemElemental(stone.getId())._type; + final ElementalItemType stoneType = Elementals.getItemElemental(stone.getId())._type; switch (item.getItem().getCrystalType()) { case R: diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java index a973ca659e..a7927edd23 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -249,7 +249,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket } else if (_type == 1) // safe enchant { - int costMultiplier = EnchantSkillGroupsData.SAFE_ENCHANT_COST_MULTIPLIER; + final int costMultiplier = EnchantSkillGroupsData.SAFE_ENCHANT_COST_MULTIPLIER; final int reqItemId; if (player.getClassId().level() == 3) { @@ -277,13 +277,13 @@ public final class RequestExEnchantSkill extends L2GameClientPacket return; } - int requiredSp = esd.getSpCost() * costMultiplier; - int requireditems = esd.getAdenaCost() * costMultiplier; - int rate = esd.getRate(player); + final int requiredSp = esd.getSpCost() * costMultiplier; + final int requireditems = esd.getAdenaCost() * costMultiplier; + final int rate = esd.getRate(player); if (player.getSp() >= requiredSp) { - L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId); + final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId); if (spb == null) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL); @@ -311,7 +311,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket { if (Config.LOG_SKILL_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "Safe Success"); + final LogRecord record = new LogRecord(Level.INFO, "Safe Success"); record.setParameters(new Object[] { player, @@ -332,7 +332,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket player.sendPacket(ExEnchantSkillResult.valueOf(true)); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED); sm.addSkillName(_skillId); player.sendPacket(sm); } @@ -340,7 +340,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket { if (Config.LOG_SKILL_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "Safe Fail"); + final LogRecord record = new LogRecord(Level.INFO, "Safe Fail"); record.setParameters(new Object[] { player, @@ -352,7 +352,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket _logEnchant.log(record); } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_FAILED_THE_SKILL_WILL_BE_INITIALIZED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_FAILED_THE_SKILL_WILL_BE_INITIALIZED); player.sendPacket(sm); player.sendPacket(ExEnchantSkillResult.valueOf(false)); } @@ -366,7 +366,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL); player.sendPacket(sm); } } @@ -403,19 +403,19 @@ public final class RequestExEnchantSkill extends L2GameClientPacket return; } - int currentEnchantLevel = beforeEnchantSkillLevel % 1000; + final int currentEnchantLevel = beforeEnchantSkillLevel % 1000; if (currentEnchantLevel != (_skillLvl % 1000)) { return; } - EnchantSkillHolder esd = s.getEnchantSkillHolder(_skillLvl); + final EnchantSkillHolder esd = s.getEnchantSkillHolder(_skillLvl); - int requiredSp = esd.getSpCost(); - int requireditems = esd.getAdenaCost(); + final int requiredSp = esd.getSpCost(); + final int requireditems = esd.getAdenaCost(); if (player.getSp() >= requiredSp) { - L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId); + final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId); if (Config.ES_SP_BOOK_NEEDED) { if (spb == null) @@ -446,7 +446,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket return; } - int levelPenalty = Rnd.get(Math.min(4, currentEnchantLevel)); + final int levelPenalty = Rnd.get(Math.min(4, currentEnchantLevel)); _skillLvl -= levelPenalty; if ((_skillLvl % 1000) == 0) { @@ -455,7 +455,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket if (Config.LOG_SKILL_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "Route Change"); + final LogRecord record = new LogRecord(Level.INFO, "Route Change"); record.setParameters(new Object[] { player, @@ -478,13 +478,13 @@ public final class RequestExEnchantSkill extends L2GameClientPacket if (levelPenalty == 0) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_WILL_REMAIN); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_WILL_REMAIN); sm.addSkillName(_skillId); player.sendPacket(sm); } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_HAS_BEEN_DECREASED_BY_S2); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_HAS_BEEN_DECREASED_BY_S2); sm.addSkillName(_skillId); if (_skillLvl > 1000) @@ -505,7 +505,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL); player.sendPacket(sm); } } @@ -537,7 +537,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket return; } - L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId); + final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId); if (spb == null) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL); @@ -548,7 +548,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket if (Config.LOG_SKILL_ENCHANTS) { - LogRecord record = new LogRecord(Level.INFO, "100% Success"); + final LogRecord record = new LogRecord(Level.INFO, "100% Success"); record.setParameters(new Object[] { player, @@ -568,7 +568,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket } player.sendPacket(ExEnchantSkillResult.valueOf(true)); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED); sm.addSkillName(_skillId); player.sendPacket(sm); player.sendPacket(new UserInfo(player)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a256c2a0ec..ea5fabd8e3 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -59,7 +59,7 @@ public final class RequestExEnchantSkillInfo extends L2GameClientPacket return; } - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { @@ -82,7 +82,7 @@ public final class RequestExEnchantSkillInfo extends L2GameClientPacket return; } - int playerSkillLvl = activeChar.getSkillLevel(_skillId); + final int playerSkillLvl = activeChar.getSkillLevel(_skillId); if ((playerSkillLvl == -1) || (playerSkillLvl != _skillLvl)) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index a8e4f3782a..c21f7504fe 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -60,7 +60,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket return; } - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { @@ -82,7 +82,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket reqSkillLvl = _skillLvl; // change route } - int playerSkillLvl = activeChar.getSkillLevel(_skillId); + final int playerSkillLvl = activeChar.getSkillLevel(_skillId); // dont have such skill if (playerSkillLvl == -1) @@ -93,7 +93,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket // if reqlvl is 100,200,.. check base skill lvl enchant if ((reqSkillLvl % 1000) == 0) { - L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId); + final L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId); if (esl != null) { // if player dont have min level to enchant @@ -118,7 +118,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket } // send skill enchantment detail - ExEnchantSkillInfoDetail esd = new ExEnchantSkillInfoDetail(_type, _skillId, _skillLvl, activeChar); + final ExEnchantSkillInfoDetail esd = new ExEnchantSkillInfoDetail(_type, _skillId, _skillLvl, activeChar); activeChar.sendPacket(esd); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 019e5a884d..bfe751e766 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -64,7 +64,7 @@ public final class RequestExMagicSkillUseGround extends L2GameClientPacket } // Get the level of the used skill - int level = activeChar.getSkillLevel(_skillId); + final int level = activeChar.getSkillLevel(_skillId); if (level <= 0) { activeChar.sendPacket(ActionFailed.STATIC_PACKET); @@ -72,7 +72,7 @@ public final class RequestExMagicSkillUseGround extends L2GameClientPacket } // Get the L2Skill template corresponding to the skillID received from the client - Skill skill = SkillData.getInstance().getSkill(_skillId, level); + final Skill skill = SkillData.getInstance().getSkill(_skillId, level); // Check the validity of the skill if (skill != null) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java index 17726bb1c3..d803ee68a3 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java @@ -41,8 +41,8 @@ public final class RequestExOustFromMPCC extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance target = L2World.getInstance().getPlayer(_name); - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance target = L2World.getInstance().getPlayer(_name); + final L2PcInstance activeChar = getClient().getActiveChar(); if ((target != null) && target.isInParty() && activeChar.isInParty() && activeChar.getParty().isInCommandChannel() && target.getParty().isInCommandChannel() && activeChar.getParty().getCommandChannel().getLeader().equals(activeChar) && activeChar.getParty().getCommandChannel().equals(target.getParty().getCommandChannel())) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 214d78c04e..c55cd830e2 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -50,13 +50,13 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket @Override public void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_objectId); + final L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_objectId); if (targetItem == null) { @@ -77,11 +77,11 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket targetItem.clearElementAttr(_element); activeChar.sendPacket(new UserInfo(activeChar)); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(targetItem); activeChar.sendPacket(iu); SystemMessage sm; - byte realElement = targetItem.isArmor() ? Elementals.getOppositeElement(_element) : _element; + final byte realElement = targetItem.isArmor() ? Elementals.getOppositeElement(_element) : _element; if (targetItem.getEnchantLevel() > 0) { if (targetItem.isArmor()) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java index 5f759a3c6e..1bac5ae95d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -42,13 +42,13 @@ public class RequestExRqItemLink extends L2GameClientPacket @Override protected void runImpl() { - L2GameClient client = getClient(); + final L2GameClient client = getClient(); if (client != null) { - L2Object object = L2World.getInstance().findObject(_objectId); + final L2Object object = L2World.getInstance().findObject(_objectId); if (object instanceof L2ItemInstance) { - L2ItemInstance item = (L2ItemInstance) object; + final L2ItemInstance item = (L2ItemInstance) object; if (item.isPublished()) { client.sendPacket(new ExRpItemLink(item)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java index 88e21fe5f9..4264933116 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java @@ -36,7 +36,7 @@ public final class RequestExitPartyMatchingWaitingRoom extends L2GameClientPacke @Override protected void runImpl() { - L2PcInstance _activeChar = getClient().getActiveChar(); + final L2PcInstance _activeChar = getClient().getActiveChar(); if (_activeChar == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java index 8486531d9d..670fa0d05f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -40,7 +40,7 @@ public class RequestFortressMapInfo extends L2GameClientPacket @Override protected void runImpl() { - Fort fort = FortManager.getInstance().getFortById(_fortressId); + final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java index af6d2a4591..86c201d13a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java @@ -39,7 +39,7 @@ public class RequestFortressSiegeInfo extends L2GameClientPacket @Override protected void runImpl() { - L2GameClient client = getClient(); + final L2GameClient client = getClient(); if (client != null) { for (Fort fort : FortManager.getInstance().getForts()) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java index d9a0a2164c..1e013cc7bd 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java @@ -58,9 +58,9 @@ public final class RequestGMCommand extends L2GameClientPacket return; } - L2PcInstance player = L2World.getInstance().getPlayer(_targetName); + final L2PcInstance player = L2World.getInstance().getPlayer(_targetName); - L2Clan clan = ClanTable.getInstance().getClanByName(_targetName); + final L2Clan clan = ClanTable.getInstance().getClanByName(_targetName); // player name was incorrect? if ((player == null) && ((clan == null) || (_command != 6))) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveNickName.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveNickName.java index fd9884d3ba..aa621ae696 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveNickName.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveNickName.java @@ -40,7 +40,7 @@ public class RequestGiveNickName extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -68,10 +68,10 @@ public class RequestGiveNickName extends L2GameClientPacket return; } - L2ClanMember member1 = activeChar.getClan().getClanMember(_target); + final L2ClanMember member1 = activeChar.getClan().getClanMember(_target); if (member1 != null) { - L2PcInstance member = member1.getPlayerInstance(); + final L2PcInstance member = member1.getPlayerInstance(); if (member != null) { // is target from the same clan? diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGotoLobby.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGotoLobby.java index 48f5c9ec69..40e5db89e0 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGotoLobby.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGotoLobby.java @@ -39,7 +39,7 @@ public class RequestGotoLobby extends L2GameClientPacket @Override protected void runImpl() { - L2GameClient client = getClient(); + final L2GameClient client = getClient(); client.sendPacket(new ExLoginVitalityEffectInfo(client)); client.sendPacket(new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1)); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestItemList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestItemList.java index 3137470fa9..7183491e31 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestItemList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestItemList.java @@ -39,7 +39,7 @@ public final class RequestItemList extends L2GameClientPacket { if ((getClient() != null) && (getClient().getActiveChar() != null) && !getClient().getActiveChar().isInventoryDisabled()) { - ItemList il = new ItemList(getClient().getActiveChar(), true); + final ItemList il = new ItemList(getClient().getActiveChar(), true); sendPacket(il); } } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java index 13770a9121..95aa83d0a3 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java @@ -44,13 +44,13 @@ public final class RequestJoinAlly extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2PcInstance ob = L2World.getInstance().getPlayer(_id); + final L2PcInstance ob = L2World.getInstance().getPlayer(_id); if (ob == null) { @@ -64,8 +64,8 @@ public final class RequestJoinAlly extends L2GameClientPacket return; } - L2PcInstance target = ob; - L2Clan clan = activeChar.getClan(); + final L2PcInstance target = ob; + final L2Clan clan = activeChar.getClan(); if (!clan.checkAllyJoinCondition(activeChar, target)) { return; @@ -75,7 +75,7 @@ public final class RequestJoinAlly extends L2GameClientPacket return; } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_LEADER_S2_HAS_REQUESTED_AN_ALLIANCE); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_LEADER_S2_HAS_REQUESTED_AN_ALLIANCE); sm.addString(activeChar.getClan().getAllyName()); sm.addString(activeChar.getName()); target.sendPacket(sm); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java index 3d361e3f9b..beac8cd859 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java @@ -50,8 +50,8 @@ public final class RequestJoinParty extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance requestor = getClient().getActiveChar(); - L2PcInstance target = L2World.getInstance().getPlayer(_name); + final L2PcInstance requestor = getClient().getActiveChar(); + final L2PcInstance target = L2World.getInstance().getPlayer(_name); if (requestor == null) { @@ -79,7 +79,7 @@ public final class RequestJoinParty extends L2GameClientPacket if (target.isPartyBanned()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_CANNOT_JOIN_A_PARTY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_CANNOT_JOIN_A_PARTY); sm.addCharName(target); requestor.sendPacket(sm); return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinSiege.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinSiege.java index 4c5960d025..49cb039463 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinSiege.java @@ -51,7 +51,7 @@ public final class RequestJoinSiege extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -63,13 +63,13 @@ public final class RequestJoinSiege extends L2GameClientPacket return; } - L2Clan clan = activeChar.getClan(); + final L2Clan clan = activeChar.getClan(); if (clan == null) { return; } - Castle castle = CastleManager.getInstance().getCastleById(_castleId); + final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if (castle != null) { if (_isJoining == 1) @@ -95,7 +95,7 @@ public final class RequestJoinSiege extends L2GameClientPacket castle.getSiege().listRegisterClan(activeChar); } - SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId); + final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId); if (hall != null) { if (_isJoining == 1) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java index 3ac23cbee0..77f2e3eeba 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java @@ -38,7 +38,7 @@ public class RequestKeyMapping extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java index 4ed232410a..246ce7bc80 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java @@ -42,7 +42,7 @@ public final class RequestLinkHtml extends L2GameClientPacket @Override public void runImpl() { - L2PcInstance actor = getClient().getActiveChar(); + final L2PcInstance actor = getClient().getActiveChar(); if (actor == null) { return; @@ -60,7 +60,7 @@ public final class RequestLinkHtml extends L2GameClientPacket return; } - int htmlObjectId = actor.validateHtmlAction("link " + _link); + final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { _log.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); @@ -73,7 +73,7 @@ public final class RequestLinkHtml extends L2GameClientPacket return; } - String filename = "html/" + _link; + final String filename = "html/" + _link; final NpcHtmlMessage msg = new NpcHtmlMessage(htmlObjectId); msg.setFile(actor.getHtmlPrefix(), filename); sendPacket(msg); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java index 72814babfb..3d155a4084 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java @@ -44,7 +44,7 @@ public class RequestListPartyMatchingWaitingRoom extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance _activeChar = getClient().getActiveChar(); + final L2PcInstance _activeChar = getClient().getActiveChar(); if (_activeChar == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestMakeMacro.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestMakeMacro.java index 3d30c8e92d..124e60dd98 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestMakeMacro.java @@ -40,11 +40,11 @@ public final class RequestMakeMacro extends L2GameClientPacket @Override protected void readImpl() { - int _id = readD(); - String _name = readS(); - String _desc = readS(); - String _acronym = readS(); - int _icon = readC(); + final int _id = readD(); + final String _name = readS(); + final String _desc = readS(); + final String _acronym = readS(); + final int _icon = readC(); int _count = readC(); if (_count > MAX_MACRO_LENGTH) { @@ -59,11 +59,11 @@ public final class RequestMakeMacro extends L2GameClientPacket final List commands = new ArrayList<>(_count); for (int i = 0; i < _count; i++) { - int entry = readC(); - int type = readC(); // 1 = skill, 3 = action, 4 = shortcut - int d1 = readD(); // skill or page number for shortcuts - int d2 = readC(); - String command = readS(); + final int entry = readC(); + final int type = readC(); // 1 = skill, 3 = action, 4 = shortcut + final int d1 = readD(); // skill or page number for shortcuts + final int d2 = readC(); + final String command = readS(); _commandsLenght += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } @@ -73,7 +73,7 @@ public final class RequestMakeMacro extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java index 647359cdb7..3245da9218 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java @@ -44,7 +44,7 @@ public final class RequestModifyBookMarkSlot extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadMatchList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadMatchList.java index 922ffc11ec..40221251fc 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadMatchList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadMatchList.java @@ -46,7 +46,7 @@ public final class RequestOlympiadMatchList extends L2GameClientPacket return; } - IBypassHandler handler = BypassHandler.getInstance().getHandler(COMMAND); + final IBypassHandler handler = BypassHandler.getInstance().getHandler(COMMAND); if (handler != null) { handler.useBypass(COMMAND, activeChar, null); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java index ae2af11cb8..c9eefad7c3 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java @@ -37,7 +37,7 @@ public final class RequestOlympiadObserverEnd extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java index 7b11d7577d..fb88d1892a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java @@ -46,19 +46,19 @@ public final class RequestOustFromPartyRoom extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getActiveChar(); + final L2PcInstance player = getActiveChar(); if (player == null) { return; } - L2PcInstance member = L2World.getInstance().getPlayer(_charid); + final L2PcInstance member = L2World.getInstance().getPlayer(_charid); if (member == null) { return; } - PartyMatchRoom room = PartyMatchRoomList.getInstance().getPlayerRoom(member); + final PartyMatchRoom room = PartyMatchRoomList.getInstance().getPlayerRoom(member); if ((room == null) || (room.getOwner() != player)) { return; @@ -81,7 +81,7 @@ public final class RequestOustFromPartyRoom extends L2GameClientPacket PartyMatchWaitingList.getInstance().addPlayer(member); // Send Room list - int loc = 0; // TODO: Closes town + final int loc = 0; // TODO: Closes town member.sendPacket(new ListPartyWating(member, 0, loc, member.getLevel())); // Clean player's LFP title diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPartyMember.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPartyMember.java index 159640941f..242b218a85 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPartyMember.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPartyMember.java @@ -40,7 +40,7 @@ public final class RequestOustPartyMember extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPledgeMember.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPledgeMember.java index 9ba835a293..5acba69b44 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -70,9 +70,9 @@ public final class RequestOustPledgeMember extends L2GameClientPacket return; } - L2Clan clan = activeChar.getClan(); + final L2Clan clan = activeChar.getClan(); - L2ClanMember member = clan.getClanMember(_target); + final L2ClanMember member = clan.getClanMember(_target); if (member == null) { _log.warning("Target (" + _target + ") is not member of the clan"); @@ -89,7 +89,7 @@ public final class RequestOustPledgeMember extends L2GameClientPacket clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); clan.updateClanInDB(); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); sm.addString(member.getName()); clan.broadcastToOnlineMembers(sm); activeChar.sendPacket(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_EXPELLING_THE_CLAN_MEMBER); @@ -101,7 +101,7 @@ public final class RequestOustPledgeMember extends L2GameClientPacket if (member.isOnline()) { - L2PcInstance player = member.getPlayerInstance(); + final L2PcInstance player = member.getPlayerInstance(); player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java index fcad5aeac1..31664f0e7e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java @@ -51,7 +51,7 @@ public class RequestPackageSend extends L2GameClientPacket { _objectId = readD(); - int count = readD(); + final int count = readD(); if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) { return; @@ -60,8 +60,8 @@ public class RequestPackageSend extends L2GameClientPacket _items = new ItemHolder[count]; for (int i = 0; i < count; i++) { - int objId = readD(); - long cnt = readQ(); + final int objId = readD(); + final long cnt = readQ(); if ((objId < 1) || (cnt < 0)) { _items = null; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java index 0e0a2fd6f9..96b01b24a3 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java @@ -40,7 +40,7 @@ public class RequestPackageSendableItemList extends L2GameClientPacket @Override public void runImpl() { - L2ItemInstance[] items = getClient().getActiveChar().getInventory().getAvailableItems(true, true, true); + final L2ItemInstance[] items = getClient().getActiveChar().getInventory().getAvailableItems(true, true, true); sendPacket(new PackageSendableList(items, _objectID)); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchConfig.java index 7f62a83593..ae3f1c6af0 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchConfig.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchConfig.java @@ -49,7 +49,7 @@ public final class RequestPartyMatchConfig extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance _activeChar = getClient().getActiveChar(); + final L2PcInstance _activeChar = getClient().getActiveChar(); if (_activeChar == null) { @@ -66,13 +66,13 @@ public final class RequestPartyMatchConfig extends L2GameClientPacket if (_activeChar.isInPartyMatchRoom()) { // If Player is in Room show him room, not list - PartyMatchRoomList _list = PartyMatchRoomList.getInstance(); + final PartyMatchRoomList _list = PartyMatchRoomList.getInstance(); if (_list == null) { return; } - PartyMatchRoom _room = _list.getPlayerRoom(_activeChar); + final PartyMatchRoom _room = _list.getPlayerRoom(_activeChar); if (_room == null) { return; @@ -91,7 +91,7 @@ public final class RequestPartyMatchConfig extends L2GameClientPacket PartyMatchWaitingList.getInstance().addPlayer(_activeChar); // Send Room list - ListPartyWating matchList = new ListPartyWating(_activeChar, _auto, _loc, _lvl); + final ListPartyWating matchList = new ListPartyWating(_activeChar, _auto, _loc, _lvl); _activeChar.sendPacket(matchList); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchDetail.java index 7e6bbc6339..9444b0c985 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchDetail.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchDetail.java @@ -57,13 +57,13 @@ public final class RequestPartyMatchDetail extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance _activeChar = getClient().getActiveChar(); + final L2PcInstance _activeChar = getClient().getActiveChar(); if (_activeChar == null) { return; } - PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid); + final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid); if (_room == null) { return; @@ -88,7 +88,7 @@ public final class RequestPartyMatchDetail extends L2GameClientPacket _member.sendPacket(new ExManagePartyRoomMember(_activeChar, _room, 0)); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ENTERED_THE_PARTY_ROOM); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ENTERED_THE_PARTY_ROOM); sm.addCharName(_activeChar); _member.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java index b50bac8e28..4eb7321923 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -54,7 +54,7 @@ public class RequestPartyMatchList extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance _activeChar = getClient().getActiveChar(); + final L2PcInstance _activeChar = getClient().getActiveChar(); if (_activeChar == null) { @@ -63,7 +63,7 @@ public class RequestPartyMatchList extends L2GameClientPacket if (_roomid > 0) { - PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid); + final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid); if (_room != null) { _log.info("PartyMatchRoom #" + _room.getId() + " changed by " + _activeChar.getName()); @@ -87,9 +87,9 @@ public class RequestPartyMatchList extends L2GameClientPacket } else { - int _maxid = PartyMatchRoomList.getInstance().getMaxId(); + final int _maxid = PartyMatchRoomList.getInstance().getMaxId(); - PartyMatchRoom _room = new PartyMatchRoom(_maxid, _roomtitle, _loot, _lvlmin, _lvlmax, _membersmax, _activeChar); + final PartyMatchRoom _room = new PartyMatchRoom(_maxid, _roomtitle, _loot, _lvlmin, _lvlmax, _membersmax, _activeChar); _log.info("PartyMatchRoom #" + _maxid + " created by " + _activeChar.getName()); // Remove from waiting list diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java index ccb91ec1a6..9181a75176 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java @@ -42,8 +42,8 @@ public final class RequestPetGetItem extends L2GameClientPacket @Override protected void runImpl() { - L2World world = L2World.getInstance(); - L2ItemInstance item = (L2ItemInstance) world.findObject(_objectId); + final L2World world = L2World.getInstance(); + final L2ItemInstance item = (L2ItemInstance) world.findObject(_objectId); if ((item == null) || (getActiveChar() == null) || !getActiveChar().hasPet()) { sendPacket(ActionFailed.STATIC_PACKET); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java index dc66ec5d2f..d4037b7a33 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java @@ -52,7 +52,7 @@ public final class RequestPetition extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -82,11 +82,11 @@ public final class RequestPetition extends L2GameClientPacket return; } - int totalPetitions = PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar) + 1; + final int totalPetitions = PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar) + 1; if (totalPetitions > Config.MAX_PETITIONS_PER_PLAYER) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.WE_HAVE_RECEIVED_S1_PETITIONS_FROM_YOU_TODAY_AND_THAT_IS_THE_MAXIMUM_THAT_YOU_CAN_SUBMIT_IN_ONE_DAY_YOU_CANNOT_SUBMIT_ANY_MORE_PETITIONS); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.WE_HAVE_RECEIVED_S1_PETITIONS_FROM_YOU_TODAY_AND_THAT_IS_THE_MAXIMUM_THAT_YOU_CAN_SUBMIT_IN_ONE_DAY_YOU_CANNOT_SUBMIT_ANY_MORE_PETITIONS); sm.addInt(totalPetitions); activeChar.sendPacket(sm); return; @@ -98,7 +98,7 @@ public final class RequestPetition extends L2GameClientPacket return; } - int petitionId = PetitionManager.getInstance().submitPetition(activeChar, _content, _type); + final int petitionId = PetitionManager.getInstance().submitPetition(activeChar, _content, _type); SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1); sm.addInt(petitionId); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionCancel.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionCancel.java index 7cfe2edb51..916272d17e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -51,7 +51,7 @@ public final class RequestPetitionCancel extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -74,14 +74,14 @@ public final class RequestPetitionCancel extends L2GameClientPacket { if (PetitionManager.getInstance().cancelActivePetition(activeChar)) { - int numRemaining = Config.MAX_PETITIONS_PER_PLAYER - PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar); + final int numRemaining = Config.MAX_PETITIONS_PER_PLAYER - PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PETITION_WAS_CANCELED_YOU_MAY_SUBMIT_S1_MORE_PETITION_S_TODAY); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PETITION_WAS_CANCELED_YOU_MAY_SUBMIT_S1_MORE_PETITION_S_TODAY); sm.addString(String.valueOf(numRemaining)); activeChar.sendPacket(sm); // Notify all GMs that the player's pending petition has been cancelled. - String msgContent = activeChar.getName() + " has canceled a pending petition."; + final String msgContent = activeChar.getName() + " has canceled a pending petition."; AdminData.getInstance().broadcastToGMs(new CreatureSay(activeChar.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); } else diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionFeedback.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionFeedback.java index 0adee00bb1..ae6a003540 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -52,7 +52,7 @@ public class RequestPetitionFeedback extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if ((player == null) || (player.getLastPetitionGmName() == null)) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeDraftListApply.java index 11f4d6f09b..5e927cf2a8 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeDraftListApply.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeDraftListApply.java @@ -77,7 +77,7 @@ public class RequestPledgeDraftListApply extends L2GameClientPacket } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION); sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(activeChar.getObjectId())); activeChar.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index e7b8c3309c..ed9897f8ec 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -46,18 +46,18 @@ public final class RequestPledgeMemberInfo extends L2GameClientPacket { // _log.info("C5: RequestPledgeMemberInfo d:"+_unk1); // _log.info("C5: RequestPledgeMemberInfo S:"+_player); - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } // do we need powers to do that?? - L2Clan clan = activeChar.getClan(); + final L2Clan clan = activeChar.getClan(); if (clan == null) { return; } - L2ClanMember member = clan.getClanMember(_player); + final L2ClanMember member = clan.getClanMember(_player); if (member == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberList.java index 7d8c3cacbe..9abc1e8a52 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberList.java @@ -40,16 +40,16 @@ public final class RequestPledgeMemberList extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2Clan clan = activeChar.getClan(); + final L2Clan clan = activeChar.getClan(); if (clan != null) { - PledgeShowMemberListAll pm = new PledgeShowMemberListAll(clan); + final PledgeShowMemberListAll pm = new PledgeShowMemberListAll(clan); activeChar.sendPacket(pm); activeChar.sendPacket(new PledgeSkillList(clan)); activeChar.broadcastUserInfo(); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java index d57586673a..bedb57658b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java @@ -47,18 +47,18 @@ public final class RequestPledgeMemberPowerInfo extends L2GameClientPacket { // _log.info("C5: RequestPledgeMemberPowerInfo d:"+_unk1); // _log.info("C5: RequestPledgeMemberPowerInfo S:"+_player); - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } // do we need powers to do that?? - L2Clan clan = activeChar.getClan(); + final L2Clan clan = activeChar.getClan(); if (clan == null) { return; } - L2ClanMember member = clan.getClanMember(_player); + final L2ClanMember member = clan.getClanMember(_player); if (member == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java index 30b64397f8..84bda2d47e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java @@ -88,7 +88,7 @@ public class RequestPledgeRecruitBoardAccess extends L2GameClientPacket } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION); sm.addLong(ClanEntryManager.getInstance().getClanLockTime(clan.getId())); activeChar.sendPacket(sm); } @@ -102,7 +102,7 @@ public class RequestPledgeRecruitBoardAccess extends L2GameClientPacket } else { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION); sm.addLong(ClanEntryManager.getInstance().getClanLockTime(clan.getId())); activeChar.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java index 5ecec46e83..bc5acade7f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java @@ -48,8 +48,8 @@ public final class RequestPledgeSetAcademyMaster extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); - L2Clan clan = activeChar.getClan(); + final L2PcInstance activeChar = getClient().getActiveChar(); + final L2Clan clan = activeChar.getClan(); if (clan == null) { return; @@ -61,8 +61,8 @@ public final class RequestPledgeSetAcademyMaster extends L2GameClientPacket return; } - L2ClanMember currentMember = clan.getClanMember(_currPlayerName); - L2ClanMember targetMember = clan.getClanMember(_targetPlayerName); + final L2ClanMember currentMember = clan.getClanMember(_currPlayerName); + final L2ClanMember targetMember = clan.getClanMember(_targetPlayerName); if ((currentMember == null) || (targetMember == null)) { return; @@ -80,8 +80,8 @@ public final class RequestPledgeSetAcademyMaster extends L2GameClientPacket sponsorMember = currentMember; } - L2PcInstance apprentice = apprenticeMember.getPlayerInstance(); - L2PcInstance sponsor = sponsorMember.getPlayerInstance(); + final L2PcInstance apprentice = apprenticeMember.getPlayerInstance(); + final L2PcInstance sponsor = sponsorMember.getPlayerInstance(); SystemMessage sm = null; if (_set == 0) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java index da23c26cc6..5f0343ed47 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java @@ -81,7 +81,7 @@ public final class RequestPledgeSetMemberPowerGrade extends L2GameClientPacket } member.setPowerGrade(_powerGrade); - L2PcInstance player = member.getPlayerInstance(); + final L2PcInstance player = member.getPlayerInstance(); if (player != null) { player.sendPacket(new PledgeReceiveUpdatePower(member.getClan().getRankPrivs(_powerGrade).getBitmask())); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java index e87577143e..46f94eb4e5 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java @@ -47,7 +47,7 @@ public class RequestPledgeWaitingApplied extends L2GameClientPacket return; } - OptionalInt clanId = ClanEntryManager.getInstance().getClanIdForPlayerApplication(activeChar.getObjectId()); + final OptionalInt clanId = ClanEntryManager.getInstance().getClanIdForPlayerApplication(activeChar.getObjectId()); if (clanId.isPresent()) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWarList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWarList.java index 9c38e8a7c6..080edb9c8c 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWarList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWarList.java @@ -44,7 +44,7 @@ public final class RequestPledgeWarList extends L2GameClientPacket { // _log.info("C5: RequestPledgeWarList d:"+_unk1); // _log.info("C5: RequestPledgeWarList d:"+_tab); - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java index 2738efcc35..506f787062 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java @@ -180,7 +180,7 @@ public final class RequestPostAttachment extends L2GameClientPacket return; } - long adena = msg.getReqAdena(); + final long adena = msg.getReqAdena(); if ((adena > 0) && !activeChar.reduceAdena("PayMail", adena, null, true)) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_BECAUSE_YOU_DON_T_HAVE_ENOUGH_ADENA); @@ -188,7 +188,7 @@ public final class RequestPostAttachment extends L2GameClientPacket } // Proceed to the transfer - InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); for (L2ItemInstance item : attachments.getItems()) { if (item == null) @@ -202,7 +202,7 @@ public final class RequestPostAttachment extends L2GameClientPacket return; } - long count = item.getCount(); + final long count = item.getCount(); final L2ItemInstance newItem = attachments.transferItem(attachments.getName(), item.getObjectId(), item.getCount(), activeChar.getInventory(), activeChar, null); if (newItem == null) { @@ -220,7 +220,7 @@ public final class RequestPostAttachment extends L2GameClientPacket playerIU.addNewItem(newItem); } } - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); activeChar.sendPacket(sm); @@ -255,7 +255,7 @@ public final class RequestPostAttachment extends L2GameClientPacket } else { - L2ItemInstance paidAdena = ItemTable.getInstance().createItem("PayMail", ADENA_ID, adena, activeChar, null); + final L2ItemInstance paidAdena = ItemTable.getInstance().createItem("PayMail", ADENA_ID, adena, activeChar, null); paidAdena.setOwnerId(msg.getSenderId()); paidAdena.setItemLocation(ItemLocation.INVENTORY); paidAdena.updateDatabase(true); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java index 4c69801852..a9fb3785a6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java @@ -115,7 +115,7 @@ public final class RequestPreviewItem extends L2GameClientPacket } // Get the current player and return if null - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -134,7 +134,7 @@ public final class RequestPreviewItem extends L2GameClientPacket } // Check current target of the player and the INTERACTION_DISTANCE - L2Object target = activeChar.getTarget(); + final L2Object target = activeChar.getTarget(); if (!activeChar.isGM() && ((target == null // No target (i.e. GM Shop) ) || !((target instanceof L2MerchantInstance)) // Target not a merchant || !activeChar.isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false) // Distance is too far @@ -165,11 +165,11 @@ public final class RequestPreviewItem extends L2GameClientPacket } long totalPrice = 0; - Map itemList = new HashMap<>(); + final Map itemList = new HashMap<>(); for (int i = 0; i < _count; i++) { - int itemId = _items[i]; + final int itemId = _items[i]; final Product product = buyList.getProductByItemId(itemId); if (product == null) @@ -178,13 +178,13 @@ public final class RequestPreviewItem extends L2GameClientPacket return; } - L2Item template = product.getItem(); + final L2Item template = product.getItem(); if (template == null) { continue; } - int slot = Inventory.getPaperdollIndex(template.getBodyPart()); + final int slot = Inventory.getPaperdollIndex(template.getBodyPart()); if (slot < 0) { continue; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 50c5cd2154..1796622b04 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -47,7 +47,7 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket protected void readImpl() { _storePlayerId = readD(); - int count = readD(); + final int count = readD(); if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) { return; @@ -56,9 +56,9 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket for (int i = 0; i < count; i++) { - int objectId = readD(); - long cnt = readQ(); - long price = readQ(); + final int objectId = readD(); + final long cnt = readQ(); + final long price = readQ(); if ((objectId < 1) || (cnt < 1) || (price < 0)) { @@ -73,7 +73,7 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getActiveChar(); + final L2PcInstance player = getActiveChar(); if (player == null) { return; @@ -91,7 +91,7 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket return; } - L2Object object = L2World.getInstance().getPlayer(_storePlayerId); + final L2Object object = L2World.getInstance().getPlayer(_storePlayerId); if (object == null) { return; @@ -102,7 +102,7 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket return; } - L2PcInstance storePlayer = (L2PcInstance) object; + final L2PcInstance storePlayer = (L2PcInstance) object; if (!player.isInsideRadius(storePlayer, INTERACTION_DISTANCE, true, false)) { return; @@ -127,7 +127,7 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket } } - TradeList storeList = storePlayer.getSellList(); + final TradeList storeList = storePlayer.getSellList(); if (storeList == null) { return; @@ -144,13 +144,13 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket { if (storeList.getItemCount() > _items.size()) { - String msgErr = "[RequestPrivateStoreBuy] player " + getClient().getActiveChar().getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] player " + getClient().getActiveChar().getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(getClient().getActiveChar(), msgErr, Config.DEFAULT_PUNISH); return; } } - int result = storeList.privateStoreBuy(player, _items); + final int result = storeList.privateStoreBuy(player, _items); if (result > 0) { sendPacket(ActionFailed.STATIC_PACKET); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java index ed51b3b72f..d6b144d40b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java @@ -36,7 +36,7 @@ public final class RequestPrivateStoreManageBuy extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player != null) { player.tryOpenPrivateBuyStore(); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java index 3ce9706a3c..52ea0f37b4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java @@ -38,7 +38,7 @@ public class RequestPrivateStoreQuitBuy extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java index 948dafef27..71e4562b42 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java @@ -38,7 +38,7 @@ public final class RequestPrivateStoreQuitSell extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 5f51bd3a94..4e41d58e9a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -46,7 +46,7 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket protected void readImpl() { _storePlayerId = readD(); - int count = readD(); + final int count = readD(); if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) { return; @@ -55,12 +55,12 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket for (int i = 0; i < count; i++) { - int objectId = readD(); - int itemId = readD(); + final int objectId = readD(); + final int itemId = readD(); readH(); // TODO analyse this readH(); // TODO analyse this - long cnt = readQ(); - long price = readQ(); + final long cnt = readQ(); + final long price = readQ(); readD(); // TODO analyse this readH(); // TODO analyse this @@ -76,7 +76,7 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -94,13 +94,13 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket return; } - L2PcInstance object = L2World.getInstance().getPlayer(_storePlayerId); + final L2PcInstance object = L2World.getInstance().getPlayer(_storePlayerId); if (object == null) { return; } - L2PcInstance storePlayer = object; + final L2PcInstance storePlayer = object; if (!player.isInsideRadius(storePlayer, INTERACTION_DISTANCE, true, false)) { return; @@ -121,7 +121,7 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket return; } - TradeList storeList = storePlayer.getBuyList(); + final TradeList storeList = storePlayer.getBuyList(); if (storeList == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestAbort.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestAbort.java index 9be2f7359c..daecf43a91 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestAbort.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestAbort.java @@ -44,16 +44,16 @@ public final class RequestQuestAbort extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - Quest qe = QuestManager.getInstance().getQuest(_questId); + final Quest qe = QuestManager.getInstance().getQuest(_questId); if (qe != null) { - QuestState qs = activeChar.getQuestState(qe.getName()); + final QuestState qs = activeChar.getQuestState(qe.getName()); if (qs != null) { qs.exitQuest(true); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestList.java index fcd9dbec9f..2f86f19768 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestList.java @@ -37,7 +37,7 @@ public final class RequestQuestList extends L2GameClientPacket @Override protected void runImpl() { - QuestList ql = new QuestList(); + final QuestList ql = new QuestList(); sendPacket(ql); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookDestroy.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookDestroy.java index 533d2ac86f..88e9c493e6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookDestroy.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookDestroy.java @@ -59,7 +59,7 @@ public final class RequestRecipeBookDestroy extends L2GameClientPacket } activeChar.unregisterRecipeList(_recipeID); - RecipeBookItemList response = new RecipeBookItemList(rp.isDwarvenRecipe(), activeChar.getMaxMp()); + final RecipeBookItemList response = new RecipeBookItemList(rp.isDwarvenRecipe(), activeChar.getMaxMp()); if (rp.isDwarvenRecipe()) { response.addRecipes(activeChar.getDwarvenRecipeBook()); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java index 1eb7bac1c2..b3ce1b5924 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java @@ -42,7 +42,7 @@ public final class RequestRecipeItemMakeInfo extends L2GameClientPacket return; } - RecipeItemMakeInfo response = new RecipeItemMakeInfo(_id, player); + final RecipeItemMakeInfo response = new RecipeItemMakeInfo(_id, player); sendPacket(response); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index d2c291f327..340791c56e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -40,7 +40,7 @@ public final class RequestRecipeItemMakeSelf extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopListSet.java index 6dca79bc92..e9794b578b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -51,7 +51,7 @@ public final class RequestRecipeShopListSet extends L2GameClientPacket @Override protected void readImpl() { - int count = readD(); + final int count = readD(); if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) { return; @@ -60,8 +60,8 @@ public final class RequestRecipeShopListSet extends L2GameClientPacket _items = new L2ManufactureItem[count]; for (int i = 0; i < count; i++) { - int id = readD(); - long cost = readQ(); + final int id = readD(); + final long cost = readQ(); if (cost < 0) { _items = null; @@ -74,7 +74,7 @@ public final class RequestRecipeShopListSet extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -101,8 +101,8 @@ public final class RequestRecipeShopListSet extends L2GameClientPacket return; } - List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); - List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); + final List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); + final List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); player.getManufactureItems().clear(); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index b59ff528a0..0a938b24da 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -47,7 +47,7 @@ public final class RequestRecipeShopMakeItem extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -58,7 +58,7 @@ public final class RequestRecipeShopMakeItem extends L2GameClientPacket return; } - L2PcInstance manufacturer = L2World.getInstance().getPlayer(_id); + final L2PcInstance manufacturer = L2World.getInstance().getPlayer(_id); if (manufacturer == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageList.java index a52c14bae2..534b46a71d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageList.java @@ -36,7 +36,7 @@ public final class RequestRecipeShopManageList extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getActiveChar(); + final L2PcInstance player = getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java index d579283fba..96c52ce0c1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java @@ -38,7 +38,7 @@ public final class RequestRecipeShopManageQuit extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecordInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecordInfo.java index e2d1ad02e8..5009853a69 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecordInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecordInfo.java @@ -47,7 +47,7 @@ public class RequestRecordInfo extends L2GameClientPacket activeChar.sendPacket(new UserInfo(activeChar)); - Collection objs = activeChar.getKnownList().getKnownObjects().values(); + final Collection objs = activeChar.getKnownList().getKnownObjects().values(); for (L2Object object : objs) { if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item")) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java index 481c00675d..8ce9c833e4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java @@ -56,17 +56,17 @@ public final class RequestRefine extends AbstractRefinePacket { return; } - L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId); + final L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId); if (targetItem == null) { return; } - L2ItemInstance refinerItem = activeChar.getInventory().getItemByObjectId(_refinerItemObjId); + final L2ItemInstance refinerItem = activeChar.getInventory().getItemByObjectId(_refinerItemObjId); if (refinerItem == null) { return; } - L2ItemInstance gemStoneItem = activeChar.getInventory().getItemByObjectId(_gemStoneItemObjId); + final L2ItemInstance gemStoneItem = activeChar.getInventory().getItemByObjectId(_gemStoneItemObjId); if (gemStoneItem == null) { return; @@ -97,8 +97,8 @@ public final class RequestRefine extends AbstractRefinePacket // unequip item if (targetItem.isEquipped()) { - L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - InventoryUpdate iu = new InventoryUpdate(); + final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); + final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { iu.addModifiedItem(itm); @@ -126,7 +126,7 @@ public final class RequestRefine extends AbstractRefinePacket final int stat34 = aug.getAugmentationId() >> 16; activeChar.sendPacket(new ExVariationResult(stat12, stat34, 1)); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(targetItem); activeChar.sendPacket(iu); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java index 6e0d98a2f6..b0572fa128 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java @@ -44,13 +44,13 @@ public final class RequestRefineCancel extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId); + final L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId); if (targetItem == null) { activeChar.sendPacket(new ExVariationCancelResult(0)); @@ -154,7 +154,7 @@ public final class RequestRefineCancel extends L2GameClientPacket activeChar.sendPacket(new ExVariationCancelResult(1)); // send inventory update - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(targetItem); activeChar.sendPacket(iu); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java index db28ae14e1..e7025f19c0 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java @@ -127,12 +127,12 @@ public final class RequestRefundItem extends L2GameClientPacket long adena = 0; long slots = 0; - L2ItemInstance[] refund = player.getRefund().getItems(); - int[] objectIds = new int[_items.length]; + final L2ItemInstance[] refund = player.getRefund().getItems(); + final int[] objectIds = new int[_items.length]; for (int i = 0; i < _items.length; i++) { - int idx = _items[i]; + final int idx = _items[i]; if ((idx < 0) || (idx >= refund.length)) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent invalid refund index", Config.DEFAULT_PUNISH); @@ -163,7 +163,7 @@ public final class RequestRefundItem extends L2GameClientPacket } } - long count = item.getCount(); + final long count = item.getCount(); weight += count * template.getWeight(); adena += (count * template.getReferencePrice()) / 2; if (!template.isStackable()) @@ -199,7 +199,7 @@ public final class RequestRefundItem extends L2GameClientPacket for (int i = 0; i < _items.length; i++) { - L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); + final L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { _log.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRegistBeauty.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRegistBeauty.java index 9377c29027..a6d58bc51b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRegistBeauty.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRegistBeauty.java @@ -75,7 +75,7 @@ public class RequestRegistBeauty extends L2GameClientPacket if (_colorId > 0) { - BeautyItem color = hair.getColors().get(_colorId); + final BeautyItem color = hair.getColors().get(_colorId); if (color == null) { player.sendPacket(new ExResponseBeautyRegistReset(player, ExResponseBeautyRegistReset.CHANGE, ExResponseBeautyRegistReset.FAILURE)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 35ddad781d..3fb83f90ac 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -70,7 +70,7 @@ public final class RequestRejectPostAttachment extends L2GameClientPacket return; } - Message msg = MailManager.getInstance().getMessage(_msgId); + final Message msg = MailManager.getInstance().getMessage(_msgId); if (msg == null) { return; @@ -95,7 +95,7 @@ public final class RequestRejectPostAttachment extends L2GameClientPacket final L2PcInstance sender = L2World.getInstance().getPlayer(msg.getSenderId()); if (sender != null) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_RETURNED_THE_MAIL); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_RETURNED_THE_MAIL); sm.addCharName(activeChar); sender.sendPacket(sm); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 39aa2c9839..1514ff3ad6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -36,19 +36,19 @@ public final class RequestReplyStartPledgeWar extends L2GameClientPacket protected void readImpl() { @SuppressWarnings("unused") - String _reqName = readS(); + final String _reqName = readS(); _answer = readD(); } @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2PcInstance requestor = activeChar.getActiveRequester(); + final L2PcInstance requestor = activeChar.getActiveRequester(); if (requestor == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index 536ba319b3..56e645789b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -36,19 +36,19 @@ public final class RequestReplyStopPledgeWar extends L2GameClientPacket protected void readImpl() { @SuppressWarnings("unused") - String _reqName = readS(); + final String _reqName = readS(); _answer = readD(); } @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2PcInstance requestor = activeChar.getActiveRequester(); + final L2PcInstance requestor = activeChar.getActiveRequester(); if (requestor == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java index 426f3aea9c..5c968a45ee 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java @@ -100,7 +100,7 @@ public final class RequestRestart extends L2GameClientPacket final L2GameClient client = getClient(); - LogRecord record = new LogRecord(Level.INFO, "Logged out"); + final LogRecord record = new LogRecord(Level.INFO, "Logged out"); record.setParameters(new Object[] { client diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java index 17a9c4ed67..124c51846b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java @@ -69,7 +69,7 @@ public final class RequestRestartPoint extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { @@ -92,7 +92,7 @@ public final class RequestRestartPoint extends L2GameClientPacket return; } - Castle castle = CastleManager.getInstance().getCastle(activeChar.getX(), activeChar.getY(), activeChar.getZ()); + final Castle castle = CastleManager.getInstance().getCastle(activeChar.getX(), activeChar.getY(), activeChar.getZ()); if ((castle != null) && castle.getSiege().isInProgress()) { if ((activeChar.getClan() != null) && castle.getSiege().checkIsAttacker(activeChar.getClan())) @@ -116,7 +116,7 @@ public final class RequestRestartPoint extends L2GameClientPacket Castle castle = null; Fort fort = null; SiegableHall hall = null; - boolean isInDefense = false; + final boolean isInDefense = false; int instanceId = 0; // force jail diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java index 1450a0f909..cf45cdc2c2 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java @@ -42,7 +42,7 @@ public final class RequestSaveBookMarkSlot extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 9b528eb15c..435fde1080 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -47,8 +47,8 @@ public final class RequestSaveInventoryOrder extends L2GameClientPacket _order = new ArrayList<>(sz); for (int i = 0; i < sz; i++) { - int objectId = readD(); - int order = readD(); + final int objectId = readD(); + final int order = readD(); _order.add(new InventoryOrder(objectId, order)); } } @@ -56,13 +56,13 @@ public final class RequestSaveInventoryOrder extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player != null) { - Inventory inventory = player.getInventory(); + final Inventory inventory = player.getInventory(); for (InventoryOrder order : _order) { - L2ItemInstance item = inventory.getItemByObjectId(order.objectID); + final L2ItemInstance item = inventory.getItemByObjectId(order.objectID); if ((item != null) && (item.getItemLocation() == ItemLocation.INVENTORY)) { item.setItemLocation(ItemLocation.INVENTORY, order.order); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveKeyMapping.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveKeyMapping.java index 2de86cfaa6..097febdc85 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveKeyMapping.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveKeyMapping.java @@ -49,28 +49,28 @@ public class RequestSaveKeyMapping extends L2GameClientPacket final int _tabNum = readD(); for (int i = 0; i < _tabNum; i++) { - int cmd1Size = readC(); + final int cmd1Size = readC(); for (int j = 0; j < cmd1Size; j++) { UIData.addCategory(_catMap, category, readC()); } category++; - int cmd2Size = readC(); + final int cmd2Size = readC(); for (int j = 0; j < cmd2Size; j++) { UIData.addCategory(_catMap, category, readC()); } category++; - int cmdSize = readD(); + final int cmdSize = readD(); for (int j = 0; j < cmdSize; j++) { - int cmd = readD(); - int key = readD(); - int tgKey1 = readD(); - int tgKey2 = readD(); - int show = readD(); + final int cmd = readD(); + final int key = readD(); + final int tgKey1 = readD(); + final int tgKey2 = readD(); + final int show = readD(); UIData.addKey(_keyMap, i, new ActionKey(i, cmd, key, tgKey1, tgKey2, show)); } } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSeedPhase.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSeedPhase.java index 0e9a107c57..1d0ab6f882 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSeedPhase.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSeedPhase.java @@ -37,7 +37,7 @@ public class RequestSeedPhase extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java index c2740161ae..9f5de69cca 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java @@ -55,7 +55,7 @@ public final class RequestSellItem extends L2GameClientPacket protected void readImpl() { _listId = readD(); - int size = readD(); + final int size = readD(); if ((size <= 0) || (size > Config.MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != _buf.remaining())) { return; @@ -64,9 +64,9 @@ public final class RequestSellItem extends L2GameClientPacket _items = new ArrayList<>(size); for (int i = 0; i < size; i++) { - int objectId = readD(); - int itemId = readD(); - long count = readQ(); + final int objectId = readD(); + final int itemId = readD(); + final long count = readQ(); if ((objectId < 1) || (itemId < 1) || (count < 1)) { _items = null; @@ -84,7 +84,7 @@ public final class RequestSellItem extends L2GameClientPacket protected void processSell() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { @@ -110,7 +110,7 @@ public final class RequestSellItem extends L2GameClientPacket return; } - L2Object target = player.getTarget(); + final L2Object target = player.getTarget(); L2Character merchant = null; if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST)) { @@ -162,7 +162,7 @@ public final class RequestSellItem extends L2GameClientPacket continue; } - long price = item.getReferencePrice() / 2; + final long price = item.getReferencePrice() / 2; totalPrice += price * i.getCount(); if (((MAX_ADENA / i.getCount()) < price) || (totalPrice > MAX_ADENA)) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java index 2a9cc7de34..fb2b8c952a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java @@ -80,7 +80,7 @@ public final class RequestSendPost extends L2GameClientPacket _subject = readS(); _text = readS(); - int attachCount = readD(); + final int attachCount = readD(); if ((attachCount < 0) || (attachCount > Config.MAX_ITEM_IN_PACKET) || (((attachCount * BATCH_LENGTH) + 8) != _buf.remaining())) { return; @@ -91,8 +91,8 @@ public final class RequestSendPost extends L2GameClientPacket _items = new AttachmentItem[attachCount]; for (int i = 0; i < attachCount; i++) { - int objectId = readD(); - long count = readQ(); + final int objectId = readD(); + final long count = readQ(); if ((objectId < 1) || (count < 0)) { _items = null; @@ -218,7 +218,7 @@ public final class RequestSendPost extends L2GameClientPacket if (accessLevel.isGm() && !activeChar.getAccessLevel().isGm()) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_MESSAGE_TO_C1_DID_NOT_REACH_ITS_RECIPIENT_YOU_CANNOT_SEND_MAIL_TO_THE_GM_STAFF); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_MESSAGE_TO_C1_DID_NOT_REACH_ITS_RECIPIENT_YOU_CANNOT_SEND_MAIL_TO_THE_GM_STAFF); sm.addString(_receiver); activeChar.sendPacket(sm); return; @@ -232,7 +232,7 @@ public final class RequestSendPost extends L2GameClientPacket if (BlockList.isInBlockList(receiverId, activeChar.getObjectId())) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BLOCKED_YOU_YOU_CANNOT_SEND_MAIL_TO_C1); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BLOCKED_YOU_YOU_CANNOT_SEND_MAIL_TO_C1); sm.addString(_receiver); activeChar.sendPacket(sm); return; @@ -262,7 +262,7 @@ public final class RequestSendPost extends L2GameClientPacket return; } - Message msg = new Message(activeChar.getObjectId(), receiverId, _isCod, _subject, _text, _reqAdena); + final Message msg = new Message(activeChar.getObjectId(), receiverId, _isCod, _subject, _text, _reqAdena); if (removeItems(activeChar, msg)) { MailManager.getInstance().sendMessage(msg); @@ -281,7 +281,7 @@ public final class RequestSendPost extends L2GameClientPacket for (AttachmentItem i : _items) { // Check validity of requested item - L2ItemInstance item = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); + final L2ItemInstance item = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((item == null) || !item.isTradeable() || item.isEquipped()) { player.sendPacket(SystemMessageId.THE_ITEM_THAT_YOU_RE_TRYING_TO_SEND_CANNOT_BE_FORWARDED_BECAUSE_IT_ISN_T_PROPER); @@ -309,7 +309,7 @@ public final class RequestSendPost extends L2GameClientPacket return true; } - Mail attachments = msg.createAttachments(); + final Mail attachments = msg.createAttachments(); // message already has attachments ? oO if (attachments == null) @@ -322,11 +322,11 @@ public final class RequestSendPost extends L2GameClientPacket final String receiver = recv.toString(); // Proceed to the transfer - InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item - L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); + final L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { _log.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java index 386b27ff39..518f3bc63a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java @@ -51,7 +51,7 @@ public final class RequestSentPost extends L2GameClientPacket return; } - Message msg = MailManager.getInstance().getMessage(_msgId); + final Message msg = MailManager.getInstance().getMessage(_msgId); if (msg == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 3c03fdad66..f4508939ce 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -74,7 +74,7 @@ public class RequestSetCastleSiegeTime extends L2GameClientPacket castle.getSiegeDate().setTimeInMillis(_time); castle.setIsTimeRegistrationOver(true); castle.getSiege().saveSiegeDate(); - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); msg.addCastleId(_castleId); Broadcast.toAllOnlinePlayers(msg); activeChar.sendPacket(new SiegeInfo(castle)); @@ -92,12 +92,12 @@ public class RequestSetCastleSiegeTime extends L2GameClientPacket private static boolean isSiegeTimeValid(long siegeDate, long choosenDate) { - Calendar cal1 = Calendar.getInstance(); + final Calendar cal1 = Calendar.getInstance(); cal1.setTimeInMillis(siegeDate); cal1.set(Calendar.MINUTE, 0); cal1.set(Calendar.SECOND, 0); - Calendar cal2 = Calendar.getInstance(); + final Calendar cal2 = Calendar.getInstance(); cal2.setTimeInMillis(choosenDate); for (int hour : Config.SIEGE_HOUR_LIST) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutDel.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutDel.java index ee84c8a3e2..45eed7e49c 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutDel.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutDel.java @@ -34,7 +34,7 @@ public final class RequestShortCutDel extends L2GameClientPacket @Override protected void readImpl() { - int id = readD(); + final int id = readD(); _slot = id % 12; _page = id / 12; } @@ -42,7 +42,7 @@ public final class RequestShortCutDel extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestShowMiniMap.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestShowMiniMap.java index 3599e3e2bf..3ede149c1c 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestShowMiniMap.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestShowMiniMap.java @@ -38,7 +38,7 @@ public final class RequestShowMiniMap extends L2GameClientPacket @Override protected final void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeAttackerList.java index 1a4456f0e3..dfe493cd18 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeAttackerList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeAttackerList.java @@ -44,18 +44,18 @@ public final class RequestSiegeAttackerList extends L2GameClientPacket @Override protected void runImpl() { - Castle castle = CastleManager.getInstance().getCastleById(_castleId); + final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if (castle != null) { - SiegeAttackerList sal = new SiegeAttackerList(castle); + final SiegeAttackerList sal = new SiegeAttackerList(castle); sendPacket(sal); } else { - SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId); + final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId); if (hall != null) { - SiegeAttackerList sal = new SiegeAttackerList(hall); + final SiegeAttackerList sal = new SiegeAttackerList(hall); sendPacket(sal); } } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeDefenderList.java index dd9c4417b4..9bea0f3e37 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeDefenderList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeDefenderList.java @@ -42,12 +42,12 @@ public final class RequestSiegeDefenderList extends L2GameClientPacket @Override protected void runImpl() { - Castle castle = CastleManager.getInstance().getCastleById(_castleId); + final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if (castle == null) { return; } - SiegeDefenderList sdl = new SiegeDefenderList(castle); + final SiegeDefenderList sdl = new SiegeDefenderList(castle); sendPacket(sdl); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java index 029fd1208e..77dca85bd1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -42,13 +42,13 @@ public final class RequestStartPledgeWar extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - L2Clan _clan = getClient().getActiveChar().getClan(); + final L2Clan _clan = getClient().getActiveChar().getClan(); if (_clan == null) { return; @@ -67,7 +67,7 @@ public final class RequestStartPledgeWar extends L2GameClientPacket return; } - L2Clan clan = ClanTable.getInstance().getClanByName(_pledgeName); + final L2Clan clan = ClanTable.getInstance().getClanByName(_pledgeName); if (clan == null) { player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST)); @@ -88,7 +88,7 @@ public final class RequestStartPledgeWar extends L2GameClientPacket } else if (_clan.isAtWarWith(clan.getId())) { - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN); sm.addString(clan.getName()); player.sendPacket(sm); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java index 03791466de..135ae948e6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -42,18 +42,18 @@ public final class RequestStopPledgeWar extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - L2Clan playerClan = player.getClan(); + final L2Clan playerClan = player.getClan(); if (playerClan == null) { return; } - L2Clan clan = ClanTable.getInstance().getClanByName(_pledgeName); + final L2Clan clan = ClanTable.getInstance().getClanByName(_pledgeName); if (clan == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index 56bcca6fbd..7b01902c55 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -40,17 +40,17 @@ public final class RequestSurrenderPledgeWar extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2Clan _clan = activeChar.getClan(); + final L2Clan _clan = activeChar.getClan(); if (_clan == null) { return; } - L2Clan clan = ClanTable.getInstance().getClanByName(_pledgeName); + final L2Clan clan = ClanTable.getInstance().getClanByName(_pledgeName); if (clan == null) { @@ -68,7 +68,7 @@ public final class RequestSurrenderPledgeWar extends L2GameClientPacket return; } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SURRENDERED_TO_THE_S1_CLAN); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SURRENDERED_TO_THE_S1_CLAN); msg.addString(_pledgeName); activeChar.sendPacket(msg); ClanTable.getInstance().deleteclanswars(_clan.getId(), clan.getId()); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTeleportBookMark.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTeleportBookMark.java index efdf7f53a0..ff4f0d24c4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTeleportBookMark.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTeleportBookMark.java @@ -38,7 +38,7 @@ public final class RequestTeleportBookMark extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialClientEvent.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialClientEvent.java index 4e6c645fbd..cec7420ba3 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialClientEvent.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialClientEvent.java @@ -36,14 +36,14 @@ public class RequestTutorialClientEvent extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - QuestState qs = player.getQuestState("Q00255_Tutorial"); + final QuestState qs = player.getQuestState("Q00255_Tutorial"); if (qs != null) { qs.getQuest().notifyEvent("CE" + eventId, null, player); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialQuestionMark.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialQuestionMark.java index a9f02b99df..b12f80ef43 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialQuestionMark.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialQuestionMark.java @@ -37,7 +37,7 @@ public class RequestTutorialQuestionMark extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java index 2b249dded8..d1024c843c 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -125,7 +125,7 @@ public class RequestUnEquipItem extends L2GameClientPacket sm.addItemName(unequipped[0]); activeChar.sendPacket(sm); - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addItems(Arrays.asList(unequipped)); activeChar.sendPacket(iu); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestVoteNew.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestVoteNew.java index f45c7dd7b5..4cf61e5cdf 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestVoteNew.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestVoteNew.java @@ -40,13 +40,13 @@ public final class RequestVoteNew extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2Object object = activeChar.getTarget(); + final L2Object object = activeChar.getTarget(); if (!(object instanceof L2PcInstance)) { @@ -61,7 +61,7 @@ public final class RequestVoteNew extends L2GameClientPacket return; } - L2PcInstance target = (L2PcInstance) object; + final L2PcInstance target = (L2PcInstance) object; if (target.getObjectId() != _targetId) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java index 6cb9cc2216..944ee368cc 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java @@ -76,7 +76,7 @@ public final class RequestWithDrawPremiumItem extends L2GameClientPacket return; } - L2PremiumItem _item = activeChar.getPremiumItemList().get(_itemNum); + final L2PremiumItem _item = activeChar.getPremiumItemList().get(_itemNum); if (_item == null) { return; @@ -86,7 +86,7 @@ public final class RequestWithDrawPremiumItem extends L2GameClientPacket return; } - long itemsLeft = (_item.getCount() - _itemCount); + final long itemsLeft = (_item.getCount() - _itemCount); activeChar.addItem("PremiumItem", _item.getItemId(), _itemCount, activeChar.getTarget(), true); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawalParty.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawalParty.java index 9a3826f3b2..906abbbb50 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawalParty.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawalParty.java @@ -44,13 +44,13 @@ public final class RequestWithDrawalParty extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - L2Party party = player.getParty(); + final L2Party party = player.getParty(); if (party != null) { @@ -58,7 +58,7 @@ public final class RequestWithDrawalParty extends L2GameClientPacket if (player.isInPartyMatchRoom()) { - PartyMatchRoom _room = PartyMatchRoomList.getInstance().getPlayerRoom(player); + final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getPlayerRoom(player); if (_room != null) { player.sendPacket(new PartyMatchDetail(player, _room)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java index fa8cd04abc..3b7a5b3d2d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java @@ -52,7 +52,7 @@ public final class RequestWithdrawPartyRoom extends L2GameClientPacket return; } - PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid); + final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid); if (_room == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 94cb4ba6b5..07c06c7a60 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -45,7 +45,7 @@ public final class RequestWithdrawalPledge extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -66,11 +66,11 @@ public final class RequestWithdrawalPledge extends L2GameClientPacket return; } - L2Clan clan = activeChar.getClan(); + final L2Clan clan = activeChar.getClan(); clan.removeClanMember(activeChar.getObjectId(), System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(activeChar.getName()); clan.broadcastToOnlineMembers(sm); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/Say2.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/Say2.java index 658134f4ae..736875f8de 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/Say2.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/Say2.java @@ -268,7 +268,7 @@ public final class Say2 extends L2GameClientPacket { return false; } - StringBuilder result = new StringBuilder(9); + final StringBuilder result = new StringBuilder(9); pos += 3; while (Character.isDigit(_text.charAt(pos))) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java index 27279425e2..e8ebdf1ea6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -51,15 +51,15 @@ public final class SendBypassBuildCmd extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - String command = "admin_" + _command.split(" ")[0]; + final String command = "admin_" + _command.split(" ")[0]; - IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command); + final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command); if (ach == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java index da0229a1d5..2bff89f344 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -59,8 +59,8 @@ public final class SendWareHouseDepositList extends L2GameClientPacket _items = new ArrayList<>(size); for (int i = 0; i < size; i++) { - int objId = readD(); - long count = readQ(); + final int objId = readD(); + final long count = readQ(); if ((objId < 1) || (count < 0)) { _items = null; @@ -128,7 +128,7 @@ public final class SendWareHouseDepositList extends L2GameClientPacket for (ItemHolder i : _items) { - L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); + final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (item == null) { _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); @@ -171,11 +171,11 @@ public final class SendWareHouseDepositList extends L2GameClientPacket } // Proceed to the transfer - InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item - L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); + final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 838970b5b9..1b9cb481c6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -57,8 +57,8 @@ public final class SendWareHouseWithDrawList extends L2GameClientPacket _items = new ItemHolder[count]; for (int i = 0; i < count; i++) { - int objId = readD(); - long cnt = readQ(); + final int objId = readD(); + final long cnt = readQ(); if ((objId < 1) || (cnt < 0)) { _items = null; @@ -134,7 +134,7 @@ public final class SendWareHouseWithDrawList extends L2GameClientPacket for (ItemHolder i : _items) { // Calculate needed slots - L2ItemInstance item = warehouse.getItemByObjectId(i.getId()); + final L2ItemInstance item = warehouse.getItemByObjectId(i.getId()); if ((item == null) || (item.getCount() < i.getCount())) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to withdraw non-existent item from warehouse.", Config.DEFAULT_PUNISH); @@ -167,10 +167,10 @@ public final class SendWareHouseWithDrawList extends L2GameClientPacket } // Proceed to the transfer - InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); for (ItemHolder i : _items) { - L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId()); + final L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 86048f8b77..8174d3c196 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -48,12 +48,12 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket @Override protected void readImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - int count = readD(); + final int count = readD(); if ((count < 1) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) { return; @@ -62,11 +62,11 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket _items = new Item[count]; for (int i = 0; i < count; i++) { - int itemId = readD(); + final int itemId = readD(); int enchantLevel = readD(); - long cnt = readQ(); - long price = readQ(); + final long cnt = readQ(); + final long price = readQ(); if ((itemId < 1) || (cnt < 1) || (price < 0)) { @@ -75,7 +75,7 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket } int attackAttribute = readH(); // Attack Attribute Type int attackAttributeValue = readH(); // Attack Attribute Value - int defenseAttributes[] = new int[6]; + final int defenseAttributes[] = new int[6]; for (int h = 0; h < 6; h++) { defenseAttributes[i] = readH(); // Defense attributes @@ -111,7 +111,7 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -153,7 +153,7 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket return; } - TradeList tradeList = player.getBuyList(); + final TradeList tradeList = player.getBuyList(); tradeList.clear(); // Check maximum number of allowed slots for pvt shops diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListSell.java index c657fecd65..438bb5f343 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListSell.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreListSell extends L2GameClientPacket protected void readImpl() { _packageSale = (readD() == 1); - int count = readD(); + final int count = readD(); if ((count < 1) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) { return; @@ -59,9 +59,9 @@ public class SetPrivateStoreListSell extends L2GameClientPacket _items = new Item[count]; for (int i = 0; i < count; i++) { - int itemId = readD(); - long cnt = readQ(); - long price = readQ(); + final int itemId = readD(); + final long cnt = readQ(); + final long price = readQ(); if ((itemId < 1) || (cnt < 1) || (price < 0)) { @@ -75,7 +75,7 @@ public class SetPrivateStoreListSell extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -126,7 +126,7 @@ public class SetPrivateStoreListSell extends L2GameClientPacket return; } - TradeList tradeList = player.getSellList(); + final TradeList tradeList = player.getSellList(); tradeList.clear(); tradeList.setPackaged(_packageSale); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SnoopQuit.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SnoopQuit.java index f4bafb4a24..9e2299fea5 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SnoopQuit.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SnoopQuit.java @@ -39,12 +39,12 @@ public final class SnoopQuit extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = L2World.getInstance().getPlayer(_snoopID); + final L2PcInstance player = L2World.getInstance().getPlayer(_snoopID); if (player == null) { return; } - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/TradeRequest.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/TradeRequest.java index aa072badd1..df69e3d5b5 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/TradeRequest.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/TradeRequest.java @@ -49,7 +49,7 @@ public final class TradeRequest extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getActiveChar(); + final L2PcInstance player = getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java index e4140b8e4e..18db709be6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java @@ -158,12 +158,12 @@ public final class UseItem extends L2GameClientPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (activeChar.getReputation() < 0)) { - SkillHolder[] skills = item.getItem().getSkills(); + final SkillHolder[] skills = item.getItem().getSkills(); if (skills != null) { for (SkillHolder sHolder : skills) { - Skill skill = sHolder.getSkill(); + final Skill skill = sHolder.getSkill(); if ((skill != null) && skill.hasEffectType(L2EffectType.TELEPORT)) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 663d7c2fcc..1e467f7d54 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -309,7 +309,7 @@ public class RequestShapeShiftingItem extends L2GameClientPacket return; } - long cost = appearanceStone.getCost(); + final long cost = appearanceStone.getCost(); if (cost > player.getAdena()) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java index b6b00e5909..29a013155d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java @@ -52,7 +52,7 @@ public class RequestCommissionRegistrableItemList extends L2GameClientPacket return; } - ArrayList auctionableItemList = new ArrayList<>(); + final ArrayList auctionableItemList = new ArrayList<>(); for (L2ItemInstance item : player.getInventory().getAvailableItems(false, false, false)) { if (item.getItem().isAuctionable()) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index cb145ac942..6faa64b5f9 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -78,7 +78,7 @@ public class RequestCrystallizeEstimate extends L2GameClientPacket return; } - int skillLevel = activeChar.getSkillLevel(CommonSkill.CRYSTALLIZE.getId()); + final int skillLevel = activeChar.getSkillLevel(CommonSkill.CRYSTALLIZE.getId()); if (skillLevel <= 0) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); @@ -182,8 +182,8 @@ public class RequestCrystallizeEstimate extends L2GameClientPacket activeChar.setInCrystallize(true); // add crystals - int crystalId = item.getItem().getCrystalItemId(); - int crystalAmount = item.getCrystalCount(); + final int crystalId = item.getItem().getCrystalItemId(); + final int crystalAmount = item.getCrystalCount(); final List items = new ArrayList<>(); items.add(new ItemChanceHolder(crystalId, 100, crystalAmount)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index eba86d5dce..83e59d0f8e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -102,7 +102,7 @@ public final class RequestAnswerFriendInvite extends L2GameClientPacket } else { - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST); requestor.sendPacket(msg); player.sendPacket(new FriendAddRequestResult(requestor, 0)); requestor.sendPacket(new FriendAddRequestResult(player, 0)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendDel.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendDel.java index 14f1d929a5..b119df536b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -53,13 +53,13 @@ public final class RequestFriendDel extends L2GameClientPacket { SystemMessage sm; - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - int id = CharNameTable.getInstance().getIdByName(_name); + final int id = CharNameTable.getInstance().getIdByName(_name); if (id == -1) { @@ -94,7 +94,7 @@ public final class RequestFriendDel extends L2GameClientPacket activeChar.getFriendList().remove(id); activeChar.sendPacket(new FriendRemove(_name, 1)); - L2PcInstance player = L2World.getInstance().getPlayer(_name); + final L2PcInstance player = L2World.getInstance().getPlayer(_name); if (player != null) { player.getFriendList().remove(Integer.valueOf(activeChar.getObjectId())); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendList.java index 10aa11d21d..1b348f00b6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestFriendList.java @@ -42,7 +42,7 @@ public final class RequestFriendList extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { @@ -58,7 +58,7 @@ public final class RequestFriendList extends L2GameClientPacket for (int id : activeChar.getFriendList().keySet()) { // int friendId = rset.getInt("friendId"); - String friendName = CharNameTable.getInstance().getNameById(id); + final String friendName = CharNameTable.getInstance().getNameById(id); if (friendName == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java index 4a105101ce..2335f3cc6e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java @@ -71,7 +71,7 @@ public final class RequestSendFriendMsg extends L2GameClientPacket if (Config.LOG_CHAT) { - LogRecord record = new LogRecord(Level.INFO, _message); + final LogRecord record = new LogRecord(Level.INFO, _message); record.setLoggerName("chat"); record.setParameters(new Object[] { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestUpdateBlockMemo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestUpdateBlockMemo.java index e899d1bc14..8397d70537 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestUpdateBlockMemo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestUpdateBlockMemo.java @@ -40,7 +40,7 @@ public final class RequestUpdateBlockMemo extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); player.getBlockList().setBlockMemo(CharNameTable.getInstance().getIdByName(cName), memo); player.sendPacket(new BlockListPacket(player)); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 2e70115da3..904ff29497 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -125,12 +125,12 @@ public class ConfirmMenteeAdd extends L2GameClientPacket else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; - int days = (int) (remainingTime / 86400); + final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; - int hours = (int) (remainingTime / 3600); + final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; - int minutes = (int) (remainingTime / 60); - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_CAN_BOND_WITH_A_NEW_MENTEE_IN_S1_DAY_S_S2_HOUR_S_S3_MINUTE_S); + final int minutes = (int) (remainingTime / 60); + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_CAN_BOND_WITH_A_NEW_MENTEE_IN_S1_DAY_S_S2_HOUR_S_S3_MINUTE_S); msg.addInt(days); msg.addInt(hours); msg.addInt(minutes); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java index df113737ff..00cf77f2cf 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java @@ -53,8 +53,8 @@ public class RequestMentorCancel extends L2GameClientPacket return; } - L2PcInstance player = getClient().getActiveChar(); - int objectId = CharNameTable.getInstance().getIdByName(_name); + final L2PcInstance player = getClient().getActiveChar(); + final int objectId = CharNameTable.getInstance().getIdByName(_name); if (player != null) { if (player.isMentor()) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java index 0eeffc3701..11c5562bbc 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java @@ -36,7 +36,7 @@ public final class RequestBRGamePoint extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player != null) { player.sendPacket(new ExBRGamePoint(player)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java index 359b36e787..f9fbf1297f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java @@ -38,7 +38,7 @@ public final class RequestBRProductInfo extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player != null) { PrimeShopData.getInstance().showProductInfo(player, _brId); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index 59358b8451..685073a4a7 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -57,7 +57,7 @@ public class RequestShuttleGetOn extends L2GameClientPacket { if ((obj instanceof L2ShuttleInstance)) { - L2ShuttleInstance shuttle = (L2ShuttleInstance) obj; + final L2ShuttleInstance shuttle = (L2ShuttleInstance) obj; if (shuttle.calculateDistance(activeChar, false, false) < 1000) { shuttle.addPassenger(activeChar); diff --git a/trunk/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java b/trunk/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java index 119abc8e9b..bb791453e9 100644 --- a/trunk/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java +++ b/trunk/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java @@ -44,7 +44,7 @@ public class BlowFishKey extends BaseSendablePacket { final Cipher rsaCipher = Cipher.getInstance("RSA/ECB/nopadding"); rsaCipher.init(Cipher.ENCRYPT_MODE, publicKey); - byte[] encrypted = rsaCipher.doFinal(blowfishKey); + final byte[] encrypted = rsaCipher.doFinal(blowfishKey); writeD(encrypted.length); writeB(encrypted); } diff --git a/trunk/java/com/l2jserver/gameserver/network/loginserverpackets/ChangePasswordResponse.java b/trunk/java/com/l2jserver/gameserver/network/loginserverpackets/ChangePasswordResponse.java index 28049a0ecb..9c80f22ee1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/loginserverpackets/ChangePasswordResponse.java +++ b/trunk/java/com/l2jserver/gameserver/network/loginserverpackets/ChangePasswordResponse.java @@ -29,10 +29,10 @@ public class ChangePasswordResponse extends BaseRecievePacket { super(decrypt); // boolean isSuccessful = readC() > 0; - String character = readS(); - String msgToSend = readS(); + final String character = readS(); + final String msgToSend = readS(); - L2PcInstance player = L2World.getInstance().getPlayer(character); + final L2PcInstance player = L2World.getInstance().getPlayer(character); if (player != null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/loginserverpackets/InitLS.java b/trunk/java/com/l2jserver/gameserver/network/loginserverpackets/InitLS.java index ffb59c3f47..fcb244cd37 100644 --- a/trunk/java/com/l2jserver/gameserver/network/loginserverpackets/InitLS.java +++ b/trunk/java/com/l2jserver/gameserver/network/loginserverpackets/InitLS.java @@ -42,7 +42,7 @@ public class InitLS extends BaseRecievePacket { super(decrypt); _rev = readD(); - int size = readD(); + final int size = readD(); _key = readB(size); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractHtmlPacket.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractHtmlPacket.java index e4435798bc..f4e772de35 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -91,7 +91,7 @@ public abstract class AbstractHtmlPacket extends L2GameServerPacket public final boolean setFile(String prefix, String path) { - String content = HtmCache.getInstance().getHtm(prefix, path); + final String content = HtmCache.getInstance().getHtm(prefix, path); if (content == null) { setHtml("My Text is missing:
" + path + ""); @@ -131,7 +131,7 @@ public abstract class AbstractHtmlPacket extends L2GameServerPacket @Override public final void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java index 1556e4cb40..2bdfbd03c4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -440,7 +440,7 @@ public abstract class AbstractMessagePacket> } else { - int _maxLevel = SkillData.getInstance().getMaxLevel(_skillId); + final int _maxLevel = SkillData.getInstance().getMaxLevel(_skillId); writeH(_maxLevel); writeH(_skillLevel); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java index c36cebf349..f9246fc4d9 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java @@ -74,7 +74,7 @@ public class AcquireSkillList extends L2GameServerPacket } else { - int maxLevel = SkillData.getInstance().getMaxLevel(skillRemove.getId()); + final int maxLevel = SkillData.getInstance().getMaxLevel(skillRemove.getId()); writeH(maxLevel); writeH(skillRemove.getLevel()); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AllianceInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AllianceInfo.java index 27e6322da7..d0953b7e58 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AllianceInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AllianceInfo.java @@ -48,7 +48,7 @@ public class AllianceInfo extends L2GameServerPacket final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0, total = 0, online = 0; - for (final L2Clan clan : allies) + for (L2Clan clan : allies) { final ClanInfo ci = new ClanInfo(clan); _allies[idx++] = ci; @@ -72,7 +72,7 @@ public class AllianceInfo extends L2GameServerPacket writeS(_leaderP); writeD(_allies.length); - for (final ClanInfo aci : _allies) + for (ClanInfo aci : _allies) { writeS(aci.getClan().getName()); writeD(0x00); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java index e830e9adb5..686927843e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java @@ -63,7 +63,7 @@ public class CharSelectionInfo extends L2GameServerPacket protected final void writeImpl() { writeC(0x09); // packet id - int size = (_characterPackages.size()); + final int size = (_characterPackages.size()); writeD(size); // How many char there is on this account // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -186,7 +186,7 @@ public class CharSelectionInfo extends L2GameServerPacket { while (charList.next())// fills the package { - CharSelectInfoPackage charInfopackage = restoreChar(charList); + final CharSelectInfoPackage charInfopackage = restoreChar(charList); if (charInfopackage != null) { characterList.add(charInfopackage); @@ -227,16 +227,16 @@ public class CharSelectionInfo extends L2GameServerPacket private static CharSelectInfoPackage restoreChar(ResultSet chardata) throws Exception { - int objectId = chardata.getInt("charId"); - String name = chardata.getString("char_name"); + final int objectId = chardata.getInt("charId"); + final String name = chardata.getString("char_name"); // See if the char must be deleted - long deletetime = chardata.getLong("deletetime"); + final long deletetime = chardata.getLong("deletetime"); if (deletetime > 0) { if (System.currentTimeMillis() > deletetime) { - L2Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); + final L2Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) { clan.removeClanMember(objectId, 0); @@ -321,7 +321,7 @@ public class CharSelectionInfo extends L2GameServerPacket { if (result.next()) { - int augment = result.getInt("augAttributes"); + final int augment = result.getInt("augAttributes"); charInfopackage.setAugmentationId(augment == -1 ? 0 : augment); } } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java index 08bad50cee..66bdbd6e28 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java @@ -46,7 +46,7 @@ public class ExBeautyItemList extends L2GameServerPacket for (BeautyItem hair : _beautyData.getHairList().values()) { - List colors = new ArrayList<>(); + final List colors = new ArrayList<>(); for (BeautyItem color : hair.getColors().values()) { colors.add(color); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7e157425e2..e04073d97a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -41,7 +41,7 @@ public final class ExEnchantSkillInfo extends L2GameServerPacket _lvl = lvl; _maxlvl = SkillData.getInstance().getMaxLevel(_id); - L2EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_id); + final L2EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_id); // do we have this skill? if (enchantLearn != null) { @@ -51,7 +51,7 @@ public final class ExEnchantSkillInfo extends L2GameServerPacket _maxEnchanted = enchantLearn.isMaxEnchant(_lvl); // get detail for next level - EnchantSkillHolder esd = enchantLearn.getEnchantSkillHolder(_lvl); + final EnchantSkillHolder esd = enchantLearn.getEnchantSkillHolder(_lvl); // if it exists add it if ((esd != null) && !_maxEnchanted) @@ -59,7 +59,7 @@ public final class ExEnchantSkillInfo extends L2GameServerPacket _routes.add(_lvl + 1); // current enchant add firts } - int skillLvL = (_lvl % 1000); + final int skillLvL = (_lvl % 1000); for (int route : enchantLearn.getAllRoutes()) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index e4705d8073..e5cc78580e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -55,7 +55,7 @@ public class ExEnchantSkillInfoDetail extends L2GameServerPacket _skilllvl = skilllvl; _maxlvl = SkillData.getInstance().getMaxLevel(_skillid); - L2EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(skillid); + final L2EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(skillid); EnchantSkillHolder esd = null; // do we have this skill? if (enchantLearn != null) diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExGetPremiumItemList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExGetPremiumItemList.java index 4e2c207a10..c268b6651d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -43,7 +43,7 @@ public class ExGetPremiumItemList extends L2GameServerPacket writeD(_activeChar.getPremiumItemList().size()); for (Entry entry : _activeChar.getPremiumItemList().entrySet()) { - L2PremiumItem item = entry.getValue(); + final L2PremiumItem item = entry.getValue(); writeQ(entry.getKey()); writeD(item.getItemId()); writeQ(item.getCount()); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java index 0876a93327..4dc85cba7b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java @@ -45,7 +45,7 @@ public class ExHeroList extends L2GameServerPacket for (Integer heroId : _heroList.keySet()) { - StatsSet hero = _heroList.get(heroId); + final StatsSet hero = _heroList.get(heroId); writeS(hero.getString(Olympiad.CHAR_NAME)); writeD(hero.getInt(Olympiad.CLASS_ID)); writeS(hero.getString(Hero.CLAN_NAME, "")); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchList.java index e15a0c583b..a227f89439 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -64,7 +64,7 @@ public class ExOlympiadMatchList extends L2GameServerPacket for (OlympiadGameTask curGame : _games) { - AbstractOlympiadGame game = curGame.getGame(); + final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExServerPrimitive.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExServerPrimitive.java index 7d3da9382d..4e4fa7dcbd 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExServerPrimitive.java @@ -399,7 +399,7 @@ public class ExServerPrimitive extends L2GameServerPacket { writeC(1); // Its the type in this case Point writeS(point.getName()); - int color = point.getColor(); + final int color = point.getColor(); writeD((color >> 16) & 0xFF); // R writeD((color >> 8) & 0xFF); // G writeD(color & 0xFF); // B @@ -413,7 +413,7 @@ public class ExServerPrimitive extends L2GameServerPacket { writeC(2); // Its the type in this case Line writeS(line.getName()); - int color = line.getColor(); + final int color = line.getColor(); writeD((color >> 16) & 0xFF); // R writeD((color >> 8) & 0xFF); // G writeD(color & 0xFF); // B diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowAgitInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowAgitInfo.java index bc1ac6293f..5f91ce3f60 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -34,7 +34,7 @@ public class ExShowAgitInfo extends L2GameServerPacket { writeC(0xfe); writeH(0x16); - Map clannhalls = ClanHallManager.getInstance().getAllAuctionableClanHalls(); + final Map clannhalls = ClanHallManager.getInstance().getAllAuctionableClanHalls(); writeD(clannhalls.size()); for (AuctionableHall ch : clannhalls.values()) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowCastleInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowCastleInfo.java index be241bdb8f..63b0fe2a69 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -39,7 +39,7 @@ public class ExShowCastleInfo extends L2GameServerPacket { writeC(0xFE); writeH(0x14); - List castles = CastleManager.getInstance().getCastles(); + final List castles = CastleManager.getInstance().getCastles(); writeD(castles.size()); for (Castle castle : castles) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressInfo.java index a05e6f68b3..6ef4cb0bad 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -41,11 +41,11 @@ public class ExShowFortressInfo extends L2GameServerPacket { writeC(0xFE); writeH(0x15); - List forts = FortManager.getInstance().getForts(); + final List forts = FortManager.getInstance().getForts(); writeD(forts.size()); for (Fort fort : forts) { - L2Clan clan = fort.getOwnerClan(); + final L2Clan clan = fort.getOwnerClan(); writeD(fort.getResidenceId()); writeS(clan != null ? clan.getName() : ""); writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java index 2f178b4eac..c3b95b1975 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -47,7 +47,7 @@ public class ExShowFortressMapInfo extends L2GameServerPacket writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status writeD(_fortress.getFortSize()); // barracks count - List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); + final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && (commanders.size() != 0) && _fortress.getSiege().isInProgress()) { switch (commanders.size()) diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 37d54a11d7..999fce7b55 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -41,7 +41,7 @@ public class ExShowFortressSiegeInfo extends L2GameServerPacket { _fortId = fort.getResidenceId(); _size = fort.getFortSize(); - List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId); + final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId); _csize = ((commanders == null) ? 0 : commanders.size()); _csize2 = fort.getSiege().getCommanders().size(); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExUISetting.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExUISetting.java index b9df0c0d2e..b1518f21ae 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExUISetting.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExUISetting.java @@ -42,27 +42,27 @@ public class ExUISetting extends L2GameServerPacket { int size = 16; // initial header and footer int category = 0; - int numKeyCt = _uiSettings.getKeys().size(); + final int numKeyCt = _uiSettings.getKeys().size(); for (int i = 0; i < numKeyCt; i++) { size++; if (_uiSettings.getCategories().containsKey(category)) { - List catElList1 = _uiSettings.getCategories().get(category); + final List catElList1 = _uiSettings.getCategories().get(category); size = size + catElList1.size(); } category++; size++; if (_uiSettings.getCategories().containsKey(category)) { - List catElList2 = _uiSettings.getCategories().get(category); + final List catElList2 = _uiSettings.getCategories().get(category); size = size + catElList2.size(); } category++; size = size + 4; if (_uiSettings.getKeys().containsKey(i)) { - List keyElList = _uiSettings.getKeys().get(i); + final List keyElList = _uiSettings.getKeys().get(i); size = size + (keyElList.size() * 20); } } @@ -81,13 +81,13 @@ public class ExUISetting extends L2GameServerPacket int category = 0; - int numKeyCt = _uiSettings.getKeys().size(); + final int numKeyCt = _uiSettings.getKeys().size(); writeD(numKeyCt); for (int i = 0; i < numKeyCt; i++) { if (_uiSettings.getCategories().containsKey(category)) { - List catElList1 = _uiSettings.getCategories().get(category); + final List catElList1 = _uiSettings.getCategories().get(category); writeC(catElList1.size()); for (int cmd : catElList1) { @@ -102,7 +102,7 @@ public class ExUISetting extends L2GameServerPacket if (_uiSettings.getCategories().containsKey(category)) { - List catElList2 = _uiSettings.getCategories().get(category); + final List catElList2 = _uiSettings.getCategories().get(category); writeC(catElList2.size()); for (int cmd : catElList2) { @@ -117,7 +117,7 @@ public class ExUISetting extends L2GameServerPacket if (_uiSettings.getKeys().containsKey(i)) { - List keyElList = _uiSettings.getKeys().get(i); + final List keyElList = _uiSettings.getKeys().get(i); writeD(keyElList.size()); for (ActionKey akey : keyElList) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java index 96a2062036..5ed55e6840 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -155,7 +155,7 @@ public class GMViewCharacterInfo extends L2GameServerPacket writeD(_activeChar.getAppearance().getNameColor()); writeD(_activeChar.getAppearance().getTitleColor()); - byte attackAttribute = _activeChar.getAttackElement(); + final byte attackAttribute = _activeChar.getAttackElement(); writeH(attackAttribute); writeH(_activeChar.getAttackElementValue(attackAttribute)); for (byte i = 0; i < 6; i++) diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java index 6eb7b4f9fa..223475248a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -43,7 +43,7 @@ public class GMViewSkillInfo extends L2GameServerPacket writeS(_activeChar.getName()); writeD(_skills.size()); - boolean isDisabled = (_activeChar.getClan() != null) ? (_activeChar.getClan().getReputationScore() < 0) : false; + final boolean isDisabled = (_activeChar.getClan() != null) ? (_activeChar.getClan().getReputationScore() < 0) : false; for (Skill skill : _skills) { @@ -54,7 +54,7 @@ public class GMViewSkillInfo extends L2GameServerPacket } else { - int maxLevel = SkillData.getInstance().getMaxLevel(skill.getDisplayLevel()); + final int maxLevel = SkillData.getInstance().getMaxLevel(skill.getDisplayLevel()); writeH(maxLevel); writeH(skill.getDisplayLevel()); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/GmViewQuestInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/GmViewQuestInfo.java index 5de075d25a..4d174074dc 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -58,7 +58,7 @@ public class GmViewQuestInfo extends L2GameServerPacket { writeD(q.getId()); - QuestState qs = _activeChar.getQuestState(q.getName()); + final QuestState qs = _activeChar.getQuestState(q.getName()); if (qs == null) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ListPartyWating.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ListPartyWating.java index e002e0c079..abe077cb84 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ListPartyWating.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ListPartyWating.java @@ -63,7 +63,7 @@ public class ListPartyWating extends L2GameServerPacket } _rooms.add(room); } - int size = _rooms.size(); + final int size = _rooms.size(); writeC(0x9c); if (size > 0) diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java index 2b381c4caf..2179ae4915 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java @@ -151,10 +151,10 @@ public class NpcInfo extends AbstractMaskPacket if (npc.isInsideZone(ZoneId.TOWN) && (npc.getCastle() != null) && (Config.SHOW_CREST_WITHOUT_QUEST || npc.getCastle().getShowNpcCrest()) && (npc.getCastle().getOwnerId() != 0)) { - int townId = TownManager.getTown(npc.getX(), npc.getY(), npc.getZ()).getTownId(); + final int townId = TownManager.getTown(npc.getX(), npc.getY(), npc.getZ()).getTownId(); if ((townId != 33) && (townId != 22)) { - L2Clan clan = ClanTable.getInstance().getClan(npc.getCastle().getOwnerId()); + final L2Clan clan = ClanTable.getInstance().getClan(npc.getCastle().getOwnerId()); _clanId = clan.getId(); _clanCrest = clan.getCrestId(); _clanLargeCrest = clan.getCrestLargeId(); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMemberPosition.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMemberPosition.java index 86d6d068d7..99418fdbda 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMemberPosition.java @@ -57,7 +57,7 @@ public class PartyMemberPosition extends L2GameServerPacket writeD(locations.size()); for (Map.Entry entry : locations.entrySet()) { - Location loc = entry.getValue(); + final Location loc = entry.getValue(); writeD(entry.getKey()); writeD(loc.getX()); writeD(loc.getY()); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java index c3af694c52..aa4e1d2e51 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java @@ -59,7 +59,7 @@ public class PartySpelled extends L2GameServerPacket } else { - int maxLevel = SkillData.getInstance().getMaxLevel(info.getSkill().getDisplayId()); + final int maxLevel = SkillData.getInstance().getMaxLevel(info.getSkill().getDisplayId()); writeH(maxLevel); writeH(info.getSkill().getDisplayLevel()); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java index 8f20f5892b..92f0749933 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java @@ -36,13 +36,13 @@ public class PetStatusUpdate extends L2GameServerPacket _summon = summon; if (_summon instanceof L2PetInstance) { - L2PetInstance pet = (L2PetInstance) _summon; + final L2PetInstance pet = (L2PetInstance) _summon; _curFed = pet.getCurrentFed(); // how fed it is _maxFed = pet.getMaxFed(); // max fed it can be } else if (_summon instanceof L2ServitorInstance) { - L2ServitorInstance sum = (L2ServitorInstance) _summon; + final L2ServitorInstance sum = (L2ServitorInstance) _summon; _curFed = sum.getLifeTimeRemaining(); _maxFed = sum.getLifeTime(); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index b0f478daff..049b29755d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -53,7 +53,7 @@ public class PledgeReceiveSubPledgeCreated extends L2GameServerPacket private String getLeaderName() { - int LeaderId = _subPledge.getLeaderId(); + final int LeaderId = _subPledge.getLeaderId(); if ((_subPledge.getId() == L2Clan.SUBUNIT_ACADEMY) || (LeaderId == 0)) { return ""; diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveWarList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveWarList.java index e32a81113b..92ff7d39d3 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -45,7 +45,7 @@ public class PledgeReceiveWarList extends L2GameServerPacket writeD(_tab == 0 ? _clan.getWarList().size() : _clan.getAttackerList().size()); for (Integer i : _tab == 0 ? _clan.getWarList() : _clan.getAttackerList()) { - L2Clan clan = ClanTable.getInstance().getClan(i); + final L2Clan clan = ClanTable.getInstance().getClan(i); if (clan == null) { continue; diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java index b9aec6d1f6..9cd5726cf1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -116,7 +116,7 @@ public class PledgeShowMemberListAll extends L2GameServerPacket writeS(m.getName()); writeD(m.getLevel()); writeD(m.getClassId()); - L2PcInstance player = m.getPlayerInstance(); + final L2PcInstance player = m.getPlayerInstance(); if (player != null) { writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect @@ -135,7 +135,7 @@ public class PledgeShowMemberListAll extends L2GameServerPacket private String getLeaderName() { - int LeaderId = _subPledge.getLeaderId(); + final int LeaderId = _subPledge.getLeaderId(); if ((_subPledge.getId() == L2Clan.SUBUNIT_ACADEMY) || (LeaderId == 0)) { return ""; diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/QuestList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/QuestList.java index 07b0d609c2..7c7f132063 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/QuestList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/QuestList.java @@ -88,14 +88,14 @@ public class QuestList extends L2GameServerPacket for (Quest q : _activeQuests) { writeD(q.getId()); - QuestState qs = _activeChar.getQuestState(q.getName()); + final QuestState qs = _activeChar.getQuestState(q.getName()); if (qs == null) { writeD(0); continue; } - int states = qs.getInt("__compltdStateFlags"); + final int states = qs.getInt("__compltdStateFlags"); if (states != 0) { writeD(states); @@ -114,7 +114,7 @@ public class QuestList extends L2GameServerPacket { questId -= 10000; } - int pos = questId / 8; + final int pos = questId / 8; int add = questId - (pos * 8); switch (add) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java index 18bae22f58..811acf79ec 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java @@ -77,7 +77,7 @@ public class RecipeShopManageList extends L2GameServerPacket for (int i = 0; i < _recipes.length; i++) { - L2RecipeList temp = _recipes[i]; + final L2RecipeList temp = _recipes[i]; writeD(temp.getId()); writeD(i + 1); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java index b53937f1d9..deaf1ca906 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java @@ -86,7 +86,7 @@ public final class RelationChanged extends L2GameServerPacket // _log.severe("Cannot add invisible character to multi relation packet."); return; } - Relation r = new Relation(); + final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; r._autoAttackable = autoattackable ? 1 : 0; diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java index 3fa4d971fd..a34b787bfb 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java @@ -36,7 +36,7 @@ public final class ShortCutInit extends L2GameServerPacket return; } - Shortcut[] tmp = activeChar.getAllShortCuts(); + final Shortcut[] tmp = activeChar.getAllShortCuts(); _shortCuts = new ShortcutInfo[tmp.length]; int index = -1; @@ -55,25 +55,25 @@ public final class ShortCutInit extends L2GameServerPacket private ShortcutInfo convert(L2PcInstance player, Shortcut shortCut) { ShortcutInfo shortcutInfo = null; - int page = shortCut.getSlot() + (shortCut.getPage() * 12); - ShortcutType type = shortCut.getType(); - int id = shortCut.getId(); + final int page = shortCut.getSlot() + (shortCut.getPage() * 12); + final ShortcutType type = shortCut.getType(); + final int id = shortCut.getId(); int characterType = 0; switch (type) { case ITEM: - int reuseGroup = -1, - currentReuse = 0, - reuse = 0, - augmentationId = 0; + int reuseGroup = -1; + final int currentReuse = 0, + reuse = 0; + int augmentationId = 0; characterType = shortCut.getCharacterType(); - L2ItemInstance item = player.getInventory().getItemByObjectId(shortCut.getId()); + final L2ItemInstance item = player.getInventory().getItemByObjectId(shortCut.getId()); if (item != null) { - L2Augmentation augmentation = item.getAugmentation(); + final L2Augmentation augmentation = item.getAugmentation(); if (augmentation != null) { augmentationId = augmentation.getAugmentationId(); @@ -86,9 +86,9 @@ public final class ShortCutInit extends L2GameServerPacket break; case SKILL: - int level = shortCut.getLevel(); - int skillReuseGroup = shortCut.getSharedReuseGroup(); - boolean isDisabled = false; // FIXME: To implement !!! + final int level = shortCut.getLevel(); + final int skillReuseGroup = shortCut.getSharedReuseGroup(); + final boolean isDisabled = false; // FIXME: To implement !!! shortcutInfo = new SkillShortcutInfo(type, page, id, skillReuseGroup, level, isDisabled, characterType); break; @@ -114,7 +114,7 @@ public final class ShortCutInit extends L2GameServerPacket { case ITEM: { - ItemShortcutInfo item = (ItemShortcutInfo) sc; + final ItemShortcutInfo item = (ItemShortcutInfo) sc; writeD(item.getId()); writeD(item.getCharacterType()); @@ -128,7 +128,7 @@ public final class ShortCutInit extends L2GameServerPacket } case SKILL: { - SkillShortcutInfo skill = (SkillShortcutInfo) sc; + final SkillShortcutInfo skill = (SkillShortcutInfo) sc; writeD(skill.getId()); if ((skill.getLevel() < 100) || (skill.getLevel() > 10000)) @@ -137,7 +137,7 @@ public final class ShortCutInit extends L2GameServerPacket } else { - int maxLevel = SkillData.getInstance().getMaxLevel(skill.getId()); + final int maxLevel = SkillData.getInstance().getMaxLevel(skill.getId()); writeH(maxLevel); writeH(skill.getLevel()); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java index b37755d59e..f53260b1c2 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java @@ -63,7 +63,7 @@ public final class ShortCutRegister extends L2GameServerPacket } else { - int _maxLevel = SkillData.getInstance().getMaxLevel(_shortcut.getId()); + final int _maxLevel = SkillData.getInstance().getMaxLevel(_shortcut.getId()); writeH(_maxLevel); writeH(_shortcut.getLevel()); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShowBoard.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShowBoard.java index dfec08e31a..36f45b08f1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShowBoard.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ShowBoard.java @@ -43,7 +43,7 @@ public class ShowBoard extends L2GameServerPacket public ShowBoard(List arg) { - StringBuilder builder = new StringBuilder(5 + StringUtil.getLength(arg) + arg.size()).append("1002\u0008"); + final StringBuilder builder = new StringBuilder(5 + StringUtil.getLength(arg) + arg.size()).append("1002\u0008"); for (String str : arg) { builder.append(str).append("\u0008"); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java index 32cef6a4b9..03647f9c40 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java @@ -74,7 +74,7 @@ public final class SiegeAttackerList extends L2GameServerPacket writeD(0x00); // 0 writeD(0x01); // 1 writeD(0x00); // 0 - int size = _castle.getSiege().getAttackerClans().size(); + final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { L2Clan clan; diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeInfo.java index d6b91f33b6..985101b1fe 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeInfo.java @@ -62,7 +62,7 @@ public class SiegeInfo extends L2GameServerPacket @Override protected final void writeImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; @@ -79,7 +79,7 @@ public class SiegeInfo extends L2GameServerPacket writeD(ownerId); if (ownerId > 0) { - L2Clan owner = ClanTable.getInstance().getClan(ownerId); + final L2Clan owner = ClanTable.getInstance().getClan(ownerId); if (owner != null) { writeS(owner.getName()); // Clan Name @@ -103,7 +103,7 @@ public class SiegeInfo extends L2GameServerPacket writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.getIsTimeRegistrationOver() && activeChar.isClanLeader() && (activeChar.getClanId() == _castle.getOwnerId())) { - Calendar cal = Calendar.getInstance(); + final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); @@ -132,7 +132,7 @@ public class SiegeInfo extends L2GameServerPacket writeD(ownerId); if (ownerId > 0) { - L2Clan owner = ClanTable.getInstance().getClan(ownerId); + final L2Clan owner = ClanTable.getInstance().getClan(ownerId); if (owner != null) { writeS(owner.getName()); // Clan Name diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SkillList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SkillList.java index e2ff169682..87467ee038 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SkillList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SkillList.java @@ -71,7 +71,7 @@ public final class SkillList extends L2GameServerPacket } else { - int maxlevel = SkillData.getInstance().getMaxLevel(temp.id); + final int maxlevel = SkillData.getInstance().getMaxLevel(temp.id); writeH(maxlevel); writeH(temp.level); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index 3d6ddf5d79..0bbac5979a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -269,8 +269,8 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket { return (order == A2Z ? A2Z : Z2A); } - String s1 = o1.getItemName(); - String s2 = o2.getItemName(); + final String s1 = o1.getItemName(); + final String s2 = o2.getItemName(); return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1)); } } @@ -305,8 +305,8 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket { try { - L2RecipeList rp1 = rd.getRecipeByItemId(o1.getItemId()); - L2RecipeList rp2 = rd.getRecipeByItemId(o2.getItemId()); + final L2RecipeList rp1 = rd.getRecipeByItemId(o1.getItemId()); + final L2RecipeList rp2 = rd.getRecipeByItemId(o2.getItemId()); if (rp1 == null) { @@ -317,8 +317,8 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket return (order == A2Z ? Z2A : A2Z); } - Integer i1 = rp1.getLevel(); - Integer i2 = rp2.getLevel(); + final Integer i1 = rp1.getLevel(); + final Integer i2 = rp2.getLevel(); return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); } @@ -328,8 +328,8 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket } } - String s1 = o1.getItemName(); - String s2 = o2.getItemName(); + final String s1 = o1.getItemName(); + final String s2 = o2.getItemName(); return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1)); } } @@ -357,8 +357,8 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket { return (order == A2Z ? A2Z : Z2A); } - Integer i1 = o1.getBodyPart(); - Integer i2 = o2.getBodyPart(); + final Integer i1 = o1.getBodyPart(); + final Integer i2 = o2.getBodyPart(); return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); } } @@ -386,8 +386,8 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket { return (order == A2Z ? A2Z : Z2A); } - CrystalType i1 = o1.getItemGrade(); - CrystalType i2 = o2.getItemGrade(); + final CrystalType i1 = o1.getItemGrade(); + final CrystalType i2 = o2.getItemGrade(); return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); } } @@ -417,8 +417,8 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket } try { - MaterialType i1 = o1.getItem().getMaterialType(); - MaterialType i2 = o2.getItem().getMaterialType(); + final MaterialType i1 = o1.getItem().getMaterialType(); + final MaterialType i2 = o2.getItem().getMaterialType(); return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); } catch (Exception e) @@ -435,7 +435,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createWeaponList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if (item.isWeapon() || (item.getItem().getType2() == L2Item.TYPE2_WEAPON) || (item.isEtcItem() && (item.getItemType() == EtcItemType.ARROW)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -460,7 +460,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createArmorList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if (item.isArmor() || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -485,7 +485,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createEtcItemList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if (item.isEtcItem() || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -510,7 +510,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createMatList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.MATERIAL)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -535,7 +535,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createRecipeList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.RECIPE)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -560,7 +560,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createAmulettList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if ((item.isEtcItem() && (item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -585,7 +585,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createSpellbookList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if ((item.isEtcItem() && (!item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -610,7 +610,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createConsumableList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if ((item.isEtcItem() && ((item.getEtcItem().getItemType() == EtcItemType.SCROLL) || (item.getEtcItem().getItemType() == EtcItemType.SHOT))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -635,7 +635,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createShotList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SHOT)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -660,7 +660,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createScrollList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SCROLL)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -685,7 +685,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createSeedList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SEED)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -710,7 +710,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createOtherList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if ((item.isEtcItem() && ((item.getEtcItem().getItemType() != EtcItemType.MATERIAL) && (item.getEtcItem().getItemType() != EtcItemType.RECIPE) && (item.getEtcItem().getItemType() != EtcItemType.SCROLL) && (item.getEtcItem().getItemType() != EtcItemType.SHOT))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) @@ -735,7 +735,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket */ private List createAllList(L2ItemInstance[] _items) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { if (list.size() < MAX_SORT_LIST_ITEMS) diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java index 96a6d0c15d..6a9a44bc7e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java @@ -38,7 +38,7 @@ public final class SpawnItem extends L2GameServerPacket if (obj instanceof L2ItemInstance) { - L2ItemInstance item = (L2ItemInstance) obj; + final L2ItemInstance item = (L2ItemInstance) obj; _itemId = item.getDisplayId(); _stackable = item.isStackable() ? 0x01 : 0x00; _count = item.getCount(); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java index 207decc368..d333772493 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java @@ -219,7 +219,7 @@ public class UserInfo extends AbstractMaskPacket writeH(56); if (_activeChar.getActiveWeaponItem() != null) { - L2Weapon weaponItem = _activeChar.getActiveWeaponItem(); + final L2Weapon weaponItem = _activeChar.getActiveWeaponItem(); if (weaponItem.getItemType() == WeaponType.POLE) { writeH(80); @@ -306,7 +306,7 @@ public class UserInfo extends AbstractMaskPacket if (containsMask(UserInfoType.ATK_ELEMENTAL)) { writeH(5); - byte attackAttribute = _activeChar.getAttackElement(); + final byte attackAttribute = _activeChar.getAttackElement(); writeC(attackAttribute); writeH(_activeChar.getAttackElementValue(attackAttribute)); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index bf46afe1d6..f130783d1e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -48,7 +48,7 @@ public class ExFriendDetailInfo extends L2GameServerPacket writeD(_player.getObjectId()); final Friend friend = _player.getFriend(CharNameTable.getInstance().getIdByName(_name)); - L2PcInstance player = friend.getFriend(); + final L2PcInstance player = friend.getFriend(); if (player == null) { writeS(_name); @@ -62,7 +62,7 @@ public class ExFriendDetailInfo extends L2GameServerPacket writeD(friend.getAllyId()); writeD(friend.getAllyCrestId()); writeS(friend.getAllyName()); - Calendar createDate = Calendar.getInstance(); + final Calendar createDate = Calendar.getInstance(); createDate.setTimeInMillis(friend.getCreateDate()); writeC(createDate.get(Calendar.MONTH) + 1); writeC(createDate.get(Calendar.DAY_OF_MONTH)); @@ -82,7 +82,7 @@ public class ExFriendDetailInfo extends L2GameServerPacket writeD(player.getAllyId()); writeD(player.getAllyCrestId()); writeS(player.getClan() != null ? player.getClan().getAllyName() : ""); - Calendar createDate = player.getCreateDate(); + final Calendar createDate = player.getCreateDate(); writeC(createDate.get(Calendar.MONTH) + 1); writeC(createDate.get(Calendar.DAY_OF_MONTH)); writeD(player.isOnline() ? -1 : (int) ((System.currentTimeMillis() - player.getLastAccess()) / 1000)); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/FriendList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/FriendList.java index 928171987e..2223ec39d0 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/FriendList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/FriendList.java @@ -43,7 +43,7 @@ public class FriendList extends L2GameServerPacket writeD(_friends.size()); for (Friend friend : _friends) { - L2PcInstance player = friend.getFriend(); + final L2PcInstance player = friend.getFriend(); if (player != null) { writeD(player.getObjectId()); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java index b2820c5cb0..44611a6b11 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java @@ -43,7 +43,7 @@ public class L2FriendList extends L2GameServerPacket writeD(_friends.size()); for (Friend friend : _friends) { - L2PcInstance player = friend.getFriend(); + final L2PcInstance player = friend.getFriend(); if (player != null) { writeD(player.getObjectId()); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java index 0bb80db762..2916086305 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java @@ -52,7 +52,7 @@ public class ExBettingLuckyGameResult extends L2GameServerPacket final L2PcInstance _activeChar = getClient().getActiveChar(); // Calculate rewards - List rewards = new ArrayList<>(); + final List rewards = new ArrayList<>(); int totalWeight = 0; for (int rewardCounter = 0; rewardCounter < _count; rewardCounter++) { @@ -115,7 +115,7 @@ public class ExBettingLuckyGameResult extends L2GameServerPacket if (_type == 2) { _activeChar.addItem("LuxuryFortuneTelling", reward, _activeChar, false); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_IN_THE_LUXURY_FORTUNE_READING); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_IN_THE_LUXURY_FORTUNE_READING); sm.addPcName(_activeChar); sm.addLong(reward.getCount()); sm.addItemName(new L2ItemInstance(reward.getId())); @@ -124,7 +124,7 @@ public class ExBettingLuckyGameResult extends L2GameServerPacket else { _activeChar.addItem("FortuneTelling", reward, _activeChar, false); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_THROUGH_FORTUNE_READING); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_THROUGH_FORTUNE_READING); sm.addPcName(_activeChar); sm.addLong(reward.getCount()); sm.addItemName(new L2ItemInstance(reward.getId())); diff --git a/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java b/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java index 0056025d55..1b7b5013f3 100644 --- a/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java +++ b/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java @@ -126,7 +126,7 @@ public class CellNodeBuffer { for (int j = 0; j < _mapSize; j++) { - CellNode n = _buffer[i][j]; + final CellNode n = _buffer[i][j]; if ((n == null) || !n.isInUse() || (n.getCost() <= 0)) { continue; @@ -257,7 +257,7 @@ public class CellNodeBuffer private final CellNode addNode(int x, int y, int z, boolean diagonal) { - CellNode newNode = getNode(x, y, z); + final CellNode newNode = getNode(x, y, z); if (newNode == null) { return null; diff --git a/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java b/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java index 90d2aac7c3..80615f21b6 100644 --- a/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java +++ b/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java @@ -60,7 +60,7 @@ public class CellPathFinding extends PathFinding { try { - String[] array = Config.PATHFIND_BUFFERS.split(";"); + final String[] array = Config.PATHFIND_BUFFERS.split(";"); _allBuffers = new BufferInfo[array.length]; @@ -94,27 +94,27 @@ public class CellPathFinding extends PathFinding @Override public List findPath(int x, int y, int z, int tx, int ty, int tz, int instanceId, boolean playable) { - int gx = GeoData.getInstance().getGeoX(x); - int gy = GeoData.getInstance().getGeoY(y); + final int gx = GeoData.getInstance().getGeoX(x); + final int gy = GeoData.getInstance().getGeoY(y); if (!GeoData.getInstance().hasGeo(x, y)) { return null; } - int gz = GeoData.getInstance().getHeight(x, y, z); - int gtx = GeoData.getInstance().getGeoX(tx); - int gty = GeoData.getInstance().getGeoY(ty); + final int gz = GeoData.getInstance().getHeight(x, y, z); + final int gtx = GeoData.getInstance().getGeoX(tx); + final int gty = GeoData.getInstance().getGeoY(ty); if (!GeoData.getInstance().hasGeo(tx, ty)) { return null; } - int gtz = GeoData.getInstance().getHeight(tx, ty, tz); - CellNodeBuffer buffer = alloc(64 + (2 * Math.max(Math.abs(gx - gtx), Math.abs(gy - gty))), playable); + final int gtz = GeoData.getInstance().getHeight(tx, ty, tz); + final CellNodeBuffer buffer = alloc(64 + (2 * Math.max(Math.abs(gx - gtx), Math.abs(gy - gty))), playable); if (buffer == null) { return null; } - boolean debug = playable && Config.DEBUG_PATH; + final boolean debug = playable && Config.DEBUG_PATH; if (debug) { @@ -136,7 +136,7 @@ public class CellPathFinding extends PathFinding List path = null; try { - CellNode result = buffer.findPath(gx, gy, gz, gtx, gty, gtz); + final CellNode result = buffer.findPath(gx, gy, gz, gtx, gty, gtz); if (debug) { @@ -178,7 +178,7 @@ public class CellPathFinding extends PathFinding return path; } - long timeStamp = System.currentTimeMillis(); + final long timeStamp = System.currentTimeMillis(); _postFilterUses++; if (playable) { @@ -202,8 +202,8 @@ public class CellPathFinding extends PathFinding int midPoint = 0; while (endPoint.hasNext()) { - AbstractNodeLoc locMiddle = path.get(midPoint); - AbstractNodeLoc locEnd = endPoint.next(); + final AbstractNodeLoc locMiddle = path.get(midPoint); + final AbstractNodeLoc locEnd = endPoint.next(); if (GeoData.getInstance().canMove(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instanceId)) { path.remove(midPoint); @@ -246,8 +246,8 @@ public class CellPathFinding extends PathFinding { if (!Config.ADVANCED_DIAGONAL_STRATEGY && (node.getParent().getParent() != null)) { - int tmpX = node.getLoc().getNodeX() - node.getParent().getParent().getLoc().getNodeX(); - int tmpY = node.getLoc().getNodeY() - node.getParent().getParent().getLoc().getNodeY(); + final int tmpX = node.getLoc().getNodeX() - node.getParent().getParent().getLoc().getNodeX(); + final int tmpY = node.getLoc().getNodeY() - node.getParent().getParent().getLoc().getNodeY(); if (Math.abs(tmpX) == Math.abs(tmpY)) { directionX = tmpX; diff --git a/trunk/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java b/trunk/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java index 709cbbaf41..11f8488712 100644 --- a/trunk/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java +++ b/trunk/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java @@ -68,15 +68,15 @@ public class GeoPathFinding extends PathFinding @Override public List findPath(int x, int y, int z, int tx, int ty, int tz, int instanceId, boolean playable) { - int gx = (x - L2World.MAP_MIN_X) >> 4; - int gy = (y - L2World.MAP_MIN_Y) >> 4; - short gz = (short) z; - int gtx = (tx - L2World.MAP_MIN_X) >> 4; - int gty = (ty - L2World.MAP_MIN_Y) >> 4; - short gtz = (short) tz; + final int gx = (x - L2World.MAP_MIN_X) >> 4; + final int gy = (y - L2World.MAP_MIN_Y) >> 4; + final short gz = (short) z; + final int gtx = (tx - L2World.MAP_MIN_X) >> 4; + final int gty = (ty - L2World.MAP_MIN_Y) >> 4; + final short gtz = (short) tz; - GeoNode start = readNode(gx, gy, gz); - GeoNode end = readNode(gtx, gty, gtz); + final GeoNode start = readNode(gx, gy, gz); + final GeoNode end = readNode(gtx, gty, gtz); if ((start == null) || (end == null)) { return null; @@ -124,13 +124,13 @@ public class GeoPathFinding extends PathFinding // load) level of intelligence though. // List of Visited Nodes - FastNodeList visited = new FastNodeList(550); + final FastNodeList visited = new FastNodeList(550); // List of Nodes to Visit - LinkedList to_visit = new LinkedList<>(); + final LinkedList to_visit = new LinkedList<>(); to_visit.add(start); - int targetX = end.getLoc().getNodeX(); - int targetY = end.getLoc().getNodeY(); + final int targetX = end.getLoc().getNodeX(); + final int targetY = end.getLoc().getNodeY(); int dx, dy; boolean added; @@ -155,7 +155,7 @@ public class GeoPathFinding extends PathFinding i++; visited.add(node); node.attachNeighbors(readNeighbors(node)); - GeoNode[] neighbors = node.getNeighbors(); + final GeoNode[] neighbors = node.getNeighbors(); if (neighbors == null) { continue; @@ -192,7 +192,7 @@ public class GeoPathFinding extends PathFinding public List constructPath2(AbstractNode node) { - LinkedList path = new LinkedList<>(); + final LinkedList path = new LinkedList<>(); int previousDirectionX = -1000; int previousDirectionY = -1000; int directionX; @@ -224,14 +224,14 @@ public class GeoPathFinding extends PathFinding int idx = n.getNeighborsIdx(); - int node_x = n.getLoc().getNodeX(); - int node_y = n.getLoc().getNodeY(); + final int node_x = n.getLoc().getNodeX(); + final int node_y = n.getLoc().getNodeY(); // short node_z = n.getLoc().getZ(); - short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y)); - ByteBuffer pn = _pathNodes.get(regoffset); + final short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y)); + final ByteBuffer pn = _pathNodes.get(regoffset); - List> neighbors = new ArrayList<>(8); + final List> neighbors = new ArrayList<>(8); GeoNode newNode; short new_node_x, new_node_y; @@ -332,7 +332,7 @@ public class GeoPathFinding extends PathFinding neighbors.add(newNode); } } - GeoNode[] result = new GeoNode[neighbors.size()]; + final GeoNode[] result = new GeoNode[neighbors.size()]; return neighbors.toArray(result); } @@ -340,47 +340,47 @@ public class GeoPathFinding extends PathFinding private GeoNode readNode(short node_x, short node_y, byte layer) { - short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y)); + final short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y)); if (!pathNodesExist(regoffset)) { return null; } - short nbx = getNodeBlock(node_x); - short nby = getNodeBlock(node_y); + final short nbx = getNodeBlock(node_x); + final short nby = getNodeBlock(node_y); int idx = _pathNodesIndex.get(regoffset).get((nby << 8) + nbx); - ByteBuffer pn = _pathNodes.get(regoffset); + final ByteBuffer pn = _pathNodes.get(regoffset); // reading - byte nodes = pn.get(idx); + final byte nodes = pn.get(idx); idx += (layer * 10) + 1;// byte + layer*10byte if (nodes < layer) { _log.warning("SmthWrong!"); } - short node_z = pn.getShort(idx); + final short node_z = pn.getShort(idx); idx += 2; return new GeoNode(new GeoNodeLoc(node_x, node_y, node_z), idx); } private GeoNode readNode(int gx, int gy, short z) { - short node_x = getNodePos(gx); - short node_y = getNodePos(gy); - short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y)); + final short node_x = getNodePos(gx); + final short node_y = getNodePos(gy); + final short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y)); if (!pathNodesExist(regoffset)) { return null; } - short nbx = getNodeBlock(node_x); - short nby = getNodeBlock(node_y); + final short nbx = getNodeBlock(node_x); + final short nby = getNodeBlock(node_y); int idx = _pathNodesIndex.get(regoffset).get((nby << 8) + nbx); - ByteBuffer pn = _pathNodes.get(regoffset); + final ByteBuffer pn = _pathNodes.get(regoffset); // reading byte nodes = pn.get(idx++); int idx2 = 0; // create index to nearlest node by z short last_z = Short.MIN_VALUE; while (nodes > 0) { - short node_z = pn.getShort(idx); + final short node_z = pn.getShort(idx); if (Math.abs(last_z - z) > Math.abs(node_z - z)) { last_z = node_z; @@ -412,8 +412,8 @@ public class GeoPathFinding extends PathFinding return; } - byte rx = Byte.parseByte(parts[0]); - byte ry = Byte.parseByte(parts[1]); + final byte rx = Byte.parseByte(parts[0]); + final byte ry = Byte.parseByte(parts[1]); LoadPathNodeFile(rx, ry); }); //@formatter:on @@ -432,8 +432,8 @@ public class GeoPathFinding extends PathFinding _log.warning("Failed to Load PathNode File: invalid region " + rx + "," + ry + Config.EOL); return; } - short regionoffset = getRegionOffset(rx, ry); - File file = new File(Config.PATHNODE_PATH.toString(), rx + "_" + ry + ".pn"); + final short regionoffset = getRegionOffset(rx, ry); + final File file = new File(Config.PATHNODE_PATH.toString(), rx + "_" + ry + ".pn"); _log.info("Path Engine: - Loading: " + file.getName() + " -> region offset: " + regionoffset + " X: " + rx + " Y: " + ry); int node = 0, size, index = 0; @@ -454,11 +454,11 @@ public class GeoPathFinding extends PathFinding } // Indexing pathnode files, so we will know where each block starts - IntBuffer indexs = IntBuffer.allocate(65536); + final IntBuffer indexs = IntBuffer.allocate(65536); while (node < 65536) { - byte layer = nodes.get(index); + final byte layer = nodes.get(index); indexs.put(node++, index); index += (layer * 10) + 1; } diff --git a/trunk/java/com/l2jserver/gameserver/pathfinding/utils/BinaryNodeHeap.java b/trunk/java/com/l2jserver/gameserver/pathfinding/utils/BinaryNodeHeap.java index 77bfd1aa52..0ca4230e33 100644 --- a/trunk/java/com/l2jserver/gameserver/pathfinding/utils/BinaryNodeHeap.java +++ b/trunk/java/com/l2jserver/gameserver/pathfinding/utils/BinaryNodeHeap.java @@ -41,10 +41,10 @@ public class BinaryNodeHeap _list[pos] = n; while (pos != 1) { - int p2 = pos / 2; + final int p2 = pos / 2; if (_list[pos].getCost() <= _list[p2].getCost()) { - GeoNode temp = _list[p2]; + final GeoNode temp = _list[p2]; _list[p2] = _list[pos]; _list[pos] = temp; pos = p2; @@ -58,7 +58,7 @@ public class BinaryNodeHeap public GeoNode removeFirst() { - GeoNode first = _list[1]; + final GeoNode first = _list[1]; _list[1] = _list[_size]; _list[_size] = null; _size--; diff --git a/trunk/java/com/l2jserver/gameserver/script/DateRange.java b/trunk/java/com/l2jserver/gameserver/script/DateRange.java index 6552925c69..827bc4b78c 100644 --- a/trunk/java/com/l2jserver/gameserver/script/DateRange.java +++ b/trunk/java/com/l2jserver/gameserver/script/DateRange.java @@ -40,13 +40,13 @@ public class DateRange public static DateRange parse(String dateRange, DateFormat format) { - String[] date = dateRange.split("-"); + final String[] date = dateRange.split("-"); if (date.length == 2) { try { - Date start = format.parse(date[0]); - Date end = format.parse(date[1]); + final Date start = format.parse(date[0]); + final Date end = format.parse(date[1]); return new DateRange(start, end); } diff --git a/trunk/java/com/l2jserver/gameserver/script/IntList.java b/trunk/java/com/l2jserver/gameserver/script/IntList.java index be7b252ca6..8de304129b 100644 --- a/trunk/java/com/l2jserver/gameserver/script/IntList.java +++ b/trunk/java/com/l2jserver/gameserver/script/IntList.java @@ -34,7 +34,7 @@ public class IntList return getIntegerList(range.split(",")); } - int[] list = + final int[] list = { getInt(range) }; @@ -48,7 +48,7 @@ public class IntList private static int[] getIntegerList(String[] numbers) { - int[] list = new int[numbers.length]; + final int[] list = new int[numbers.length]; for (int i = 0; i < list.length; i++) { list[i] = getInt(numbers[i]); @@ -58,9 +58,9 @@ public class IntList private static int[] getIntegerRange(String[] numbers) { - int min = getInt(numbers[0]); - int max = getInt(numbers[1]); - int[] list = new int[(max - min) + 1]; + final int min = getInt(numbers[0]); + final int max = getInt(numbers[1]); + final int[] list = new int[(max - min) + 1]; for (int i = 0; i < list.length; i++) { list[i] = min + i; diff --git a/trunk/java/com/l2jserver/gameserver/script/ScriptDocument.java b/trunk/java/com/l2jserver/gameserver/script/ScriptDocument.java index 557dcd951a..8f6919f0b6 100644 --- a/trunk/java/com/l2jserver/gameserver/script/ScriptDocument.java +++ b/trunk/java/com/l2jserver/gameserver/script/ScriptDocument.java @@ -44,10 +44,10 @@ public class ScriptDocument { _name = name; - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); try { - DocumentBuilder builder = factory.newDocumentBuilder(); + final DocumentBuilder builder = factory.newDocumentBuilder(); _document = builder.parse(input); } diff --git a/trunk/java/com/l2jserver/gameserver/script/ScriptPackage.java b/trunk/java/com/l2jserver/gameserver/script/ScriptPackage.java index 5897aee456..12c9460bdf 100644 --- a/trunk/java/com/l2jserver/gameserver/script/ScriptPackage.java +++ b/trunk/java/com/l2jserver/gameserver/script/ScriptPackage.java @@ -68,7 +68,7 @@ public class ScriptPackage { for (Enumeration e = pack.entries(); e.hasMoreElements();) { - ZipEntry entry = e.nextElement(); + final ZipEntry entry = e.nextElement(); if (entry.getName().endsWith(".xml")) { try @@ -103,7 +103,7 @@ public class ScriptPackage return "Empty Package."; } - StringBuilder out = new StringBuilder(); + final StringBuilder out = new StringBuilder(); out.append("Package Name: "); out.append(getName()); out.append(Config.EOL); diff --git a/trunk/java/com/l2jserver/gameserver/script/ShortList.java b/trunk/java/com/l2jserver/gameserver/script/ShortList.java index 8d7c680c35..616d92746f 100644 --- a/trunk/java/com/l2jserver/gameserver/script/ShortList.java +++ b/trunk/java/com/l2jserver/gameserver/script/ShortList.java @@ -34,7 +34,7 @@ public class ShortList return getShortList(range.split(",")); } - short[] list = + final short[] list = { getShort(range) }; @@ -48,7 +48,7 @@ public class ShortList private static short[] getShortList(String[] numbers) { - short[] list = new short[numbers.length]; + final short[] list = new short[numbers.length]; for (int i = 0; i < list.length; i++) { list[i] = getShort(numbers[i]); diff --git a/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java b/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java index ae001a45a7..ff8d5823f3 100644 --- a/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java +++ b/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java @@ -44,10 +44,10 @@ public class FaenorEventParser extends FaenorParser @Override public void parseScript(final Node eventNode, ScriptContext context) { - String ID = attribute(eventNode, "ID"); + final String ID = attribute(eventNode, "ID"); _eventDates = DateRange.parse(attribute(eventNode, "Active"), DATE_FORMAT); - Date currentDate = new Date(); + final Date currentDate = new Date(); if (_eventDates.getEndDate().before(currentDate)) { _log.info("Event ID: (" + ID + ") has passed... Ignored."); @@ -83,8 +83,8 @@ public class FaenorEventParser extends FaenorParser { try { - String type = attribute(sysMsg, "Type"); - String message = attribute(sysMsg, "Msg"); + final String type = attribute(sysMsg, "Type"); + final String message = attribute(sysMsg, "Msg"); if (type.equalsIgnoreCase("OnJoin")) { @@ -112,9 +112,9 @@ public class FaenorEventParser extends FaenorParser { try { - int[] items = IntList.parse(attribute(drop, "Items")); - int[] count = IntList.parse(attribute(drop, "Count")); - double chance = getPercent(attribute(drop, "Chance")); + final int[] items = IntList.parse(attribute(drop, "Items")); + final int[] count = IntList.parse(attribute(drop, "Count")); + final double chance = getPercent(attribute(drop, "Chance")); _bridge.addEventDrop(items, count, chance, _eventDates); } diff --git a/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorParser.java b/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorParser.java index 9cfb8ebd7e..316c7666dc 100644 --- a/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorParser.java +++ b/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorParser.java @@ -72,10 +72,10 @@ public abstract class FaenorParser extends Parser { try { - NodeList list = parentNode.getChildNodes(); + final NodeList list = parentNode.getChildNodes(); for (int i = 0; i < list.getLength(); i++) { - Node node = list.item(i); + final Node node = list.item(i); if (node.getNodeName().equalsIgnoreCase(elementName)) { return node.getTextContent(); diff --git a/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorScriptEngine.java b/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorScriptEngine.java index 0f842c2969..9b463208e1 100644 --- a/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorScriptEngine.java +++ b/trunk/java/com/l2jserver/gameserver/script/faenor/FaenorScriptEngine.java @@ -66,8 +66,8 @@ public class FaenorScriptEngine extends ScriptEngine public void parseScript(ScriptDocument script, ScriptContext context) { - Node node = script.getDocument().getFirstChild(); - String parserClass = "faenor.Faenor" + node.getNodeName() + "Parser"; + final Node node = script.getDocument().getFirstChild(); + final String parserClass = "faenor.Faenor" + node.getNodeName() + "Parser"; Parser parser = null; try diff --git a/trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java b/trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java index 91eb5fcdf5..575ed6676c 100644 --- a/trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java +++ b/trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java @@ -85,8 +85,8 @@ public final class L2ScriptEngineManager protected L2ScriptEngineManager() { - ScriptEngineManager scriptEngineManager = new ScriptEngineManager(); - ScriptEngineFactory factory = new JavaScriptEngineFactory(); + final ScriptEngineManager scriptEngineManager = new ScriptEngineManager(); + final ScriptEngineFactory factory = new JavaScriptEngineFactory(); scriptEngineManager.registerEngineExtension("java", factory); _extEngines.put("java", factory.getScriptEngine()); _log.info("Script Engine: " + factory.getEngineName() + " " + factory.getEngineVersion() + " - Language: " + factory.getLanguageName() + " - Language Version: " + factory.getLanguageVersion()); @@ -130,7 +130,7 @@ public final class L2ScriptEngineManager continue; } - String[] parts = line.trim().split("#"); + final String[] parts = line.trim().split("#"); if ((parts.length > 0) && !parts[0].isEmpty() && (parts[0].charAt(0) != '#')) { @@ -145,7 +145,7 @@ public final class L2ScriptEngineManager line = line.substring(0, line.length() - 2); } - File file = new File(SCRIPT_FOLDER, line); + final File file = new File(SCRIPT_FOLDER, line); if (file.isDirectory() && parts[0].endsWith("/**")) { @@ -214,13 +214,13 @@ public final class L2ScriptEngineManager { try { - String name = file.getName(); - int lastIndex = name.lastIndexOf('.'); + final String name = file.getName(); + final int lastIndex = name.lastIndexOf('.'); String extension; if (lastIndex != -1) { extension = name.substring(lastIndex + 1); - ScriptEngine engine = getEngineByExtension(extension); + final ScriptEngine engine = getEngineByExtension(extension); if (engine != null) { executeScript(engine, file); @@ -242,8 +242,8 @@ public final class L2ScriptEngineManager public void executeScript(File file) throws ScriptException { - String name = file.getName(); - int lastIndex = name.lastIndexOf('.'); + final String name = file.getName(); + final int lastIndex = name.lastIndexOf('.'); String extension; if (lastIndex != -1) { @@ -254,7 +254,7 @@ public final class L2ScriptEngineManager throw new ScriptException("Script file (" + name + ") doesnt has an extension that identifies the ScriptEngine to be used."); } - ScriptEngine engine = getEngineByExtension(extension); + final ScriptEngine engine = getEngineByExtension(extension); if (engine == null) { throw new ScriptException("No engine registered for extension (" + extension + ")"); @@ -271,8 +271,8 @@ public final class L2ScriptEngineManager if (PURGE_ERROR_LOG) { - String name = file.getAbsolutePath() + ".error.log"; - File errorLog = new File(name); + final String name = file.getAbsolutePath() + ".error.log"; + final File errorLog = new File(name); if (errorLog.isFile()) { errorLog.delete(); @@ -284,7 +284,7 @@ public final class L2ScriptEngineManager InputStreamReader isr = new InputStreamReader(fis); BufferedReader reader = new BufferedReader(isr)) { - ScriptContext context = new SimpleScriptContext(); + final ScriptContext context = new SimpleScriptContext(); context.setAttribute("mainClass", getClassForFile(file).replace('/', '.').replace('\\', '.'), ScriptContext.ENGINE_SCOPE); context.setAttribute(ScriptEngine.FILENAME, relativeName, ScriptContext.ENGINE_SCOPE); context.setAttribute("classpath", SCRIPT_FOLDER.getAbsolutePath(), ScriptContext.ENGINE_SCOPE); @@ -309,11 +309,11 @@ public final class L2ScriptEngineManager public static String getClassForFile(File script) { - String path = script.getAbsolutePath(); - String scpPath = SCRIPT_FOLDER.getAbsolutePath(); + final String path = script.getAbsolutePath(); + final String scpPath = SCRIPT_FOLDER.getAbsolutePath(); if (path.startsWith(scpPath)) { - int idx = path.lastIndexOf('.'); + final int idx = path.lastIndexOf('.'); return path.substring(scpPath.length() + 1, idx); } return null; @@ -328,8 +328,8 @@ public final class L2ScriptEngineManager { if ((engine instanceof Compilable) && ATTEMPT_COMPILATION) { - Compilable eng = (Compilable) engine; - CompiledScript cs = eng.compile(script); + final Compilable eng = (Compilable) engine; + final CompiledScript cs = eng.compile(script); return context != null ? cs.eval(context) : cs.eval(); } return context != null ? engine.eval(script, context) : engine.eval(script); @@ -342,14 +342,14 @@ public final class L2ScriptEngineManager public void reportScriptFileError(File script, ScriptException e) { - String dir = script.getParent(); - String name = script.getName() + ".error.log"; + final String dir = script.getParent(); + final String name = script.getName() + ".error.log"; if (dir != null) { final File file = new File(dir + "/" + name); try (FileOutputStream fos = new FileOutputStream(file)) { - String errorHeader = "Error on: " + file.getCanonicalPath() + Config.EOL + "Line: " + e.getLineNumber() + " - Column: " + e.getColumnNumber() + Config.EOL + Config.EOL; + final String errorHeader = "Error on: " + file.getCanonicalPath() + Config.EOL + "Line: " + e.getLineNumber() + " - Column: " + e.getColumnNumber() + Config.EOL + Config.EOL; fos.write(errorHeader.getBytes()); fos.write(e.getMessage().getBytes()); _log.warning("Failed executing script: " + script.getAbsolutePath() + ". See " + file.getName() + " for details."); diff --git a/trunk/java/com/l2jserver/gameserver/security/SecondaryPasswordAuth.java b/trunk/java/com/l2jserver/gameserver/security/SecondaryPasswordAuth.java index 2316f1b1fa..aeff5a0e37 100644 --- a/trunk/java/com/l2jserver/gameserver/security/SecondaryPasswordAuth.java +++ b/trunk/java/com/l2jserver/gameserver/security/SecondaryPasswordAuth.java @@ -252,9 +252,9 @@ public class SecondaryPasswordAuth { try { - MessageDigest md = MessageDigest.getInstance("SHA"); - byte[] raw = password.getBytes("UTF-8"); - byte[] hash = md.digest(raw); + final MessageDigest md = MessageDigest.getInstance("SHA"); + final byte[] raw = password.getBytes("UTF-8"); + final byte[] hash = md.digest(raw); return Base64.getEncoder().encodeToString(hash); } catch (NoSuchAlgorithmException e) diff --git a/trunk/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java b/trunk/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java index 605fa26ee0..8e70c67b55 100644 --- a/trunk/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/trunk/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java @@ -112,7 +112,7 @@ public class AttackStanceTaskManager @Override public void run() { - long current = System.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iter = _attackStanceTasks.entrySet().iterator(); diff --git a/trunk/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java b/trunk/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java index 3053da6016..6f139372ac 100644 --- a/trunk/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java +++ b/trunk/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java @@ -148,7 +148,7 @@ public final class DecayTaskManager @Override public String toString() { - StringBuilder ret = new StringBuilder(); + final StringBuilder ret = new StringBuilder(); ret.append("============= DecayTask Manager Report ============"); ret.append(Config.EOL); ret.append("Tasks count: "); diff --git a/trunk/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java b/trunk/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java index 9defe0e57a..87acbb51bf 100644 --- a/trunk/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java +++ b/trunk/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java @@ -106,7 +106,7 @@ public class KnownListUpdateTaskManager public void updateRegion(L2WorldRegion region, boolean fullUpdate, boolean forgetObjects) { - Collection vObj = region.getVisibleObjects().values(); + final Collection vObj = region.getVisibleObjects().values(); for (L2Object object : vObj) // and for all members in region { if ((object == null) || !object.isVisible()) @@ -126,7 +126,7 @@ public class KnownListUpdateTaskManager { if ((object instanceof L2Playable) || (aggro && regi.isActive()) || fullUpdate) { - Collection inrObj = regi.getVisibleObjects().values(); + final Collection inrObj = regi.getVisibleObjects().values(); for (L2Object obj : inrObj) { if (obj != object) @@ -139,7 +139,7 @@ public class KnownListUpdateTaskManager { if (regi.isActive()) { - Collection inrPls = regi.getVisibleObjects().values(); + final Collection inrPls = regi.getVisibleObjects().values(); for (L2Object obj : inrPls) { diff --git a/trunk/java/com/l2jserver/gameserver/taskmanager/TaskManager.java b/trunk/java/com/l2jserver/gameserver/taskmanager/TaskManager.java index 86c6822b6c..6c1c55f27d 100644 --- a/trunk/java/com/l2jserver/gameserver/taskmanager/TaskManager.java +++ b/trunk/java/com/l2jserver/gameserver/taskmanager/TaskManager.java @@ -200,7 +200,7 @@ public final class TaskManager public void registerTask(Task task) { - int key = task.getName().hashCode(); + final int key = task.getName().hashCode(); _tasks.computeIfAbsent(key, k -> { task.initializate(); @@ -216,7 +216,7 @@ public final class TaskManager { while (rset.next()) { - Task task = _tasks.get(rset.getString("task").trim().toLowerCase().hashCode()); + final Task task = _tasks.get(rset.getString("task").trim().toLowerCase().hashCode()); if (task == null) { continue; @@ -225,7 +225,7 @@ public final class TaskManager final TaskTypes type = TaskTypes.valueOf(rset.getString("type")); if (type != TYPE_NONE) { - ExecutedTask current = new ExecutedTask(task, type, rset); + final ExecutedTask current = new ExecutedTask(task, type, rset); if (launchTask(current)) { _currentTasks.add(current); @@ -261,8 +261,8 @@ public final class TaskManager case TYPE_TIME: try { - Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - long diff = desired.getTime() - System.currentTimeMillis(); + final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = scheduler.scheduleGeneral(task, diff); @@ -275,7 +275,7 @@ public final class TaskManager } break; case TYPE_SPECIAL: - ScheduledFuture result = task.getTask().launchSpecial(task); + final ScheduledFuture result = task.getTask().launchSpecial(task); if (result != null) { task.scheduled = result; @@ -284,7 +284,7 @@ public final class TaskManager break; case TYPE_GLOBAL_TASK: interval = Long.valueOf(task.getParams()[0]) * 86400000L; - String[] hour = task.getParams()[1].split(":"); + final String[] hour = task.getParams()[1].split(":"); if (hour.length != 3) { @@ -292,10 +292,10 @@ public final class TaskManager return false; } - Calendar check = Calendar.getInstance(); + final Calendar check = Calendar.getInstance(); check.setTimeInMillis(task.getLastActivation() + interval); - Calendar min = Calendar.getInstance(); + final Calendar min = Calendar.getInstance(); try { min.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); diff --git a/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskClanLeaderApply.java b/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskClanLeaderApply.java index 4ffd1a9b32..6e86bee83b 100644 --- a/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskClanLeaderApply.java +++ b/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskClanLeaderApply.java @@ -45,7 +45,7 @@ public class TaskClanLeaderApply extends Task @Override public void onTimeElapsed(ExecutedTask task) { - Calendar cal = Calendar.getInstance(); + final Calendar cal = Calendar.getInstance(); if (cal.get(Calendar.DAY_OF_WEEK) == Config.ALT_CLAN_LEADER_DATE_CHANGE) { for (L2Clan clan : ClanTable.getInstance().getClans()) diff --git a/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRestart.java b/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRestart.java index 78f26ae085..02887c9bc0 100644 --- a/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRestart.java +++ b/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRestart.java @@ -38,7 +38,7 @@ public final class TaskRestart extends Task @Override public void onTimeElapsed(ExecutedTask task) { - Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), true); + final Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), true); handler.start(); } } diff --git a/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskShutdown.java b/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskShutdown.java index 619c564e9d..3ec87887f1 100644 --- a/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskShutdown.java +++ b/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskShutdown.java @@ -38,7 +38,7 @@ public class TaskShutdown extends Task @Override public void onTimeElapsed(ExecutedTask task) { - Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), false); + final Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), false); handler.start(); } } diff --git a/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskVitalityReset.java b/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskVitalityReset.java index 6784c0ed70..53455d1414 100644 --- a/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskVitalityReset.java +++ b/trunk/java/com/l2jserver/gameserver/taskmanager/tasks/TaskVitalityReset.java @@ -49,7 +49,7 @@ public class TaskVitalityReset extends Task @Override public void onTimeElapsed(ExecutedTask task) { - Calendar cal = Calendar.getInstance(); + final Calendar cal = Calendar.getInstance(); if (cal.get(Calendar.DAY_OF_WEEK) == Config.ALT_VITALITY_DATE_RESET) { for (L2PcInstance player : L2World.getInstance().getPlayers()) diff --git a/trunk/java/com/l2jserver/gameserver/util/Broadcast.java b/trunk/java/com/l2jserver/gameserver/util/Broadcast.java index 233926d183..ced4950bfc 100644 --- a/trunk/java/com/l2jserver/gameserver/util/Broadcast.java +++ b/trunk/java/com/l2jserver/gameserver/util/Broadcast.java @@ -52,7 +52,7 @@ public final class Broadcast */ public static void toPlayersTargettingMyself(L2Character character, L2GameServerPacket mov) { - Collection plrs = character.getKnownList().getKnownPlayers().values(); + final Collection plrs = character.getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if (player.getTarget() != character) @@ -88,8 +88,8 @@ public final class Broadcast player.sendPacket(mov); if ((mov instanceof CharInfo) && (character.isPlayer())) { - int relation = ((L2PcInstance) character).getRelation(player); - Integer oldrelation = character.getKnownList().getKnownRelations().get(player.getObjectId()); + final int relation = ((L2PcInstance) character).getRelation(player); + final Integer oldrelation = character.getKnownList().getKnownRelations().get(player.getObjectId()); if ((oldrelation != null) && (oldrelation != relation)) { final RelationChanged rc = new RelationChanged(); @@ -136,7 +136,7 @@ public final class Broadcast radius = 1500; } - Collection plrs = character.getKnownList().getKnownPlayers().values(); + final Collection plrs = character.getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if (character.isInsideRadius(player, radius, false, false)) @@ -177,7 +177,7 @@ public final class Broadcast character.sendPacket(mov); } - Collection plrs = character.getKnownList().getKnownPlayers().values(); + final Collection plrs = character.getKnownList().getKnownPlayers().values(); for (L2PcInstance player : plrs) { if ((player != null) && Util.checkIfInRange(radius, character, player, false)) diff --git a/trunk/java/com/l2jserver/gameserver/util/Evolve.java b/trunk/java/com/l2jserver/gameserver/util/Evolve.java index 7881ed3b14..d2557b2b6a 100644 --- a/trunk/java/com/l2jserver/gameserver/util/Evolve.java +++ b/trunk/java/com/l2jserver/gameserver/util/Evolve.java @@ -73,40 +73,40 @@ public final class Evolve L2ItemInstance item = null; long petexp = currentPet.getStat().getExp(); - String oldname = currentPet.getName(); - int oldX = currentPet.getX(); - int oldY = currentPet.getY(); - int oldZ = currentPet.getZ(); + final String oldname = currentPet.getName(); + final int oldX = currentPet.getX(); + final int oldY = currentPet.getY(); + final int oldZ = currentPet.getZ(); - L2PetData oldData = PetDataTable.getInstance().getPetDataByItemId(itemIdtake); + final L2PetData oldData = PetDataTable.getInstance().getPetDataByItemId(itemIdtake); if (oldData == null) { return false; } - int oldnpcID = oldData.getNpcId(); + final int oldnpcID = oldData.getNpcId(); if ((currentPet.getStat().getLevel() < petminlvl) || (currentPet.getId() != oldnpcID)) { return false; } - L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(itemIdgive); + final L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(itemIdgive); if (petData == null) { return false; } - int npcID = petData.getNpcId(); + final int npcID = petData.getNpcId(); if (npcID == 0) { return false; } - L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcID); + final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcID); currentPet.unSummon(player); @@ -116,7 +116,7 @@ public final class Evolve item = player.getInventory().addItem("Evolve", itemIdgive, 1, player, npc); // Summoning new pet - L2PetInstance petSummon = L2PetInstance.spawnPet(npcTemplate, player, item); + final L2PetInstance petSummon = L2PetInstance.spawnPet(npcTemplate, player, item); if (petSummon == null) { @@ -124,7 +124,7 @@ public final class Evolve } // Fix for non-linear baby pet exp - long _minimumexp = petSummon.getStat().getExpForLevel(petminlvl); + final long _minimumexp = petSummon.getStat().getExpForLevel(petminlvl); if (petexp < _minimumexp) { petexp = _minimumexp; @@ -169,7 +169,7 @@ public final class Evolve return false; } - L2ItemInstance item = player.getInventory().getItemByItemId(itemIdtake); + final L2ItemInstance item = player.getInventory().getItemByItemId(itemIdtake); if (item == null) { return false; @@ -181,43 +181,43 @@ public final class Evolve oldpetlvl = petminlvl; } - L2PetData oldData = PetDataTable.getInstance().getPetDataByItemId(itemIdtake); + final L2PetData oldData = PetDataTable.getInstance().getPetDataByItemId(itemIdtake); if (oldData == null) { return false; } - L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(itemIdgive); + final L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(itemIdgive); if (petData == null) { return false; } - int npcId = petData.getNpcId(); + final int npcId = petData.getNpcId(); if (npcId == 0) { return false; } - L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcId); + final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcId); // deleting old pet item - L2ItemInstance removedItem = player.getInventory().destroyItem("PetRestore", item, player, npc); - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); + final L2ItemInstance removedItem = player.getInventory().destroyItem("PetRestore", item, player, npc); + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(removedItem); player.sendPacket(sm); // Give new pet item - L2ItemInstance addedItem = player.getInventory().addItem("PetRestore", itemIdgive, 1, player, npc); + final L2ItemInstance addedItem = player.getInventory().addItem("PetRestore", itemIdgive, 1, player, npc); // Summoning new pet - L2PetInstance petSummon = L2PetInstance.spawnPet(npcTemplate, player, addedItem); + final L2PetInstance petSummon = L2PetInstance.spawnPet(npcTemplate, player, addedItem); if (petSummon == null) { return false; } - long _maxexp = petSummon.getStat().getExpForLevel(oldpetlvl); + final long _maxexp = petSummon.getStat().getExpForLevel(oldpetlvl); petSummon.getStat().addExp(_maxexp); petSummon.setCurrentHp(petSummon.getMaxHp()); @@ -237,7 +237,7 @@ public final class Evolve addedItem.setEnchantLevel(petSummon.getLevel()); // Inventory update - InventoryUpdate iu = new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); iu.addRemovedItem(removedItem); player.sendPacket(iu); @@ -246,7 +246,7 @@ public final class Evolve player.broadcastUserInfo(); - L2World world = L2World.getInstance(); + final L2World world = L2World.getInstance(); world.removeObject(removedItem); ThreadPoolManager.getInstance().scheduleGeneral(new EvolveFinalizer(player, petSummon), 900); diff --git a/trunk/java/com/l2jserver/gameserver/util/FloodProtectorAction.java b/trunk/java/com/l2jserver/gameserver/util/FloodProtectorAction.java index a0171dcd4d..a9948bdc15 100644 --- a/trunk/java/com/l2jserver/gameserver/util/FloodProtectorAction.java +++ b/trunk/java/com/l2jserver/gameserver/util/FloodProtectorAction.java @@ -177,7 +177,7 @@ public final class FloodProtectorAction { if (_client.getActiveChar() != null) { - int charId = _client.getActiveChar().getObjectId(); + final int charId = _client.getActiveChar().getObjectId(); if (charId > 0) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); diff --git a/trunk/java/com/l2jserver/gameserver/util/GeoUtils.java b/trunk/java/com/l2jserver/gameserver/util/GeoUtils.java index c91d5c8f8f..a1a64fd060 100644 --- a/trunk/java/com/l2jserver/gameserver/util/GeoUtils.java +++ b/trunk/java/com/l2jserver/gameserver/util/GeoUtils.java @@ -32,21 +32,21 @@ public final class GeoUtils { public static void debug2DLine(L2PcInstance player, int x, int y, int tx, int ty, int z) { - int gx = GeoData.getInstance().getGeoX(x); - int gy = GeoData.getInstance().getGeoY(y); + final int gx = GeoData.getInstance().getGeoX(x); + final int gy = GeoData.getInstance().getGeoY(y); - int tgx = GeoData.getInstance().getGeoX(tx); - int tgy = GeoData.getInstance().getGeoY(ty); + final int tgx = GeoData.getInstance().getGeoX(tx); + final int tgy = GeoData.getInstance().getGeoY(ty); - ExServerPrimitive prim = new ExServerPrimitive("Debug2DLine", x, y, z); + final ExServerPrimitive prim = new ExServerPrimitive("Debug2DLine", x, y, z); prim.addLine(Color.BLUE, GeoData.getInstance().getWorldX(gx), GeoData.getInstance().getWorldY(gy), z, GeoData.getInstance().getWorldX(tgx), GeoData.getInstance().getWorldY(tgy), z); - LinePointIterator iter = new LinePointIterator(gx, gy, tgx, tgy); + final LinePointIterator iter = new LinePointIterator(gx, gy, tgx, tgy); while (iter.next()) { - int wx = GeoData.getInstance().getWorldX(iter.x()); - int wy = GeoData.getInstance().getWorldY(iter.y()); + final int wx = GeoData.getInstance().getWorldX(iter.x()); + final int wy = GeoData.getInstance().getWorldY(iter.y()); prim.addPoint(Color.RED, wx, wy, z); } @@ -55,16 +55,16 @@ public final class GeoUtils public static void debug3DLine(L2PcInstance player, int x, int y, int z, int tx, int ty, int tz) { - int gx = GeoData.getInstance().getGeoX(x); - int gy = GeoData.getInstance().getGeoY(y); + final int gx = GeoData.getInstance().getGeoX(x); + final int gy = GeoData.getInstance().getGeoY(y); - int tgx = GeoData.getInstance().getGeoX(tx); - int tgy = GeoData.getInstance().getGeoY(ty); + final int tgx = GeoData.getInstance().getGeoX(tx); + final int tgy = GeoData.getInstance().getGeoY(ty); - ExServerPrimitive prim = new ExServerPrimitive("Debug3DLine", x, y, z); + final ExServerPrimitive prim = new ExServerPrimitive("Debug3DLine", x, y, z); prim.addLine(Color.BLUE, GeoData.getInstance().getWorldX(gx), GeoData.getInstance().getWorldY(gy), z, GeoData.getInstance().getWorldX(tgx), GeoData.getInstance().getWorldY(tgy), tz); - LinePointIterator3D iter = new LinePointIterator3D(gx, gy, z, tgx, tgy, tz); + final LinePointIterator3D iter = new LinePointIterator3D(gx, gy, z, tgx, tgy, tz); iter.next(); int prevX = iter.x(); int prevY = iter.y(); @@ -75,8 +75,8 @@ public final class GeoUtils while (iter.next()) { - int curX = iter.x(); - int curY = iter.y(); + final int curX = iter.x(); + final int curY = iter.y(); if ((curX != prevX) || (curY != prevY)) { @@ -104,20 +104,15 @@ public final class GeoUtils public static void debugGrid(L2PcInstance player) { - int geoRadius = 10; - int blocksPerPacket = 49; - if (geoRadius < 0) - { - throw new IllegalArgumentException("geoRadius < 0"); - } - + final int geoRadius = 10; + final int blocksPerPacket = 49; int iBlock = blocksPerPacket; int iPacket = 0; ExServerPrimitive exsp = null; - GeoData gd = GeoData.getInstance(); - int playerGx = gd.getGeoX(player.getX()); - int playerGy = gd.getGeoY(player.getY()); + final GeoData gd = GeoData.getInstance(); + final int playerGx = gd.getGeoX(player.getX()); + final int playerGy = gd.getGeoY(player.getY()); for (int dx = -geoRadius; dx <= geoRadius; ++dx) { for (int dy = -geoRadius; dy <= geoRadius; ++dy) @@ -138,12 +133,12 @@ public final class GeoUtils throw new IllegalStateException(); } - int gx = playerGx + dx; - int gy = playerGy + dy; + final int gx = playerGx + dx; + final int gy = playerGy + dy; - int x = gd.getWorldX(gx); - int y = gd.getWorldY(gy); - int z = gd.getNearestZ(gx, gy, player.getZ()); + final int x = gd.getWorldX(gx); + final int y = gd.getWorldY(gy); + final int z = gd.getNearestZ(gx, gy, player.getZ()); // north arrow Color col = getDirectionColor(gx, gy, z, Cell.NSWE_NORTH); diff --git a/trunk/java/com/l2jserver/gameserver/util/MinionList.java b/trunk/java/com/l2jserver/gameserver/util/MinionList.java index 07a1d891fb..9896ae29fb 100644 --- a/trunk/java/com/l2jserver/gameserver/util/MinionList.java +++ b/trunk/java/com/l2jserver/gameserver/util/MinionList.java @@ -334,7 +334,7 @@ public class MinionList public static final L2MonsterInstance spawnMinion(L2MonsterInstance master, int minionId) { // Get the template of the Minion to spawn - L2NpcTemplate minionTemplate = NpcData.getInstance().getTemplate(minionId); + final L2NpcTemplate minionTemplate = NpcData.getInstance().getTemplate(minionId); if (minionTemplate == null) { return null; diff --git a/trunk/java/com/l2jserver/gameserver/util/Util.java b/trunk/java/com/l2jserver/gameserver/util/Util.java index 617db13e9b..3af0da13d3 100644 --- a/trunk/java/com/l2jserver/gameserver/util/Util.java +++ b/trunk/java/com/l2jserver/gameserver/util/Util.java @@ -94,7 +94,7 @@ public final class Util public static final double convertHeadingToDegree(int clientHeading) { - double degree = clientHeading / 182.044444444; + final double degree = clientHeading / 182.044444444; return degree; } @@ -197,8 +197,8 @@ public final class Util return str; } - char[] charArray = str.toCharArray(); - StringBuilder result = new StringBuilder(); + final char[] charArray = str.toCharArray(); + final StringBuilder result = new StringBuilder(); // Capitalize the first letter in the given string! charArray[0] = Character.toUpperCase(charArray[0]); @@ -248,13 +248,13 @@ public final class Util rad += ((L2Character) obj2).getTemplate().getCollisionRadius(); } - double dx = obj1.getX() - obj2.getX(); - double dy = obj1.getY() - obj2.getY(); + final double dx = obj1.getX() - obj2.getX(); + final double dy = obj1.getY() - obj2.getY(); double d = (dx * dx) + (dy * dy); if (includeZAxis) { - double dz = obj1.getZ() - obj2.getZ(); + final double dz = obj1.getZ() - obj2.getZ(); d += (dz * dz); } return d <= ((range * range) + (2 * range * rad) + (rad * rad)); @@ -279,12 +279,12 @@ public final class Util return true; // not limited } - int dx = obj1.getX() - obj2.getX(); - int dy = obj1.getY() - obj2.getY(); + final int dx = obj1.getX() - obj2.getX(); + final int dy = obj1.getY() - obj2.getY(); if (includeZAxis) { - int dz = obj1.getZ() - obj2.getZ(); + final int dz = obj1.getZ() - obj2.getZ(); return ((dx * dx) + (dy * dy) + (dz * dz)) <= (radius * radius); } return ((dx * dx) + (dy * dy)) <= (radius * radius); @@ -346,7 +346,7 @@ public final class Util return Math.round(number); } - float exponent = (float) Math.pow(10, numPlaces); + final float exponent = (float) Math.pow(10, numPlaces); return Math.round(number * exponent) / exponent; } @@ -468,7 +468,7 @@ public final class Util public static File[] getDatapackFiles(String dirname, String extention) { - File dir = new File(Config.DATAPACK_ROOT, "/" + dirname); + final File dir = new File(Config.DATAPACK_ROOT, "/" + dirname); if (!dir.exists()) { return null; @@ -478,13 +478,13 @@ public final class Util public static String getDateString(Date date) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); return dateFormat.format(date.getTime()); } private static final void buildHtmlBypassCache(L2PcInstance player, HtmlActionScope scope, String html) { - String htmlLower = html.toLowerCase(Locale.ENGLISH); + final String htmlLower = html.toLowerCase(Locale.ENGLISH); int bypassEnd = 0; int bypassStart = htmlLower.indexOf("=\"bypass ", bypassEnd); int bypassStartEnd; @@ -497,7 +497,7 @@ public final class Util break; } - int hParamPos = htmlLower.indexOf("-h ", bypassStartEnd); + final int hParamPos = htmlLower.indexOf("-h ", bypassStartEnd); String bypass; if ((hParamPos != -1) && (hParamPos < bypassEnd)) { @@ -508,7 +508,7 @@ public final class Util bypass = html.substring(bypassStartEnd, bypassEnd).trim(); } - int firstParameterStart = bypass.indexOf(AbstractHtmlPacket.VAR_PARAM_START_CHAR); + final int firstParameterStart = bypass.indexOf(AbstractHtmlPacket.VAR_PARAM_START_CHAR); if (firstParameterStart != -1) { bypass = bypass.substring(0, firstParameterStart + 1); @@ -525,7 +525,7 @@ public final class Util private static final void buildHtmlLinkCache(L2PcInstance player, HtmlActionScope scope, String html) { - String htmlLower = html.toLowerCase(Locale.ENGLISH); + final String htmlLower = html.toLowerCase(Locale.ENGLISH); int linkEnd = 0; int linkStart = htmlLower.indexOf("=\"link ", linkEnd); int linkStartEnd; @@ -538,7 +538,7 @@ public final class Util break; } - String htmlLink = html.substring(linkStartEnd, linkEnd).trim(); + final String htmlLink = html.substring(linkStartEnd, linkEnd).trim(); if (htmlLink.isEmpty()) { LOGGER.warning("Html link path is empty!"); @@ -745,7 +745,7 @@ public final class Util public static boolean isInsideRangeOfObjectId(L2Object obj, int targetObjId, int radius) { - L2Object target = obj.getKnownList().getKnownObjects().get(targetObjId); + final L2Object target = obj.getKnownList().getKnownObjects().get(targetObjId); if (target == null) { return false; @@ -1009,7 +1009,7 @@ public final class Util { try { - String value = st.nextToken().trim(); + final String value = st.nextToken().trim(); return Integer.parseInt(value); } catch (Exception e) diff --git a/trunk/java/com/l2jserver/log/filter/ItemFilter.java b/trunk/java/com/l2jserver/log/filter/ItemFilter.java index 60d27ff62d..ae25f15e1c 100644 --- a/trunk/java/com/l2jserver/log/filter/ItemFilter.java +++ b/trunk/java/com/l2jserver/log/filter/ItemFilter.java @@ -53,13 +53,13 @@ public class ItemFilter implements Filter return false; } - String[] messageList = record.getMessage().split(":"); + final String[] messageList = record.getMessage().split(":"); if ((messageList.length < 2) || !EXCLUDE_PROCESS.contains(messageList[1])) { return true; } - L2ItemInstance item = ((L2ItemInstance) record.getParameters()[0]); + final L2ItemInstance item = ((L2ItemInstance) record.getParameters()[0]); if (!EXCLUDED_ITEM_TYPES.contains(item.getItemType())) { return true; diff --git a/trunk/java/com/l2jserver/log/formatter/AccountingFormatter.java b/trunk/java/com/l2jserver/log/formatter/AccountingFormatter.java index afc62ed614..8bc7dbc595 100644 --- a/trunk/java/com/l2jserver/log/formatter/AccountingFormatter.java +++ b/trunk/java/com/l2jserver/log/formatter/AccountingFormatter.java @@ -90,7 +90,7 @@ public class AccountingFormatter extends Formatter } else if (p instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) p; + final L2PcInstance player = (L2PcInstance) p; StringUtil.append(output, player.getName()); StringUtil.append(output, "(", String.valueOf(player.getObjectId()), ")"); } diff --git a/trunk/java/com/l2jserver/log/formatter/ChatLogFormatter.java b/trunk/java/com/l2jserver/log/formatter/ChatLogFormatter.java index 550e67b857..7b411fd913 100644 --- a/trunk/java/com/l2jserver/log/formatter/ChatLogFormatter.java +++ b/trunk/java/com/l2jserver/log/formatter/ChatLogFormatter.java @@ -33,7 +33,7 @@ public class ChatLogFormatter extends Formatter @Override public String format(LogRecord record) { - Object[] params = record.getParameters(); + final Object[] params = record.getParameters(); final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params != null ? 10 * params.length : 0), "[", dateFmt.format(new Date(record.getMillis())), "] "); if (params != null) diff --git a/trunk/java/com/l2jserver/log/formatter/DamageFormatter.java b/trunk/java/com/l2jserver/log/formatter/DamageFormatter.java index aa3c68de6e..603e119b63 100644 --- a/trunk/java/com/l2jserver/log/formatter/DamageFormatter.java +++ b/trunk/java/com/l2jserver/log/formatter/DamageFormatter.java @@ -62,7 +62,7 @@ public class DamageFormatter extends Formatter if (p instanceof L2Summon) { - L2PcInstance owner = ((L2Summon) p).getOwner(); + final L2PcInstance owner = ((L2Summon) p).getOwner(); if (owner != null) { StringUtil.append(output, " Owner:", owner.getName(), "(", String.valueOf(owner.getObjectId()), ")"); diff --git a/trunk/java/com/l2jserver/log/formatter/EnchantFormatter.java b/trunk/java/com/l2jserver/log/formatter/EnchantFormatter.java index 6ca8afef0d..dc64146df2 100644 --- a/trunk/java/com/l2jserver/log/formatter/EnchantFormatter.java +++ b/trunk/java/com/l2jserver/log/formatter/EnchantFormatter.java @@ -52,7 +52,7 @@ public class EnchantFormatter extends Formatter if (p instanceof L2PcInstance) { - L2PcInstance player = (L2PcInstance) p; + final L2PcInstance player = (L2PcInstance) p; StringUtil.append(output, "Character:", player.getName(), " [" + String.valueOf(player.getObjectId()) + "] Account:", player.getAccountName()); if ((player.getClient() != null) && !player.getClient().isDetached()) { @@ -61,7 +61,7 @@ public class EnchantFormatter extends Formatter } else if (p instanceof L2ItemInstance) { - L2ItemInstance item = (L2ItemInstance) p; + final L2ItemInstance item = (L2ItemInstance) p; if (item.getEnchantLevel() > 0) { StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " "); @@ -71,7 +71,7 @@ public class EnchantFormatter extends Formatter } else if (p instanceof Skill) { - Skill skill = (Skill) p; + final Skill skill = (Skill) p; if (skill.getLevel() > 100) { StringUtil.append(output, "+", String.valueOf(skill.getLevel() % 100), " "); diff --git a/trunk/java/com/l2jserver/log/formatter/ItemLogFormatter.java b/trunk/java/com/l2jserver/log/formatter/ItemLogFormatter.java index b047287917..73db5e1ce7 100644 --- a/trunk/java/com/l2jserver/log/formatter/ItemLogFormatter.java +++ b/trunk/java/com/l2jserver/log/formatter/ItemLogFormatter.java @@ -49,7 +49,7 @@ public class ItemLogFormatter extends Formatter output.append(", "); if (p instanceof L2ItemInstance) { - L2ItemInstance item = (L2ItemInstance) p; + final L2ItemInstance item = (L2ItemInstance) p; StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":"); if (item.getEnchantLevel() > 0) { diff --git a/trunk/java/com/l2jserver/loginserver/FloodProtectedListener.java b/trunk/java/com/l2jserver/loginserver/FloodProtectedListener.java index 2ac770ae9f..d02ffb2d62 100644 --- a/trunk/java/com/l2jserver/loginserver/FloodProtectedListener.java +++ b/trunk/java/com/l2jserver/loginserver/FloodProtectedListener.java @@ -136,7 +136,7 @@ public abstract class FloodProtectedListener extends Thread { return; } - ForeignConnection fConnection = _floodProtection.get(ip); + final ForeignConnection fConnection = _floodProtection.get(ip); if (fConnection != null) { fConnection.connectionNumber -= 1; diff --git a/trunk/java/com/l2jserver/loginserver/GameServerTable.java b/trunk/java/com/l2jserver/loginserver/GameServerTable.java index d3fc59226e..b497452179 100644 --- a/trunk/java/com/l2jserver/loginserver/GameServerTable.java +++ b/trunk/java/com/l2jserver/loginserver/GameServerTable.java @@ -614,7 +614,7 @@ public final class GameServerTable implements IXmlReader */ public String[] getServerAddresses() { - String[] result = new String[_addrs.size()]; + final String[] result = new String[_addrs.size()]; for (int i = 0; i < result.length; i++) { result[i] = _addrs.get(i).toString(); diff --git a/trunk/java/com/l2jserver/loginserver/GameServerThread.java b/trunk/java/com/l2jserver/loginserver/GameServerThread.java index 61af719f1e..a814738146 100644 --- a/trunk/java/com/l2jserver/loginserver/GameServerThread.java +++ b/trunk/java/com/l2jserver/loginserver/GameServerThread.java @@ -79,7 +79,7 @@ public class GameServerThread extends Thread return; } - InitLS startPacket = new InitLS(_publicKey.getModulus().toByteArray()); + final InitLS startPacket = new InitLS(_publicKey.getModulus().toByteArray()); try { sendPacket(startPacket); @@ -100,7 +100,7 @@ public class GameServerThread extends Thread break; } - byte[] data = new byte[length - 2]; + final byte[] data = new byte[length - 2]; int receivedBytes = 0; int newBytes = 0; @@ -137,8 +137,8 @@ public class GameServerThread extends Thread } catch (IOException e) { - String serverName = (getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"); - String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); + final String serverName = (getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"); + final String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); _log.info(msg); broadcastToTelnet(msg); } @@ -221,7 +221,7 @@ public class GameServerThread extends Thread { _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); } - KeyPair pair = GameServerTable.getInstance().getKeyPair(); + final KeyPair pair = GameServerTable.getInstance().getKeyPair(); _privateKey = (RSAPrivateKey) pair.getPrivate(); _publicKey = (RSAPublicKey) pair.getPublic(); _blowfish = new NewCrypt("_;v.]05-31!|+-%xT!^[$\00"); @@ -236,7 +236,7 @@ public class GameServerThread extends Thread { try { - byte[] data = sl.getContent(); + final byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); if (Config.DEBUG) { @@ -244,7 +244,7 @@ public class GameServerThread extends Thread } _blowfish.crypt(data, 0, data.length); - int len = data.length + 2; + final int len = data.length + 2; synchronized (_out) { _out.write(len & 0xff); diff --git a/trunk/java/com/l2jserver/loginserver/L2LoginServer.java b/trunk/java/com/l2jserver/loginserver/L2LoginServer.java index f8b0c8023d..8516b86d23 100644 --- a/trunk/java/com/l2jserver/loginserver/L2LoginServer.java +++ b/trunk/java/com/l2jserver/loginserver/L2LoginServer.java @@ -74,7 +74,7 @@ public final class L2LoginServer /*** Main ***/ // Create log folder - File logFolder = new File(".", LOG_FOLDER); + final File logFolder = new File(".", LOG_FOLDER); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -208,7 +208,7 @@ public final class L2LoginServer String[] parts = line.split("#", 2); // address[ duration][ # comments] line = parts[0]; parts = line.split("\\s+"); // durations might be aligned via multiple spaces - String address = parts[0]; + final String address = parts[0]; long duration = 0; if (parts.length > 1) diff --git a/trunk/java/com/l2jserver/loginserver/LoginController.java b/trunk/java/com/l2jserver/loginserver/LoginController.java index 42337e2d44..290e04634a 100644 --- a/trunk/java/com/l2jserver/loginserver/LoginController.java +++ b/trunk/java/com/l2jserver/loginserver/LoginController.java @@ -89,7 +89,7 @@ public class LoginController KeyPairGenerator keygen = null; keygen = KeyPairGenerator.getInstance("RSA"); - RSAKeyGenParameterSpec spec = new RSAKeyGenParameterSpec(1024, RSAKeyGenParameterSpec.F4); + final RSAKeyGenParameterSpec spec = new RSAKeyGenParameterSpec(1024, RSAKeyGenParameterSpec.F4); keygen.initialize(spec); // generate the initial set of keys @@ -104,7 +104,7 @@ public class LoginController // Store keys for blowfish communication generateBlowFishKeys(); - Thread purge = new PurgeThread(); + final Thread purge = new PurgeThread(); purge.setDaemon(true); purge.start(); } @@ -118,7 +118,7 @@ public class LoginController private void testCipher(RSAPrivateKey key) throws GeneralSecurityException { // avoid worst-case execution, KenM - Cipher rsaCipher = Cipher.getInstance("RSA/ECB/nopadding"); + final Cipher rsaCipher = Cipher.getInstance("RSA/ECB/nopadding"); rsaCipher.init(Cipher.DECRYPT_MODE, key); } @@ -214,9 +214,9 @@ public class LoginController { try { - MessageDigest md = MessageDigest.getInstance("SHA"); - byte[] raw = password.getBytes(StandardCharsets.UTF_8); - String hashBase64 = Base64.getEncoder().encodeToString(md.digest(raw)); + final MessageDigest md = MessageDigest.getInstance("SHA"); + final byte[] raw = password.getBytes(StandardCharsets.UTF_8); + final String hashBase64 = Base64.getEncoder().encodeToString(md.digest(raw)); try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) @@ -232,7 +232,7 @@ public class LoginController _log.fine("Account '" + login + "' exists."); } - AccountInfo info = new AccountInfo(rset.getString("login"), rset.getString("password"), rset.getInt("accessLevel"), rset.getInt("lastServer")); + final AccountInfo info = new AccountInfo(rset.getString("login"), rset.getString("password"), rset.getInt("accessLevel"), rset.getInt("lastServer")); if (!info.checkPassHash(hashBase64)) { // wrong password @@ -329,7 +329,7 @@ public class LoginController public boolean isBannedAddress(InetAddress address) throws UnknownHostException { - String[] parts = address.getHostAddress().split("\\."); + final String[] parts = address.getHostAddress().split("\\."); Long bi = _bannedIps.get(address); if (bi == null) { @@ -390,7 +390,7 @@ public class LoginController public SessionKey getKeyForAccount(String account) { - L2LoginClient client = _loginServerClients.get(account); + final L2LoginClient client = _loginServerClients.get(account); if (client != null) { return client.getSessionKey(); @@ -400,10 +400,10 @@ public class LoginController public boolean isAccountInAnyGameServer(String account) { - Collection serverList = GameServerTable.getInstance().getRegisteredGameServers().values(); + final Collection serverList = GameServerTable.getInstance().getRegisteredGameServers().values(); for (GameServerInfo gsi : serverList) { - GameServerThread gst = gsi.getGameServerThread(); + final GameServerThread gst = gsi.getGameServerThread(); if ((gst != null) && gst.hasAccountOnGameServer(account)) { return true; @@ -414,10 +414,10 @@ public class LoginController public GameServerInfo getAccountOnGameServer(String account) { - Collection serverList = GameServerTable.getInstance().getRegisteredGameServers().values(); + final Collection serverList = GameServerTable.getInstance().getRegisteredGameServers().values(); for (GameServerInfo gsi : serverList) { - GameServerThread gst = gsi.getGameServerThread(); + final GameServerThread gst = gsi.getGameServerThread(); if ((gst != null) && gst.hasAccountOnGameServer(account)) { return gsi; @@ -428,7 +428,7 @@ public class LoginController public void getCharactersOnAccount(String account) { - Collection serverList = GameServerTable.getInstance().getRegisteredGameServers().values(); + final Collection serverList = GameServerTable.getInstance().getRegisteredGameServers().values(); for (GameServerInfo gsi : serverList) { if (gsi.isAuthed()) @@ -445,11 +445,11 @@ public class LoginController */ public boolean isLoginPossible(L2LoginClient client, int serverId) { - GameServerInfo gsi = GameServerTable.getInstance().getRegisteredGameServerById(serverId); - int access = client.getAccessLevel(); + final GameServerInfo gsi = GameServerTable.getInstance().getRegisteredGameServerById(serverId); + final int access = client.getAccessLevel(); if ((gsi != null) && gsi.isAuthed()) { - boolean loginOk = ((gsi.getCurrentPlayerCount() < gsi.getMaxPlayers()) && (gsi.getStatus() != ServerStatus.STATUS_GM_ONLY)) || (access > 0); + final boolean loginOk = ((gsi.getCurrentPlayerCount() < gsi.getMaxPlayers()) && (gsi.getStatus() != ServerStatus.STATUS_GM_ONLY)) || (access > 0); if (loginOk && (client.getLastServer() != serverId)) { @@ -506,7 +506,7 @@ public class LoginController public void setCharactersOnServer(String account, int charsNum, long[] timeToDel, int serverId) { - L2LoginClient client = _loginServerClients.get(account); + final L2LoginClient client = _loginServerClients.get(account); if (client == null) { @@ -545,8 +545,8 @@ public class LoginController { try { - List ipWhiteList = new ArrayList<>(); - List ipBlackList = new ArrayList<>(); + final List ipWhiteList = new ArrayList<>(); + final List ipBlackList = new ArrayList<>(); try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_IPAUTH_SELECT)) { @@ -613,7 +613,7 @@ public class LoginController public boolean isValidIPAddress(String ipAddress) { - String[] parts = ipAddress.split("\\."); + final String[] parts = ipAddress.split("\\."); if (parts.length != 4) { return false; @@ -621,7 +621,7 @@ public class LoginController for (String s : parts) { - int i = Integer.parseInt(s); + final int i = Integer.parseInt(s); if ((i < 0) || (i > 255)) { return false; diff --git a/trunk/java/com/l2jserver/loginserver/SelectorHelper.java b/trunk/java/com/l2jserver/loginserver/SelectorHelper.java index 49dd078936..b0c54ccd6c 100644 --- a/trunk/java/com/l2jserver/loginserver/SelectorHelper.java +++ b/trunk/java/com/l2jserver/loginserver/SelectorHelper.java @@ -58,7 +58,7 @@ public class SelectorHelper implements IMMOExecutor, IClientFacto @Override public L2LoginClient create(MMOConnection con) { - L2LoginClient client = new L2LoginClient(con); + final L2LoginClient client = new L2LoginClient(con); client.sendPacket(new Init(client)); return client; } diff --git a/trunk/java/com/l2jserver/loginserver/network/L2JGameServerPacketHandler.java b/trunk/java/com/l2jserver/loginserver/network/L2JGameServerPacketHandler.java index 2d4004a8b7..f00eefe8b2 100644 --- a/trunk/java/com/l2jserver/loginserver/network/L2JGameServerPacketHandler.java +++ b/trunk/java/com/l2jserver/loginserver/network/L2JGameServerPacketHandler.java @@ -52,8 +52,8 @@ public class L2JGameServerPacketHandler public static BaseRecievePacket handlePacket(byte[] data, GameServerThread server) { BaseRecievePacket msg = null; - int opcode = data[0] & 0xff; - GameServerState state = server.getLoginConnectionState(); + final int opcode = data[0] & 0xff; + final GameServerState state = server.getLoginConnectionState(); switch (state) { case CONNECTED: diff --git a/trunk/java/com/l2jserver/loginserver/network/L2LoginClient.java b/trunk/java/com/l2jserver/loginserver/network/L2LoginClient.java index ddd37142b6..689589c105 100644 --- a/trunk/java/com/l2jserver/loginserver/network/L2LoginClient.java +++ b/trunk/java/com/l2jserver/loginserver/network/L2LoginClient.java @@ -279,7 +279,7 @@ public final class L2LoginClient extends MMOClient> @Override public String toString() { - InetAddress address = getConnection().getInetAddress(); + final InetAddress address = getConnection().getInetAddress(); if (getState() == LoginClientState.AUTHED_LOGIN) { return "[" + getAccount() + " (" + (address == null ? "disconnected" : address.getHostAddress()) + ")]"; diff --git a/trunk/java/com/l2jserver/loginserver/network/L2LoginPacketHandler.java b/trunk/java/com/l2jserver/loginserver/network/L2LoginPacketHandler.java index 7e7aca5f44..1647a3cc6d 100644 --- a/trunk/java/com/l2jserver/loginserver/network/L2LoginPacketHandler.java +++ b/trunk/java/com/l2jserver/loginserver/network/L2LoginPacketHandler.java @@ -40,10 +40,10 @@ public final class L2LoginPacketHandler implements IPacketHandler @Override public ReceivablePacket handlePacket(ByteBuffer buf, L2LoginClient client) { - int opcode = buf.get() & 0xFF; + final int opcode = buf.get() & 0xFF; ReceivablePacket packet = null; - LoginClientState state = client.getState(); + final LoginClientState state = client.getState(); switch (state) { diff --git a/trunk/java/com/l2jserver/loginserver/network/clientpackets/RequestAuthLogin.java b/trunk/java/com/l2jserver/loginserver/network/clientpackets/RequestAuthLogin.java index 110a71a4a5..d5e2df44f3 100644 --- a/trunk/java/com/l2jserver/loginserver/network/clientpackets/RequestAuthLogin.java +++ b/trunk/java/com/l2jserver/loginserver/network/clientpackets/RequestAuthLogin.java @@ -142,10 +142,10 @@ public class RequestAuthLogin extends L2LoginClientPacket return; } - InetAddress clientAddr = getClient().getConnection().getInetAddress(); + final InetAddress clientAddr = getClient().getConnection().getInetAddress(); final LoginController lc = LoginController.getInstance(); - AccountInfo info = lc.retriveAccountInfo(clientAddr, _user, _password); + final AccountInfo info = lc.retriveAccountInfo(clientAddr, _user, _password); if (info == null) { // user or pass wrong @@ -153,7 +153,7 @@ public class RequestAuthLogin extends L2LoginClientPacket return; } - AuthLoginResult result = lc.tryCheckinAccount(client, clientAddr, info); + final AuthLoginResult result = lc.tryCheckinAccount(client, clientAddr, info); switch (result) { case AUTH_SUCCESS: @@ -177,7 +177,7 @@ public class RequestAuthLogin extends L2LoginClientPacket client.close(new AccountKicked(AccountKickedReason.REASON_PERMANENTLY_BANNED)); return; case ALREADY_ON_LS: - L2LoginClient oldClient = lc.getAuthedClient(info.getLogin()); + final L2LoginClient oldClient = lc.getAuthedClient(info.getLogin()); if (oldClient != null) { // kick the other client @@ -188,7 +188,7 @@ public class RequestAuthLogin extends L2LoginClientPacket client.close(LoginFailReason.REASON_ACCOUNT_IN_USE); break; case ALREADY_ON_GS: - GameServerInfo gsi = lc.getAccountOnGameServer(info.getLogin()); + final GameServerInfo gsi = lc.getAccountOnGameServer(info.getLogin()); if (gsi != null) { client.close(LoginFailReason.REASON_ACCOUNT_IN_USE); diff --git a/trunk/java/com/l2jserver/loginserver/network/clientpackets/RequestServerLogin.java b/trunk/java/com/l2jserver/loginserver/network/clientpackets/RequestServerLogin.java index dd233e197c..2196dacf22 100644 --- a/trunk/java/com/l2jserver/loginserver/network/clientpackets/RequestServerLogin.java +++ b/trunk/java/com/l2jserver/loginserver/network/clientpackets/RequestServerLogin.java @@ -79,7 +79,7 @@ public class RequestServerLogin extends L2LoginClientPacket @Override public void run() { - SessionKey sk = getClient().getSessionKey(); + final SessionKey sk = getClient().getSessionKey(); // if we didnt showed the license we cant check these values if (!Config.SHOW_LICENCE || sk.checkLoginPair(_skey1, _skey2)) diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/BlowFishKey.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/BlowFishKey.java index d8053f1539..e5a60a6b10 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/BlowFishKey.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/BlowFishKey.java @@ -44,17 +44,17 @@ public class BlowFishKey extends BaseRecievePacket public BlowFishKey(byte[] decrypt, GameServerThread server) { super(decrypt); - int size = readD(); - byte[] tempKey = readB(size); + final int size = readD(); + final byte[] tempKey = readB(size); try { byte[] tempDecryptKey; - Cipher rsaCipher = Cipher.getInstance("RSA/ECB/nopadding"); + final Cipher rsaCipher = Cipher.getInstance("RSA/ECB/nopadding"); rsaCipher.init(Cipher.DECRYPT_MODE, server.getPrivateKey()); tempDecryptKey = rsaCipher.doFinal(tempKey); // there are nulls before the key we must remove them int i = 0; - int len = tempDecryptKey.length; + final int len = tempDecryptKey.length; for (; i < len; i++) { if (tempDecryptKey[i] != 0) @@ -62,7 +62,7 @@ public class BlowFishKey extends BaseRecievePacket break; } } - byte[] key = new byte[len - i]; + final byte[] key = new byte[len - i]; System.arraycopy(tempDecryptKey, i, key, 0, len - i); server.SetBlowFish(new NewCrypt(key)); diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ChangeAccessLevel.java index 59873d712f..cc92d31cb8 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ChangeAccessLevel.java @@ -38,8 +38,8 @@ public class ChangeAccessLevel extends BaseRecievePacket public ChangeAccessLevel(byte[] decrypt, GameServerThread server) { super(decrypt); - int level = readD(); - String account = readS(); + final int level = readD(); + final String account = readS(); LoginController.getInstance().setAccountAccessLevel(account, level); _log.info("Changed " + account + " access level to " + level); diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ChangePassword.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ChangePassword.java index 2a27484466..a92f95d669 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ChangePassword.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ChangePassword.java @@ -45,13 +45,13 @@ public class ChangePassword extends BaseRecievePacket { super(decrypt); - String accountName = readS(); - String characterName = readS(); - String curpass = readS(); - String newpass = readS(); + final String accountName = readS(); + final String characterName = readS(); + final String curpass = readS(); + final String newpass = readS(); // get the GameServerThread - Collection serverList = GameServerTable.getInstance().getRegisteredGameServers().values(); + final Collection serverList = GameServerTable.getInstance().getRegisteredGameServers().values(); for (GameServerInfo gsi : serverList) { if ((gsi.getGameServerThread() != null) && gsi.getGameServerThread().hasAccountOnGameServer(accountName)) @@ -73,11 +73,11 @@ public class ChangePassword extends BaseRecievePacket { try { - MessageDigest md = MessageDigest.getInstance("SHA"); + final MessageDigest md = MessageDigest.getInstance("SHA"); byte[] raw = curpass.getBytes("UTF-8"); raw = md.digest(raw); - String curpassEnc = Base64.getEncoder().encodeToString(raw); + final String curpassEnc = Base64.getEncoder().encodeToString(raw); String pass = null; int passUpdated = 0; diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/GameServerAuth.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/GameServerAuth.java index 8c01e96e51..d842cc053d 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/GameServerAuth.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/GameServerAuth.java @@ -86,7 +86,7 @@ public class GameServerAuth extends BaseRecievePacket if (handleRegProcess()) { - AuthResponse ar = new AuthResponse(server.getGameServerInfo().getId()); + final AuthResponse ar = new AuthResponse(server.getGameServerInfo().getId()); server.sendPacket(ar); if (Config.DEBUG) { @@ -99,10 +99,10 @@ public class GameServerAuth extends BaseRecievePacket private boolean handleRegProcess() { - GameServerTable gameServerTable = GameServerTable.getInstance(); + final GameServerTable gameServerTable = GameServerTable.getInstance(); - int id = _desiredId; - byte[] hexId = _hexId; + final int id = _desiredId; + final byte[] hexId = _hexId; GameServerInfo gsi = gameServerTable.getRegisteredGameServerById(id); // is there a gameserver registered with this id? diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerAuthRequest.java index 6428369ce8..936d006b0a 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerAuthRequest.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerAuthRequest.java @@ -41,19 +41,19 @@ public class PlayerAuthRequest extends BaseRecievePacket public PlayerAuthRequest(byte[] decrypt, GameServerThread server) { super(decrypt); - String account = readS(); - int playKey1 = readD(); - int playKey2 = readD(); - int loginKey1 = readD(); - int loginKey2 = readD(); - SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2); + final String account = readS(); + final int playKey1 = readD(); + final int playKey2 = readD(); + final int loginKey1 = readD(); + final int loginKey2 = readD(); + final SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2); PlayerAuthResponse authResponse; if (Config.DEBUG) { _log.info("auth request received for Player " + account); } - SessionKey key = LoginController.getInstance().getKeyForAccount(account); + final SessionKey key = LoginController.getInstance().getKeyForAccount(account); if ((key != null) && key.equals(sessionKey)) { if (Config.DEBUG) diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerInGame.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerInGame.java index aa79b97c32..e37b74acfb 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerInGame.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerInGame.java @@ -39,10 +39,10 @@ public class PlayerInGame extends BaseRecievePacket public PlayerInGame(byte[] decrypt, GameServerThread server) { super(decrypt); - int size = readH(); + final int size = readH(); for (int i = 0; i < size; i++) { - String account = readS(); + final String account = readS(); server.addAccountOnGameServer(account); if (Config.DEBUG) { diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerLogout.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerLogout.java index b24e34e8a8..f2015d24c2 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerLogout.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerLogout.java @@ -39,7 +39,7 @@ public class PlayerLogout extends BaseRecievePacket public PlayerLogout(byte[] decrypt, GameServerThread server) { super(decrypt); - String account = readS(); + final String account = readS(); server.removeAccountOnGameServer(account); if (Config.DEBUG) diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerTracert.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerTracert.java index b86b5e9d36..cfcdc871ea 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerTracert.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/PlayerTracert.java @@ -37,12 +37,12 @@ public class PlayerTracert extends BaseRecievePacket public PlayerTracert(byte[] decrypt) { super(decrypt); - String account = readS(); - String pcIp = readS(); - String hop1 = readS(); - String hop2 = readS(); - String hop3 = readS(); - String hop4 = readS(); + final String account = readS(); + final String pcIp = readS(); + final String hop1 = readS(); + final String hop2 = readS(); + final String hop3 = readS(); + final String hop4 = readS(); LoginController.getInstance().setAccountLastTracert(account, pcIp, hop1, hop2, hop3, hop4); if (Config.DEBUG) diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ReplyCharacters.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ReplyCharacters.java index 1857100c02..b43b65481e 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ReplyCharacters.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ReplyCharacters.java @@ -35,10 +35,10 @@ public class ReplyCharacters extends BaseRecievePacket public ReplyCharacters(byte[] decrypt, GameServerThread server) { super(decrypt); - String account = readS(); - int chars = readC(); - int charsToDel = readC(); - long[] charsList = new long[charsToDel]; + final String account = readS(); + final int chars = readC(); + final int charsToDel = readC(); + final long[] charsList = new long[charsToDel]; for (int i = 0; i < charsToDel; i++) { charsList[i] = readQ(); diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/RequestTempBan.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/RequestTempBan.java index 5ead0cda4c..8e52d3b01c 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/RequestTempBan.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/RequestTempBan.java @@ -50,7 +50,7 @@ public class RequestTempBan extends BaseRecievePacket _accountName = readS(); _ip = readS(); _banTime = readQ(); - boolean haveReason = readC() == 0 ? false : true; + final boolean haveReason = readC() == 0 ? false : true; if (haveReason) { _banReason = readS(); diff --git a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ServerStatus.java b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ServerStatus.java index d6a4b35f37..af09528e48 100644 --- a/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ServerStatus.java +++ b/trunk/java/com/l2jserver/loginserver/network/gameserverpackets/ServerStatus.java @@ -72,14 +72,14 @@ public class ServerStatus extends BaseRecievePacket { super(decrypt); - GameServerInfo gsi = GameServerTable.getInstance().getRegisteredGameServerById(server.getServerId()); + final GameServerInfo gsi = GameServerTable.getInstance().getRegisteredGameServerById(server.getServerId()); if (gsi != null) { - int size = readD(); + final int size = readD(); for (int i = 0; i < size; i++) { - int type = readD(); - int value = readD(); + final int type = readD(); + final int value = readD(); switch (type) { case SERVER_LIST_STATUS: diff --git a/trunk/java/com/l2jserver/status/GameStatusThread.java b/trunk/java/com/l2jserver/status/GameStatusThread.java index 7c11881a1d..2aad8a1c5b 100644 --- a/trunk/java/com/l2jserver/status/GameStatusThread.java +++ b/trunk/java/com/l2jserver/status/GameStatusThread.java @@ -83,10 +83,10 @@ public final class GameStatusThread extends Thread private boolean isValidIP(Socket client) { boolean result = false; - InetAddress ClientIP = client.getInetAddress(); + final InetAddress ClientIP = client.getInetAddress(); // convert IP to String, and compare with list - String clientStringIP = ClientIP.getHostAddress(); + final String clientStringIP = ClientIP.getHostAddress(); telnetOutput(1, "Connection from: " + clientStringIP); @@ -99,10 +99,10 @@ public final class GameStatusThread extends Thread final File file = new File(Config.TELNET_FILE); try (InputStream telnetIS = new FileInputStream(file)) { - Properties telnetSettings = new Properties(); + final Properties telnetSettings = new Properties(); telnetSettings.load(telnetIS); - String HostList = telnetSettings.getProperty("ListOfHosts", "127.0.0.1,localhost,::1"); + final String HostList = telnetSettings.getProperty("ListOfHosts", "127.0.0.1,localhost,::1"); if (Config.DEVELOPER) { @@ -159,7 +159,7 @@ public final class GameStatusThread extends Thread _print.println("Please Insert Your Password!"); _print.print("Password: "); _print.flush(); - String tmpLine = _read.readLine(); + final String tmpLine = _read.readLine(); if (tmpLine == null) { _print.println("Error."); diff --git a/trunk/java/com/l2jserver/status/LoginStatusThread.java b/trunk/java/com/l2jserver/status/LoginStatusThread.java index 73b9067683..96dbfee7a3 100644 --- a/trunk/java/com/l2jserver/status/LoginStatusThread.java +++ b/trunk/java/com/l2jserver/status/LoginStatusThread.java @@ -75,10 +75,10 @@ public final class LoginStatusThread extends Thread private boolean isValidIP(Socket client) { boolean result = false; - InetAddress ClientIP = client.getInetAddress(); + final InetAddress ClientIP = client.getInetAddress(); // convert IP to String, and compare with list - String clientStringIP = ClientIP.getHostAddress(); + final String clientStringIP = ClientIP.getHostAddress(); telnetOutput(1, "Connection from: " + clientStringIP); @@ -91,10 +91,10 @@ public final class LoginStatusThread extends Thread final File file = new File(Config.TELNET_FILE); try (InputStream telnetIS = new FileInputStream(file)) { - Properties telnetSettings = new Properties(); + final Properties telnetSettings = new Properties(); telnetSettings.load(telnetIS); - String HostList = telnetSettings.getProperty("ListOfHosts", "127.0.0.1,localhost,::1"); + final String HostList = telnetSettings.getProperty("ListOfHosts", "127.0.0.1,localhost,::1"); if (Config.DEVELOPER) { @@ -149,7 +149,7 @@ public final class LoginStatusThread extends Thread _print.println("Please Insert Your Password!"); _print.print("Password: "); _print.flush(); - String tmpLine = _read.readLine(); + final String tmpLine = _read.readLine(); if (tmpLine == null) { _print.println("Error."); diff --git a/trunk/java/com/l2jserver/status/Status.java b/trunk/java/com/l2jserver/status/Status.java index 0fb8858d4a..981aa62381 100644 --- a/trunk/java/com/l2jserver/status/Status.java +++ b/trunk/java/com/l2jserver/status/Status.java @@ -53,14 +53,14 @@ public class Status extends Thread { try { - Socket connection = statusServerSocket.accept(); + final Socket connection = statusServerSocket.accept(); if (_mode == Server.MODE_GAMESERVER) { new GameStatusThread(connection, _uptime, _statusPw); } else if (_mode == Server.MODE_LOGINSERVER) { - LoginStatusThread lst = new LoginStatusThread(connection, _uptime, _statusPw); + final LoginStatusThread lst = new LoginStatusThread(connection, _uptime, _statusPw); if (lst.isAlive()) { _loginStatus.add(lst); @@ -101,12 +101,12 @@ public class Status extends Thread { super("Status"); _mode = mode; - Properties telnetSettings = new Properties(); + final Properties telnetSettings = new Properties(); try (InputStream is = new FileInputStream(new File(Config.TELNET_FILE))) { telnetSettings.load(is); } - int statusPort = Integer.parseInt(telnetSettings.getProperty("StatusPort", "12345")); + final int statusPort = Integer.parseInt(telnetSettings.getProperty("StatusPort", "12345")); _statusPw = telnetSettings.getProperty("StatusPW"); if ((_mode == Server.MODE_GAMESERVER) || (_mode == Server.MODE_LOGINSERVER)) @@ -134,7 +134,7 @@ public class Status extends Thread for (int i = 0; i < length; i++) { - int charSet = Rnd.nextInt(3); + final int charSet = Rnd.nextInt(3); switch (charSet) { case 0: @@ -153,7 +153,7 @@ public class Status extends Thread public void sendMessageToTelnets(String msg) { - List lsToRemove = new ArrayList<>(); // TODO(Zoey76): Unused? + final List lsToRemove = new ArrayList<>(); // TODO(Zoey76): Unused? for (LoginStatusThread ls : _loginStatus) { if (ls.isInterrupted()) diff --git a/trunk/java/com/l2jserver/tools/accountmanager/SQLAccountManager.java b/trunk/java/com/l2jserver/tools/accountmanager/SQLAccountManager.java index d3f15cf118..c745a3ba19 100644 --- a/trunk/java/com/l2jserver/tools/accountmanager/SQLAccountManager.java +++ b/trunk/java/com/l2jserver/tools/accountmanager/SQLAccountManager.java @@ -107,7 +107,7 @@ public class SQLAccountManager System.out.print(" it will only delete the account login server data."); System.out.println(); System.out.print("Do you really want to delete this account? Y/N: "); - String yesno = _scn.next(); + final String yesno = _scn.next(); if ((yesno != null) && yesno.equalsIgnoreCase("Y")) { deleteAccount(_uname.trim()); @@ -192,7 +192,7 @@ public class SQLAccountManager try (Connection con = ConnectionFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE accounts(login, password, accessLevel) VALUES (?, ?, ?)")) { - MessageDigest md = MessageDigest.getInstance("SHA"); + final MessageDigest md = MessageDigest.getInstance("SHA"); byte[] newPassword; newPassword = password.getBytes("UTF-8"); newPassword = md.digest(newPassword); diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/LauncherGS.java b/trunk/java/com/l2jserver/tools/dbinstaller/LauncherGS.java index ee03507f87..b722225198 100644 --- a/trunk/java/com/l2jserver/tools/dbinstaller/LauncherGS.java +++ b/trunk/java/com/l2jserver/tools/dbinstaller/LauncherGS.java @@ -33,8 +33,8 @@ public class LauncherGS extends AbstractDBLauncher { public static void main(String[] args) { - String defDatabase = "lineage2"; - String dir = "sql/game/"; + final String defDatabase = "lineage2"; + final String dir = "sql/game/"; if ((args != null) && (args.length > 0)) { diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/LauncherLS.java b/trunk/java/com/l2jserver/tools/dbinstaller/LauncherLS.java index 264d2de91c..6fd7d67096 100644 --- a/trunk/java/com/l2jserver/tools/dbinstaller/LauncherLS.java +++ b/trunk/java/com/l2jserver/tools/dbinstaller/LauncherLS.java @@ -33,8 +33,8 @@ public class LauncherLS extends AbstractDBLauncher { public static void main(String[] args) { - String defDatabase = "lineage2"; - String dir = "sql/login/"; + final String defDatabase = "lineage2"; + final String dir = "sql/login/"; if ((args != null) && (args.length > 0)) { diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java b/trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java index 67534722f6..fd9dfeda70 100644 --- a/trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java +++ b/trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java @@ -46,7 +46,7 @@ public class RunTasks extends Thread public void run() { new DBDumper(_frame, _db); - ScriptExecutor exec = new ScriptExecutor(_frame); + final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/console/DBInstallerConsole.java b/trunk/java/com/l2jserver/tools/dbinstaller/console/DBInstallerConsole.java index 0bafc5dda1..eee9f969d8 100644 --- a/trunk/java/com/l2jserver/tools/dbinstaller/console/DBInstallerConsole.java +++ b/trunk/java/com/l2jserver/tools/dbinstaller/console/DBInstallerConsole.java @@ -37,7 +37,7 @@ public class DBInstallerConsole implements DBOutputInterface public DBInstallerConsole(String db, String dir) { System.out.println("Welcome to L2J DataBase installer"); - Preferences prop = Preferences.userRoot(); + final Preferences prop = Preferences.userRoot(); RunTasks rt = null; try (Scanner scn = new Scanner(new CloseShieldedInputStream(System.in))) { @@ -50,7 +50,7 @@ public class DBInstallerConsole implements DBOutputInterface System.out.printf("%s (%s): ", "Username", prop.get("dbUser_" + db, "root")); String dbUser = scn.nextLine(); System.out.printf("%s (%s): ", "Password", ""); - String dbPass = scn.nextLine(); + final String dbPass = scn.nextLine(); System.out.printf("%s (%s): ", "Database", prop.get("dbDbse_" + db, db)); String dbDbse = scn.nextLine(); @@ -59,13 +59,13 @@ public class DBInstallerConsole implements DBOutputInterface dbUser = dbUser.isEmpty() ? prop.get("dbUser_" + db, "root") : dbUser; dbDbse = dbDbse.isEmpty() ? prop.get("dbDbse_" + db, db) : dbDbse; - MySqlConnect connector = new MySqlConnect(dbHost, dbPort, dbUser, dbPass, dbDbse, true); + final MySqlConnect connector = new MySqlConnect(dbHost, dbPort, dbUser, dbPass, dbDbse, true); _con = connector.getConnection(); } System.out.print("(C)lean install, (U)pdate or (E)xit? "); - String resp = scn.next(); + final String resp = scn.next(); if (resp.equalsIgnoreCase("c")) { System.out.print("Do you really want to destroy your db (Y/N)?"); diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java b/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java index 65fcc572f6..2d19342943 100644 --- a/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java +++ b/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java @@ -63,9 +63,9 @@ public class DBConfigGUI extends JFrame _db = db; _dir = dir; - int width = 260; - int height = 220; - Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize(); + final int width = 260; + final int height = 220; + final Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize(); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setBounds((resolution.width - width) / 2, (resolution.height - height) / 2, width, height); @@ -74,7 +74,7 @@ public class DBConfigGUI extends JFrame _prop = Preferences.userRoot(); // Host - JLabel labelDbHost = new JLabel("Host: ", SwingConstants.LEFT); + final JLabel labelDbHost = new JLabel("Host: ", SwingConstants.LEFT); add(labelDbHost); _dbHost = new JTextField(15); _dbHost.setText(_prop.get("dbHost_" + db, "localhost")); @@ -82,7 +82,7 @@ public class DBConfigGUI extends JFrame add(_dbHost); // Port - JLabel labelDbPort = new JLabel("Port: ", SwingConstants.LEFT); + final JLabel labelDbPort = new JLabel("Port: ", SwingConstants.LEFT); add(labelDbPort); _dbPort = new JTextField(15); _dbPort.setText(_prop.get("dbPort_" + db, "3306")); @@ -90,7 +90,7 @@ public class DBConfigGUI extends JFrame add(_dbPort); // Username - JLabel labelDbUser = new JLabel("Username: ", SwingConstants.LEFT); + final JLabel labelDbUser = new JLabel("Username: ", SwingConstants.LEFT); add(labelDbUser); _dbUser = new JTextField(15); _dbUser.setText(_prop.get("dbUser_" + db, "root")); @@ -98,7 +98,7 @@ public class DBConfigGUI extends JFrame add(_dbUser); // Password - JLabel labelDbPass = new JLabel("Password: ", SwingConstants.LEFT); + final JLabel labelDbPass = new JLabel("Password: ", SwingConstants.LEFT); add(labelDbPass); _dbPass = new JPasswordField(15); _dbPass.setText(_prop.get("dbPass_" + db, "")); @@ -106,23 +106,23 @@ public class DBConfigGUI extends JFrame add(_dbPass); // Database - JLabel labelDbDbse = new JLabel("Database: ", SwingConstants.LEFT); + final JLabel labelDbDbse = new JLabel("Database: ", SwingConstants.LEFT); add(labelDbDbse); _dbDbse = new JTextField(15); _dbDbse.setText(_prop.get("dbDbse_" + db, db)); labelDbDbse.setLabelFor(_dbDbse); add(_dbDbse); - ActionListener cancelListener = e -> System.exit(0); + final ActionListener cancelListener = e -> System.exit(0); // Cancel - JButton btnCancel = new JButton("Cancel"); + final JButton btnCancel = new JButton("Cancel"); btnCancel.addActionListener(cancelListener); add(btnCancel); - ActionListener connectListener = e -> + final ActionListener connectListener = e -> { - MySqlConnect connector = new MySqlConnect(_dbHost.getText(), _dbPort.getText(), _dbUser.getText(), new String(_dbPass.getPassword()), _dbDbse.getText(), false); + final MySqlConnect connector = new MySqlConnect(_dbHost.getText(), _dbPort.getText(), _dbUser.getText(), new String(_dbPass.getPassword()), _dbDbse.getText(), false); if (connector.getConnection() != null) { @@ -131,17 +131,17 @@ public class DBConfigGUI extends JFrame _prop.put("dbUser_" + _db, _dbUser.getText()); _prop.put("dbDbse_" + _db, _dbDbse.getText()); - DBInstallerGUI dbi = new DBInstallerGUI(connector.getConnection()); + final DBInstallerGUI dbi = new DBInstallerGUI(connector.getConnection()); setVisible(false); if (_dir.equals("sql/login/")) { - Object[] options = + final Object[] options = { "Install Login", "Exit" }; - int n = JOptionPane.showOptionDialog(null, "Install login server database?", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]); + final int n = JOptionPane.showOptionDialog(null, "Install login server database?", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]); if ((n == 1) || (n == -1)) { @@ -150,12 +150,12 @@ public class DBConfigGUI extends JFrame } else { - Object[] options = + final Object[] options = { "Install Server", "Exit" }; - int n = JOptionPane.showOptionDialog(null, "Install game server database?", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]); + final int n = JOptionPane.showOptionDialog(null, "Install game server database?", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]); if ((n == 1) || (n == -1)) { @@ -164,14 +164,14 @@ public class DBConfigGUI extends JFrame } dbi.setVisible(true); - RunTasks task = new RunTasks(dbi, _db, _dir); + final RunTasks task = new RunTasks(dbi, _db, _dir); task.setPriority(Thread.MAX_PRIORITY); task.start(); } }; // Connect - JButton btnConnect = new JButton("Connect"); + final JButton btnConnect = new JButton("Connect"); btnConnect.addActionListener(connectListener); add(btnConnect); diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBInstallerGUI.java b/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBInstallerGUI.java index a900d029e1..f76910661e 100644 --- a/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBInstallerGUI.java +++ b/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBInstallerGUI.java @@ -50,9 +50,9 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface _con = con; - int width = 480; - int height = 360; - Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize(); + final int width = 480; + final int height = 360; + final Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize(); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setBounds((resolution.width - width) / 2, (resolution.height - height) / 2, width, height); @@ -63,7 +63,7 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface add(_progBar, BorderLayout.PAGE_START); _progArea = new JTextArea(); - JScrollPane scrollPane = new JScrollPane(_progArea); + final JScrollPane scrollPane = new JScrollPane(_progArea); _progArea.setEditable(false); appendToProgressArea("Connected"); diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/DBDumper.java b/trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/DBDumper.java index e4aa99d650..3fc5490536 100644 --- a/trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/DBDumper.java +++ b/trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/DBDumper.java @@ -52,18 +52,18 @@ public class DBDumper { try (Formatter form = new Formatter()) { - Connection con = _frame.getConnection(); + final Connection con = _frame.getConnection(); try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); new File("dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); if (rset.last()) { - int rows = rset.getRow(); + final int rows = rset.getRow(); rset.beforeFirst(); if (rows > 0) { @@ -84,7 +84,7 @@ public class DBDumper try (Statement desc = con.createStatement(); ResultSet dset = desc.executeQuery("DESC " + rset.getString(1))) { - Map> keys = new HashMap<>(); + final Map> keys = new HashMap<>(); boolean isFirst = true; while (dset.next()) { diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/ScriptExecutor.java b/trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/ScriptExecutor.java index 3156ab9cc0..8719ce232f 100644 --- a/trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/ScriptExecutor.java +++ b/trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/ScriptExecutor.java @@ -74,7 +74,7 @@ public class ScriptExecutor { _frame.appendToProgressArea("Installing " + file.getName()); String line = ""; - Connection con = _frame.getConnection(); + final Connection con = _frame.getConnection(); try (Statement stmt = con.createStatement(); Scanner scn = new Scanner(file)) { @@ -114,13 +114,13 @@ public class ScriptExecutor { try { - Object[] options = + final Object[] options = { "Continue", "Abort" }; - int n = JOptionPane.showOptionDialog(null, "MySQL Error: " + e.getMessage(), "Script Error", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]); + final int n = JOptionPane.showOptionDialog(null, "MySQL Error: " + e.getMessage(), "Script Error", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]); if (n == 1) { System.exit(0); diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/util/swing/SpringUtilities.java b/trunk/java/com/l2jserver/tools/dbinstaller/util/swing/SpringUtilities.java index 9644555e55..a75bd77cf5 100644 --- a/trunk/java/com/l2jserver/tools/dbinstaller/util/swing/SpringUtilities.java +++ b/trunk/java/com/l2jserver/tools/dbinstaller/util/swing/SpringUtilities.java @@ -76,11 +76,11 @@ public class SpringUtilities return; } - Spring xPadSpring = Spring.constant(xPad); - Spring yPadSpring = Spring.constant(yPad); - Spring initialXSpring = Spring.constant(initialX); - Spring initialYSpring = Spring.constant(initialY); - int max = rows * cols; + final Spring xPadSpring = Spring.constant(xPad); + final Spring yPadSpring = Spring.constant(yPad); + final Spring initialXSpring = Spring.constant(initialX); + final Spring initialYSpring = Spring.constant(initialY); + final int max = rows * cols; // Calculate Springs that are the max of the width/height so that all // cells have the same size. @@ -88,7 +88,7 @@ public class SpringUtilities Spring maxHeightSpring = layout.getConstraints(parent.getComponent(0)).getWidth(); for (int i = 1; i < max; i++) { - SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i)); + final SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i)); maxWidthSpring = Spring.max(maxWidthSpring, cons.getWidth()); maxHeightSpring = Spring.max(maxHeightSpring, cons.getHeight()); @@ -98,7 +98,7 @@ public class SpringUtilities // components to have the same size. for (int i = 0; i < max; i++) { - SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i)); + final SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i)); cons.setWidth(maxWidthSpring); cons.setHeight(maxHeightSpring); @@ -110,7 +110,7 @@ public class SpringUtilities SpringLayout.Constraints lastRowCons = null; for (int i = 0; i < max; i++) { - SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i)); + final SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i)); if ((i % cols) == 0) { // start of new row lastRowCons = lastCons; @@ -142,7 +142,7 @@ public class SpringUtilities } // Set the parent's size. - SpringLayout.Constraints pCons = layout.getConstraints(parent); + final SpringLayout.Constraints pCons = layout.getConstraints(parent); if (lastCons != null) { pCons.setConstraint(SpringLayout.SOUTH, Spring.sum(Spring.constant(yPad), lastCons.getConstraint(SpringLayout.SOUTH))); @@ -153,8 +153,8 @@ public class SpringUtilities /* Used by makeCompactGrid. */ private static SpringLayout.Constraints getConstraintsForCell(int row, int col, Container parent, int cols) { - SpringLayout layout = (SpringLayout) parent.getLayout(); - Component c = parent.getComponent((row * cols) + col); + final SpringLayout layout = (SpringLayout) parent.getLayout(); + final Component c = parent.getComponent((row * cols) + col); return layout.getConstraints(c); } @@ -193,7 +193,7 @@ public class SpringUtilities } for (int r = 0; r < rows; r++) { - SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols); + final SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols); constraints.setX(x); constraints.setWidth(width); } @@ -211,7 +211,7 @@ public class SpringUtilities } for (int c = 0; c < cols; c++) { - SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols); + final SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols); constraints.setY(y); constraints.setHeight(height); } @@ -219,7 +219,7 @@ public class SpringUtilities } // Set the parent's size. - SpringLayout.Constraints pCons = layout.getConstraints(parent); + final SpringLayout.Constraints pCons = layout.getConstraints(parent); pCons.setConstraint(SpringLayout.SOUTH, y); pCons.setConstraint(SpringLayout.EAST, x); } diff --git a/trunk/java/com/l2jserver/tools/gsregistering/BaseGameServerRegister.java b/trunk/java/com/l2jserver/tools/gsregistering/BaseGameServerRegister.java index 7b8ef58759..3c56d5b57d 100644 --- a/trunk/java/com/l2jserver/tools/gsregistering/BaseGameServerRegister.java +++ b/trunk/java/com/l2jserver/tools/gsregistering/BaseGameServerRegister.java @@ -51,7 +51,7 @@ public abstract class BaseGameServerRegister */ public static void main(String[] args) { - GameServerRegister cmdUi = new GameServerRegister(); + final GameServerRegister cmdUi = new GameServerRegister(); try { cmdUi.consoleUI(); @@ -130,11 +130,11 @@ public abstract class BaseGameServerRegister */ public static void registerGameServer(int id, String outDir) throws IOException { - byte[] hexId = Util.generateHex(16); + final byte[] hexId = Util.generateHex(16); GameServerTable.getInstance().registerServerOnDB(hexId, id, ""); - Properties hexSetting = new Properties(); - File file = new File(outDir, "hexid.txt"); + final Properties hexSetting = new Properties(); + final File file = new File(outDir, "hexid.txt"); // Create a new empty file only if it doesn't exist file.createNewFile(); try (OutputStream out = new FileOutputStream(file)) diff --git a/trunk/java/com/l2jserver/tools/gsregistering/GameServerRegister.java b/trunk/java/com/l2jserver/tools/gsregistering/GameServerRegister.java index afac08b5e3..4a19d1b9f0 100644 --- a/trunk/java/com/l2jserver/tools/gsregistering/GameServerRegister.java +++ b/trunk/java/com/l2jserver/tools/gsregistering/GameServerRegister.java @@ -42,7 +42,7 @@ public class GameServerRegister extends BaseGameServerRegister super(); load(); - int size = GameServerTable.getInstance().getServerNames().size(); + final int size = GameServerTable.getInstance().getServerNames().size(); if (size == 0) { System.out.println("No available names for GameServer, verify servername.xml file exists in the LoginServer folder."); @@ -73,7 +73,7 @@ public class GameServerRegister extends BaseGameServerRegister choice = _in.readLine(); try { - int choiceNumber = Integer.parseInt(choice); + final int choiceNumber = Integer.parseInt(choice); choiceOk = true; switch (choiceNumber) @@ -139,9 +139,9 @@ public class GameServerRegister extends BaseGameServerRegister String id; boolean inUse; - String gsInUse = "In Use"; - String gsFree = "Free"; - int gsStatusMaxLen = Math.max(gsInUse.length(), gsFree.length()) + 2; + final String gsInUse = "In Use"; + final String gsFree = "Free"; + final int gsStatusMaxLen = Math.max(gsInUse.length(), gsFree.length()) + 2; for (Entry e : GameServerTable.getInstance().getServerNames().entrySet()) { id = e.getKey().toString(); @@ -162,7 +162,7 @@ public class GameServerRegister extends BaseGameServerRegister System.out.print("| "); inUse = GameServerTable.getInstance().hasRegisteredGameServerOnId(e.getKey()); - String inUseStr = (inUse ? gsInUse : gsFree); + final String inUseStr = (inUse ? gsInUse : gsFree); System.out.print(inUseStr); for (int i = inUseStr.length(); i < gsStatusMaxLen; i++) @@ -246,7 +246,7 @@ public class GameServerRegister extends BaseGameServerRegister } while (id == Integer.MIN_VALUE); - String name = GameServerTable.getInstance().getServerNameById(id); + final String name = GameServerTable.getInstance().getServerNameById(id); if (name == null) { System.out.printf("No name for ID: %d" + Config.EOL, id); @@ -295,7 +295,7 @@ public class GameServerRegister extends BaseGameServerRegister } while (id == Integer.MIN_VALUE); - String name = GameServerTable.getInstance().getServerNameById(id); + final String name = GameServerTable.getInstance().getServerNameById(id); if (name == null) { System.out.printf("No name for ID: %d" + Config.EOL, id); diff --git a/trunk/java/com/l2jserver/util/DeadLockDetector.java b/trunk/java/com/l2jserver/util/DeadLockDetector.java index 99f782bd23..e18a333b21 100644 --- a/trunk/java/com/l2jserver/util/DeadLockDetector.java +++ b/trunk/java/com/l2jserver/util/DeadLockDetector.java @@ -57,13 +57,13 @@ public class DeadLockDetector extends Thread { try { - long[] ids = tmx.findDeadlockedThreads(); + final long[] ids = tmx.findDeadlockedThreads(); if (ids != null) { deadlock = true; - ThreadInfo[] tis = tmx.getThreadInfo(ids, true, true); - StringBuilder info = new StringBuilder(); + final ThreadInfo[] tis = tmx.getThreadInfo(ids, true, true); + final StringBuilder info = new StringBuilder(); info.append("DeadLock Found!"); info.append(Config.EOL); for (ThreadInfo ti : tis) @@ -73,8 +73,8 @@ public class DeadLockDetector extends Thread for (ThreadInfo ti : tis) { - LockInfo[] locks = ti.getLockedSynchronizers(); - MonitorInfo[] monitors = ti.getLockedMonitors(); + final LockInfo[] locks = ti.getLockedSynchronizers(); + final MonitorInfo[] monitors = ti.getLockedMonitors(); if ((locks.length == 0) && (monitors.length == 0)) { continue; diff --git a/trunk/java/com/l2jserver/util/EnumIntBitmask.java b/trunk/java/com/l2jserver/util/EnumIntBitmask.java index 6773f2d4cc..867f250b15 100644 --- a/trunk/java/com/l2jserver/util/EnumIntBitmask.java +++ b/trunk/java/com/l2jserver/util/EnumIntBitmask.java @@ -27,7 +27,7 @@ public final class EnumIntBitmask> implements Cloneable public static > int getAllBitmask(Class enumClass) { int allBitmask = 0; - E[] values = enumClass.getEnumConstants(); + final E[] values = enumClass.getEnumConstants(); if (values.length > 32) { throw new IllegalArgumentException("Enum too big for an integer bitmask."); @@ -46,7 +46,7 @@ public final class EnumIntBitmask> implements Cloneable { _enumClass = enumClass; - E[] values = _enumClass.getEnumConstants(); + final E[] values = _enumClass.getEnumConstants(); if (values.length > 32) { throw new IllegalArgumentException("Enum too big for an integer bitmask."); diff --git a/trunk/java/com/l2jserver/util/HexUtils.java b/trunk/java/com/l2jserver/util/HexUtils.java index 378d093915..bac3df8f35 100644 --- a/trunk/java/com/l2jserver/util/HexUtils.java +++ b/trunk/java/com/l2jserver/util/HexUtils.java @@ -248,7 +248,7 @@ public class HexUtils else if (dataLen < _HEX_ED_BPL) { // last line which shows less than _HEX_ED_BPL bytes - int lineHexDataEnd = lineHexDataStart + (dataLen * _HEX_ED_CPB); + final int lineHexDataEnd = lineHexDataStart + (dataLen * _HEX_ED_CPB); Arrays.fill(textData, lineHexDataEnd, lineHexDataEnd + ((_HEX_ED_BPL - dataLen) * _HEX_ED_CPB) + 1, ' '); // spaces, for the last line if there are not _HEX_ED_BPL bytes } else diff --git a/trunk/java/com/l2jserver/util/IPSubnet.java b/trunk/java/com/l2jserver/util/IPSubnet.java index 243f35456f..41d874bbda 100644 --- a/trunk/java/com/l2jserver/util/IPSubnet.java +++ b/trunk/java/com/l2jserver/util/IPSubnet.java @@ -29,7 +29,7 @@ public class IPSubnet public IPSubnet(String input) throws UnknownHostException, NumberFormatException, ArrayIndexOutOfBoundsException { - int idx = input.indexOf("/"); + final int idx = input.indexOf("/"); if (idx > 0) { _addr = InetAddress.getByName(input.substring(0, idx)).getAddress(); diff --git a/trunk/java/com/l2jserver/util/IPv4Filter.java b/trunk/java/com/l2jserver/util/IPv4Filter.java index cbe101ce1f..77a8ac42b6 100644 --- a/trunk/java/com/l2jserver/util/IPv4Filter.java +++ b/trunk/java/com/l2jserver/util/IPv4Filter.java @@ -41,7 +41,7 @@ public class IPv4Filter implements IAcceptFilter, Runnable public IPv4Filter() { _ipFloodMap = new HashMap<>(); - Thread t = new Thread(this, getClass().getSimpleName()); + final Thread t = new Thread(this, getClass().getSimpleName()); t.setDaemon(true); t.start(); } @@ -78,7 +78,7 @@ public class IPv4Filter implements IAcceptFilter, Runnable } final int h = hash(addr.getAddress()); - long current = System.currentTimeMillis(); + final long current = System.currentTimeMillis(); Flood f; synchronized (_ipFloodMap) { @@ -125,13 +125,13 @@ public class IPv4Filter implements IAcceptFilter, Runnable { while (true) { - long reference = System.currentTimeMillis() - (1000 * 300); + final long reference = System.currentTimeMillis() - (1000 * 300); synchronized (_ipFloodMap) { - Iterator> it = _ipFloodMap.entrySet().iterator(); + final Iterator> it = _ipFloodMap.entrySet().iterator(); while (it.hasNext()) { - Flood f = it.next().getValue(); + final Flood f = it.next().getValue(); if (f.lastAccess < reference) { it.remove(); diff --git a/trunk/java/com/l2jserver/util/PropertiesParser.java b/trunk/java/com/l2jserver/util/PropertiesParser.java index 55f4e52966..150c296f39 100644 --- a/trunk/java/com/l2jserver/util/PropertiesParser.java +++ b/trunk/java/com/l2jserver/util/PropertiesParser.java @@ -65,13 +65,13 @@ public final class PropertiesParser private String getValue(String key) { - String value = _properties.getProperty(key); + final String value = _properties.getProperty(key); return value != null ? value.trim() : null; } public boolean getBoolean(String key, boolean defaultValue) { - String value = getValue(key); + final String value = getValue(key); if (value == null) { _log.warning("[" + _file.getName() + "] missing property for key: " + key + " using default value: " + defaultValue); @@ -95,7 +95,7 @@ public final class PropertiesParser public byte getByte(String key, byte defaultValue) { - String value = getValue(key); + final String value = getValue(key); if (value == null) { _log.warning("[" + _file.getName() + "] missing property for key: " + key + " using default value: " + defaultValue); @@ -115,7 +115,7 @@ public final class PropertiesParser public short getShort(String key, short defaultValue) { - String value = getValue(key); + final String value = getValue(key); if (value == null) { _log.warning("[" + _file.getName() + "] missing property for key: " + key + " using default value: " + defaultValue); @@ -135,7 +135,7 @@ public final class PropertiesParser public int getInt(String key, int defaultValue) { - String value = getValue(key); + final String value = getValue(key); if (value == null) { _log.warning("[" + _file.getName() + "] missing property for key: " + key + " using default value: " + defaultValue); @@ -155,7 +155,7 @@ public final class PropertiesParser public long getLong(String key, long defaultValue) { - String value = getValue(key); + final String value = getValue(key); if (value == null) { _log.warning("[" + _file.getName() + "] missing property for key: " + key + " using default value: " + defaultValue); @@ -175,7 +175,7 @@ public final class PropertiesParser public float getFloat(String key, float defaultValue) { - String value = getValue(key); + final String value = getValue(key); if (value == null) { _log.warning("[" + _file.getName() + "] missing property for key: " + key + " using default value: " + defaultValue); @@ -195,7 +195,7 @@ public final class PropertiesParser public double getDouble(String key, double defaultValue) { - String value = getValue(key); + final String value = getValue(key); if (value == null) { _log.warning("[" + _file.getName() + "] missing property for key: " + key + " using default value: " + defaultValue); @@ -215,7 +215,7 @@ public final class PropertiesParser public String getString(String key, String defaultValue) { - String value = getValue(key); + final String value = getValue(key); if (value == null) { _log.warning("[" + _file.getName() + "] missing property for key: " + key + " using default value: " + defaultValue); @@ -226,7 +226,7 @@ public final class PropertiesParser public > T getEnum(String key, Class clazz, T defaultValue) { - String value = getValue(key); + final String value = getValue(key); if (value == null) { _log.warning("[" + _file.getName() + "] missing property for key: " + key + " using default value: " + defaultValue); diff --git a/trunk/java/com/l2jserver/util/StringUtil.java b/trunk/java/com/l2jserver/util/StringUtil.java index 440b8f4922..06158a3ce6 100644 --- a/trunk/java/com/l2jserver/util/StringUtil.java +++ b/trunk/java/com/l2jserver/util/StringUtil.java @@ -198,7 +198,7 @@ public final class StringUtil public static String concat(final String... strings) { final StringBuilder sbString = new StringBuilder(); - for (final String string : strings) + for (String string : strings) { sbString.append(string); } @@ -215,7 +215,7 @@ public final class StringUtil { final int length = getLength(strings); final StringBuilder sbString = new StringBuilder(sizeHint > length ? sizeHint : length); - for (final String string : strings) + for (String string : strings) { sbString.append(string); } @@ -231,7 +231,7 @@ public final class StringUtil { sbString.ensureCapacity(sbString.length() + getLength(strings)); - for (final String string : strings) + for (String string : strings) { sbString.append(string); } @@ -240,7 +240,7 @@ public final class StringUtil public static int getLength(final Iterable strings) { int length = 0; - for (final String string : strings) + for (String string : strings) { length += (string == null) ? 4 : string.length(); } @@ -255,7 +255,7 @@ public final class StringUtil public static int getLength(final String[] strings) { int length = 0; - for (final String string : strings) + for (String string : strings) { length += (string == null) ? 4 : string.length(); } @@ -265,7 +265,7 @@ public final class StringUtil public static String getTraceString(StackTraceElement[] trace) { final StringBuilder sbString = new StringBuilder(); - for (final StackTraceElement element : trace) + for (StackTraceElement element : trace) { sbString.append(element.toString()).append(Config.EOL); } diff --git a/trunk/java/com/l2jserver/util/TimeUtil.java b/trunk/java/com/l2jserver/util/TimeUtil.java index e6f985478e..564eb76d0a 100644 --- a/trunk/java/com/l2jserver/util/TimeUtil.java +++ b/trunk/java/com/l2jserver/util/TimeUtil.java @@ -61,7 +61,7 @@ public class TimeUtil } try { - int val = Integer.parseInt(datePattern.substring(0, index)); + final int val = Integer.parseInt(datePattern.substring(0, index)); final String type = datePattern.substring(index); final ChronoUnit unit; switch (type.toLowerCase()) diff --git a/trunk/java/com/l2jserver/util/Util.java b/trunk/java/com/l2jserver/util/Util.java index dc109abc97..3209d194ad 100644 --- a/trunk/java/com/l2jserver/util/Util.java +++ b/trunk/java/com/l2jserver/util/Util.java @@ -71,7 +71,7 @@ public final class Util { try { - InetAddress addr = InetAddress.getByName(host); + final InetAddress addr = InetAddress.getByName(host); return addr.isSiteLocalAddress() || addr.isLoopbackAddress(); } catch (UnknownHostException e) @@ -111,9 +111,9 @@ public final class Util */ public static String printData(ByteBuffer buf) { - byte[] data = new byte[buf.remaining()]; + final byte[] data = new byte[buf.remaining()]; buf.get(data); - String hex = Util.printData(data, data.length); + final String hex = Util.printData(data, data.length); buf.position(buf.position() - data.length); return hex; } @@ -125,7 +125,7 @@ public final class Util */ public static byte[] generateHex(int size) { - byte[] array = new byte[size]; + final byte[] array = new byte[size]; Rnd.nextBytes(array); return array; } @@ -137,7 +137,7 @@ public final class Util */ public static String getStackTrace(Throwable t) { - StringWriter sw = new StringWriter(); + final StringWriter sw = new StringWriter(); t.printStackTrace(new PrintWriter(sw)); return sw.toString(); } diff --git a/trunk/java/com/l2jserver/util/crypt/BlowfishEngine.java b/trunk/java/com/l2jserver/util/crypt/BlowfishEngine.java index fe02e6803f..4676704dc5 100644 --- a/trunk/java/com/l2jserver/util/crypt/BlowfishEngine.java +++ b/trunk/java/com/l2jserver/util/crypt/BlowfishEngine.java @@ -1129,7 +1129,7 @@ public final class BlowfishEngine */ private void processTable(int xl, int xr, int[] table) { - int size = table.length; + final int size = table.length; for (int s = 0; s < size; s += 2) { xl ^= P[0]; @@ -1174,7 +1174,7 @@ public final class BlowfishEngine * (2) Now, XOR P[0] with the first 32 bits of the key, XOR P[1] with the second 32-bits of the key, and so on for all bits of the key (up to P[17]).
* Repeatedly cycle through the key bits until the entire P-array has been XOR-ed with the key bits */ - int keyLength = key.length; + final int keyLength = key.length; int keyIndex = 0; for (int i = 0; i < P_SZ; i++) { diff --git a/trunk/java/com/l2jserver/util/crypt/NewCrypt.java b/trunk/java/com/l2jserver/util/crypt/NewCrypt.java index f0635a9a09..07bd1547ac 100644 --- a/trunk/java/com/l2jserver/util/crypt/NewCrypt.java +++ b/trunk/java/com/l2jserver/util/crypt/NewCrypt.java @@ -71,7 +71,7 @@ public final class NewCrypt } long chksum = 0; - int count = size - 4; + final int count = size - 4; long check = -1; int i; @@ -111,7 +111,7 @@ public final class NewCrypt public static void appendChecksum(final byte[] raw, final int offset, final int size) { long chksum = 0; - int count = size - 4; + final int count = size - 4; long ecx; int i; @@ -157,7 +157,7 @@ public final class NewCrypt */ static void encXORPass(byte[] raw, final int offset, final int size, int key) { - int stop = size - 8; + final int stop = size - 8; int pos = 4 + offset; int edx; int ecx = key; // Initial xor key diff --git a/trunk/java/com/l2jserver/util/crypt/ScrambledKeyPair.java b/trunk/java/com/l2jserver/util/crypt/ScrambledKeyPair.java index 8e79718c1b..38ee2a3a2a 100644 --- a/trunk/java/com/l2jserver/util/crypt/ScrambledKeyPair.java +++ b/trunk/java/com/l2jserver/util/crypt/ScrambledKeyPair.java @@ -44,14 +44,14 @@ public class ScrambledKeyPair if ((scrambledMod.length == 0x81) && (scrambledMod[0] == 0x00)) { - byte[] temp = new byte[0x80]; + final byte[] temp = new byte[0x80]; System.arraycopy(scrambledMod, 1, temp, 0, 0x80); scrambledMod = temp; } // step 1 : 0x4d-0x50 <-> 0x00-0x04 for (int i = 0; i < 4; i++) { - byte temp = scrambledMod[0x00 + i]; + final byte temp = scrambledMod[0x00 + i]; scrambledMod[0x00 + i] = scrambledMod[0x4d + i]; scrambledMod[0x4d + i] = temp; } diff --git a/trunk/java/com/l2jserver/util/network/BaseRecievePacket.java b/trunk/java/com/l2jserver/util/network/BaseRecievePacket.java index 9c01c1fc08..d5776e3c3f 100644 --- a/trunk/java/com/l2jserver/util/network/BaseRecievePacket.java +++ b/trunk/java/com/l2jserver/util/network/BaseRecievePacket.java @@ -48,7 +48,7 @@ public abstract class BaseRecievePacket public int readC() { - int result = _decrypt[_off++] & 0xff; + final int result = _decrypt[_off++] & 0xff; return result; } @@ -91,7 +91,7 @@ public abstract class BaseRecievePacket public final byte[] readB(int length) { - byte[] result = new byte[length]; + final byte[] result = new byte[length]; System.arraycopy(_decrypt, _off, result, 0, length); _off += length; return result; diff --git a/trunk/java/com/l2jserver/util/network/BaseSendablePacket.java b/trunk/java/com/l2jserver/util/network/BaseSendablePacket.java index 93e167a32e..c78228137b 100644 --- a/trunk/java/com/l2jserver/util/network/BaseSendablePacket.java +++ b/trunk/java/com/l2jserver/util/network/BaseSendablePacket.java @@ -58,7 +58,7 @@ public abstract class BaseSendablePacket protected void writeF(double org) { - long value = Double.doubleToRawLongBits(org); + final long value = Double.doubleToRawLongBits(org); _bao.write((int) (value & 0xff)); _bao.write((int) ((value >> 8) & 0xff)); _bao.write((int) ((value >> 16) & 0xff)); @@ -123,7 +123,7 @@ public abstract class BaseSendablePacket writeD(0x00); // reserve for checksum - int padding = _bao.size() % 8; + final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++)