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

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java
View File

@@ -43,7 +43,7 @@ public final class AllyDismiss extends L2GameClientPacket
{
return;
}
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
@@ -53,7 +53,7 @@ public final class AllyDismiss extends L2GameClientPacket
player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION);
return;
}
L2Clan leaderClan = player.getClan();
final L2Clan leaderClan = player.getClan();
if (leaderClan.getAllyId() == 0)
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS);
@@ -64,7 +64,7 @@ public final class AllyDismiss extends L2GameClientPacket
player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS);
return;
}
L2Clan clan = ClanTable.getInstance().getClanByName(_clanName);
final L2Clan clan = ClanTable.getInstance().getClanByName(_clanName);
if (clan == null)
{
player.sendPacket(SystemMessageId.THAT_CLAN_DOES_NOT_EXIST);
@@ -81,7 +81,7 @@ public final class AllyDismiss extends L2GameClientPacket
return;
}
long currentTime = System.currentTimeMillis();
final long currentTime = System.currentTimeMillis();
leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000L), L2Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000
leaderClan.updateClanInDB();

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java
View File

@@ -35,7 +35,7 @@ public final class AllyLeave extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
@@ -50,7 +50,7 @@ public final class AllyLeave extends L2GameClientPacket
player.sendPacket(SystemMessageId.ONLY_THE_CLAN_LEADER_MAY_APPLY_FOR_WITHDRAWAL_FROM_THE_ALLIANCE);
return;
}
L2Clan clan = player.getClan();
final L2Clan clan = player.getClan();
if (clan.getAllyId() == 0)
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS);
@@ -62,7 +62,7 @@ public final class AllyLeave extends L2GameClientPacket
return;
}
long currentTime = System.currentTimeMillis();
final long currentTime = System.currentTimeMillis();
clan.setAllyId(0);
clan.setAllyName(null);
clan.changeAllyCrest(0, true);

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java
View File

@@ -48,8 +48,8 @@ public class AnswerCoupleAction extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getActiveChar();
L2PcInstance target = L2World.getInstance().getPlayer(_charObjId);
final L2PcInstance activeChar = getActiveChar();
final L2PcInstance target = L2World.getInstance().getPlayer(_charObjId);
if ((activeChar == null) || (target == null))
{
return;
@@ -82,7 +82,7 @@ public class AnswerCoupleAction extends L2GameClientPacket
}
else if (_answer == -1) // refused
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_COUPLE_ACTIONS_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_COUPLE_ACTIONS_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(activeChar);
target.sendPacket(sm);
}

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
View File

@@ -54,7 +54,7 @@ public final class AnswerJoinPartyRoom extends L2GameClientPacket
return;
}
L2PcInstance partner = player.getActiveRequester();
final L2PcInstance partner = player.getActiveRequester();
if (partner == null)
{
// Partner hasn't been found, cancel the invitation
@@ -80,7 +80,7 @@ public final class AnswerJoinPartyRoom extends L2GameClientPacket
// If answer is positive, join the requester's PartyRoom.
if ((_answer == 1) && !partner.isRequestExpired())
{
PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(partner.getPartyRoom());
final PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(partner.getPartyRoom());
if (room == null)
{
return;

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerPartyLootModification.java
View File

@@ -39,12 +39,12 @@ public class AnswerPartyLootModification extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
}
L2Party party = activeChar.getParty();
final L2Party party = activeChar.getParty();
if (party != null)
{
party.answerLootChangeRequest(activeChar, _answer == 1);

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java
View File

@@ -45,7 +45,7 @@ public final class AnswerTradeRequest extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
@@ -58,7 +58,7 @@ public final class AnswerTradeRequest extends L2GameClientPacket
return;
}
L2PcInstance partner = player.getActiveRequester();
final L2PcInstance partner = player.getActiveRequester();
if (partner == null)
{
// Trade partner not found, cancel trade
@@ -90,7 +90,7 @@ public final class AnswerTradeRequest extends L2GameClientPacket
}
else
{
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DENIED_YOUR_REQUEST_TO_TRADE);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DENIED_YOUR_REQUEST_TO_TRADE);
msg.addString(player.getName());
partner.sendPacket(msg);
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java
View File

@@ -43,7 +43,7 @@ public final class Appearing extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/AuthLogin.java
View File

@@ -61,7 +61,7 @@ public final class AuthLogin extends L2GameClientPacket
client.close((L2GameServerPacket) null);
return;
}
SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2);
final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2);
if (Config.DEBUG)
{
_log.info("user:" + _loginName);

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java
View File

@@ -44,9 +44,9 @@ public class BrEventRankerList extends L2GameClientPacket
protected void runImpl()
{
// TODO count, bestScore, myScore
int count = 0;
int bestScore = 0;
int myScore = 0;
final int count = 0;
final int bestScore = 0;
final int myScore = 0;
getClient().sendPacket(new ExBrLoadEventTopRankers(_eventId, _day, count, bestScore, myScore));
}

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/BypassUserCmd.java
View File

@@ -41,13 +41,13 @@ public class BypassUserCmd extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
}
IUserCommandHandler handler = UserCommandHandler.getInstance().getHandler(_command);
final IUserCommandHandler handler = UserCommandHandler.getInstance().getHandler(_command);
if (handler == null)
{

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymore.java
View File

@@ -48,7 +48,7 @@ public final class CannotMoveAnymore extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
View File

@@ -48,7 +48,7 @@ public final class CannotMoveAnymoreInVehicle extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
@@ -59,7 +59,7 @@ public final class CannotMoveAnymoreInVehicle extends L2GameClientPacket
{
player.setInVehiclePosition(new Location(_x, _y, _z));
player.setHeading(_heading);
StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
player.broadcastPacket(msg);
}
}

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
View File

@@ -260,7 +260,7 @@ public final class CharacterCreate extends L2GameClientPacket
initNewChar(getClient(), newChar);
LogRecord record = new LogRecord(Level.INFO, "Created new character");
final LogRecord record = new LogRecord(Level.INFO, "Created new character");
record.setParameters(new Object[]
{
newChar,
@@ -292,7 +292,7 @@ public final class CharacterCreate extends L2GameClientPacket
if (Config.CUSTOM_STARTING_LOC)
{
Location createLoc = new Location(Config.CUSTOM_STARTING_LOC_X, Config.CUSTOM_STARTING_LOC_Y, Config.CUSTOM_STARTING_LOC_Z);
final Location createLoc = new Location(Config.CUSTOM_STARTING_LOC_X, Config.CUSTOM_STARTING_LOC_Y, Config.CUSTOM_STARTING_LOC_Z);
newChar.setXYZInvisible(createLoc.getX(), createLoc.getY(), createLoc.getZ());
}
else if (Config.FACTION_SYSTEM_ENABLED)
@@ -301,7 +301,7 @@ public final class CharacterCreate extends L2GameClientPacket
}
else
{
Location createLoc = template.getCreationPoint();
final Location createLoc = template.getCreationPoint();
newChar.setXYZInvisible(createLoc.getX(), createLoc.getY(), createLoc.getZ());
}
newChar.setTitle("");

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java
View File

@@ -62,7 +62,7 @@ public final class CharacterDelete extends L2GameClientPacket
try
{
byte answer = getClient().markToDeleteChar(_charSlot);
final byte answer = getClient().markToDeleteChar(_charSlot);
switch (answer)
{
@@ -87,7 +87,7 @@ public final class CharacterDelete extends L2GameClientPacket
_log.log(Level.SEVERE, "Error:", e);
}
CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1);
final CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1);
sendPacket(cl);
getClient().setCharSelection(cl.getCharInfo());
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java
View File

@@ -49,7 +49,7 @@ public final class CharacterRestore extends L2GameClientPacket
}
getClient().markRestoredChar(_charSlot);
CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1);
final CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1);
sendPacket(cl);
getClient().setCharSelection(cl.getCharInfo());
final CharSelectInfoPackage charInfo = getClient().getCharSelection(_charSlot);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java
View File

