Minor code rework.
This commit is contained in:
@@ -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)
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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)
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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());
|
||||
|
@@ -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());
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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())
|
||||
{
|
@@ -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()
|
@@ -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
|
@@ -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);
|
||||
}
|
||||
|
@@ -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;
|
||||
|
@@ -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));
|
||||
|
@@ -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));
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user