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

Support for MultiSellList custom item display ids.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-11-13 22:13:58 +00:00
parent 1c6372c9bd
commit bd0ee06ab5
19 changed files with 210 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -83,14 +83,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -106,8 +107,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
packet.writeD((displayItemEnchantment != null) && (displayItemEnchantment.getAugmentation() != null) ? displayItemEnchantment.getAugmentation().getOption1Id() : 0);

15
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -83,14 +83,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -106,8 +107,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -85,14 +85,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -108,8 +109,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -110,8 +111,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

5
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -80,14 +80,15 @@ public class MultiSellList implements IClientOutgoingPacket
for (Ingredient ing : ent.getProducts())
{
packet.writeD(ing.getItemId());
if (ing.getTemplate() != null)
{
packet.writeD(ing.getTemplate().getDisplayId());
packet.writeD(ing.getTemplate().getBodyPart());
packet.writeH(ing.getTemplate().getType2());
}
else
{
packet.writeD(ing.getItemId());
packet.writeD(0);
packet.writeH(65535);
}
@ -124,7 +125,7 @@ public class MultiSellList implements IClientOutgoingPacket
for (Ingredient ing : ent.getIngredients())
{
packet.writeD(ing.getItemId());
packet.writeD(ing.getTemplate() != null ? ing.getTemplate().getDisplayId() : ing.getItemId());
packet.writeH(ing.getTemplate() != null ? ing.getTemplate().getType2() : 65535);
packet.writeQ(ing.getItemCount());
if (ing.getItemInfo() != null)

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -80,14 +80,15 @@ public class MultiSellList implements IClientOutgoingPacket
for (Ingredient ing : ent.getProducts())
{
packet.writeD(ing.getItemId());
if (ing.getTemplate() != null)
{
packet.writeD(ing.getTemplate().getDisplayId());
packet.writeD(ing.getTemplate().getBodyPart());
packet.writeH(ing.getTemplate().getType2());
}
else
{
packet.writeD(ing.getItemId());
packet.writeD(0);
packet.writeH(65535);
}
@ -124,7 +125,7 @@ public class MultiSellList implements IClientOutgoingPacket
for (Ingredient ing : ent.getIngredients())
{
packet.writeD(ing.getItemId());
packet.writeD(ing.getTemplate() != null ? ing.getTemplate().getDisplayId() : ing.getItemId());
packet.writeH(ing.getTemplate() != null ? ing.getTemplate().getType2() : 65535);
packet.writeQ(ing.getItemCount());
if (ing.getItemInfo() != null)

15
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -85,14 +85,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -108,8 +109,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -109,8 +110,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

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

@ -87,14 +87,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -111,8 +112,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);

15
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@ -86,14 +86,15 @@ public class MultiSellList extends AbstractItemPacket
{
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;
packet.writeD(product.getId());
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeQ(template.getBodyPart());
packet.writeH(template.getType2());
}
else
{
packet.writeD(product.getId());
packet.writeQ(0);
packet.writeH(65535);
}
@ -110,8 +111,16 @@ public class MultiSellList extends AbstractItemPacket
{
final Item template = ItemTable.getInstance().getTemplate(ingredient.getId());
final ItemInfo displayItemEnchantment = ((itemEnchantment != null) && (itemEnchantment.getItem().getId() == ingredient.getId())) ? itemEnchantment : null;
packet.writeD(ingredient.getId());
packet.writeH(template != null ? template.getType2() : 65535);
if (template != null)
{
packet.writeD(template.getDisplayId());
packet.writeH(template.getType2());
}
else
{
packet.writeD(ingredient.getId());
packet.writeH(65535);
}
packet.writeQ(_list.getIngredientCount(ingredient));
packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
writeItemAugment(packet, displayItemEnchantment);