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

AcquireSkillList updated to Classic.

Browse Source
This commit is contained in:
MobiusDev 2017-05-01 12:15:19 +00:00
parent d2471e71a5
commit fbc44249cb
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
View File

@ -17,19 +17,17 @@
package com.l2jmobius.gameserver.network.serverpackets; package com.l2jmobius.gameserver.network.serverpackets;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.L2SkillLearn;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.holders.ItemHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.OutgoingPackets; import com.l2jmobius.gameserver.network.OutgoingPackets;
/** /**
* @author Sdw * @author Sdw, Mobius
* @version Classic 2.0
*/ */
public class AcquireSkillList implements IClientOutgoingPacket public class AcquireSkillList implements IClientOutgoingPacket
{ {
@ -51,26 +49,29 @@ public class AcquireSkillList implements IClientOutgoingPacket
packet.writeH(_learnable.size()); packet.writeH(_learnable.size());
for (L2SkillLearn skill : _learnable) for (L2SkillLearn skill : _learnable)
{ {
if (skill == null)
{
continue;
}
packet.writeD(skill.getSkillId()); packet.writeD(skill.getSkillId());
packet.writeD(skill.getSkillLevel()); packet.writeH(skill.getSkillLevel());
packet.writeQ(skill.getLevelUpSp()); packet.writeQ(skill.getLevelUpSp());
packet.writeC(skill.getGetLevel()); packet.writeC(skill.getGetLevel());
packet.writeC(skill.getDualClassLevel()); packet.writeC(0x00);
packet.writeC(skill.getRequiredItems().size()); if (skill.getRequiredItems().size() > 0)
for (ItemHolder item : skill.getRequiredItems())
{ {
packet.writeD(item.getId()); for (ItemHolder item : skill.getRequiredItems())
packet.writeQ(item.getCount()); {
packet.writeC(0x01);
packet.writeD(item.getId());
packet.writeQ(item.getCount());
}
} }
else
final List<Skill> skillRem = skill.getRemoveSkills().stream().map(_activeChar::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList());
packet.writeC(skillRem.size());
for (Skill skillRemove : skillRem)
{ {
packet.writeD(skillRemove.getId()); packet.writeC(0x00);
packet.writeD(skillRemove.getLevel());
} }
packet.writeC(0x00);
} }
return true; return true;
} }