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

Reuse item info for multisells that are maintainEnchantment enabled.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-09-16 22:15:26 +00:00
parent 7da17cc9a3
commit 1d392a8a8a
57 changed files with 612 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
View File

@@ -299,7 +299,7 @@ public class MultisellData implements IXmlReader
do
{
// send list at least once even if size = 0
player.sendPacket(new MultiSellList(list, index));
player.sendPacket(new MultiSellList(player, list, index));
index += PAGE_SIZE;
}
while (index < list.getEntries().size());

25
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@@ -142,7 +142,7 @@ public class MultiSellChoose implements IClientIncomingPacket
return;
}
final ItemInfo itemEnchantment = list.getItemEnchantment(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer.
ItemInfo itemEnchantment = list.getItemEnchantment(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer.
// Validate the requested item with its full stats.
//@formatter:off
@@ -284,7 +284,6 @@ public class MultiSellChoose implements IClientIncomingPacket
final InventoryUpdate iu = new InventoryUpdate();
boolean itemEnchantmentProcessed = (itemEnchantment == null);
int enchantLevel = -1;
// Take all ingredients
for (ItemChanceHolder ingredient : entry.getIngredients())
@@ -347,9 +346,9 @@ public class MultiSellChoose implements IClientIncomingPacket
{
itemEnchantmentProcessed = true;
iu.addItem(destroyedItem);
if (enchantLevel < 0) // Will only consider first ingredient enchant.
if (itemEnchantmentProcessed && destroyedItem.isEquipable()) // Will only consider first equipable ingredient.
{
enchantLevel = destroyedItem.getEnchantLevel();
itemEnchantment = new ItemInfo(destroyedItem);
}
}
else
@@ -368,9 +367,9 @@ public class MultiSellChoose implements IClientIncomingPacket
{
itemEnchantmentProcessed = true;
iu.addItem(destroyedItem);
if (enchantLevel < 0) // Will only consider first ingredient enchant.
if (itemEnchantmentProcessed && destroyedItem.isEquipable()) // Will only consider first equipable ingredient.
{
enchantLevel = destroyedItem.getEnchantLevel();
itemEnchantment = new ItemInfo(destroyedItem);
}
}
else
@@ -388,9 +387,9 @@ public class MultiSellChoose implements IClientIncomingPacket
if (destroyedItem != null)
{
iu.addItem(destroyedItem);
if (enchantLevel < 0) // Will only consider first ingredient enchant.
if (itemEnchantmentProcessed && destroyedItem.isEquipable()) // Will only consider first equipable ingredient.
{
enchantLevel = destroyedItem.getEnchantLevel();
itemEnchantment = new ItemInfo(destroyedItem);
}
}
else
@@ -493,7 +492,9 @@ public class MultiSellChoose implements IClientIncomingPacket
addedItem.setAttribute(new AttributeHolder(AttributeType.DARK, itemEnchantment.getAttributeDefence(AttributeType.DARK)), false);
}
}
addedItem.updateDatabase(true);
// Mark that we have already upgraded the item.
itemEnchantmentProcessed = false;
}
@@ -503,12 +504,6 @@ public class MultiSellChoose implements IClientIncomingPacket
addedItem.setEnchantLevel(product.getEnchantmentLevel());
addedItem.updateDatabase(true);
}
else if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (enchantLevel > 0) && !addedItem.getItem().isEtcItem())
{
addedItem.setEnchantLevel(enchantLevel);
addedItem.updateDatabase(true);
enchantLevel = -1; // Will only enchant first product.
}
if (addedItem.getCount() > 1)
{
@@ -539,7 +534,7 @@ public class MultiSellChoose implements IClientIncomingPacket
// Update inventory and weight.
player.sendInventoryUpdate(iu);
// finally, give the tax to the castle...
// Finally, give the tax to the castle.
if ((npc != null) && list.isApplyTaxes())
{
final OptionalLong taxPaid = entry.getIngredients().stream().filter(i -> i.getId() == Inventory.ADENA_ID).mapToLong(i -> Math.round(i.getCount() * list.getIngredientMultiplier() * list.getTaxRate()) * _amount).reduce(Math::multiplyExact);

25
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@@ -21,21 +21,25 @@ import static org.l2jmobius.gameserver.data.xml.MultisellData.PAGE_SIZE;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.model.ItemInfo;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder;
import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.network.OutgoingPackets;
public class MultiSellList extends AbstractItemPacket
{
private final PlayerInstance _player;
private int _size;
private int _index;
private final PreparedMultisellListHolder _list;
private final boolean _finished;
public MultiSellList(PreparedMultisellListHolder list, int index)
public MultiSellList(PlayerInstance player, PreparedMultisellListHolder list, int index)
{
_player = player;
_list = list;
_index = index;
_size = list.getEntries().size() - index;
@@ -68,8 +72,21 @@ public class MultiSellList extends AbstractItemPacket
while (_size-- > 0)
{
final ItemInfo itemEnchantment = _list.getItemEnchantment(_index);
ItemInfo itemEnchantment = _list.getItemEnchantment(_index);
final MultisellEntryHolder entry = _list.getEntries().get(_index++);
if ((itemEnchantment == null) && _list.isMaintainEnchantment())
{
SEARCH: for (ItemChanceHolder holder : entry.getIngredients())
{
final ItemInstance item = _player.getInventory().getItemByItemId(holder.getId());
if ((item != null) && item.isEquipable())
{
itemEnchantment = new ItemInfo(item);
break SEARCH;
}
}
}
packet.writeD(_index); // Entry ID. Start from 1.
packet.writeC(entry.isStackable() ? 1 : 0);
@@ -86,7 +103,7 @@ public class MultiSellList extends AbstractItemPacket
for (ItemChanceHolder product : entry.getProducts())
{
final Item template = ItemTable.getInstance().getTemplate(product.getId());
final ItemInfo displayItemEnchantment = (_list.isMaintainEnchantment() && (itemEnchantment != null) && (template != null) && template.getClass().equals(itemEnchantment.getItem().getClass())) ? itemEnchantment : null;
final ItemInfo displayItemEnchantment = _list.isMaintainEnchantment() && (itemEnchantment != null) && (template != null) && template.getClass().equals(itemEnchantment.getItem().getClass()) ? itemEnchantment : null;
if (template != null)
{
packet.writeD(template.getDisplayId());
@@ -111,7 +128,7 @@ public class MultiSellList extends AbstractItemPacket
for (ItemChanceHolder ingredient : entry.getIngredients())
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
final ItemInfo displayItemEnchantment = (itemEnchantment != null) && (template != null) && template.getClass().equals(itemEnchantment.getItem().getClass()) ? itemEnchantment : null;
if (template != null)
{
packet.writeD(template.getDisplayId());