From 1f4ab8b34c29b3439c77e016c0cd89b29172401e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 30 May 2020 21:39:12 +0000 Subject: [PATCH] AcquireSkillList packet structure adjustments. Contributed by Sahar. --- .../gameserver/network/serverpackets/AcquireSkillList.java | 6 +++--- .../gameserver/network/serverpackets/AcquireSkillList.java | 6 +++--- .../gameserver/network/serverpackets/AcquireSkillList.java | 6 +++--- .../gameserver/network/serverpackets/AcquireSkillList.java | 6 +++--- .../gameserver/network/serverpackets/AcquireSkillList.java | 4 ++-- .../gameserver/network/serverpackets/AcquireSkillList.java | 4 ++-- .../gameserver/network/serverpackets/AcquireSkillList.java | 5 +++-- .../gameserver/network/serverpackets/AcquireSkillList.java | 5 +++-- .../gameserver/network/serverpackets/AcquireSkillList.java | 5 +++-- .../gameserver/network/serverpackets/AcquireSkillList.java | 5 +++-- 10 files changed, 28 insertions(+), 24 deletions(-) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 394f0006f8..39503f7cc1 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; /** - * @author Sdw + * @author Sdw, Mobius */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -63,14 +63,14 @@ public class AcquireSkillList implements IClientOutgoingPacket packet.writeD(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeH(skill.getDualClassLevel()); // Salvation: Changed from byte to short. + packet.writeC(skill.getDualClassLevel()); + packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0x00 : 0x01); packet.writeC(skill.getRequiredItems().size()); for (ItemHolder item : skill.getRequiredItems()) { packet.writeD(item.getId()); packet.writeQ(item.getCount()); } - final List skillRem = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(skillRem.size()); for (Skill skillRemove : skillRem) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 394f0006f8..39503f7cc1 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; /** - * @author Sdw + * @author Sdw, Mobius */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -63,14 +63,14 @@ public class AcquireSkillList implements IClientOutgoingPacket packet.writeD(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeH(skill.getDualClassLevel()); // Salvation: Changed from byte to short. + packet.writeC(skill.getDualClassLevel()); + packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0x00 : 0x01); packet.writeC(skill.getRequiredItems().size()); for (ItemHolder item : skill.getRequiredItems()) { packet.writeD(item.getId()); packet.writeQ(item.getCount()); } - final List skillRem = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(skillRem.size()); for (Skill skillRemove : skillRem) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index dcb599ff9e..64603c6c23 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; /** - * @author Sdw + * @author Sdw, Mobius */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -63,14 +63,14 @@ public class AcquireSkillList implements IClientOutgoingPacket packet.writeD(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeH(skill.getDualClassLevel()); // Salvation: Changed from byte to short. + packet.writeC(skill.getDualClassLevel()); + packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0x00 : 0x01); packet.writeC(skill.getRequiredItems().size()); for (ItemHolder item : skill.getRequiredItems()) { packet.writeD(item.getId()); packet.writeQ(item.getCount()); } - final List skillRem = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(skillRem.size()); for (Skill skillRemove : skillRem) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index dcb599ff9e..64603c6c23 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; /** - * @author Sdw + * @author Sdw, Mobius */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -63,14 +63,14 @@ public class AcquireSkillList implements IClientOutgoingPacket packet.writeD(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeH(skill.getDualClassLevel()); // Salvation: Changed from byte to short. + packet.writeC(skill.getDualClassLevel()); + packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0x00 : 0x01); packet.writeC(skill.getRequiredItems().size()); for (ItemHolder item : skill.getRequiredItems()) { packet.writeD(item.getId()); packet.writeQ(item.getCount()); } - final List skillRem = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(skillRem.size()); for (Skill skillRemove : skillRem) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 596accf282..d5e5e084f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; /** * @author Sdw, Mobius - * @version Classic 2.0 */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -61,11 +60,12 @@ public class AcquireSkillList implements IClientOutgoingPacket { continue; } + packet.writeD(skill.getSkillId()); packet.writeH(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeC(0x00); + packet.writeC(0x00); // Skill dual class level. if (skill.getRequiredItems().size() > 0) { for (ItemHolder item : skill.getRequiredItems()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 596accf282..d5e5e084f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; /** * @author Sdw, Mobius - * @version Classic 2.0 */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -61,11 +60,12 @@ public class AcquireSkillList implements IClientOutgoingPacket { continue; } + packet.writeD(skill.getSkillId()); packet.writeH(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeC(0x00); + packet.writeC(0x00); // Skill dual class level. if (skill.getRequiredItems().size() > 0) { for (ItemHolder item : skill.getRequiredItems()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 518003b504..7b15cd53e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; /** * @author Sdw, Mobius - * @version Classic 2.0 */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -61,11 +60,13 @@ public class AcquireSkillList implements IClientOutgoingPacket { continue; } + packet.writeD(skill.getSkillId()); packet.writeH(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeH(0x00); // Salvation: Changed from byte to short. + packet.writeC(0x00); // Skill dual class level. + packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0x00 : 0x01); if (skill.getRequiredItems().size() > 0) { for (ItemHolder item : skill.getRequiredItems()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 518003b504..7b15cd53e8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; /** * @author Sdw, Mobius - * @version Classic 2.0 */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -61,11 +60,13 @@ public class AcquireSkillList implements IClientOutgoingPacket { continue; } + packet.writeD(skill.getSkillId()); packet.writeH(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeH(0x00); // Salvation: Changed from byte to short. + packet.writeC(0x00); // Skill dual class level. + packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0x00 : 0x01); if (skill.getRequiredItems().size() > 0) { for (ItemHolder item : skill.getRequiredItems()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 518003b504..7b15cd53e8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; /** * @author Sdw, Mobius - * @version Classic 2.0 */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -61,11 +60,13 @@ public class AcquireSkillList implements IClientOutgoingPacket { continue; } + packet.writeD(skill.getSkillId()); packet.writeH(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeH(0x00); // Salvation: Changed from byte to short. + packet.writeC(0x00); // Skill dual class level. + packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0x00 : 0x01); if (skill.getRequiredItems().size() > 0) { for (ItemHolder item : skill.getRequiredItems()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 518003b504..7b15cd53e8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; /** * @author Sdw, Mobius - * @version Classic 2.0 */ public class AcquireSkillList implements IClientOutgoingPacket { @@ -61,11 +60,13 @@ public class AcquireSkillList implements IClientOutgoingPacket { continue; } + packet.writeD(skill.getSkillId()); packet.writeH(skill.getSkillLevel()); packet.writeQ(skill.getLevelUpSp()); packet.writeC(skill.getGetLevel()); - packet.writeH(0x00); // Salvation: Changed from byte to short. + packet.writeC(0x00); // Skill dual class level. + packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0x00 : 0x01); if (skill.getRequiredItems().size() > 0) { for (ItemHolder item : skill.getRequiredItems())