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

Adjustments for abstract item packet.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-04-28 22:09:48 +00:00
parent c0acb794c4
commit 08f7e83ade
4 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
View File

@ -72,8 +72,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
{ {
final int mask = calculateMask(item); final int mask = calculateMask(item);
packet.writeC(mask); packet.writeH(mask);
packet.writeC(0x00); // item.getItem().isBlessed() ? 0x01 : 0x00 - 286 protocol
packet.writeD(item.getObjectId()); // ObjectId packet.writeD(item.getObjectId()); // ObjectId
packet.writeD(item.getItem().getDisplayId()); // ItemId packet.writeD(item.getItem().getDisplayId()); // ItemId
packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1 packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1
@ -82,8 +81,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
packet.writeC(item.getCustomType1()); // Filler (always 0) packet.writeC(item.getCustomType1()); // Filler (always 0)
packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
packet.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item) packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
packet.writeC(0x00); // 286 protocol
packet.writeD(item.getMana()); packet.writeD(item.getMana());
packet.writeC(0x00); // 270 protocol packet.writeC(0x00); // 270 protocol
packet.writeD(item.getTime()); packet.writeD(item.getTime());
@ -111,9 +109,9 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
{ {
writeItemEnsoulOptions(packet, item); writeItemEnsoulOptions(packet, item);
} }
// if (item.getItem().isBlessed()) // if (containsMask(mask, ItemListType.BLESSED))
// { // {
// packet.writeC(item.getItem().isBlessed() ? 0x01 : 0x00); // packet.writeC(0x01);
// } // }
} }
@ -121,8 +119,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
{ {
final int mask = calculateMask(item); final int mask = calculateMask(item);
packet.writeC(mask); packet.writeH(mask);
packet.writeC(0x00); // item.getItem().isBlessed() ? 0x01 : 0x00 - 286 protocol
packet.writeD(item.getObjectId()); // ObjectId packet.writeD(item.getObjectId()); // ObjectId
packet.writeD(item.getItem().getDisplayId()); // ItemId packet.writeD(item.getItem().getDisplayId()); // ItemId
packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1 packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1
@ -131,8 +128,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
packet.writeC(item.getCustomType1()); // Filler (always 0) packet.writeC(item.getCustomType1()); // Filler (always 0)
packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
packet.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item) packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
packet.writeC(0x00); // 286 protocol
packet.writeD(item.getMana()); packet.writeD(item.getMana());
packet.writeC(0x00); // 270 protocol packet.writeC(0x00); // 270 protocol
packet.writeD(item.getTime()); packet.writeD(item.getTime());
@ -160,9 +156,9 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
{ {
writeItemEnsoulOptions(packet, item); writeItemEnsoulOptions(packet, item);
} }
// if (item.getItem().isBlessed()) // if (containsMask(mask, ItemListType.BLESSED))
// { // {
// packet.writeC(item.getItem().isBlessed() ? 0x01 : 0x00); // packet.writeC(0x01);
// } // }
} }
@ -201,6 +197,11 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
mask |= ItemListType.SOUL_CRYSTAL.getMask(); mask |= ItemListType.SOUL_CRYSTAL.getMask();
} }
// if (item.isBlessed())
// {
// mask |= ItemListType.BLESSED.getMask();
// }
return mask; return mask;
} }

25
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
View File

