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/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java
View File

@@ -96,7 +96,7 @@ public abstract class AbstractPlayerGroup
*/
public int getRaceCount()
{
List<Race> partyRaces = new ArrayList<>();
final List<Race> partyRaces = new ArrayList<>();
for (L2PcInstance member : getMembers())
{
if (!partyRaces.contains(member.getRace()))

2
trunk/java/com/l2jserver/gameserver/model/ArenaParticipantsHolder.java
View File

@@ -58,7 +58,7 @@ public final class ArenaParticipantsHolder
public List<L2PcInstance> getAllPlayers()
{
List<L2PcInstance> all = new ArrayList<>(12);
final List<L2PcInstance> all = new ArrayList<>(12);
all.addAll(_redPlayers);
all.addAll(_bluePlayers);
return all;

28
trunk/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java
View File

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

18
trunk/java/com/l2jserver/gameserver/model/BlockList.java
View File

@@ -109,7 +109,7 @@ public class BlockList
private static HashMap<Integer, String> loadList(int ObjId)
{
HashMap<Integer, String> list = new HashMap<>();
final HashMap<Integer, String> 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);

2
trunk/java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java
View File

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

6
trunk/java/com/l2jserver/gameserver/model/CombatFlag.java
View File

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

28
trunk/java/com/l2jserver/gameserver/model/CursedWeapon.java
View File

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

6
trunk/java/com/l2jserver/gameserver/model/Elementals.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/L2AdminCommandAccessRight.java
View File

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

4
trunk/java/com/l2jserver/gameserver/model/L2ArmorSet.java
View File

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

4
trunk/java/com/l2jserver/gameserver/model/L2Augmentation.java
View File

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

88
trunk/java/com/l2jserver/gameserver/model/L2Clan.java
View File

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

6
trunk/java/com/l2jserver/gameserver/model/L2ClanMember.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/L2CommandChannel.java
View File

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

6
trunk/java/com/l2jserver/gameserver/model/L2ContactList.java
View File

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

10
trunk/java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/L2Mentee.java
View File

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

12
trunk/java/com/l2jserver/gameserver/model/L2Object.java
View File

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

30
trunk/java/com/l2jserver/gameserver/model/L2Party.java
View File

@@ -158,7 +158,7 @@ public class L2Party extends AbstractPlayerGroup
*/
private L2PcInstance getCheckedRandomMember(int itemId, L2Character target)
{
List<L2PcInstance> availableMembers = new ArrayList<>();
final List<L2PcInstance> 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);
}

2
trunk/java/com/l2jserver/gameserver/model/L2PetData.java
View File

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

4
trunk/java/com/l2jserver/gameserver/model/L2Radar.java
View File

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

12
trunk/java/com/l2jserver/gameserver/model/L2RecipeList.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/L2Request.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/L2SiegeClan.java
View File

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

10
trunk/java/com/l2jserver/gameserver/model/L2Spawn.java
View File

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

26
trunk/java/com/l2jserver/gameserver/model/L2Territory.java
View File

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

10
trunk/java/com/l2jserver/gameserver/model/L2World.java
View File

@@ -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<L2Object> visibles = getVisibleObjects(object, 2000);
final List<L2Object> visibles = getVisibleObjects(object, 2000);
if (Config.DEBUG)
{
_log.finest("objects in range:" + visibles.size());
@@ -404,7 +404,7 @@ public final class L2World
*/
public List<L2Object> 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<L2Playable> 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<Integer, L2Playable> _allpls = regi.getVisiblePlayable();
Collection<L2Playable> _playables = _allpls.values();
final Map<Integer, L2Playable> _allpls = regi.getVisiblePlayable();
final Collection<L2Playable> _playables = _allpls.values();
// Go through visible object of the selected region
for (L2Playable _object : _playables)
{

6
trunk/java/com/l2jserver/gameserver/model/L2WorldRegion.java
View File

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

22
trunk/java/com/l2jserver/gameserver/model/MacroList.java
View File

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

46
trunk/java/com/l2jserver/gameserver/model/MobGroup.java
View File

@@ -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<L2ControllableMobInstance> deadMobs = new LinkedList<>();
final List<L2ControllableMobInstance> 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);
}

4
trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java
View File

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

18
trunk/java/com/l2jserver/gameserver/model/ShortCuts.java
View File

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

64
trunk/java/com/l2jserver/gameserver/model/StatsSet.java
View File

@@ -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<Byte> getByteList(String key, String splitOn)
{
List<Byte> result = new ArrayList<>();
final List<Byte> 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<Integer> getIntegerList(String key, String splitOn)
{
List<Integer> result = new ArrayList<>();
final List<Integer> 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 extends Enum<T>> T getEnum(String key, Class<T> 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 extends Enum<T>> T getEnum(String key, Class<T> 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> A getObject(String name, Class<A> 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<MinionHolder> getMinionList(String key)
{
Object obj = _set.get(key);
final Object obj = _set.get(key);
if ((obj == null) || !(obj instanceof List<?>))
{
return Collections.emptyList();

44
trunk/java/com/l2jserver/gameserver/model/TradeList.java
View File

@@ -125,7 +125,7 @@ public class TradeList
final List<TradeItem> 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;

12
trunk/java/com/l2jserver/gameserver/model/UIKeysSettings.java
View File

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

40
trunk/java/com/l2jserver/gameserver/model/actor/L2Attackable.java
View File

@@ -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<L2Summon> summon = attacker.getServitors().values().stream().filter(s -> ((L2ServitorInstance) s).getExpMultiplier() > 1).findFirst();
final Optional<L2Summon> 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<L2Character> result = new ArrayList<>();
final List<L2Character> 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<L2Character> result = new ArrayList<>();
final List<L2Character> 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<ItemHolder> deathItems = npcTemplate.calculateDrops(DropListScope.DEATH, this, player);
final Collection<ItemHolder> 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;
}

214
trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
View File

@@ -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<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
final Collection<L2PcInstance> 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<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
final Collection<L2PcInstance> 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<L2Object> objs = getKnownList().getKnownObjects().values();
final Collection<L2Object> 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<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
final Collection<L2PcInstance> 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<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
final Collection<L2PcInstance> 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<L2Object> objs = player.getKnownList().getKnownObjects().values();
final Collection<L2Object> 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<L2Object> objs = getKnownList().getKnownObjects().values();
final Collection<L2Object> objs = getKnownList().getKnownObjects().values();
for (L2Object npc : objs)
{
if ((npc != null) && npc.isNpc())

2
trunk/java/com/l2jserver/gameserver/model/actor/L2Decoy.java
View File

@@ -59,7 +59,7 @@ public abstract class L2Decoy extends L2Character
@Override
public void updateAbnormalVisualEffects()
{
Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
final Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
{

34
trunk/java/com/l2jserver/gameserver/model/actor/L2Npc.java
View File

@@ -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<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
final Collection<L2PcInstance> 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)

6
trunk/java/com/l2jserver/gameserver/model/actor/L2Playable.java
View File

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

10
trunk/java/com/l2jserver/gameserver/model/actor/L2Summon.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java
View File

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

86
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java
View File

@@ -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<Auction> auctions = ClanHallAuctionManager.getInstance().getAuctions();
SimpleDateFormat format = new SimpleDateFormat("yy/MM/dd");
final List<Auction> 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("<table width=280 border=0><tr>");
for (int j = 1; j <= npage; j++)
{
@@ -362,7 +362,7 @@ public final class L2AuctioneerInstance extends L2Npc
}
items.append("</table>");
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<Integer, Bidder> bidders = ClanHallAuctionManager.getInstance().getAuction(auctionId).getBidders();
final Map<Integer, Bidder> bidders = ClanHallAuctionManager.getInstance().getAuction(auctionId).getBidders();
for (Bidder b : bidders.values())
{
biders += "<tr>" + "<td>" + b.getClanName() + "</td><td>" + b.getName() + "</td><td>" + b.getTimeBid().get(Calendar.YEAR) + "/" + (b.getTimeBid().get(Calendar.MONTH) + 1) + "/" + b.getTimeBid().get(Calendar.DATE) + "</td><td>" + b.getBid() + "</td>" + "</tr>";
}
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)

6
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BabyPetInstance.java
View File

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

18
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java
View File

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

8
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CastleDoormenInstance.java
View File

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

4
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java
View File

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

110
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
View File

@@ -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 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 20\">20%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 220\">220%</a>]";
String hp_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 100\">100%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 160\">160%</a>]";
String hp_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 80\">80%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 140\">140%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 200\">200%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 260\">260%</a>]";
String hp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 80\">80%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 120\">120%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 180\">180%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 240\">240%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 300\">300%</a>]";
String exp_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 10\">10%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 25\">25%</a>]";
String exp_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 30\">30%</a>]";
String exp_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 25\">25%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 40\">40%</a>]";
String exp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 25\">25%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 35\">35%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 50\">50%</a>]";
String mp_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 10\">10%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 25\">25%</a>]";
String mp_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 25\">25%</a>]";
String mp_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>]";
String mp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>]";
final String hp_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 20\">20%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 220\">220%</a>]";
final String hp_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 100\">100%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 160\">160%</a>]";
final String hp_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 80\">80%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 140\">140%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 200\">200%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 260\">260%</a>]";
final String hp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 80\">80%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 120\">120%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 180\">180%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 240\">240%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 300\">300%</a>]";
final String exp_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 10\">10%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 25\">25%</a>]";
final String exp_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 30\">30%</a>]";
final String exp_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 25\">25%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 40\">40%</a>]";
final String exp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 25\">25%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 35\">35%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 50\">50%</a>]";
final String mp_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 10\">10%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 25\">25%</a>]";
final String mp_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 25\">25%</a>]";
final String mp_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>]";
final String mp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
{
html.replace("%hp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease()) + "</font>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()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease()) + "</font>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()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease()) + "</font>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 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_tele 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_tele 2\">Level 2</a>]";
String support_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
String support_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 4\">Level 4</a>]";
String support_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 3\">Level 3</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 4\">Level 4</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 5\">Level 5</a>]";
String support_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 3\">Level 3</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 5\">Level 5</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 7\">Level 7</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 8\">Level 8</a>]";
String item = "[<a action=\"bypass -h npc_%objectId%_manage other edit_item 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 3\">Level 3</a>]";
final String tele = "[<a action=\"bypass -h npc_%objectId%_manage other edit_tele 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_tele 2\">Level 2</a>]";
final String support_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
final String support_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 4\">Level 4</a>]";
final String support_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 3\">Level 3</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 4\">Level 4</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 5\">Level 5</a>]";
final String support_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 3\">Level 3</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 5\">Level 5</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 7\">Level 7</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 8\">Level 8</a>]";
final String item = "[<a action=\"bypass -h npc_%objectId%_manage other edit_item 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 3\">Level 3</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
{
html.replace("%tele%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease()) + "</font>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()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease()) + "</font>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 = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_curtains 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_curtains 2\">Level 2</a>]";
String fixtures = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 2\">Level 2</a>]";
final String curtains = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_curtains 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_curtains 2\">Level 2</a>]";
final String fixtures = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 2\">Level 2</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
{
html.replace("%curtain%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease()) + "</font>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);
}
}

2
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClassMasterInstance.java
View File

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

38
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java
View File

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

4
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java
View File

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

8
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java
View File

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

48
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java
View File

@@ -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<L2PcInstance> knownPlayers = getKnownList().getKnownPlayers().values();
final Collection<L2PcInstance> 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<Integer> set = DoorData.getDoorsByGroup(groupName);
final Set<Integer> 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();

6
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java
View File

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

8
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@@ -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<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId());
final List<FortSiegeSpawn> 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());

4
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java
View File

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

8
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java
View File

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

62
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java
View File

@@ -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 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 300\">300%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 400\">400%</a>]";
String exp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 45\">45%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 50\">50%</a>]";
String mp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 50\">50%</a>]";
final String hp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 300\">300%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 400\">400%</a>]";
final String exp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 45\">45%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 50\">50%</a>]";
final String mp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 50\">50%</a>]";
if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null)
{
html.replace("%hp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease()) + "</font>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 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_tele 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_tele 2\">Level 2</a>]";
String support = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
final String tele = "[<a action=\"bypass -h npc_%objectId%_manage other edit_tele 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_tele 2\">Level 2</a>]";
final String support = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
if (getFort().getFunction(Fort.FUNC_TELEPORT) != null)
{
html.replace("%tele%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLease()) + "</font>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))

2
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java
View File

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

6
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java
View File

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

430
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

File diff suppressed because it is too large Load Diff

76
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
View File

@@ -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<Integer> foodIds = getPetData().getFood();
final List<Integer> 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);
}

12
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java
View File

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

38
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java
View File

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

10
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java
View File

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

10
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
View File

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

4
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java
View File

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

4
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java
View File

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

14
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java
View File

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

20
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java
View File

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

12
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/knownlist/AttackableKnownList.java
View File

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

12
trunk/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java
View File

@@ -128,7 +128,7 @@ public class CharKnownList extends ObjectKnownList
final Iterator<L2PcInstance> 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<L2Summon> 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<L2Object> 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<L2Character> getKnownCharacters()
{
List<L2Character> result = new LinkedList<>();
final List<L2Character> result = new LinkedList<>();
for (L2Object obj : getKnownObjects().values())
{
if (obj instanceof L2Character)
@@ -211,7 +211,7 @@ public class CharKnownList extends ObjectKnownList
public List<L2Character> getKnownCharactersInRadius(long radius)
{
List<L2Character> result = new LinkedList<>();
final List<L2Character> result = new LinkedList<>();
for (L2Object obj : getKnownObjects().values())
{
if (obj instanceof L2Character)
@@ -227,7 +227,7 @@ public class CharKnownList extends ObjectKnownList
public final List<L2PcInstance> getKnownPlayersInRadius(long radius)
{
List<L2PcInstance> result = new LinkedList<>();
final List<L2PcInstance> result = new LinkedList<>();
for (L2PcInstance player : getKnownPlayers().values())
{
if (Util.checkIfInRange((int) radius, getActiveChar(), player, true))

8
trunk/java/com/l2jserver/gameserver/model/actor/knownlist/DefenderKnownList.java
View File

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

13
trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java
View File

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

24
trunk/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java
View File

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

6
trunk/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java
View File

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

6
trunk/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java
View File

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

10
trunk/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java
View File

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

6
trunk/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/status/PetStatus.java
View File

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

8
trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicAction.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicHeal.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/FameTask.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/GameGuardCheckTask.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/LookingForFishTask.java
View File

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

4
trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/PetFeedTask.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/WaterTask.java
View File

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

4
trunk/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java
View File

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

8
trunk/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java
View File

@@ -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<IDropItem> getDropList(DropListScope dropListScope)
{
Map<DropListScope, List<IDropItem>> dropLists = _dropLists;
final Map<DropListScope, List<IDropItem>> dropLists = _dropLists;
return dropLists != null ? dropLists.get(dropListScope) : null;
}
public Collection<ItemHolder> calculateDrops(DropListScope dropListScope, L2Character victim, L2Character killer)
{
List<IDropItem> dropList = getDropList(dropListScope);
final List<IDropItem> 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()))

2
trunk/java/com/l2jserver/gameserver/model/base/PlayerClass.java
View File

@@ -261,7 +261,7 @@ public enum PlayerClass
public static final EnumSet<PlayerClass> getSet(Race race, ClassLevel level)
{
EnumSet<PlayerClass> allOf = EnumSet.noneOf(PlayerClass.class);
final EnumSet<PlayerClass> allOf = EnumSet.noneOf(PlayerClass.class);
for (PlayerClass playerClass : EnumSet.allOf(PlayerClass.class))
{

2
trunk/java/com/l2jserver/gameserver/model/beautyshop/BeautyItem.java
View File

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

8
trunk/java/com/l2jserver/gameserver/model/buylist/Product.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/conditions/Condition.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerWeight.java
View File

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

10
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java
View File

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

2
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java
View File

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

Some files were not shown because too many files have changed in this diff Show More