From 741dffc5d2098f4e0522ea9e9c790a262465b62c Mon Sep 17 00:00:00 2001 From: mobius <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 28 Jan 2015 01:38:20 +0000 Subject: [PATCH] Minor code rework. --- .../instancemanager/AuctionManager.java | 106 ++++++++++-------- .../model/actor/instance/L2PcInstance.java | 16 +-- .../model/entity/AppearanceStone.java | 18 +-- .../network/L2GamePacketHandler.java | 3 + .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestChangeAttributeCancel.java | 3 +- .../RequestChangeAttributeItem.java | 7 +- .../clientpackets/RequestCommissionInfo.java | 4 +- .../RequestCommissionRegister.java | 21 ++-- .../RequestCommissionRegisteredItem.java | 2 +- .../RequestCommissionRegistrableItemList.java | 2 +- .../clientpackets/RequestNewEnchantClose.java | 2 +- .../RequestNewEnchantPushOne.java | 10 +- .../RequestNewEnchantPushTwo.java | 10 +- .../RequestNewEnchantRemoveOne.java | 5 +- .../RequestNewEnchantRemoveTwo.java | 5 +- .../clientpackets/RequestNewEnchantTry.java | 6 +- .../SendChangeAttributeTargetItem.java | 9 +- .../RequestDivideAdena.java | 13 ++- .../RequestDivideAdenaCancel.java | 7 +- .../RequestDivideAdenaStart.java | 6 +- .../friend/RequestUpdateFriendMemo.java | 8 +- .../RequestExCancelShape_Shifting_Item.java | 2 +- ...Put_Shape_Shifting_EnchantSupportItem.java | 8 +- ...tExTryToPut_Shape_Shifting_TargetItem.java | 8 +- .../RequestShape_Shifting_Item.java | 14 +-- .../serverpackets/ExChangeAttributeFail.java | 4 +- .../serverpackets/ExChangeAttributeOk.java | 4 +- .../network/serverpackets/ExEnchantFail.java | 3 +- .../serverpackets/ExEnchantOneFail.java | 4 +- .../network/serverpackets/ExEnchantOneOK.java | 4 +- .../serverpackets/ExEnchantOneRemoveFail.java | 4 +- .../serverpackets/ExEnchantOneRemoveOK.java | 4 +- .../serverpackets/ExEnchantTwoFail.java | 4 +- .../network/serverpackets/ExEnchantTwoOK.java | 4 +- .../serverpackets/ExEnchantTwoRemoveFail.java | 4 +- .../serverpackets/ExEnchantTwoRemoveOK.java | 4 +- .../ExResponseCommissionBuyInfo.java | 4 +- .../ExResponseCommissionBuyItem.java | 9 +- .../ExResponseCommissionDelete.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ExResponseCommissionRegister.java | 2 +- .../ExDivideAdenaCancel.java | 8 +- .../ExDivideAdenaDone.java | 11 +- .../ExDivideAdenaStart.java | 8 +- .../friend/ExFriendDetailInfo.java | 6 +- .../serverpackets/friend/L2FriendList.java | 2 +- ...Shape_Shifting_Extraction_Item_Result.java | 4 +- 48 files changed, 197 insertions(+), 201 deletions(-) rename trunk/java/com/l2jserver/gameserver/network/clientpackets/{ => adenadistribution}/RequestDivideAdena.java (77%) rename trunk/java/com/l2jserver/gameserver/network/clientpackets/{ => adenadistribution}/RequestDivideAdenaCancel.java (81%) rename trunk/java/com/l2jserver/gameserver/network/clientpackets/{ => adenadistribution}/RequestDivideAdenaStart.java (84%) rename trunk/java/com/l2jserver/gameserver/network/serverpackets/{ => adenadistribution}/ExDivideAdenaCancel.java (77%) rename trunk/java/com/l2jserver/gameserver/network/serverpackets/{ => adenadistribution}/ExDivideAdenaDone.java (79%) rename trunk/java/com/l2jserver/gameserver/network/serverpackets/{ => adenadistribution}/ExDivideAdenaStart.java (77%) diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java index a7314b2180..c96261af09 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java @@ -1,28 +1,31 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation, either version 3 of the License, or (at your option) any later - * version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . + * Copyright (C) 2004-2015 L2J Server + * + * This file is part of L2J Server. + * + * L2J Server is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * L2J Server is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.l2jserver.gameserver.instancemanager; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.ArrayList; import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; -import javolution.util.FastList; - import com.l2jserver.L2DatabaseFactory; import com.l2jserver.gameserver.enums.MailType; import com.l2jserver.gameserver.model.entity.Message; @@ -36,10 +39,10 @@ public class AuctionManager { Connection con = null; private static final Logger _log = Logger.getLogger(AuctionManager.class.getName()); - FastList auctions; - HashMap categoryType; - HashMap categoryConvert; - HashMap massCategoryConvert; + private static ArrayList auctions; + private static HashMap categoryType; + private static HashMap categoryConvert; + private static HashMap massCategoryConvert; public AuctionManager() { @@ -56,14 +59,20 @@ public class AuctionManager private void load() { - auctions = new FastList<>(); - int auctionID = 0, sellerID = 0, count = 0, category = 0, duration = 0, itemOID = 0, itemID = 0; - long price = 0, finishTime = 0; + auctions = new ArrayList<>(); + int auctionID = 0; + int sellerID = 0; + int count = 0; + int category = 0; + int duration = 0; + int itemOID = 0; + int itemID = 0; + long price = 0; + long finishTime = 0; String itemName = ""; try (Connection con = L2DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM auctions_info");) { - ResultSet rset = statement.executeQuery(); while (rset.next()) { @@ -469,29 +478,26 @@ public class AuctionManager }; int i = 0; int IDS[] = null; - if (id == 61) + switch (id) { - IDS = ids[1]; - } - else if (id == 62) - { - IDS = ids[2]; - } - else if (id == 63) - { - IDS = ids[3]; - } - else if (id == 64) - { - IDS = ids[4]; - } - else if (id == 65) - { - IDS = ids[5]; - } - else if (id == 1) - { - IDS = ids[0]; + case 61: + IDS = ids[1]; + break; + case 62: + IDS = ids[2]; + break; + case 63: + IDS = ids[3]; + break; + case 64: + IDS = ids[4]; + break; + case 65: + IDS = ids[5]; + break; + case 1: + IDS = ids[0]; + break; } if ((((id > 60) && (id < 66)) || (id == 1)) && (IDS != null)) @@ -891,16 +897,22 @@ public class AuctionManager return 59; } - public FastList getAuctions() + public ArrayList getAuctions() { return auctions; } public class Auctions { - int auctionID, itemOID, duration, playerID, category; + int auctionID; + int itemOID; + int duration; + int playerID; + int category; L2ItemInstance item; - long price, count, finishTime; + long price; + long count; + long finishTime; String itemName; public Auctions(int _auctionID, String _itemName, int _itemOID, L2ItemInstance _item, long _price, long _count, int _duration, int _playerID, long _finishTime, int _category) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java index 196f28f487..77364edcd9 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java @@ -584,6 +584,8 @@ public final class L2PcInstance extends L2Playable /** Recommendation Two Hours bonus **/ protected boolean _recoTwoHoursGiven = false; + private int _vitalityPoints = 140000; + private final PcInventory _inventory = new PcInventory(this); private final PcAuction _auctionInventory = new PcAuction(this); private final PcFreight _freight = new PcFreight(this); @@ -7212,7 +7214,7 @@ public final class L2PcInstance extends L2Playable // Set Teleport Bookmark Slot player.setBookMarkSlot(rset.getInt("BookmarkSlot")); - player._vitPoints = rset.getInt("vitality_points"); + player._vitalityPoints = rset.getInt("vitality_points"); // character creation Time player.getCreateDate().setTime(rset.getDate("createDate")); @@ -7675,7 +7677,7 @@ public final class L2PcInstance extends L2Playable statement.setString(45, getName()); statement.setLong(46, 0); // unset statement.setInt(47, getBookMarkSlot()); - statement.setInt(48, _vitPoints); // unset + statement.setInt(48, _vitalityPoints); // unset statement.setString(49, getLang()); int factionId = 0; @@ -15046,8 +15048,6 @@ public final class L2PcInstance extends L2Playable return getServitors().values().stream().mapToInt(L2Summon::getSummonPoints).sum(); } - int _vitPoints = 140000; - /* * Return current vitality points in integer format */ @@ -15055,27 +15055,27 @@ public final class L2PcInstance extends L2Playable { if (getClassId().getId() == getBaseClass()) { - return _vitPoints; + return _vitalityPoints; } if (getSubClasses().containsKey(getClassIndex())) { return getSubClasses().get(getClassIndex()).getVitalityPoints(); } - return _vitPoints; + return _vitalityPoints; } public void setVitalityPoints(int points) { if (getClassId().getId() == getBaseClass()) { - _vitPoints = points; + _vitalityPoints = points; return; } if (getSubClasses().containsKey(getClassIndex())) { getSubClasses().get(getClassIndex()).setVitalityPoints(points); } - _vitPoints = points; + _vitalityPoints = points; } int _firstCompoundOID = -1; diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/AppearanceStone.java b/trunk/java/com/l2jserver/gameserver/model/entity/AppearanceStone.java index a2415951dc..ad55927228 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/AppearanceStone.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/AppearanceStone.java @@ -21,7 +21,7 @@ package com.l2jserver.gameserver.model.entity; import java.util.ArrayList; /** - * @author Erlandas + * @author Erlandys */ public class AppearanceStone { @@ -43,14 +43,14 @@ public class AppearanceStone All } - int _itemId; - StoneType _type; - AppearanceItemType _itemType; - ArrayList _grades; - long _price; - int _targetItem; - long _timeForAppearance; - int _maxGrade; + private final int _itemId; + private final StoneType _type; + private final AppearanceItemType _itemType; + private final ArrayList _grades; + private final long _price; + private final int _targetItem; + private final long _timeForAppearance; + private int _maxGrade; public AppearanceStone(int itemId, StoneType type, AppearanceItemType itemType, ArrayList grades, long price, int targetItem, long timeForAppearance) { diff --git a/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java b/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java index 51dec82775..9b67d0f8a5 100644 --- a/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java +++ b/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java @@ -29,6 +29,9 @@ import com.l2jserver.commons.mmocore.MMOConnection; import com.l2jserver.commons.mmocore.ReceivablePacket; import com.l2jserver.gameserver.network.L2GameClient.GameClientState; import com.l2jserver.gameserver.network.clientpackets.*; +import com.l2jserver.gameserver.network.clientpackets.adenadistribution.RequestDivideAdena; +import com.l2jserver.gameserver.network.clientpackets.adenadistribution.RequestDivideAdenaCancel; +import com.l2jserver.gameserver.network.clientpackets.adenadistribution.RequestDivideAdenaStart; import com.l2jserver.gameserver.network.clientpackets.crystalization.RequestCrystallizeEstimate; import com.l2jserver.gameserver.network.clientpackets.crystalization.RequestCrystallizeItemCancel; import com.l2jserver.gameserver.network.clientpackets.friend.RequestAnswerFriendInvite; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java index 0396c50c2a..a2dd2f699d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java @@ -287,7 +287,7 @@ public final class RequestBypassToServer extends L2GameClientPacket EventDispatcher.getInstance().notifyEventAsync(new OnNpcManorBypass(activeChar, lastNpc, ask, state, time), lastNpc); } } - else if (_command.startsWith("showAuction")) + else if (_command.equals("showAuction")) { L2PcInstance player = getClient().getActiveChar(); if (player == null) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeCancel.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeCancel.java index 36a4a17a6f..11993c3298 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeCancel.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeCancel.java @@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; */ public class RequestChangeAttributeCancel extends L2GameClientPacket { - private static final String _C__D0_B7_SENDCHANGEATTRIBUTETARGETITEM = "[C] D0:B7 RequestChangeAttributeCancel"; @Override @@ -32,7 +31,7 @@ public class RequestChangeAttributeCancel extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java index 0b40e9ebc2..9fdba8cac8 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java @@ -33,10 +33,11 @@ import com.l2jserver.util.Rnd; */ public class RequestChangeAttributeItem extends L2GameClientPacket { - private static final String _C__D0_B7_SENDCHANGEATTRIBUTETARGETITEM = "[C] D0:B7 SendChangeAttributeTargetItem"; - private int _attributeOID, _itemOID, _newAttributeID; + private int _attributeOID; + private int _itemOID; + private int _newAttributeID; @Override protected void readImpl() @@ -49,7 +50,7 @@ public class RequestChangeAttributeItem extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionInfo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionInfo.java index dc12cb5eb8..4ecd4a2da1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionInfo.java @@ -24,7 +24,7 @@ public final class RequestCommissionInfo extends L2GameClientPacket { private static final String _C__D0_9C_REQUESTCOMMISSIONINFO = "[C] D0:9C RequestCommissionInfo"; - int _itemOID; + private int _itemOID; @Override protected void readImpl() @@ -35,7 +35,7 @@ public final class RequestCommissionInfo extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegister.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegister.java index b5a9740aea..6931cd0556 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegister.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegister.java @@ -33,11 +33,11 @@ public final class RequestCommissionRegister extends L2GameClientPacket { private static final String _C__D0_9D_REQUESTCOMMISSIONREGISTER = "[C] D0:9D RequestCommissionRegister"; - int _itemOID; - String _itemName; - long _price; - long _count; - int _duration; + private int _itemOID; + private String _itemName; + private long _price; + private long _count; + private int _duration; @Override protected void readImpl() @@ -53,7 +53,7 @@ public final class RequestCommissionRegister extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; @@ -80,6 +80,7 @@ public final class RequestCommissionRegister extends L2GameClientPacket timeToAdd = 604800000; destroyPrice *= 0.0007; } + if (destroyPrice < 1000) { destroyPrice = 1000; @@ -106,8 +107,8 @@ public final class RequestCommissionRegister extends L2GameClientPacket return; } - int itemID = player.getInventory().getItemByObjectId(_itemOID).getId(); - L2Item item = ItemTable.getInstance().getTemplate(itemID); + final int itemID = player.getInventory().getItemByObjectId(_itemOID).getId(); + final L2Item item = ItemTable.getInstance().getTemplate(itemID); if (((player.getAuctionInventory().getSize() >= 10) && !player.isGM()) || ((player.getAuctionInventory().getSize() >= 99999) && player.isGM()) || !item.isTradeable() || !item.isSellable()) { @@ -116,10 +117,10 @@ public final class RequestCommissionRegister extends L2GameClientPacket return; } - int category = am.getCategoryByItem(player.getInventory().getItemByObjectId(_itemOID)); + final int category = am.getCategoryByItem(player.getInventory().getItemByObjectId(_itemOID)); player.getInventory().destroyItemByItemId("CreateAuction", 57, destroyPrice, null, null); player.getInventory().transferItem("CreateAuction", _itemOID, _count, player.getAuctionInventory(), player, null); - long finishTime = (System.currentTimeMillis() + timeToAdd) / 1000; + final long finishTime = (System.currentTimeMillis() + timeToAdd) / 1000; int auctionID = IdFactory.getInstance().getNextId(); if (player.getAuctionInventory().getItemByObjectId(_itemOID) == null) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegisteredItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegisteredItem.java index 217dcb0924..7d038bb630 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegisteredItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegisteredItem.java @@ -33,7 +33,7 @@ public final class RequestCommissionRegisteredItem extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegistrableItemList.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegistrableItemList.java index 7d93e43f53..923b608a3e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegistrableItemList.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegistrableItemList.java @@ -32,7 +32,7 @@ public final class RequestCommissionRegistrableItemList extends L2GameClientPack @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantClose.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantClose.java index a51fe1efbc..6c28f52c4f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantClose.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantClose.java @@ -35,7 +35,7 @@ public final class RequestNewEnchantClose extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantPushOne.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantPushOne.java index 8b7eed866c..1fed30acd6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantPushOne.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantPushOne.java @@ -31,7 +31,7 @@ public final class RequestNewEnchantPushOne extends L2GameClientPacket { private static final String _C__D0_F4_REQUESTNEWENCHANTPUSHONE = "[C] D0:F4 RequestNewEnchantPushOne"; - int _itemId; + private int _itemId; @Override protected void readImpl() @@ -42,18 +42,18 @@ public final class RequestNewEnchantPushOne extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_itemId); + final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_itemId); if (item == null) { return; } - int secondCompoundOID = activeChar.getSecondCompoundOID(); - L2ItemInstance secondItem = activeChar.getInventory().getItemByObjectId(secondCompoundOID); + final int secondCompoundOID = activeChar.getSecondCompoundOID(); + final L2ItemInstance secondItem = activeChar.getInventory().getItemByObjectId(secondCompoundOID); if ((item.getItem().getBodyPart() != L2Item.SLOT_BROOCH_JEWEL) || ((secondItem != null) && ((secondItem.getObjectId() == item.getObjectId()) || (secondItem.getId() != item.getId()))) || ((item.getId() == 38931) || ((item.getId() % 10) == 4) || ((item.getId() % 10) == 9))) { activeChar.sendPacket(new ExEnchantOneFail()); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantPushTwo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantPushTwo.java index 7aa0d1fad0..978dc111b1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantPushTwo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantPushTwo.java @@ -31,7 +31,7 @@ public final class RequestNewEnchantPushTwo extends L2GameClientPacket { private static final String _C__D0_F6_REQUESTNEWENCHANTPUSHTWO = "[C] D0:F6 RequestNewEnchantPushTwo"; - int _itemId; + private int _itemId; @Override protected void readImpl() @@ -42,18 +42,18 @@ public final class RequestNewEnchantPushTwo extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_itemId); + final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_itemId); if (item == null) { return; } - int firstCompoundOID = activeChar.getFirstCompoundOID(); - L2ItemInstance firstItem = activeChar.getInventory().getItemByObjectId(firstCompoundOID); + final int firstCompoundOID = activeChar.getFirstCompoundOID(); + final L2ItemInstance firstItem = activeChar.getInventory().getItemByObjectId(firstCompoundOID); if ((item.getItem().getBodyPart() != L2Item.SLOT_BROOCH_JEWEL) || ((firstItem != null) && ((firstItem.getObjectId() == item.getObjectId()) || (firstItem.getId() != item.getId()))) || ((item.getId() == 38931) || ((item.getId() % 10) == 4) || ((item.getId() % 10) == 9))) { activeChar.sendPacket(new ExEnchantTwoFail()); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveOne.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveOne.java index 3f82a6e3ae..52918c44a4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveOne.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveOne.java @@ -27,7 +27,8 @@ public final class RequestNewEnchantRemoveOne extends L2GameClientPacket { private static final String _C__D0_F5_REQUESTNEWENCHANTREMOVEONE = "[C] D0:F4 RequestNewEnchantRemoveOne"; - int _itemId; + @SuppressWarnings("unused") + private int _itemId; @Override protected void readImpl() @@ -38,7 +39,7 @@ public final class RequestNewEnchantRemoveOne extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveTwo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveTwo.java index 74d67ea557..f5bac4b6f8 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveTwo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveTwo.java @@ -27,7 +27,8 @@ public final class RequestNewEnchantRemoveTwo extends L2GameClientPacket { private static final String _C__D0_F7_REQUESTNEWENCHANTREMOVETWO = "[C] D0:F7 RequestNewEnchantRemoveTwo"; - int _itemId; + @SuppressWarnings("unused") + private int _itemId; @Override protected void readImpl() @@ -38,7 +39,7 @@ public final class RequestNewEnchantRemoveTwo extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantTry.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantTry.java index 3f56a5c113..421dfe9945 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantTry.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantTry.java @@ -40,13 +40,13 @@ public final class RequestNewEnchantTry extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance activeChar = getClient().getActiveChar(); + final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { return; } - L2ItemInstance firstItem = activeChar.getInventory().getItemByObjectId(activeChar.getFirstCompoundOID()); - L2ItemInstance secondItem = activeChar.getInventory().getItemByObjectId(activeChar.getSecondCompoundOID()); + final L2ItemInstance firstItem = activeChar.getInventory().getItemByObjectId(activeChar.getFirstCompoundOID()); + final L2ItemInstance secondItem = activeChar.getInventory().getItemByObjectId(activeChar.getSecondCompoundOID()); if ((firstItem == null) || (secondItem == null)) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendChangeAttributeTargetItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendChangeAttributeTargetItem.java index f0bf1c1fe7..42824cbb39 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendChangeAttributeTargetItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/SendChangeAttributeTargetItem.java @@ -23,10 +23,9 @@ import com.l2jserver.gameserver.network.serverpackets.ExChangeAttributeInfo; */ public class SendChangeAttributeTargetItem extends L2GameClientPacket { - private static final String _C__D0_B0_SENDCHANGEATTRIBUTETARGETITEM = "[C] D0:B0 SendChangeAttributeTargetItem"; - int _elementOID; - int _itemOID; + private int _elementOID; + private int _itemOID; @Override protected void readImpl() @@ -38,12 +37,12 @@ public class SendChangeAttributeTargetItem extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - L2ItemInstance item = player.getInventory().getItemByObjectId(_itemOID); + final L2ItemInstance item = player.getInventory().getItemByObjectId(_itemOID); if (item == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdena.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java similarity index 77% rename from trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdena.java rename to trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java index 5b3149533f..e152aba9b0 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdena.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java @@ -16,18 +16,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jserver.gameserver.network.clientpackets; +package com.l2jserver.gameserver.network.clientpackets.adenadistribution; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.network.SystemMessageId; -import com.l2jserver.gameserver.network.serverpackets.ExDivideAdenaDone; +import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket; +import com.l2jserver.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaDone; /** * @author Erlandys */ public class RequestDivideAdena extends L2GameClientPacket { - long _count; + private long _count; @Override protected void readImpl() @@ -44,14 +45,14 @@ public class RequestDivideAdena extends L2GameClientPacket { return; } - long count = activeChar.getAdena(); + final long count = activeChar.getAdena(); if (_count > count) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_PROCEED_AS_THERE_IS_INSUFFICIENT_ADENA); return; } - int membersCount = activeChar.getParty().getMemberCount(); - long dividedCount = (long) Math.floor(_count / membersCount); + final int membersCount = activeChar.getParty().getMemberCount(); + final long dividedCount = (long) Math.floor(_count / membersCount); activeChar.reduceAdena("AdenaDistribution", membersCount * dividedCount, null, false); for (L2PcInstance player : activeChar.getParty().getMembers()) { diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdenaCancel.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java similarity index 81% rename from trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdenaCancel.java rename to trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java index 38270518f4..7808eeadaf 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdenaCancel.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java @@ -16,18 +16,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jserver.gameserver.network.clientpackets; +package com.l2jserver.gameserver.network.clientpackets.adenadistribution; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.network.SystemMessageId; -import com.l2jserver.gameserver.network.serverpackets.ExDivideAdenaCancel; +import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket; +import com.l2jserver.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaCancel; /** * @author Erlandys */ public class RequestDivideAdenaCancel extends L2GameClientPacket { - int _cancel; + private int _cancel; @Override protected void readImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdenaStart.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java similarity index 84% rename from trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdenaStart.java rename to trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java index efd0360c42..aacebdb16a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdenaStart.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java @@ -16,11 +16,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jserver.gameserver.network.clientpackets; +package com.l2jserver.gameserver.network.clientpackets.adenadistribution; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.network.SystemMessageId; -import com.l2jserver.gameserver.network.serverpackets.ExDivideAdenaStart; +import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket; +import com.l2jserver.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaStart; /** * @author Erlandys @@ -30,7 +31,6 @@ public class RequestDivideAdenaStart extends L2GameClientPacket @Override protected void readImpl() { - } @Override diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestUpdateFriendMemo.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestUpdateFriendMemo.java index 823e6e71d3..c3dbbadd05 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestUpdateFriendMemo.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/friend/RequestUpdateFriendMemo.java @@ -25,8 +25,8 @@ import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket; public final class RequestUpdateFriendMemo extends L2GameClientPacket { private static final String _C__D0_95_REQUESTUPDATEFRIENDMEMO = "[C] D0:95 RequestUpdateFriendMemo"; - String cName; - String memo; + private String cName; + private String memo; @Override protected void readImpl() @@ -38,8 +38,8 @@ public final class RequestUpdateFriendMemo extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); - int id = CharNameTable.getInstance().getIdByName(cName); + final L2PcInstance player = getClient().getActiveChar(); + final int id = CharNameTable.getInstance().getIdByName(cName); player.getFriend(id).setMemo(memo); player.updateMemo(id); } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExCancelShape_Shifting_Item.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExCancelShape_Shifting_Item.java index e31fb3f719..ce663484d4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExCancelShape_Shifting_Item.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExCancelShape_Shifting_Item.java @@ -33,7 +33,7 @@ public final class RequestExCancelShape_Shifting_Item extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExTryToPut_Shape_Shifting_EnchantSupportItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExTryToPut_Shape_Shifting_EnchantSupportItem.java index 3148af62f5..c746a33d5f 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExTryToPut_Shape_Shifting_EnchantSupportItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExTryToPut_Shape_Shifting_EnchantSupportItem.java @@ -40,19 +40,19 @@ public final class RequestExTryToPut_Shape_Shifting_EnchantSupportItem extends L @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - L2ItemInstance stone = player.getUsingAppearanceStone(); + final L2ItemInstance stone = player.getUsingAppearanceStone(); if ((stone == null) || (stone.getEtcItem().getAppearanceStone() == null)) { player.sendPacket(new ExPut_Shape_Shifting_Target_Item_Result(0)); return; } - L2ItemInstance targetItem = player.getInventory().getItemByObjectId(_itemOID); + final L2ItemInstance targetItem = player.getInventory().getItemByObjectId(_itemOID); if (targetItem == null) { player.sendPacket(new ExPut_Shape_Shifting_Target_Item_Result(0)); @@ -63,7 +63,7 @@ public final class RequestExTryToPut_Shape_Shifting_EnchantSupportItem extends L player.sendPacket(new ExPut_Shape_Shifting_Target_Item_Result(0)); return; } - L2ItemInstance item = player.getAppearanceItem(); + final L2ItemInstance item = player.getAppearanceItem(); if (item == null) { player.sendPacket(new ExPut_Shape_Shifting_Target_Item_Result(0)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExTryToPut_Shape_Shifting_TargetItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExTryToPut_Shape_Shifting_TargetItem.java index bf8d00cae3..ae4f9a9315 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExTryToPut_Shape_Shifting_TargetItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestExTryToPut_Shape_Shifting_TargetItem.java @@ -39,17 +39,17 @@ public final class RequestExTryToPut_Shape_Shifting_TargetItem extends L2GameCli @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - L2ItemInstance item = player.getInventory().getItemByObjectId(_itemId); + final L2ItemInstance item = player.getInventory().getItemByObjectId(_itemId); if (item == null) { return; } - L2ItemInstance stone = player.getUsingAppearanceStone(); + final L2ItemInstance stone = player.getUsingAppearanceStone(); if ((stone == null) || (stone.getEtcItem().getAppearanceStone() == null)) { return; @@ -60,7 +60,7 @@ public final class RequestExTryToPut_Shape_Shifting_TargetItem extends L2GameCli player.sendPacket(new ExPut_Shape_Shifting_Extraction_Item_Result(0)); return; } - boolean isSameType = ((stone.getEtcItem().getAppearanceStone().getItemType() == AppearanceItemType.Armor) && item.isArmor()) || ((stone.getEtcItem().getAppearanceStone().getItemType() == AppearanceItemType.Weapon) && item.isWeapon()) || ((stone.getEtcItem().getAppearanceStone().getItemType() == AppearanceItemType.Accessory) && item.isArmor()) || ((stone.getEtcItem().getAppearanceStone().getItemType() == AppearanceItemType.All)); + final boolean isSameType = ((stone.getEtcItem().getAppearanceStone().getItemType() == AppearanceItemType.Armor) && item.isArmor()) || ((stone.getEtcItem().getAppearanceStone().getItemType() == AppearanceItemType.Weapon) && item.isWeapon()) || ((stone.getEtcItem().getAppearanceStone().getItemType() == AppearanceItemType.Accessory) && item.isArmor()) || ((stone.getEtcItem().getAppearanceStone().getItemType() == AppearanceItemType.All)); if (!isSameType) { player.sendPacket(new ExPut_Shape_Shifting_Extraction_Item_Result(0)); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestShape_Shifting_Item.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestShape_Shifting_Item.java index 15372792c7..081f11caf6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestShape_Shifting_Item.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/itemappearance/RequestShape_Shifting_Item.java @@ -41,15 +41,15 @@ public final class RequestShape_Shifting_Item extends L2GameClientPacket @Override protected void runImpl() { - L2PcInstance player = getClient().getActiveChar(); + final L2PcInstance player = getClient().getActiveChar(); if (player == null) { return; } - L2ItemInstance stone = player.getUsingAppearanceStone(); - L2ItemInstance item = player.getAppearanceItem(); - L2ItemInstance targetItem = player.getTargetAppearanceItem(); - boolean needTargetItem = (stone != null) && (stone.getEtcItem().getAppearanceStone() != null) && (stone.getEtcItem().getAppearanceStone().getType().equals(StoneType.Blessed) || stone.getEtcItem().getAppearanceStone().getType().equals(StoneType.Normal)) ? true : false; + final L2ItemInstance stone = player.getUsingAppearanceStone(); + final L2ItemInstance item = player.getAppearanceItem(); + final L2ItemInstance targetItem = player.getTargetAppearanceItem(); + final boolean needTargetItem = (stone != null) && (stone.getEtcItem().getAppearanceStone() != null) && (stone.getEtcItem().getAppearanceStone().getType().equals(StoneType.Blessed) || stone.getEtcItem().getAppearanceStone().getType().equals(StoneType.Normal)) ? true : false; player.setUsingAppearanceStone(null); player.setAppearanceItem(null); player.setTargetAppearanceItem(null); @@ -57,12 +57,12 @@ public final class RequestShape_Shifting_Item extends L2GameClientPacket { return; } - AppearanceStone st = stone.getEtcItem().getAppearanceStone(); + final AppearanceStone st = stone.getEtcItem().getAppearanceStone(); if (st == null) { return; } - long cost = st.getPrice(); + final long cost = st.getPrice(); if (cost > player.getAdena()) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeFail.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeFail.java index 20e5e753b5..358592bb39 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeFail.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeFail.java @@ -19,9 +19,7 @@ package com.l2jserver.gameserver.network.serverpackets; */ public class ExChangeAttributeFail extends L2GameServerPacket { - public ExChangeAttributeFail() - { - } + public static final ExChangeAttributeFail STATIC_PACKET = new ExChangeAttributeFail(); @Override protected void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeOk.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeOk.java index b210c3bb9b..7a295b65a2 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeOk.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeOk.java @@ -19,9 +19,7 @@ package com.l2jserver.gameserver.network.serverpackets; */ public class ExChangeAttributeOk extends L2GameServerPacket { - public ExChangeAttributeOk() - { - } + public static final ExChangeAttributeOk STATIC_PACKET = new ExChangeAttributeOk(); @Override protected void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantFail.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantFail.java index f590b512f8..1545d7679c 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantFail.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantFail.java @@ -20,7 +20,8 @@ package com.l2jserver.gameserver.network.serverpackets; public class ExEnchantFail extends L2GameServerPacket { - int _itemId1, _itemId2; + private final int _itemId1; + private final int _itemId2; public ExEnchantFail(int itemId1, int itemId2) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneFail.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneFail.java index 249c1e32c4..d8205a0896 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneFail.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneFail.java @@ -20,9 +20,7 @@ package com.l2jserver.gameserver.network.serverpackets; public class ExEnchantOneFail extends L2GameServerPacket { - public ExEnchantOneFail() - { - } + public static final ExEnchantOneFail STATIC_PACKET = new ExEnchantOneFail(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneOK.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneOK.java index 454102e360..43f4fea929 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneOK.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneOK.java @@ -20,9 +20,7 @@ package com.l2jserver.gameserver.network.serverpackets; public class ExEnchantOneOK extends L2GameServerPacket { - public ExEnchantOneOK() - { - } + public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveFail.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveFail.java index 148ad04eaf..f877abc7c0 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveFail.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveFail.java @@ -20,9 +20,7 @@ package com.l2jserver.gameserver.network.serverpackets; public class ExEnchantOneRemoveFail extends L2GameServerPacket { - public ExEnchantOneRemoveFail() - { - } + public static final ExEnchantOneRemoveFail STATIC_PACKET = new ExEnchantOneRemoveFail(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveOK.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveOK.java index b36a481a5e..e423aed27e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveOK.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveOK.java @@ -20,9 +20,7 @@ package com.l2jserver.gameserver.network.serverpackets; public class ExEnchantOneRemoveOK extends L2GameServerPacket { - public ExEnchantOneRemoveOK() - { - } + public static final ExEnchantOneRemoveOK STATIC_PACKET = new ExEnchantOneRemoveOK(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoFail.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoFail.java index a39f11114b..feb2df3527 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoFail.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoFail.java @@ -20,9 +20,7 @@ package com.l2jserver.gameserver.network.serverpackets; public class ExEnchantTwoFail extends L2GameServerPacket { - public ExEnchantTwoFail() - { - } + public static final ExEnchantTwoFail STATIC_PACKET = new ExEnchantTwoFail(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoOK.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoOK.java index 24306e6b8c..262eae1c85 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoOK.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoOK.java @@ -20,9 +20,7 @@ package com.l2jserver.gameserver.network.serverpackets; public class ExEnchantTwoOK extends L2GameServerPacket { - public ExEnchantTwoOK() - { - } + public static final ExEnchantTwoOK STATIC_PACKET = new ExEnchantTwoOK(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveFail.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveFail.java index 06800a2f06..e8003b6791 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveFail.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveFail.java @@ -20,9 +20,7 @@ package com.l2jserver.gameserver.network.serverpackets; public class ExEnchantTwoRemoveFail extends L2GameServerPacket { - public ExEnchantTwoRemoveFail() - { - } + public static final ExEnchantTwoRemoveFail STATIC_PACKET = new ExEnchantTwoRemoveFail(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveOK.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveOK.java index 036ea0e715..285525b6d9 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveOK.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveOK.java @@ -20,9 +20,7 @@ package com.l2jserver.gameserver.network.serverpackets; public class ExEnchantTwoRemoveOK extends L2GameServerPacket { - public ExEnchantTwoRemoveOK() - { - } + public static final ExEnchantTwoRemoveOK STATIC_PACKET = new ExEnchantTwoRemoveOK(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyInfo.java index 80813fc875..75516c859b 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyInfo.java @@ -22,7 +22,7 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; */ public class ExResponseCommissionBuyInfo extends L2GameServerPacket { - Auctions _auction; + private final Auctions _auction; public ExResponseCommissionBuyInfo(Auctions auction) { @@ -37,7 +37,7 @@ public class ExResponseCommissionBuyInfo extends L2GameServerPacket writeD(0x01); // Unknown - L2ItemInstance item = _auction.getItem(); + final L2ItemInstance item = _auction.getItem(); writeQ(_auction.getPrice()); writeD(_auction.getCategory()); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyItem.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyItem.java index 9e3c34508a..3927d9ce82 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyItem.java @@ -14,19 +14,12 @@ */ package com.l2jserver.gameserver.network.serverpackets; -import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; - /** * @author Erlandys */ public class ExResponseCommissionBuyItem extends L2GameServerPacket { - L2PcInstance player; - - public ExResponseCommissionBuyItem(L2PcInstance _player) - { - player = _player; - } + public static final ExResponseCommissionBuyItem STATIC_PACKET = new ExResponseCommissionBuyItem(); @Override protected void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionDelete.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionDelete.java index 51854d5586..081793376a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionDelete.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionDelete.java @@ -19,7 +19,7 @@ package com.l2jserver.gameserver.network.serverpackets; */ public class ExResponseCommissionDelete extends L2GameServerPacket { - boolean success; + private final boolean success; public ExResponseCommissionDelete(boolean _success) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionItemList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionItemList.java index 80924c3092..62fb00a2e4 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionItemList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionItemList.java @@ -22,7 +22,7 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; */ public class ExResponseCommissionItemList extends AbstractItemPacket { - L2PcInstance _player; + private final L2PcInstance _player; public ExResponseCommissionItemList(L2PcInstance player) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionRegister.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionRegister.java index c56e4dea69..a4770b6f3e 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionRegister.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionRegister.java @@ -19,7 +19,7 @@ package com.l2jserver.gameserver.network.serverpackets; */ public class ExResponseCommissionRegister extends L2GameServerPacket { - boolean success; + private final boolean success; public ExResponseCommissionRegister(boolean _success) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaCancel.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java similarity index 77% rename from trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaCancel.java rename to trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index fc4b4c4573..1fc0fa1c46 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaCancel.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jserver.gameserver.network.serverpackets; +package com.l2jserver.gameserver.network.serverpackets.adenadistribution; + +import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; /** * @author Erlandys */ public class ExDivideAdenaCancel extends L2GameServerPacket { - public ExDivideAdenaCancel() - { - } + public static final ExDivideAdenaCancel STATIC_PACKET = new ExDivideAdenaCancel(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaDone.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java similarity index 79% rename from trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaDone.java rename to trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index b59c4351bf..15802f8145 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaDone.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -16,16 +16,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jserver.gameserver.network.serverpackets; +package com.l2jserver.gameserver.network.serverpackets.adenadistribution; + +import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; /** * @author Erlandys */ public class ExDivideAdenaDone extends L2GameServerPacket { - int _friendsCount; - long _count, _dividedCount; - String _name; + private final int _friendsCount; + private final long _count; + private final long _dividedCount; + private final String _name; public ExDivideAdenaDone(int friendsCount, long count, long dividedCount, String name) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaStart.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java similarity index 77% rename from trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaStart.java rename to trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java index c79e366e72..8446b9b062 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaStart.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jserver.gameserver.network.serverpackets; +package com.l2jserver.gameserver.network.serverpackets.adenadistribution; + +import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; /** * @author Erlandys */ public class ExDivideAdenaStart extends L2GameServerPacket { - public ExDivideAdenaStart() - { - } + public static final ExDivideAdenaStart STATIC_PACKET = new ExDivideAdenaStart(); @Override protected final void writeImpl() diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index e0061f7f05..bf46afe1d6 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -30,8 +30,8 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; */ public class ExFriendDetailInfo extends L2GameServerPacket { - final L2PcInstance _player; - final String _name; + private final L2PcInstance _player; + private final String _name; public ExFriendDetailInfo(L2PcInstance player, String name) { @@ -46,7 +46,7 @@ public class ExFriendDetailInfo extends L2GameServerPacket writeH(0xEC); writeD(_player.getObjectId()); - Friend friend = _player.getFriend(CharNameTable.getInstance().getIdByName(_name)); + final Friend friend = _player.getFriend(CharNameTable.getInstance().getIdByName(_name)); L2PcInstance player = friend.getFriend(); if (player == null) diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java index d509e9d5f6..b2820c5cb0 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java @@ -29,7 +29,7 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; */ public class L2FriendList extends L2GameServerPacket { - Collection _friends; + private final Collection _friends; public L2FriendList(L2PcInstance player) { diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/itemappearance/ExPut_Shape_Shifting_Extraction_Item_Result.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/itemappearance/ExPut_Shape_Shifting_Extraction_Item_Result.java index c4abfcaa9a..32f9fde677 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/itemappearance/ExPut_Shape_Shifting_Extraction_Item_Result.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/itemappearance/ExPut_Shape_Shifting_Extraction_Item_Result.java @@ -25,8 +25,8 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; */ public class ExPut_Shape_Shifting_Extraction_Item_Result extends L2GameServerPacket { - int _type; - long _price = 0; + private final int _type; + private long _price = 0; public ExPut_Shape_Shifting_Extraction_Item_Result(int type) {