@@ -184,7 +184,7 @@ public class CharacterSelect extends L2GameClientPacket
client.getActiveCharLock().unlock();
}
LogRecord record = new LogRecord(Level.INFO, "Logged in");
final LogRecord record = new LogRecord(Level.INFO, "Logged in");
record.setParameters(new Object[]
{
client

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java
View File

@@ -76,14 +76,14 @@ public final class DlgAnswer extends L2GameClientPacket
}
else if (activeChar.removeAction(PlayerAction.ADMIN_COMMAND))
{
String cmd = activeChar.getAdminConfirmCmd();
final String cmd = activeChar.getAdminConfirmCmd();
activeChar.setAdminConfirmCmd(null);
if (_answer == 0)
{
return;
}
String command = cmd.split(" ")[0];
IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
final String command = cmd.split(" ")[0];
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
{
if (Config.GMAUDIT)

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java
View File

@@ -38,7 +38,7 @@ public final class EndScenePlayer extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

16
trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -146,7 +146,7 @@ public class EnterWorld extends L2GameClientPacket
return;
}
String[] adress = new String[5];
final String[] adress = new String[5];
for (int i = 0; i < 5; i++)
{
adress[i] = tracert[i][0] + "." + tracert[i][1] + "." + tracert[i][2] + "." + tracert[i][3];
@@ -331,7 +331,7 @@ public class EnterWorld extends L2GameClientPacket
notifySponsorOrApprentice(activeChar);
AuctionableHall clanHall = ClanHallManager.getInstance().getClanHallByOwner(activeChar.getClan());
final AuctionableHall clanHall = ClanHallManager.getInstance().getClanHallByOwner(activeChar.getClan());
if (clanHall != null)
{
@@ -488,7 +488,7 @@ public class EnterWorld extends L2GameClientPacket
sm.addString(activeChar.getName());
for (int id : activeChar.getFriendList().keySet())
{
L2Object obj = L2World.getInstance().findObject(id);
final L2Object obj = L2World.getInstance().findObject(id);
if (obj != null)
{
obj.sendPacket(sm);
@@ -518,7 +518,7 @@ public class EnterWorld extends L2GameClientPacket
}
else if (Config.SERVER_NEWS)
{
String serverNews = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/servnews.htm");
final String serverNews = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/servnews.htm");
if (serverNews != null)
{
sendPacket(new NpcHtmlMessage(serverNews));
@@ -576,7 +576,7 @@ public class EnterWorld extends L2GameClientPacket
}
else
{
int slot = activeChar.getInventory().getSlotFromItem(activeChar.getInventory().getItemByItemId(9819));
final int slot = activeChar.getInventory().getSlotFromItem(activeChar.getInventory().getItemByItemId(9819));
activeChar.getInventory().unEquipItemInBodySlot(slot);
activeChar.destroyItem("CombatFlag", activeChar.getInventory().getItemByItemId(9819), null, true);
}
@@ -616,7 +616,7 @@ public class EnterWorld extends L2GameClientPacket
L2ClassMasterInstance.showQuestionMark(activeChar);
int birthday = activeChar.checkBirthDay();
final int birthday = activeChar.checkBirthDay();
if (birthday == 0)
{
activeChar.sendPacket(SystemMessageId.HAPPY_BIRTHDAY_ALEGRIA_HAS_SENT_YOU_A_BIRTHDAY_GIFT);
@@ -667,7 +667,7 @@ public class EnterWorld extends L2GameClientPacket
private void engage(L2PcInstance cha)
{
int chaId = cha.getObjectId();
final int chaId = cha.getObjectId();
for (Couple cl : CoupleManager.getInstance().getCouples())
{
@@ -698,7 +698,7 @@ public class EnterWorld extends L2GameClientPacket
*/
private void notifyPartner(L2PcInstance cha, int partnerId)
{
int objId = cha.getPartnerId();
final int objId = cha.getPartnerId();
if (objId != 0)
{
final L2PcInstance partner = L2World.getInstance().getPlayer(objId);

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java
View File

@@ -70,11 +70,11 @@ public class GameGuardReply extends L2GameClientPacket
@Override
protected void runImpl()
{
L2GameClient client = getClient();
final L2GameClient client = getClient();
try
{
MessageDigest md = MessageDigest.getInstance("SHA");
byte[] result = md.digest(_reply);
final MessageDigest md = MessageDigest.getInstance("SHA");
final byte[] result = md.digest(_reply);
if (Arrays.equals(result, VALID))
{
client.setGameGuardOk(true);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/Logout.java
View File

@@ -89,7 +89,7 @@ public final class Logout extends L2GameClientPacket
// Remove player from Boss Zone
player.removeFromBossZone();
LogRecord record = new LogRecord(Level.INFO, "Disconnected");
final LogRecord record = new LogRecord(Level.INFO, "Disconnected");
record.setParameters(new Object[]
{
getClient()

10
trunk/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java
View File

@@ -68,7 +68,7 @@ public class MoveBackwardToLocation extends L2GameClientPacket
{
if (Config.L2WALKER_PROTECTION)
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is trying to use L2Walker and got kicked.", Config.DEFAULT_PUNISH);
}
}
@@ -77,7 +77,7 @@ public class MoveBackwardToLocation extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
@@ -119,7 +119,7 @@ public class MoveBackwardToLocation extends L2GameClientPacket
activeChar.abortCast();
activeChar.setTarget(null);
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
JumpWay jw = JumpManager.getInstance().new JumpWay();
final JumpWay jw = JumpManager.getInstance().new JumpWay();
jw.add(JumpManager.getInstance().new JumpNode(_targetX, _targetY, _targetZ, -1));
activeChar.sendPacket(new ExFlyMove(activeChar.getObjectId(), -1, jw));
activeChar.setXYZ(_targetX, _targetY, _targetZ);
@@ -135,8 +135,8 @@ public class MoveBackwardToLocation extends L2GameClientPacket
return;
}
double dx = _targetX - activeChar.getX();
double dy = _targetY - activeChar.getY();
final double dx = _targetX - activeChar.getX();
final double dy = _targetY - activeChar.getY();
// Can't move if character is confused, or trying to move a huge distance
if (activeChar.isOutOfControl() || (((dx * dx) + (dy * dy)) > 98010000)) // 9900*9900
{

14
trunk/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java
View File

@@ -91,7 +91,7 @@ public class MultiSellChoose extends L2GameClientPacket
return;
}
PreparedListContainer list = player.getMultiSell();
final PreparedListContainer list = player.getMultiSell();
if ((list == null) || (list.getListId() != _listId))
{
player.setMultiSell(null);
@@ -159,7 +159,7 @@ public class MultiSellChoose extends L2GameClientPacket
return;
}
ArrayList<Ingredient> ingredientsList = new ArrayList<>(entry.getIngredients().size());
final ArrayList<Ingredient> ingredientsList = new ArrayList<>(entry.getIngredients().size());
// Generate a list of distinct ingredients and counts in order to check if the correct item-counts
// are possessed by the player
boolean newIng;
@@ -170,7 +170,7 @@ public class MultiSellChoose extends L2GameClientPacket
// whenever they need to be applied. Uniqueness of items is thus judged by item id AND enchantment level
for (int i = ingredientsList.size(); --i >= 0;)
{
Ingredient ex = ingredientsList.get(i);
final Ingredient ex = ingredientsList.get(i);
// if the item was already added in the list, merely increment the count
// this happens if 1 list entry has the same ingredient twice (example 2 swords = 1 dual)
if ((ex.getItemId() == e.getItemId()) && (ex.getEnchantLevel() == e.getEnchantLevel()))
@@ -217,7 +217,7 @@ public class MultiSellChoose extends L2GameClientPacket
final long required = ((Config.ALT_BLACKSMITH_USE_RECIPES || !e.getMaintainIngredient()) ? (e.getItemCount() * _amount) : e.getItemCount());
if (inv.getInventoryItemCount(e.getItemId(), (list.getMaintainEnchantment() || (e.getEnchantLevel() > 0)) ? e.getEnchantLevel() : -1, false) < required)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S2_S1_S);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S2_S1_S);
sm.addItemName(e.getTemplate());
sm.addLong(required);
player.sendPacket(sm);
@@ -226,7 +226,7 @@ public class MultiSellChoose extends L2GameClientPacket
}
}
List<L2Augmentation> augmentation = new ArrayList<>();
final List<L2Augmentation> augmentation = new ArrayList<>();
Elementals[] elemental = null;
/** All ok, remove items and add final product */
@@ -278,7 +278,7 @@ public class MultiSellChoose extends L2GameClientPacket
if (list.getMaintainEnchantment() || (e.getEnchantLevel() > 0))
{
// loop through this list and remove (one by one) each item until the required amount is taken.
L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantLevel(), false);
final L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantLevel(), false);
for (int i = 0; i < (e.getItemCount() * _amount); i++)
{
if (inventoryContents[i].isAugmented())
@@ -336,7 +336,7 @@ public class MultiSellChoose extends L2GameClientPacket
// choice 1. Small number of items exchanged. No sorting.
for (int i = 1; i <= (e.getItemCount() * _amount); i++)
{
L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), false);
final L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), false);
itemToTake = inventoryContents[0];
// get item with the LOWEST enchantment level from the inventory...

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/NotifyExitBeautyShop.java
View File

@@ -44,7 +44,7 @@ public class NotifyExitBeautyShop extends L2GameClientPacket
return;
}
UserInfo userInfo = new UserInfo(activeChar, false);
final UserInfo userInfo = new UserInfo(activeChar, false);
userInfo.addComponentType(UserInfoType.APPAREANCE);
sendPacket(userInfo);
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/ObserverReturn.java
View File

@@ -36,7 +36,7 @@ public final class ObserverReturn extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/ProtocolVersion.java
View File

@@ -58,14 +58,14 @@ public final class ProtocolVersion extends L2GameClientPacket
}
else if (!Config.PROTOCOL_LIST.contains(_version))
{
LogRecord record = new LogRecord(Level.WARNING, "Wrong protocol");
final LogRecord record = new LogRecord(Level.WARNING, "Wrong protocol");
record.setParameters(new Object[]
{
_version,
getClient()
});
_logAccounting.log(record);
KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 0);
final KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 0);
getClient().setProtocolOk(false);
getClient().close(pk);
}
@@ -76,7 +76,7 @@ public final class ProtocolVersion extends L2GameClientPacket
_log.fine("Client Protocol Revision is ok: " + _version);
}
KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 1);
final KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 1);
getClient().sendPacket(pk);
getClient().setProtocolOk(true);
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireAbilityList.java
View File

@@ -42,7 +42,7 @@ public class RequestAcquireAbilityList extends L2GameClientPacket
readD(); // Total size
for (int i = 0; i < 3; i++)
{
int size = readD();
final int size = readD();
for (int j = 0; j < size; j++)
{
_skills.add(new SkillHolder(readD(), readD()));

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -196,7 +196,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
}
final L2Clan clan = activeChar.getClan();
int repCost = s.getLevelUpSp();
final int repCost = s.getLevelUpSp();
if (clan.getReputationScore() >= repCost)
{
if (Config.LIFE_CRYSTAL_NEEDED)
@@ -645,7 +645,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
if (levelUpSp > 0)
{
player.setSp(player.getSp() - levelUpSp);
UserInfo ui = new UserInfo(player);
final UserInfo ui = new UserInfo(player);
ui.addComponentType(UserInfoType.CURRENT_HPMPCP_EXP_SP);
player.sendPacket(ui);
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java
View File

@@ -128,7 +128,7 @@ public final class RequestActionUse extends L2GameClientPacket
// Don't allow to do some action if player is transformed
if (activeChar.isTransformed())
{
int[] allowedActions = activeChar.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
final int[] allowedActions = activeChar.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0))
{
sendPacket(ActionFailed.STATIC_PACKET);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java
View File

@@ -37,7 +37,7 @@ public class RequestAllCastleInfo extends L2GameClientPacket
@Override
protected void runImpl()
{
L2GameClient client = getClient();
final L2GameClient client = getClient();
if (client != null)
{
client.sendPacket(new ExShowCastleInfo());

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java
View File

@@ -37,7 +37,7 @@ public class RequestAllFortressInfo extends L2GameClientPacket
@Override
protected void runImpl()
{
L2GameClient client = getClient();
final L2GameClient client = getClient();
if (client != null)
{
client.sendPacket(ExShowFortressInfo.STATIC_PACKET);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java
View File

@@ -77,7 +77,7 @@ public final class RequestAllyInfo extends L2GameClientPacket
activeChar.sendPacket(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFORMATION);
for (final ClanInfo aci : ai.getAllies())
for (ClanInfo aci : ai.getAllies())
{
activeChar.sendPacket(sm);

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
View File

@@ -37,13 +37,13 @@ public final class RequestAnswerJoinAlly extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
}
L2PcInstance requestor = activeChar.getRequest().getPartner();
final L2PcInstance requestor = activeChar.getRequest().getPartner();
if (requestor == null)
{
return;
@@ -61,7 +61,7 @@ public final class RequestAnswerJoinAlly extends L2GameClientPacket
return; // hax
}
L2Clan clan = requestor.getClan();
final L2Clan clan = requestor.getClan();
// we must double check this cause of hack
if (clan.checkAllyJoinCondition(requestor, activeChar))
{

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java
View File

@@ -68,7 +68,7 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket
{
case -1: // Party disable by player client config
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_PARTY_REQUESTS_AND_CANNOT_RECEIVE_A_PARTY_REQUEST);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_PARTY_REQUESTS_AND_CANNOT_RECEIVE_A_PARTY_REQUEST);
sm.addPcName(player);
requestor.sendPacket(sm);
break;
@@ -84,7 +84,7 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket
{
if (requestor.getParty().getMemberCount() >= 7)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PARTY_IS_FULL);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PARTY_IS_FULL);
player.sendPacket(sm);
requestor.sendPacket(sm);
return;
@@ -125,7 +125,7 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket
if (room != null)
{
room.addMember(player);
ExManagePartyRoomMember packet = new ExManagePartyRoomMember(player, room, 1);
final ExManagePartyRoomMember packet = new ExManagePartyRoomMember(player, room, 1);
for (L2PcInstance member : room.getPartyMembers())
{
if (member != null)

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@@ -49,13 +49,13 @@ public final class RequestAnswerJoinPledge extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
}
L2PcInstance requestor = activeChar.getRequest().getPartner();
final L2PcInstance requestor = activeChar.getRequest().getPartner();
if (requestor == null)
{
return;
@@ -77,7 +77,7 @@ public final class RequestAnswerJoinPledge extends L2GameClientPacket
return; // hax
}
RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
final L2Clan clan = requestor.getClan();
// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
@@ -99,7 +99,7 @@ public final class RequestAnswerJoinPledge extends L2GameClientPacket
activeChar.setClanPrivileges(activeChar.getClan().getRankPrivs(activeChar.getPowerGrade()));
activeChar.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
sm.addString(activeChar.getName());
clan.broadcastToOnlineMembers(sm);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
View File

@@ -37,7 +37,7 @@ public final class RequestBookMarkSlotInfo extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
player.sendPacket(new ExGetBookMarkInfoPacket(player));
}

12
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java
View File

@@ -54,7 +54,7 @@ public final class RequestBuyItem extends L2GameClientPacket
protected void readImpl()
{
_listId = readD();
int size = readD();
final int size = readD();
if ((size <= 0) || (size > Config.MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != _buf.remaining()))
{
return;
@@ -63,8 +63,8 @@ public final class RequestBuyItem extends L2GameClientPacket
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
int itemId = readD();
long count = readQ();
final int itemId = readD();
final long count = readQ();
if ((itemId < 1) || (count < 1))
{
_items = null;
@@ -77,7 +77,7 @@ public final class RequestBuyItem extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
@@ -102,7 +102,7 @@ public final class RequestBuyItem extends L2GameClientPacket
return;
}
L2Object target = player.getTarget();
final L2Object target = player.getTarget();
L2Character merchant = null;
if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
@@ -248,7 +248,7 @@ public final class RequestBuyItem extends L2GameClientPacket
// Proceed the purchase
for (ItemHolder i : _items)
{
Product product = buyList.getProductByItemId(i.getId());
final Product product = buyList.getProductByItemId(i.getId());
if (product == null)
{
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id " + _listId + " and item_id " + i.getId(), Config.DEFAULT_PUNISH);

42
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java
View File

@@ -133,9 +133,9 @@ public final class RequestBypassToServer extends L2GameClientPacket
{
if (_command.startsWith("admin_"))
{
String command = _command.split(" ")[0];
final String command = _command.split(" ")[0];
IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
if (ach == null)
{
@@ -157,7 +157,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
if (AdminData.getInstance().requireConfirm(command))
{
activeChar.setAdminConfirmCmd(_command);
ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S13);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S13);
dlg.addString("Are you sure you want execute command " + _command.substring(6) + " ?");
activeChar.addAction(PlayerAction.ADMIN_COMMAND);
activeChar.sendPacket(dlg);
@@ -182,7 +182,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
}
else if (_command.startsWith("npc_"))
{
int endOfId = _command.indexOf('_', 5);
final int endOfId = _command.indexOf('_', 5);
String id;
if (endOfId > 0)
{
@@ -194,7 +194,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
}
if (Util.isDigit(id))
{
L2Object object = L2World.getInstance().findObject(Integer.parseInt(id));
final L2Object object = L2World.getInstance().findObject(Integer.parseInt(id));
if ((object != null) && object.isNpc() && (endOfId > 0) && activeChar.isInsideRadius(object, L2Npc.INTERACTION_DISTANCE, false, false))
{
@@ -206,7 +206,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
}
else if (_command.startsWith("item_"))
{
int endOfId = _command.indexOf('_', 5);
final int endOfId = _command.indexOf('_', 5);
String id;
if (endOfId > 0)
{
@@ -233,11 +233,11 @@ public final class RequestBypassToServer extends L2GameClientPacket
}
else if (_command.startsWith("_match"))
{
String params = _command.substring(_command.indexOf("?") + 1);
StringTokenizer st = new StringTokenizer(params, "&");
int heroclass = Integer.parseInt(st.nextToken().split("=")[1]);
int heropage = Integer.parseInt(st.nextToken().split("=")[1]);
int heroid = Hero.getInstance().getHeroByClass(heroclass);
final String params = _command.substring(_command.indexOf("?") + 1);
final StringTokenizer st = new StringTokenizer(params, "&");
final int heroclass = Integer.parseInt(st.nextToken().split("=")[1]);
final int heropage = Integer.parseInt(st.nextToken().split("=")[1]);
final int heroid = Hero.getInstance().getHeroByClass(heroclass);
if (heroid > 0)
{
Hero.getInstance().showHeroFights(activeChar, heroclass, heroid, heropage);
@@ -245,11 +245,11 @@ public final class RequestBypassToServer extends L2GameClientPacket
}
else if (_command.startsWith("_diary"))
{
String params = _command.substring(_command.indexOf("?") + 1);
StringTokenizer st = new StringTokenizer(params, "&");
int heroclass = Integer.parseInt(st.nextToken().split("=")[1]);
int heropage = Integer.parseInt(st.nextToken().split("=")[1]);
int heroid = Hero.getInstance().getHeroByClass(heroclass);
final String params = _command.substring(_command.indexOf("?") + 1);
final StringTokenizer st = new StringTokenizer(params, "&");
final int heroclass = Integer.parseInt(st.nextToken().split("=")[1]);
final int heropage = Integer.parseInt(st.nextToken().split("=")[1]);
final int heroid = Hero.getInstance().getHeroByClass(heroclass);
if (heroid > 0)
{
Hero.getInstance().showHeroDiary(activeChar, heroclass, heroid, heropage);
@@ -257,7 +257,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
}
else if (_command.startsWith("_olympiad?command"))
{
int arenaId = Integer.parseInt(_command.split("=")[2]);
final int arenaId = Integer.parseInt(_command.split("=")[2]);
final IBypassHandler handler = BypassHandler.getInstance().getHandler("arenachange");
if (handler != null)
{
@@ -304,7 +304,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
{
if (bypassOriginId > 0)
{
L2Object bypassOrigin = activeChar.getKnownList().getKnownObjects().get(bypassOriginId);
final L2Object bypassOrigin = activeChar.getKnownList().getKnownObjects().get(bypassOriginId);
if ((bypassOrigin != null) && bypassOrigin.isInstanceTypes(InstanceType.L2Character))
{
handler.useBypass(_command, activeChar, (L2Character) bypassOrigin);
@@ -331,7 +331,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
if (activeChar.isGM())
{
StringBuilder sb = new StringBuilder(200);
final StringBuilder sb = new StringBuilder(200);
sb.append("<html><body>");
sb.append("Bypass error: " + e + "<br1>");
sb.append("Bypass command: " + _command + "<br1>");
@@ -356,14 +356,14 @@ public final class RequestBypassToServer extends L2GameClientPacket
*/
private static void comeHere(L2PcInstance activeChar)
{
L2Object obj = activeChar.getTarget();
final L2Object obj = activeChar.getTarget();
if (obj == null)
{
return;
}
if (obj instanceof L2Npc)
{
L2Npc temp = (L2Npc) obj;
final L2Npc temp = (L2Npc) obj;
temp.setTarget(activeChar);
temp.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, activeChar.getLocation());
}

10
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java
View File

@@ -65,7 +65,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket
return;
}
Message msg = MailManager.getInstance().getMessage(_msgId);
final Message msg = MailManager.getInstance().getMessage(_msgId);
if (msg == null)
{
return;
@@ -165,7 +165,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket
}
// Proceed to the transfer
InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
for (L2ItemInstance item : attachments.getItems())
{
if (item == null)
@@ -173,7 +173,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket
continue;
}
long count = item.getCount();
final long count = item.getCount();
final L2ItemInstance newItem = attachments.transferItem(attachments.getName(), item.getObjectId(), count, activeChar.getInventory(), activeChar, null);
if (newItem == null)
{
@@ -191,7 +191,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket
playerIU.addNewItem(newItem);
}
}
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1);
sm.addItemName(item.getId());
sm.addLong(count);
activeChar.sendPacket(sm);
@@ -215,7 +215,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket
final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL);
sm.addCharName(activeChar);
receiver.sendPacket(sm);
receiver.sendPacket(new ExChangePostState(true, _msgId, Message.DELETED));

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAbilityPoint.java
View File

@@ -59,10 +59,10 @@ public class RequestChangeAbilityPoint extends L2GameClientPacket
return;
}
long spRequired = AbilityPointsData.getInstance().getPrice(activeChar.getAbilityPoints());
final long spRequired = AbilityPointsData.getInstance().getPrice(activeChar.getAbilityPoints());
if (spRequired > activeChar.getSp())
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S1_SP_TO_CONVERT_TO1_ABILITY_POINT);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S1_SP_TO_CONVERT_TO1_ABILITY_POINT);
sm.addLong(spRequired);
activeChar.sendPacket(sm);
return;

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java
View File

@@ -64,7 +64,7 @@ public class RequestChangeAttributeItem extends L2GameClientPacket
}
request.setProcessing(true);
L2ItemInstance item = player.getInventory().getItemByObjectId(_itemOID);
final L2ItemInstance item = player.getInventory().getItemByObjectId(_itemOID);
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
@@ -93,12 +93,12 @@ public class RequestChangeAttributeItem extends L2GameClientPacket
player.sendPacket(new ExChangeAttributeItemList(player, _attributeOID));
return;
}
L2ItemInstance attribute = player.getInventory().getItemByObjectId(_attributeOID);
final L2ItemInstance attribute = player.getInventory().getItemByObjectId(_attributeOID);
player.getInventory().destroyItem("ChangingAttribute", _attributeOID, 1, player, null);
if (Rnd.get(100) < Config.CHANGE_CHANCE_ELEMENT)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_S2_ATTRIBUTE_HAS_SUCCESSFULLY_CHANGED_TO_S3_ATTRIBUTE);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_S2_ATTRIBUTE_HAS_SUCCESSFULLY_CHANGED_TO_S3_ATTRIBUTE);
sm.addItemName(item);
sm.addElemental(item.getAttackElementType());
sm.addElemental(_newAttributeID);
@@ -121,7 +121,7 @@ public class RequestChangeAttributeItem extends L2GameClientPacket
// send packets
player.sendPacket(new ExStorageMaxCount(player));
InventoryUpdate iu = new InventoryUpdate();
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(item);
if (player.getInventory().getItemByObjectId(_attributeOID) == null)
{

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePartyLeader.java
View File

@@ -39,13 +39,13 @@ public final class RequestChangePartyLeader extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
}
L2Party party = activeChar.getParty();
final L2Party party = activeChar.getParty();
if ((party != null) && party.isLeader(activeChar))
{
party.changePartyLeader(_name);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java
View File

@@ -42,7 +42,7 @@ public final class RequestChangePetName extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java
View File

@@ -52,17 +52,17 @@ public final class RequestConfirmGemStone extends AbstractRefinePacket
{
return;
}
L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId);
final L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId);
if (targetItem == null)
{
return;
}
L2ItemInstance refinerItem = activeChar.getInventory().getItemByObjectId(_refinerItemObjId);
final L2ItemInstance refinerItem = activeChar.getInventory().getItemByObjectId(_refinerItemObjId);
if (refinerItem == null)
{
return;
}
L2ItemInstance gemStoneItem = activeChar.getInventory().getItemByObjectId(_gemstoneItemObjId);
final L2ItemInstance gemStoneItem = activeChar.getInventory().getItemByObjectId(_gemstoneItemObjId);
if (gemStoneItem == null)
{
return;

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
View File

@@ -48,7 +48,7 @@ public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
@@ -60,7 +60,7 @@ public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket
return;
}
Castle castle = CastleManager.getInstance().getCastleById(_castleId);
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
if (castle == null)
{
return;
@@ -72,7 +72,7 @@ public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket
return;
}
L2Clan clan = ClanTable.getInstance().getClan(_clanId);
final L2Clan clan = ClanTable.getInstance().getClan(_clanId);
if (clan == null)
{
return;

12
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@@ -61,7 +61,7 @@ public final class RequestCrystallizeItem extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
@@ -87,7 +87,7 @@ public final class RequestCrystallizeItem extends L2GameClientPacket
return;
}
int skillLevel = activeChar.getSkillLevel(CommonSkill.CRYSTALLIZE.getId());
final int skillLevel = activeChar.getSkillLevel(CommonSkill.CRYSTALLIZE.getId());
if (skillLevel <= 0)
{
activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
@@ -99,10 +99,10 @@ public final class RequestCrystallizeItem extends L2GameClientPacket
return;
}
PcInventory inventory = activeChar.getInventory();
final PcInventory inventory = activeChar.getInventory();
if (inventory != null)
{
L2ItemInstance item = inventory.getItemByObjectId(_objectId);
final L2ItemInstance item = inventory.getItemByObjectId(_objectId);
if (item == null)
{
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
@@ -206,8 +206,8 @@ public final class RequestCrystallizeItem extends L2GameClientPacket
SystemMessage sm;
if (itemToRemove.isEquipped())
{
L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot());
InventoryUpdate iu = new InventoryUpdate();
final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot());
final InventoryUpdate iu = new InventoryUpdate();
for (L2ItemInstance item : unequiped)
{
iu.addModifiedItem(item);

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java
View File

@@ -42,14 +42,14 @@ public class RequestCursedWeaponList extends L2GameClientPacket
@Override
protected void runImpl()
{
L2Character activeChar = getClient().getActiveChar();
final L2Character activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
}
// send a ExCursedWeaponList :p
List<Integer> list = new ArrayList<>();
final List<Integer> list = new ArrayList<>();
for (int id : CursedWeaponsManager.getInstance().getCursedWeaponsIds())
{
list.add(id);

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
View File

@@ -45,13 +45,13 @@ public final class RequestCursedWeaponLocation extends L2GameClientPacket
@Override
protected void runImpl()
{
L2Character activeChar = getClient().getActiveChar();
final L2Character activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
}
List<CursedWeaponInfo> list = new ArrayList<>();
final List<CursedWeaponInfo> list = new ArrayList<>();
for (CursedWeapon cw : CursedWeaponsManager.getInstance().getCursedWeapons())
{
if (!cw.isActive())
@@ -59,7 +59,7 @@ public final class RequestCursedWeaponLocation extends L2GameClientPacket
continue;
}
Location pos = cw.getWorldPosition();
final Location pos = cw.getWorldPosition();
if (pos != null)
{
list.add(new CursedWeaponInfo(pos, cw.getItemId(), cw.isActivated() ? 1 : 0));

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
View File

@@ -39,7 +39,7 @@ public final class RequestDeleteBookMarkSlot extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
View File

@@ -41,7 +41,7 @@ public final class RequestDeleteReceivedPost extends L2GameClientPacket
@Override
protected void readImpl()
{
int count = readD();
final int count = readD();
if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining()))
{
return;
@@ -71,7 +71,7 @@ public final class RequestDeleteReceivedPost extends L2GameClientPacket
for (int msgId : _msgIds)
{
Message msg = MailManager.getInstance().getMessage(msgId);
final Message msg = MailManager.getInstance().getMessage(msgId);
if (msg == null)
{
continue;

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java
View File

@@ -41,7 +41,7 @@ public final class RequestDeleteSentPost extends L2GameClientPacket
@Override
protected void readImpl()
{
int count = readD();
final int count = readD();
if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining()))
{
return;
@@ -71,7 +71,7 @@ public final class RequestDeleteSentPost extends L2GameClientPacket
for (int msgId : _msgIds)
{
Message msg = MailManager.getInstance().getMessage(msgId);
final Message msg = MailManager.getInstance().getMessage(msgId);
if (msg == null)
{
continue;

18
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@@ -58,7 +58,7 @@ public final class RequestDestroyItem extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
@@ -87,7 +87,7 @@ public final class RequestDestroyItem extends L2GameClientPacket
return;
}
L2ItemInstance itemToRemove = activeChar.getInventory().getItemByObjectId(_objectId);
final L2ItemInstance itemToRemove = activeChar.getInventory().getItemByObjectId(_objectId);
// if we can't find the requested item, its actually a cheat
if (itemToRemove == null)
@@ -115,7 +115,7 @@ public final class RequestDestroyItem extends L2GameClientPacket
}
}
int itemId = itemToRemove.getId();
final int itemId = itemToRemove.getId();
if ((!activeChar.canOverrideCond(PcCondOverride.DESTROY_ALL_ITEMS) && !itemToRemove.isDestroyable()) || CursedWeaponsManager.getInstance().isCursed(itemId))
{
@@ -175,21 +175,21 @@ public final class RequestDestroyItem extends L2GameClientPacket
{
if (itemToRemove.getEnchantLevel() > 0)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(itemToRemove.getEnchantLevel());
sm.addItemName(itemToRemove);
activeChar.sendPacket(sm);
}
else
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(itemToRemove);
activeChar.sendPacket(sm);
}
L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot());
final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot());
InventoryUpdate iu = new InventoryUpdate();
final InventoryUpdate iu = new InventoryUpdate();
for (L2ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
@@ -197,7 +197,7 @@ public final class RequestDestroyItem extends L2GameClientPacket
activeChar.sendPacket(iu);
}
L2ItemInstance removedItem = activeChar.getInventory().destroyItem("Destroy", itemToRemove, count, activeChar, null);
final L2ItemInstance removedItem = activeChar.getInventory().destroyItem("Destroy", itemToRemove, count, activeChar, null);
if (removedItem == null)
{
@@ -206,7 +206,7 @@ public final class RequestDestroyItem extends L2GameClientPacket
if (!Config.FORCE_INVENTORY_UPDATE)
{
InventoryUpdate iu = new InventoryUpdate();
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissAlly.java
View File

@@ -38,7 +38,7 @@ public final class RequestDismissAlly extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java
View File

@@ -50,7 +50,7 @@ public class RequestDismissPartyRoom extends L2GameClientPacket
return;
}
PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
if (_room == null)
{

16
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java
View File

@@ -61,7 +61,7 @@ public final class RequestDropItem extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if ((activeChar == null) || activeChar.isDead())
{
return;
@@ -72,7 +72,7 @@ public final class RequestDropItem extends L2GameClientPacket
return;
}
L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
if ((item == null) || (_count == 0) || !activeChar.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && activeChar.havePetInvItems()) || activeChar.isInsideZone(ZoneId.NO_ITEM_DROP))
{
@@ -190,8 +190,8 @@ public final class RequestDropItem extends L2GameClientPacket
if (item.isEquipped())
{
L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot());
InventoryUpdate iu = new InventoryUpdate();
final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot());
final InventoryUpdate iu = new InventoryUpdate();
for (L2ItemInstance itm : unequiped)
{
itm.unChargeAllShots();
@@ -200,11 +200,11 @@ public final class RequestDropItem extends L2GameClientPacket
activeChar.sendPacket(iu);
activeChar.broadcastUserInfo();
ItemList il = new ItemList(activeChar, true);
final ItemList il = new ItemList(activeChar, true);
activeChar.sendPacket(il);
}
L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false);
final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false);
if (Config.DEBUG)
{
@@ -215,13 +215,13 @@ public final class RequestDropItem extends L2GameClientPacket
if (activeChar.isGM())
{
String target = (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target");
final String target = (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target");
GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", "Drop", target, "(id: " + dropedItem.getId() + " name: " + dropedItem.getItemName() + " objId: " + dropedItem.getObjectId() + " x: " + activeChar.getX() + " y: " + activeChar.getY() + " z: " + activeChar.getZ() + ")");
}
if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000))
{
String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")";
final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")";
_log.warning(msg);
AdminData.getInstance().broadcastMessageToGMs(msg);
}

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelAnswerStart.java
View File

@@ -46,13 +46,13 @@ public final class RequestDuelAnswerStart extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
}
L2PcInstance requestor = player.getActiveRequester();
final L2PcInstance requestor = player.getActiveRequester();
if (requestor == null)
{
return;
@@ -98,7 +98,7 @@ public final class RequestDuelAnswerStart extends L2GameClientPacket
}
else if (_response == -1)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_DUEL_REQUESTS_AND_CANNOT_RECEIVE_A_DUEL_REQUEST);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_DUEL_REQUESTS_AND_CANNOT_RECEIVE_A_DUEL_REQUEST);
sm.addPcName(player);
requestor.sendPacket(sm);
}

14
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java
View File

@@ -47,9 +47,9 @@ public final class RequestDuelStart extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
L2PcInstance targetChar = L2World.getInstance().getPlayer(_player);
boolean isPartyDuel = _partyDuel == 1 ? true : false;
final L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance targetChar = L2World.getInstance().getPlayer(_player);
final boolean isPartyDuel = _partyDuel == 1 ? true : false;
if ((activeChar == null) || (targetChar == null))
{
return;
@@ -64,7 +64,7 @@ public final class RequestDuelStart extends L2GameClientPacket
}
if (!activeChar.isInsideRadius(targetChar, 250, false, false))
{
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_TOO_FAR_AWAY_TO_RECEIVE_A_DUEL_CHALLENGE);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_TOO_FAR_AWAY_TO_RECEIVE_A_DUEL_CHALLENGE);
msg.addString(targetChar.getName());
activeChar.sendPacket(msg);
return;
@@ -102,7 +102,7 @@ public final class RequestDuelStart extends L2GameClientPacket
return;
}
}
L2PcInstance partyLeader = targetChar.getParty().getLeader(); // snatch party leader of targetChar's party
final L2PcInstance partyLeader = targetChar.getParty().getLeader(); // snatch party leader of targetChar's party
for (L2PcInstance temp : targetChar.getParty().getMembers())
{
@@ -135,7 +135,7 @@ public final class RequestDuelStart extends L2GameClientPacket
}
else
{
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
msg.addString(partyLeader.getName());
activeChar.sendPacket(msg);
}
@@ -164,7 +164,7 @@ public final class RequestDuelStart extends L2GameClientPacket
}
else
{
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
msg.addString(targetChar.getName());
activeChar.sendPacket(msg);
}

28
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -188,7 +188,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
case SUCCESS:
{
Skill enchant4Skill = null;
L2Item it = item.getItem();
final L2Item it = item.getItem();
// Increase enchant level only if scroll's base template has chance, some armors can success over +20 but they shouldn't have increased.
if (scrollTemplate.getChance(activeChar, item) > 0)
{
@@ -210,7 +210,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
if (Config.LOG_ITEM_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "Success");
final LogRecord record = new LogRecord(Level.INFO, "Success");
record.setParameters(new Object[]
{
activeChar,
@@ -223,17 +223,17 @@ public final class RequestEnchantItem extends L2GameClientPacket
}
// announce the success
int minEnchantAnnounce = item.isArmor() ? 6 : 7;
int maxEnchantAnnounce = item.isArmor() ? 0 : 15;
final int minEnchantAnnounce = item.isArmor() ? 6 : 7;
final int maxEnchantAnnounce = item.isArmor() ? 0 : 15;
if ((item.getEnchantLevel() == minEnchantAnnounce) || (item.getEnchantLevel() == maxEnchantAnnounce))
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_SUCCESSFULLY_ENCHANTED_A_S2_S3);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_SUCCESSFULLY_ENCHANTED_A_S2_S3);
sm.addCharName(activeChar);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
activeChar.broadcastPacket(sm);
Skill skill = CommonSkill.FIREWORK.getSkill();
final Skill skill = CommonSkill.FIREWORK.getSkill();
if (skill != null)
{
activeChar.broadcastPacket(new MagicSkillUse(activeChar, activeChar, skill.getId(), skill.getLevel(), skill.getHitTime(), skill.getReuseDelay()));
@@ -262,7 +262,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
if (Config.LOG_ITEM_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "Safe Fail");
final LogRecord record = new LogRecord(Level.INFO, "Safe Fail");
record.setParameters(new Object[]
{
activeChar,
@@ -281,19 +281,19 @@ public final class RequestEnchantItem extends L2GameClientPacket
{
if (item.getEnchantLevel() > 0)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
activeChar.sendPacket(sm);
}
else
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(item);
activeChar.sendPacket(sm);
}
L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot());
final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot());
for (L2ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
@@ -314,7 +314,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
if (Config.LOG_ITEM_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "Blessed Fail");
final LogRecord record = new LogRecord(Level.INFO, "Blessed Fail");
record.setParameters(new Object[]
{
activeChar,
@@ -337,7 +337,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
if (Config.LOG_ITEM_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "Blessed Fail");
final LogRecord record = new LogRecord(Level.INFO, "Blessed Fail");
record.setParameters(new Object[]
{
activeChar,
@@ -361,7 +361,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
if (Config.LOG_ITEM_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "Unable to destroy");
final LogRecord record = new LogRecord(Level.INFO, "Unable to destroy");
record.setParameters(new Object[]
{
activeChar,
@@ -397,7 +397,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
if (Config.LOG_ITEM_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "Fail");
final LogRecord record = new LogRecord(Level.INFO, "Fail");
record.setParameters(new Object[]
{
activeChar,

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
View File

@@ -52,7 +52,7 @@ public class RequestEx2ndPasswordReq extends L2GameClientPacket
return;
}
SecondaryPasswordAuth secondAuth = getClient().getSecondaryAuth();
final SecondaryPasswordAuth secondAuth = getClient().getSecondaryAuth();
boolean success = false;
if ((_changePass == 0) && !secondAuth.passwordExist())

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
View File

@@ -41,10 +41,10 @@ public final class RequestExAcceptJoinMPCC extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player != null)
{
L2PcInstance requestor = player.getActiveRequester();
final L2PcInstance requestor = player.getActiveRequester();
SystemMessage sm;
if (requestor == null)
{

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAddContactToContactList.java
View File

@@ -56,7 +56,7 @@ public class RequestExAddContactToContactList extends L2GameClientPacket
return;
}
boolean charAdded = activeChar.getContactList().add(_name);
final boolean charAdded = activeChar.getContactList().add(_name);
activeChar.sendPacket(new ExConfirmAddingContact(_name, charAdded));
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
View File

@@ -65,7 +65,7 @@ public final class RequestExAskJoinMPCC extends L2GameClientPacket
// activeChar is in a Party?
if (activeChar.isInParty())
{
L2Party activeParty = activeChar.getParty();
final L2Party activeParty = activeChar.getParty();
// activeChar is PartyLeader? && activeChars Party is already in a CommandChannel?
if (activeParty.getLeader().equals(activeChar))
{

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
View File

@@ -48,7 +48,7 @@ public final class RequestExCubeGameChangeTeam extends L2GameClientPacket
{
return;
}
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
switch (_team)
{
@@ -60,7 +60,7 @@ public final class RequestExCubeGameChangeTeam extends L2GameClientPacket
case -1:
// Remove Player (me)
{
int team = HandysBlockCheckerManager.getInstance().getHolder(_arena).getPlayerTeam(player);
final int team = HandysBlockCheckerManager.getInstance().getHolder(_arena).getPlayerTeam(player);
// client sends two times this packet if click on exit
// client did not send this packet on restart
if (team > -1)

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
View File

@@ -44,7 +44,7 @@ public final class RequestExCubeGameReadyAnswer extends L2GameClientPacket
@Override
public void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
View File

@@ -139,7 +139,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
{
elementToAdd = Elementals.getOppositeElement(elementToAdd);
}
byte opositeElement = Elementals.getOppositeElement(elementToAdd);
final byte opositeElement = Elementals.getOppositeElement(elementToAdd);
final Elementals oldElement = item.getElemental(elementToAdd);
final int elementValue = oldElement == null ? 0 : oldElement.getValue();
@@ -305,7 +305,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
}
boolean success = false;
ElementalItemType stoneType = Elementals.getItemElemental(stone.getId())._type;
final ElementalItemType stoneType = Elementals.getItemElemental(stone.getId())._type;
switch (item.getItem().getCrystalType())
{
case R:

46
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java
View File

@@ -249,7 +249,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
}
else if (_type == 1) // safe enchant
{
int costMultiplier = EnchantSkillGroupsData.SAFE_ENCHANT_COST_MULTIPLIER;
final int costMultiplier = EnchantSkillGroupsData.SAFE_ENCHANT_COST_MULTIPLIER;
final int reqItemId;
if (player.getClassId().level() == 3)
{
@@ -277,13 +277,13 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
return;
}
int requiredSp = esd.getSpCost() * costMultiplier;
int requireditems = esd.getAdenaCost() * costMultiplier;
int rate = esd.getRate(player);
final int requiredSp = esd.getSpCost() * costMultiplier;
final int requireditems = esd.getAdenaCost() * costMultiplier;
final int rate = esd.getRate(player);
if (player.getSp() >= requiredSp)
{
L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
if (spb == null)
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
@@ -311,7 +311,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
{
if (Config.LOG_SKILL_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "Safe Success");
final LogRecord record = new LogRecord(Level.INFO, "Safe Success");
record.setParameters(new Object[]
{
player,
@@ -332,7 +332,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
player.sendPacket(ExEnchantSkillResult.valueOf(true));
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED);
sm.addSkillName(_skillId);
player.sendPacket(sm);
}
@@ -340,7 +340,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
{
if (Config.LOG_SKILL_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "Safe Fail");
final LogRecord record = new LogRecord(Level.INFO, "Safe Fail");
record.setParameters(new Object[]
{
player,
@@ -352,7 +352,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
_logEnchant.log(record);
}
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_FAILED_THE_SKILL_WILL_BE_INITIALIZED);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_FAILED_THE_SKILL_WILL_BE_INITIALIZED);
player.sendPacket(sm);
player.sendPacket(ExEnchantSkillResult.valueOf(false));
}
@@ -366,7 +366,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
}
else
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
player.sendPacket(sm);
}
}
@@ -403,19 +403,19 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
return;
}
int currentEnchantLevel = beforeEnchantSkillLevel % 1000;
final int currentEnchantLevel = beforeEnchantSkillLevel % 1000;
if (currentEnchantLevel != (_skillLvl % 1000))
{
return;
}
EnchantSkillHolder esd = s.getEnchantSkillHolder(_skillLvl);
final EnchantSkillHolder esd = s.getEnchantSkillHolder(_skillLvl);
int requiredSp = esd.getSpCost();
int requireditems = esd.getAdenaCost();
final int requiredSp = esd.getSpCost();
final int requireditems = esd.getAdenaCost();
if (player.getSp() >= requiredSp)
{
L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
if (Config.ES_SP_BOOK_NEEDED)
{
if (spb == null)
@@ -446,7 +446,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
return;
}
int levelPenalty = Rnd.get(Math.min(4, currentEnchantLevel));
final int levelPenalty = Rnd.get(Math.min(4, currentEnchantLevel));
_skillLvl -= levelPenalty;
if ((_skillLvl % 1000) == 0)
{
@@ -455,7 +455,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
if (Config.LOG_SKILL_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "Route Change");
final LogRecord record = new LogRecord(Level.INFO, "Route Change");
record.setParameters(new Object[]
{
player,
@@ -478,13 +478,13 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
if (levelPenalty == 0)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_WILL_REMAIN);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_WILL_REMAIN);
sm.addSkillName(_skillId);
player.sendPacket(sm);
}
else
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_HAS_BEEN_DECREASED_BY_S2);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_HAS_BEEN_DECREASED_BY_S2);
sm.addSkillName(_skillId);
if (_skillLvl > 1000)
@@ -505,7 +505,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
}
else
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
player.sendPacket(sm);
}
}
@@ -537,7 +537,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
return;
}
L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
if (spb == null)
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
@@ -548,7 +548,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
if (Config.LOG_SKILL_ENCHANTS)
{
LogRecord record = new LogRecord(Level.INFO, "100% Success");
final LogRecord record = new LogRecord(Level.INFO, "100% Success");
record.setParameters(new Object[]
{
player,
@@ -568,7 +568,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
}
player.sendPacket(ExEnchantSkillResult.valueOf(true));
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED);
sm.addSkillName(_skillId);
player.sendPacket(sm);
player.sendPacket(new UserInfo(player));

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
View File

@@ -59,7 +59,7 @@ public final class RequestExEnchantSkillInfo extends L2GameClientPacket
return;
}
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
@@ -82,7 +82,7 @@ public final class RequestExEnchantSkillInfo extends L2GameClientPacket
return;
}
int playerSkillLvl = activeChar.getSkillLevel(_skillId);
final int playerSkillLvl = activeChar.getSkillLevel(_skillId);
if ((playerSkillLvl == -1) || (playerSkillLvl != _skillLvl))
{
return;

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
View File

@@ -60,7 +60,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
return;
}
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
@@ -82,7 +82,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
reqSkillLvl = _skillLvl; // change route
}
int playerSkillLvl = activeChar.getSkillLevel(_skillId);
final int playerSkillLvl = activeChar.getSkillLevel(_skillId);
// dont have such skill
if (playerSkillLvl == -1)
@@ -93,7 +93,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
// if reqlvl is 100,200,.. check base skill lvl enchant
if ((reqSkillLvl % 1000) == 0)
{
L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
final L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
if (esl != null)
{
// if player dont have min level to enchant
@@ -118,7 +118,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
}
// send skill enchantment detail
ExEnchantSkillInfoDetail esd = new ExEnchantSkillInfoDetail(_type, _skillId, _skillLvl, activeChar);
final ExEnchantSkillInfoDetail esd = new ExEnchantSkillInfoDetail(_type, _skillId, _skillLvl, activeChar);
activeChar.sendPacket(esd);
}

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
View File

@@ -64,7 +64,7 @@ public final class RequestExMagicSkillUseGround extends L2GameClientPacket
}
// Get the level of the used skill
int level = activeChar.getSkillLevel(_skillId);
final int level = activeChar.getSkillLevel(_skillId);
if (level <= 0)
{
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
@@ -72,7 +72,7 @@ public final class RequestExMagicSkillUseGround extends L2GameClientPacket
}
// Get the L2Skill template corresponding to the skillID received from the client
Skill skill = SkillData.getInstance().getSkill(_skillId, level);
final Skill skill = SkillData.getInstance().getSkill(_skillId, level);
// Check the validity of the skill
if (skill != null)

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java
View File

@@ -41,8 +41,8 @@ public final class RequestExOustFromMPCC extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance target = L2World.getInstance().getPlayer(_name);
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance target = L2World.getInstance().getPlayer(_name);
final L2PcInstance activeChar = getClient().getActiveChar();
if ((target != null) && target.isInParty() && activeChar.isInParty() && activeChar.getParty().isInCommandChannel() && target.getParty().isInCommandChannel() && activeChar.getParty().getCommandChannel().getLeader().equals(activeChar) && activeChar.getParty().getCommandChannel().equals(target.getParty().getCommandChannel()))
{

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
View File

@@ -50,13 +50,13 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket
@Override
public void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
}
L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_objectId);
final L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_objectId);
if (targetItem == null)
{
@@ -77,11 +77,11 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket
targetItem.clearElementAttr(_element);
activeChar.sendPacket(new UserInfo(activeChar));
InventoryUpdate iu = new InventoryUpdate();
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
activeChar.sendPacket(iu);
SystemMessage sm;
byte realElement = targetItem.isArmor() ? Elementals.getOppositeElement(_element) : _element;
final byte realElement = targetItem.isArmor() ? Elementals.getOppositeElement(_element) : _element;
if (targetItem.getEnchantLevel() > 0)
{
if (targetItem.isArmor())

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -42,13 +42,13 @@ public class RequestExRqItemLink extends L2GameClientPacket
@Override
protected void runImpl()
{
L2GameClient client = getClient();
final L2GameClient client = getClient();
if (client != null)
{
L2Object object = L2World.getInstance().findObject(_objectId);
final L2Object object = L2World.getInstance().findObject(_objectId);
if (object instanceof L2ItemInstance)
{
L2ItemInstance item = (L2ItemInstance) object;
final L2ItemInstance item = (L2ItemInstance) object;
if (item.isPublished())
{
client.sendPacket(new ExRpItemLink(item));

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
View File

@@ -36,7 +36,7 @@ public final class RequestExitPartyMatchingWaitingRoom extends L2GameClientPacke
@Override
protected void runImpl()
{
L2PcInstance _activeChar = getClient().getActiveChar();
final L2PcInstance _activeChar = getClient().getActiveChar();
if (_activeChar == null)
{

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java
View File

@@ -40,7 +40,7 @@ public class RequestFortressMapInfo extends L2GameClientPacket
@Override
protected void runImpl()
{
Fort fort = FortManager.getInstance().getFortById(_fortressId);
final Fort fort = FortManager.getInstance().getFortById(_fortressId);
if (fort == null)
{

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
View File

@@ -39,7 +39,7 @@ public class RequestFortressSiegeInfo extends L2GameClientPacket
@Override
protected void runImpl()
{
L2GameClient client = getClient();
final L2GameClient client = getClient();
if (client != null)
{
for (Fort fort : FortManager.getInstance().getForts())

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java
View File

@@ -58,9 +58,9 @@ public final class RequestGMCommand extends L2GameClientPacket
return;
}
L2PcInstance player = L2World.getInstance().getPlayer(_targetName);
final L2PcInstance player = L2World.getInstance().getPlayer(_targetName);
L2Clan clan = ClanTable.getInstance().getClanByName(_targetName);
final L2Clan clan = ClanTable.getInstance().getClanByName(_targetName);
// player name was incorrect?
if ((player == null) && ((clan == null) || (_command != 6)))

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@@ -40,7 +40,7 @@ public class RequestGiveNickName extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
@@ -68,10 +68,10 @@ public class RequestGiveNickName extends L2GameClientPacket
return;
}
L2ClanMember member1 = activeChar.getClan().getClanMember(_target);
final L2ClanMember member1 = activeChar.getClan().getClanMember(_target);
if (member1 != null)
{
L2PcInstance member = member1.getPlayerInstance();
final L2PcInstance member = member1.getPlayerInstance();
if (member != null)
{
// is target from the same clan?

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGotoLobby.java
View File

@@ -39,7 +39,7 @@ public class RequestGotoLobby extends L2GameClientPacket
@Override
protected void runImpl()
{
L2GameClient client = getClient();
final L2GameClient client = getClient();
client.sendPacket(new ExLoginVitalityEffectInfo(client));
client.sendPacket(new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1));
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestItemList.java
View File

@@ -39,7 +39,7 @@ public final class RequestItemList extends L2GameClientPacket
{
if ((getClient() != null) && (getClient().getActiveChar() != null) && !getClient().getActiveChar().isInventoryDisabled())
{
ItemList il = new ItemList(getClient().getActiveChar(), true);
final ItemList il = new ItemList(getClient().getActiveChar(), true);
sendPacket(il);
}
}

10
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java
View File

@@ -44,13 +44,13 @@ public final class RequestJoinAlly extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
}
L2PcInstance ob = L2World.getInstance().getPlayer(_id);
final L2PcInstance ob = L2World.getInstance().getPlayer(_id);
if (ob == null)
{
@@ -64,8 +64,8 @@ public final class RequestJoinAlly extends L2GameClientPacket
return;
}
L2PcInstance target = ob;
L2Clan clan = activeChar.getClan();
final L2PcInstance target = ob;
final L2Clan clan = activeChar.getClan();
if (!clan.checkAllyJoinCondition(activeChar, target))
{
return;
@@ -75,7 +75,7 @@ public final class RequestJoinAlly extends L2GameClientPacket
return;
}
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_LEADER_S2_HAS_REQUESTED_AN_ALLIANCE);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_LEADER_S2_HAS_REQUESTED_AN_ALLIANCE);
sm.addString(activeChar.getClan().getAllyName());
sm.addString(activeChar.getName());
target.sendPacket(sm);

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java
View File

@@ -50,8 +50,8 @@ public final class RequestJoinParty extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance requestor = getClient().getActiveChar();
L2PcInstance target = L2World.getInstance().getPlayer(_name);
final L2PcInstance requestor = getClient().getActiveChar();
final L2PcInstance target = L2World.getInstance().getPlayer(_name);
if (requestor == null)
{
@@ -79,7 +79,7 @@ public final class RequestJoinParty extends L2GameClientPacket
if (target.isPartyBanned())
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_CANNOT_JOIN_A_PARTY);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_CANNOT_JOIN_A_PARTY);
sm.addCharName(target);
requestor.sendPacket(sm);
return;

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinSiege.java
View File

@@ -51,7 +51,7 @@ public final class RequestJoinSiege extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
@@ -63,13 +63,13 @@ public final class RequestJoinSiege extends L2GameClientPacket
return;
}
L2Clan clan = activeChar.getClan();
final L2Clan clan = activeChar.getClan();
if (clan == null)
{
return;
}
Castle castle = CastleManager.getInstance().getCastleById(_castleId);
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
if (castle != null)
{
if (_isJoining == 1)
@@ -95,7 +95,7 @@ public final class RequestJoinSiege extends L2GameClientPacket
castle.getSiege().listRegisterClan(activeChar);
}
SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId);
final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId);
if (hall != null)
{
if (_isJoining == 1)

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java
View File

@@ -38,7 +38,7 @@ public class RequestKeyMapping extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java
View File

@@ -42,7 +42,7 @@ public final class RequestLinkHtml extends L2GameClientPacket
@Override
public void runImpl()
{
L2PcInstance actor = getClient().getActiveChar();
final L2PcInstance actor = getClient().getActiveChar();
if (actor == null)
{
return;
@@ -60,7 +60,7 @@ public final class RequestLinkHtml extends L2GameClientPacket
return;
}
int htmlObjectId = actor.validateHtmlAction("link " + _link);
final int htmlObjectId = actor.validateHtmlAction("link " + _link);
if (htmlObjectId == -1)
{
_log.warning("Player " + actor.getName() + " sent non cached html link: link " + _link);
@@ -73,7 +73,7 @@ public final class RequestLinkHtml extends L2GameClientPacket
return;
}
String filename = "html/" + _link;
final String filename = "html/" + _link;
final NpcHtmlMessage msg = new NpcHtmlMessage(htmlObjectId);
msg.setFile(actor.getHtmlPrefix(), filename);
sendPacket(msg);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
View File

@@ -44,7 +44,7 @@ public class RequestListPartyMatchingWaitingRoom extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance _activeChar = getClient().getActiveChar();
final L2PcInstance _activeChar = getClient().getActiveChar();
if (_activeChar == null)
{

22
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestMakeMacro.java
View File

@@ -40,11 +40,11 @@ public final class RequestMakeMacro extends L2GameClientPacket
@Override
protected void readImpl()
{
int _id = readD();
String _name = readS();
String _desc = readS();
String _acronym = readS();
int _icon = readC();
final int _id = readD();
final String _name = readS();
final String _desc = readS();
final String _acronym = readS();
final int _icon = readC();
int _count = readC();
if (_count > MAX_MACRO_LENGTH)
{
@@ -59,11 +59,11 @@ public final class RequestMakeMacro extends L2GameClientPacket
final List<MacroCmd> commands = new ArrayList<>(_count);
for (int i = 0; i < _count; i++)
{
int entry = readC();
int type = readC(); // 1 = skill, 3 = action, 4 = shortcut
int d1 = readD(); // skill or page number for shortcuts
int d2 = readC();
String command = readS();
final int entry = readC();
final int type = readC(); // 1 = skill, 3 = action, 4 = shortcut
final int d1 = readD(); // skill or page number for shortcuts
final int d2 = readC();
final String command = readS();
_commandsLenght += command.length();
commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command));
}
@@ -73,7 +73,7 @@ public final class RequestMakeMacro extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
View File

@@ -44,7 +44,7 @@ public final class RequestModifyBookMarkSlot extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadMatchList.java
View File

@@ -46,7 +46,7 @@ public final class RequestOlympiadMatchList extends L2GameClientPacket
return;
}
IBypassHandler handler = BypassHandler.getInstance().getHandler(COMMAND);
final IBypassHandler handler = BypassHandler.getInstance().getHandler(COMMAND);
if (handler != null)
{
handler.useBypass(COMMAND, activeChar, null);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
View File

@@ -37,7 +37,7 @@ public final class RequestOlympiadObserverEnd extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
View File

@@ -46,19 +46,19 @@ public final class RequestOustFromPartyRoom extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getActiveChar();
final L2PcInstance player = getActiveChar();
if (player == null)
{
return;
}
L2PcInstance member = L2World.getInstance().getPlayer(_charid);
final L2PcInstance member = L2World.getInstance().getPlayer(_charid);
if (member == null)
{
return;
}
PartyMatchRoom room = PartyMatchRoomList.getInstance().getPlayerRoom(member);
final PartyMatchRoom room = PartyMatchRoomList.getInstance().getPlayerRoom(member);
if ((room == null) || (room.getOwner() != player))
{
return;
@@ -81,7 +81,7 @@ public final class RequestOustFromPartyRoom extends L2GameClientPacket
PartyMatchWaitingList.getInstance().addPlayer(member);
// Send Room list
int loc = 0; // TODO: Closes town
final int loc = 0; // TODO: Closes town
member.sendPacket(new ListPartyWating(member, 0, loc, member.getLevel()));
// Clean player's LFP title

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPartyMember.java
View File

@@ -40,7 +40,7 @@ public final class RequestOustPartyMember extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPledgeMember.java
View File

@@ -70,9 +70,9 @@ public final class RequestOustPledgeMember extends L2GameClientPacket
return;
}
L2Clan clan = activeChar.getClan();
final L2Clan clan = activeChar.getClan();
L2ClanMember member = clan.getClanMember(_target);
final L2ClanMember member = clan.getClanMember(_target);
if (member == null)
{
_log.warning("Target (" + _target + ") is not member of the clan");
@@ -89,7 +89,7 @@ public final class RequestOustPledgeMember extends L2GameClientPacket
clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS));
clan.updateClanInDB();
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED);
sm.addString(member.getName());
clan.broadcastToOnlineMembers(sm);
activeChar.sendPacket(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_EXPELLING_THE_CLAN_MEMBER);
@@ -101,7 +101,7 @@ public final class RequestOustPledgeMember extends L2GameClientPacket
if (member.isOnline())
{
L2PcInstance player = member.getPlayerInstance();
final L2PcInstance player = member.getPlayerInstance();
player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS);
}
}

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java
View File

@@ -51,7 +51,7 @@ public class RequestPackageSend extends L2GameClientPacket
{
_objectId = readD();
int count = readD();
final int count = readD();
if ((count <= 0) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining()))
{
return;
@@ -60,8 +60,8 @@ public class RequestPackageSend extends L2GameClientPacket
_items = new ItemHolder[count];
for (int i = 0; i < count; i++)
{
int objId = readD();
long cnt = readQ();
final int objId = readD();
final long cnt = readQ();
if ((objId < 1) || (cnt < 0))
{
_items = null;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java
View File

@@ -40,7 +40,7 @@ public class RequestPackageSendableItemList extends L2GameClientPacket
@Override
public void runImpl()
{
L2ItemInstance[] items = getClient().getActiveChar().getInventory().getAvailableItems(true, true, true);
final L2ItemInstance[] items = getClient().getActiveChar().getInventory().getAvailableItems(true, true, true);
sendPacket(new PackageSendableList(items, _objectID));
}

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchConfig.java
View File

@@ -49,7 +49,7 @@ public final class RequestPartyMatchConfig extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance _activeChar = getClient().getActiveChar();
final L2PcInstance _activeChar = getClient().getActiveChar();
if (_activeChar == null)
{
@@ -66,13 +66,13 @@ public final class RequestPartyMatchConfig extends L2GameClientPacket
if (_activeChar.isInPartyMatchRoom())
{
// If Player is in Room show him room, not list
PartyMatchRoomList _list = PartyMatchRoomList.getInstance();
final PartyMatchRoomList _list = PartyMatchRoomList.getInstance();
if (_list == null)
{
return;
}
PartyMatchRoom _room = _list.getPlayerRoom(_activeChar);
final PartyMatchRoom _room = _list.getPlayerRoom(_activeChar);
if (_room == null)
{
return;
@@ -91,7 +91,7 @@ public final class RequestPartyMatchConfig extends L2GameClientPacket
PartyMatchWaitingList.getInstance().addPlayer(_activeChar);
// Send Room list
ListPartyWating matchList = new ListPartyWating(_activeChar, _auto, _loc, _lvl);
final ListPartyWating matchList = new ListPartyWating(_activeChar, _auto, _loc, _lvl);
_activeChar.sendPacket(matchList);
}

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchDetail.java
View File

@@ -57,13 +57,13 @@ public final class RequestPartyMatchDetail extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance _activeChar = getClient().getActiveChar();
final L2PcInstance _activeChar = getClient().getActiveChar();
if (_activeChar == null)
{
return;
}
PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
if (_room == null)
{
return;
@@ -88,7 +88,7 @@ public final class RequestPartyMatchDetail extends L2GameClientPacket
_member.sendPacket(new ExManagePartyRoomMember(_activeChar, _room, 0));
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ENTERED_THE_PARTY_ROOM);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ENTERED_THE_PARTY_ROOM);
sm.addCharName(_activeChar);
_member.sendPacket(sm);
}

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java
View File

@@ -54,7 +54,7 @@ public class RequestPartyMatchList extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance _activeChar = getClient().getActiveChar();
final L2PcInstance _activeChar = getClient().getActiveChar();
if (_activeChar == null)
{
@@ -63,7 +63,7 @@ public class RequestPartyMatchList extends L2GameClientPacket
if (_roomid > 0)
{
PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
if (_room != null)
{
_log.info("PartyMatchRoom #" + _room.getId() + " changed by " + _activeChar.getName());
@@ -87,9 +87,9 @@ public class RequestPartyMatchList extends L2GameClientPacket
}
else
{
int _maxid = PartyMatchRoomList.getInstance().getMaxId();
final int _maxid = PartyMatchRoomList.getInstance().getMaxId();
PartyMatchRoom _room = new PartyMatchRoom(_maxid, _roomtitle, _loot, _lvlmin, _lvlmax, _membersmax, _activeChar);
final PartyMatchRoom _room = new PartyMatchRoom(_maxid, _roomtitle, _loot, _lvlmin, _lvlmax, _membersmax, _activeChar);
_log.info("PartyMatchRoom #" + _maxid + " created by " + _activeChar.getName());
// Remove from waiting list

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java
View File

@@ -42,8 +42,8 @@ public final class RequestPetGetItem extends L2GameClientPacket
@Override
protected void runImpl()
{
L2World world = L2World.getInstance();
L2ItemInstance item = (L2ItemInstance) world.findObject(_objectId);
final L2World world = L2World.getInstance();
final L2ItemInstance item = (L2ItemInstance) world.findObject(_objectId);
if ((item == null) || (getActiveChar() == null) || !getActiveChar().hasPet())
{
sendPacket(ActionFailed.STATIC_PACKET);

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java
View File

@@ -52,7 +52,7 @@ public final class RequestPetition extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
@@ -82,11 +82,11 @@ public final class RequestPetition extends L2GameClientPacket
return;
}
int totalPetitions = PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar) + 1;
final int totalPetitions = PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar) + 1;
if (totalPetitions > Config.MAX_PETITIONS_PER_PLAYER)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.WE_HAVE_RECEIVED_S1_PETITIONS_FROM_YOU_TODAY_AND_THAT_IS_THE_MAXIMUM_THAT_YOU_CAN_SUBMIT_IN_ONE_DAY_YOU_CANNOT_SUBMIT_ANY_MORE_PETITIONS);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.WE_HAVE_RECEIVED_S1_PETITIONS_FROM_YOU_TODAY_AND_THAT_IS_THE_MAXIMUM_THAT_YOU_CAN_SUBMIT_IN_ONE_DAY_YOU_CANNOT_SUBMIT_ANY_MORE_PETITIONS);
sm.addInt(totalPetitions);
activeChar.sendPacket(sm);
return;
@@ -98,7 +98,7 @@ public final class RequestPetition extends L2GameClientPacket
return;
}
int petitionId = PetitionManager.getInstance().submitPetition(activeChar, _content, _type);
final int petitionId = PetitionManager.getInstance().submitPetition(activeChar, _content, _type);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1);
sm.addInt(petitionId);

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionCancel.java
View File

@@ -51,7 +51,7 @@ public final class RequestPetitionCancel extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance activeChar = getClient().getActiveChar();
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
return;
@@ -74,14 +74,14 @@ public final class RequestPetitionCancel extends L2GameClientPacket
{
if (PetitionManager.getInstance().cancelActivePetition(activeChar))
{
int numRemaining = Config.MAX_PETITIONS_PER_PLAYER - PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar);
final int numRemaining = Config.MAX_PETITIONS_PER_PLAYER - PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PETITION_WAS_CANCELED_YOU_MAY_SUBMIT_S1_MORE_PETITION_S_TODAY);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PETITION_WAS_CANCELED_YOU_MAY_SUBMIT_S1_MORE_PETITION_S_TODAY);
sm.addString(String.valueOf(numRemaining));
activeChar.sendPacket(sm);
// Notify all GMs that the player's pending petition has been cancelled.
String msgContent = activeChar.getName() + " has canceled a pending petition.";
final String msgContent = activeChar.getName() + " has canceled a pending petition.";
AdminData.getInstance().broadcastToGMs(new CreatureSay(activeChar.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent));
}
else

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