@ -72,8 +72,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
{ {
final int mask = calculateMask(item); final int mask = calculateMask(item);
packet.writeC(mask); packet.writeH(mask);
packet.writeC(0x00); // item.getItem().isBlessed() ? 0x01 : 0x00 - 286 protocol
packet.writeD(item.getObjectId()); // ObjectId packet.writeD(item.getObjectId()); // ObjectId
packet.writeD(item.getItem().getDisplayId()); // ItemId packet.writeD(item.getItem().getDisplayId()); // ItemId
packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1 packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1
@ -82,8 +81,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
packet.writeC(item.getCustomType1()); // Filler (always 0) packet.writeC(item.getCustomType1()); // Filler (always 0)
packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
packet.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item) packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
packet.writeC(0x00); // 286 protocol
packet.writeD(item.getMana()); packet.writeD(item.getMana());
packet.writeC(0x00); // 270 protocol packet.writeC(0x00); // 270 protocol
packet.writeD(item.getTime()); packet.writeD(item.getTime());
@ -111,9 +109,9 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
{ {
writeItemEnsoulOptions(packet, item); writeItemEnsoulOptions(packet, item);
} }
// if (item.getItem().isBlessed()) // if (containsMask(mask, ItemListType.BLESSED))
// { // {
// packet.writeC(item.getItem().isBlessed() ? 0x01 : 0x00); // packet.writeC(0x01);
// } // }
} }
@ -121,8 +119,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
{ {
final int mask = calculateMask(item); final int mask = calculateMask(item);
packet.writeC(mask); packet.writeH(mask);
packet.writeC(0x00); // item.getItem().isBlessed() ? 0x01 : 0x00 - 286 protocol
packet.writeD(item.getObjectId()); // ObjectId packet.writeD(item.getObjectId()); // ObjectId
packet.writeD(item.getItem().getDisplayId()); // ItemId packet.writeD(item.getItem().getDisplayId()); // ItemId
packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1 packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1
@ -131,8 +128,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
packet.writeC(item.getCustomType1()); // Filler (always 0) packet.writeC(item.getCustomType1()); // Filler (always 0)
packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
packet.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item) packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
packet.writeC(0x00); // 286 protocol
packet.writeD(item.getMana()); packet.writeD(item.getMana());
packet.writeC(0x00); // 270 protocol packet.writeC(0x00); // 270 protocol
packet.writeD(item.getTime()); packet.writeD(item.getTime());
@ -160,9 +156,9 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
{ {
writeItemEnsoulOptions(packet, item); writeItemEnsoulOptions(packet, item);
} }
// if (item.getItem().isBlessed()) // if (containsMask(mask, ItemListType.BLESSED))
// { // {
// packet.writeC(item.getItem().isBlessed() ? 0x01 : 0x00); // packet.writeC(0x01);
// } // }
} }
@ -201,6 +197,11 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
mask |= ItemListType.SOUL_CRYSTAL.getMask(); mask |= ItemListType.SOUL_CRYSTAL.getMask();
} }
// if (item.isBlessed())
// {
// mask |= ItemListType.BLESSED.getMask();
// }
return mask; return mask;
} }

6
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
View File

@ -81,8 +81,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
packet.writeC(item.getCustomType1()); // Filler (always 0) packet.writeC(item.getCustomType1()); // Filler (always 0)
packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
packet.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item) packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
packet.writeC(0x00); // 286 protocol
packet.writeD(item.getMana()); packet.writeD(item.getMana());
packet.writeC(0x00); // 270 protocol packet.writeC(0x00); // 270 protocol
packet.writeD(item.getTime()); packet.writeD(item.getTime());
@ -129,8 +128,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
packet.writeC(item.getCustomType1()); // Filler (always 0) packet.writeC(item.getCustomType1()); // Filler (always 0)
packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
packet.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item) packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
packet.writeC(0x00); // 286 protocol
packet.writeD(item.getMana()); packet.writeD(item.getMana());
packet.writeC(0x00); // 270 protocol packet.writeC(0x00); // 270 protocol
packet.writeD(item.getTime()); packet.writeD(item.getTime());

6
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
View File

@ -81,8 +81,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
packet.writeC(item.getCustomType1()); // Filler (always 0) packet.writeC(item.getCustomType1()); // Filler (always 0)
packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
packet.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item) packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
packet.writeC(0x00); // 286 protocol
packet.writeD(item.getMana()); packet.writeD(item.getMana());
packet.writeC(0x00); // 270 protocol packet.writeC(0x00); // 270 protocol
packet.writeD(item.getTime()); packet.writeD(item.getTime());
@ -129,8 +128,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
packet.writeC(item.getCustomType1()); // Filler (always 0) packet.writeC(item.getCustomType1()); // Filler (always 0)
packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
packet.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item) packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
packet.writeC(0x00); // 286 protocol
packet.writeD(item.getMana()); packet.writeD(item.getMana());
packet.writeC(0x00); // 270 protocol packet.writeC(0x00); // 270 protocol
packet.writeD(item.getTime()); packet.writeD(item.getTime());