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

Support for is_auctionable item option.

Browse Source
This commit is contained in:
MobiusDev
2015-11-15 19:15:59 +00:00
parent 9f7e471eb3
commit a4630cae9b
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
trunk/dist/game/data/xsd/items.xsd vendored
View File

@@ -29,6 +29,7 @@
<xs:enumeration value="handler" /> <xs:enumeration value="handler" />
<xs:enumeration value="icon" /> <xs:enumeration value="icon" />
<xs:enumeration value="immediate_effect" /> <xs:enumeration value="immediate_effect" />
<xs:enumeration value="is_auctionable" />
<xs:enumeration value="is_depositable" /> <xs:enumeration value="is_depositable" />
<xs:enumeration value="is_destroyable" /> <xs:enumeration value="is_destroyable" />
<xs:enumeration value="is_dropable" /> <xs:enumeration value="is_dropable" />

10
trunk/java/com/l2jserver/gameserver/model/items/L2Item.java
View File

@@ -134,6 +134,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
private final boolean _destroyable; private final boolean _destroyable;
private final boolean _tradeable; private final boolean _tradeable;
private final boolean _depositable; private final boolean _depositable;
private final boolean _auctionable;
private final int _enchantable; private final int _enchantable;
private final boolean _elementable; private final boolean _elementable;
private final boolean _questItem; private final boolean _questItem;
@@ -194,6 +195,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
_destroyable = set.getBoolean("is_destroyable", true); _destroyable = set.getBoolean("is_destroyable", true);
_tradeable = set.getBoolean("is_tradable", true); _tradeable = set.getBoolean("is_tradable", true);
_depositable = set.getBoolean("is_depositable", true); _depositable = set.getBoolean("is_depositable", true);
_auctionable = set.getBoolean("is_auctionable", true);
_elementable = set.getBoolean("element_enabled", false); _elementable = set.getBoolean("element_enabled", false);
_enchantable = set.getInt("enchant_enabled", 0); _enchantable = set.getInt("enchant_enabled", 0);
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
@@ -648,6 +650,14 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
return _depositable; return _depositable;
} }
/**
* @return {@code true} if the item can be put into auctionhouse, {@code false} otherwise.
*/
public final boolean isAuctionable()
{
return _auctionable;
}
/** /**
* This method also check the enchant blacklist. * This method also check the enchant blacklist.
* @return {@code true} if the item can be enchanted, {@code false} otherwise. * @return {@code true} if the item can be enchanted, {@code false} otherwise.

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

@@ -18,10 +18,11 @@
*/ */
package com.l2jserver.gameserver.network.clientpackets.commission; package com.l2jserver.gameserver.network.clientpackets.commission;
import java.util.Arrays; import java.util.ArrayList;
import com.l2jserver.gameserver.instancemanager.CommissionManager; import com.l2jserver.gameserver.instancemanager.CommissionManager;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket; import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket;
import com.l2jserver.gameserver.network.serverpackets.commission.ExCloseCommission; import com.l2jserver.gameserver.network.serverpackets.commission.ExCloseCommission;
import com.l2jserver.gameserver.network.serverpackets.commission.ExResponseCommissionItemList; import com.l2jserver.gameserver.network.serverpackets.commission.ExResponseCommissionItemList;
@@ -51,7 +52,16 @@ public class RequestCommissionRegistrableItemList extends L2GameClientPacket
return; return;
} }
player.sendPacket(new ExResponseCommissionItemList(Arrays.asList(player.getInventory().getAvailableItems(false, false, false)))); ArrayList<L2ItemInstance> auctionableItemList = new ArrayList<>();
for (L2ItemInstance item : player.getInventory().getAvailableItems(false, false, false))
{
if (item.getItem().isAuctionable())
{
auctionableItemList.add(item);
}
}
player.sendPacket(new ExResponseCommissionItemList(auctionableItemList));
} }
@Override @Override