Added missing final modifiers.

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

View File

@@ -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<ArmorsetSkillHolder> skills = armorSet != null ? armorSet.getSkills() : null;
final List<SkillHolder> shieldSkill = armorSet != null ? armorSet.getShieldSkills() : null; // shield skill
final List<ArmorsetSkillHolder> 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())
{

View File

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

View File

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

View File

@@ -141,7 +141,7 @@ public class PcInventory extends Inventory
public L2ItemInstance[] getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable)
{
List<L2ItemInstance> list = new LinkedList<>();
final List<L2ItemInstance> 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<L2ItemInstance> list = new LinkedList<>();
final List<L2ItemInstance> 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<L2ItemInstance> list = new LinkedList<>();
final List<L2ItemInstance> 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<L2ItemInstance> list = new LinkedList<>();
final List<L2ItemInstance> 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<L2ItemInstance> list = new LinkedList<>();
final List<L2ItemInstance> 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<L2ItemInstance> list = new LinkedList<>();
final List<L2ItemInstance> 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<L2ItemInstance> list = new LinkedList<>();
final List<L2ItemInstance> 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<TradeItem> list = new LinkedList<>();
final List<TradeItem> 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);

View File

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

View File

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