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

Minor code rework.

Browse Source
This commit is contained in:
mobius 2015-01-28 01:38:20 +00:00
parent 6176b4811e
commit 741dffc5d2
48 changed files with 197 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
trunk/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java
View File

@ -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 <http://www.gnu.org/licenses/>.
* 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 <http://www.gnu.org/licenses/>.
*/
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> auctions;
HashMap<String, Integer> categoryType;
HashMap<Integer, Integer> categoryConvert;
HashMap<Integer, Integer> massCategoryConvert;
private static ArrayList<Auctions> auctions;
private static HashMap<String, Integer> categoryType;
private static HashMap<Integer, Integer> categoryConvert;
private static HashMap<Integer, Integer> 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<Auctions> getAuctions()
public ArrayList<Auctions> 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)

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

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

18
trunk/java/com/l2jserver/gameserver/model/entity/AppearanceStone.java
View File

@ -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<Integer> _grades;
long _price;
int _targetItem;
long _timeForAppearance;
int _maxGrade;
private final int _itemId;
private final StoneType _type;
private final AppearanceItemType _itemType;
private final ArrayList<Integer> _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<Integer> grades, long price, int targetItem, long timeForAppearance)
{

3
trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
View File

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

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

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

3
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeCancel.java
View File

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

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

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

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

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

21
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCommissionRegister.java
View File

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

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

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

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

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

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

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

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

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

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

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

5
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveOne.java
View File

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

5
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestNewEnchantRemoveTwo.java
View File

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

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

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

9
trunk/java/com/l2jserver/gameserver/network/clientpackets/SendChangeAttributeTargetItem.java
View File

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

13
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdena.java → trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java
View File

@ -16,18 +16,19 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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())
{

7
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdenaCancel.java → trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java
View File

@ -16,18 +16,19 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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()

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestDivideAdenaStart.java → trunk/java/com/l2jserver/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java
View File

@ -16,11 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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

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

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

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

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

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

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

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

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

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

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeFail.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeOk.java
View File

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

3
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantFail.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneFail.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneOK.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveFail.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveOK.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoFail.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoOK.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveFail.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveOK.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyInfo.java
View File

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

9
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionBuyItem.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionDelete.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionItemList.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExResponseCommissionRegister.java
View File

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

8
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaCancel.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java
View File

@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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()

11
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaDone.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java
View File

@ -16,16 +16,19 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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)
{

8
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDivideAdenaStart.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java
View File

@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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()

6
trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/friend/L2FriendList.java
View File

@ -29,7 +29,7 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
*/
public class L2FriendList extends L2GameServerPacket
{
Collection<Friend> _friends;
private final Collection<Friend> _friends;
public L2FriendList(L2PcInstance player)
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/itemappearance/ExPut_Shape_Shifting_Extraction_Item_Result.java
View File

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