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

Fixed exceptions when transforming after last streams update.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2020-06-20 05:28:53 +00:00
parent b7040e9288
commit 9e1f81f639
15 changed files with 135 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -11507,13 +11507,7 @@ public class PlayerInstance extends Playable
if (isTransformed() && !_transformSkills.isEmpty())
{
// Include transformation skills and those skills that are allowed during transformation.
for (Skill skill : currentSkills)
{
if (!skill.allowOnTransform())
{
currentSkills.remove(skill);
}
}
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
// Revelation skills.
if (isDualClassActive())
@ -11546,18 +11540,14 @@ public class PlayerInstance extends Playable
currentSkills.addAll(_transformSkills.values());
}
for (Skill skill : currentSkills)
{
if ((skill == null) //
|| skill.isBlockActionUseSkill() // Skills that are blocked from player use are not shown in skill list.
|| SkillTreeData.getInstance().isAlchemySkill(skill.getId(), skill.getLevel()) //
|| !skill.isDisplayInList())
{
currentSkills.remove(skill);
}
}
return currentSkills;
//@formatter:off
return currentSkills.stream()
.filter(Objects::nonNull)
.filter(s -> !s.isBlockActionUseSkill()) // Skills that are blocked from player use are not shown in skill list.
.filter(s -> !SkillTreeData.getInstance().isAlchemySkill(s.getId(), s.getLevel()))
.filter(s -> s.isDisplayInList())
.collect(Collectors.toList());
//@formatter:on
}
protected void startFeed(int npcId)