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

Added missing final modifiers.

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractHtmlPacket.java
View File

@@ -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("<html><body>My Text is missing:<br>" + path + "</body></html>");
@@ -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;

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java
View File

@@ -440,7 +440,7 @@ public abstract class AbstractMessagePacket<T extends AbstractMessagePacket<?>>
}
else
{
int _maxLevel = SkillData.getInstance().getMaxLevel(_skillId);
final int _maxLevel = SkillData.getInstance().getMaxLevel(_skillId);
writeH(_maxLevel);
writeH(_skillLevel);
}

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/AllianceInfo.java
View File

@@ -48,7 +48,7 @@ public class AllianceInfo extends L2GameServerPacket
final Collection<L2Clan> 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);

14
trunk/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java
View File

@@ -46,7 +46,7 @@ public class ExBeautyItemList extends L2GameServerPacket
for (BeautyItem hair : _beautyData.getHairList().values())
{
List<BeautyItem> colors = new ArrayList<>();
final List<BeautyItem> colors = new ArrayList<>();
for (BeautyItem color : hair.getColors().values())
{
colors.add(color);

6
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java
View File

@@ -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())
{

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
View File

@@ -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)

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExGetPremiumItemList.java
View File

@@ -43,7 +43,7 @@ public class ExGetPremiumItemList extends L2GameServerPacket
writeD(_activeChar.getPremiumItemList().size());
for (Entry<Integer, L2PremiumItem> entry : _activeChar.getPremiumItemList().entrySet())
{
L2PremiumItem item = entry.getValue();
final L2PremiumItem item = entry.getValue();
writeQ(entry.getKey());
writeD(item.getItemId());
writeQ(item.getCount());

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java
View File

@@ -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, ""));

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchList.java
View File

@@ -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)

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExServerPrimitive.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowAgitInfo.java
View File

@@ -34,7 +34,7 @@ public class ExShowAgitInfo extends L2GameServerPacket
{
writeC(0xfe);
writeH(0x16);
Map<Integer, AuctionableHall> clannhalls = ClanHallManager.getInstance().getAllAuctionableClanHalls();
final Map<Integer, AuctionableHall> clannhalls = ClanHallManager.getInstance().getAllAuctionableClanHalls();
writeD(clannhalls.size());
for (AuctionableHall ch : clannhalls.values())
{

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowCastleInfo.java
View File

@@ -39,7 +39,7 @@ public class ExShowCastleInfo extends L2GameServerPacket
{
writeC(0xFE);
writeH(0x14);
List<Castle> castles = CastleManager.getInstance().getCastles();
final List<Castle> castles = CastleManager.getInstance().getCastles();
writeD(castles.size());
for (Castle castle : castles)
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressInfo.java
View File

@@ -41,11 +41,11 @@ public class ExShowFortressInfo extends L2GameServerPacket
{
writeC(0xFE);
writeH(0x15);
List<Fort> forts = FortManager.getInstance().getForts();
final List<Fort> 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);

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java
View File

@@ -47,7 +47,7 @@ public class ExShowFortressMapInfo extends L2GameServerPacket
writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status
writeD(_fortress.getFortSize()); // barracks count
List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId());
final List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId());
if ((commanders != null) && (commanders.size() != 0) && _fortress.getSiege().isInProgress())
{
switch (commanders.size())

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
View File

@@ -41,7 +41,7 @@ public class ExShowFortressSiegeInfo extends L2GameServerPacket
{
_fortId = fort.getResidenceId();
_size = fort.getFortSize();
List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId);
final List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId);
_csize = ((commanders == null) ? 0 : commanders.size());
_csize2 = fort.getSiege().getCommanders().size();
}

16
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExUISetting.java
View File

@@ -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<Integer> catElList1 = _uiSettings.getCategories().get(category);
final List<Integer> catElList1 = _uiSettings.getCategories().get(category);
size = size + catElList1.size();
}
category++;
size++;
if (_uiSettings.getCategories().containsKey(category))
{
List<Integer> catElList2 = _uiSettings.getCategories().get(category);
final List<Integer> catElList2 = _uiSettings.getCategories().get(category);
size = size + catElList2.size();
}
category++;
size = size + 4;
if (_uiSettings.getKeys().containsKey(i))
{
List<ActionKey> keyElList = _uiSettings.getKeys().get(i);
final List<ActionKey> 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<Integer> catElList1 = _uiSettings.getCategories().get(category);
final List<Integer> 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<Integer> catElList2 = _uiSettings.getCategories().get(category);
final List<Integer> 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<ActionKey> keyElList = _uiSettings.getKeys().get(i);
final List<ActionKey> keyElList = _uiSettings.getKeys().get(i);
writeD(keyElList.size());
for (ActionKey akey : keyElList)
{

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java
View File

@@ -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++)

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/GmViewQuestInfo.java
View File

@@ -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)
{

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ListPartyWating.java
View File

@@ -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)

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java
View File

@@ -151,10 +151,10 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
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();

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMemberPosition.java
View File

@@ -57,7 +57,7 @@ public class PartyMemberPosition extends L2GameServerPacket
writeD(locations.size());
for (Map.Entry<Integer, Location> entry : locations.entrySet())
{
Location loc = entry.getValue();
final Location loc = entry.getValue();
writeD(entry.getKey());
writeD(loc.getX());
writeD(loc.getY());

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveWarList.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java
View File

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

6
trunk/java/com/l2jserver/gameserver/network/serverpackets/QuestList.java
View File

@@ -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)
{

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java
View File

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

32
trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ShowBoard.java
View File

@@ -43,7 +43,7 @@ public class ShowBoard extends L2GameServerPacket
public ShowBoard(List<String> 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");

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java
View File

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

8
trunk/java/com/l2jserver/gameserver/network/serverpackets/SiegeInfo.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/SkillList.java
View File

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

54
trunk/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java
View File

@@ -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<L2WarehouseItem> createWeaponList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createArmorList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createEtcItemList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createMatList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createRecipeList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createAmulettList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createSpellbookList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createConsumableList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createShotList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createScrollList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createSeedList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createOtherList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> 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<L2WarehouseItem> createAllList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> list = new ArrayList<>();
final List<L2WarehouseItem> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (list.size() < MAX_SORT_LIST_ITEMS)

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java
View File

@@ -219,7 +219,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
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<UserInfoType>
if (containsMask(UserInfoType.ATK_ELEMENTAL))
{
writeH(5);
byte attackAttribute = _activeChar.getAttackElement();
final byte attackAttribute = _activeChar.getAttackElement();
writeC(attackAttribute);
writeH(_activeChar.getAttackElementValue(attackAttribute));
}

6
trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/FriendList.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java
View File

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

6
trunk/java/com/l2jserver/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java
View File

@@ -52,7 +52,7 @@ public class ExBettingLuckyGameResult extends L2GameServerPacket
final L2PcInstance _activeChar = getClient().getActiveChar();
// Calculate rewards
List<ItemHolder> rewards = new ArrayList<>();
final List<ItemHolder> 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()));