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

Added missing final modifiers.

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

2
trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java vendored
View File

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

10
trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java vendored
View File

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

6
trunk/dist/game/data/scripts/handlers/itemhandlers/Book.java vendored
View File

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

6
trunk/dist/game/data/scripts/handlers/itemhandlers/Bypass.java vendored
View File

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

2
trunk/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java vendored
View File

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

4
trunk/dist/game/data/scripts/handlers/itemhandlers/EventItem.java vendored
View File

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

12
trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@ -63,8 +63,8 @@ public class ExtractableItems implements IItemHandler
return false;
}
List<L2ItemInstance> extractedItems = new ArrayList<>();
List<L2ItemInstance> enchantedItems = new ArrayList<>();
final List<L2ItemInstance> extractedItems = new ArrayList<>();
final List<L2ItemInstance> 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);
}

4
trunk/dist/game/data/scripts/handlers/itemhandlers/FishShots.java vendored
View File

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

4
trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

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

6
trunk/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java vendored
View File

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

8
trunk/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java vendored
View File

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

4
trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java vendored
View File

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

4
trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java vendored
View File

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

4
trunk/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java vendored
View File

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