From a2d05fbf2db7a22c171fa7a7a2eabc1b97f07005 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 8 Jan 2023 12:04:08 +0000 Subject: [PATCH] Removed stream usage from AcquireSkillList serverpacket. --- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 18 +++++++++++++----- .../serverpackets/AcquireSkillList.java | 18 +++++++++++++----- .../serverpackets/AcquireSkillList.java | 18 +++++++++++++----- .../serverpackets/AcquireSkillList.java | 18 +++++++++++++----- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 15 ++++++++++++--- .../serverpackets/AcquireSkillList.java | 18 +++++++++++++----- .../serverpackets/AcquireSkillList.java | 18 +++++++++++++----- .../serverpackets/AcquireSkillList.java | 18 +++++++++++++----- .../serverpackets/AcquireSkillList.java | 18 +++++++++++++----- 26 files changed, 320 insertions(+), 94 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 9032d378ed..faa3511956 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -72,7 +72,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 37216e9f43..5ecd7ef747 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -72,7 +72,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 37216e9f43..5ecd7ef747 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -72,7 +72,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 37216e9f43..5ecd7ef747 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -72,7 +72,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 203f754c33..c24c7bd4a0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -73,7 +73,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 203f754c33..c24c7bd4a0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -73,7 +73,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index a645523379..9307e6584a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -73,7 +73,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index a645523379..9307e6584a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -73,7 +73,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 71546fc494..c636424100 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,9 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; +import java.util.LinkedList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -61,7 +60,7 @@ public class AcquireSkillList extends ServerPacket for (SkillLearn skill : _learnable) { writeInt(skill.getSkillId()); - writeInt(skill.getSkillLevel()); // Main writeD, Essence writeH. + writeInt(skill.getSkillLevel()); // Main writeInt, Essence writeShort. writeLong(skill.getLevelUpSp()); writeByte(skill.getGetLevel()); writeByte(skill.getDualClassLevel()); @@ -74,12 +73,21 @@ public class AcquireSkillList extends ServerPacket writeLong(item.get(0).getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { writeInt(removed.getId()); - writeInt(removed.getLevel()); // Main writeD, Essence writeH. + writeInt(removed.getLevel()); // Main writeInt, Essence writeShort. } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 71546fc494..c636424100 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,9 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; +import java.util.LinkedList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -61,7 +60,7 @@ public class AcquireSkillList extends ServerPacket for (SkillLearn skill : _learnable) { writeInt(skill.getSkillId()); - writeInt(skill.getSkillLevel()); // Main writeD, Essence writeH. + writeInt(skill.getSkillLevel()); // Main writeInt, Essence writeShort. writeLong(skill.getLevelUpSp()); writeByte(skill.getGetLevel()); writeByte(skill.getDualClassLevel()); @@ -74,12 +73,21 @@ public class AcquireSkillList extends ServerPacket writeLong(item.get(0).getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { writeInt(removed.getId()); - writeInt(removed.getLevel()); // Main writeD, Essence writeH. + writeInt(removed.getLevel()); // Main writeInt, Essence writeShort. } } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 71546fc494..c636424100 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,9 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; +import java.util.LinkedList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -61,7 +60,7 @@ public class AcquireSkillList extends ServerPacket for (SkillLearn skill : _learnable) { writeInt(skill.getSkillId()); - writeInt(skill.getSkillLevel()); // Main writeD, Essence writeH. + writeInt(skill.getSkillLevel()); // Main writeInt, Essence writeShort. writeLong(skill.getLevelUpSp()); writeByte(skill.getGetLevel()); writeByte(skill.getDualClassLevel()); @@ -74,12 +73,21 @@ public class AcquireSkillList extends ServerPacket writeLong(item.get(0).getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { writeInt(removed.getId()); - writeInt(removed.getLevel()); // Main writeD, Essence writeH. + writeInt(removed.getLevel()); // Main writeInt, Essence writeShort. } } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 71546fc494..c636424100 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,9 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; +import java.util.LinkedList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -61,7 +60,7 @@ public class AcquireSkillList extends ServerPacket for (SkillLearn skill : _learnable) { writeInt(skill.getSkillId()); - writeInt(skill.getSkillLevel()); // Main writeD, Essence writeH. + writeInt(skill.getSkillLevel()); // Main writeInt, Essence writeShort. writeLong(skill.getLevelUpSp()); writeByte(skill.getGetLevel()); writeByte(skill.getDualClassLevel()); @@ -74,12 +73,21 @@ public class AcquireSkillList extends ServerPacket writeLong(item.get(0).getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { writeInt(removed.getId()); - writeInt(removed.getLevel()); // Main writeD, Essence writeH. + writeInt(removed.getLevel()); // Main writeInt, Essence writeShort. } } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index c5971abd08..4e2d8f2a67 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -72,7 +72,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index c5971abd08..4e2d8f2a67 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -72,7 +72,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { 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 c5971abd08..4e2d8f2a67 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 @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -72,7 +72,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index c5971abd08..4e2d8f2a67 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -72,7 +72,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 005810cb45..c3fcf079d5 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -73,7 +73,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 005810cb45..c3fcf079d5 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -73,7 +73,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 005810cb45..c3fcf079d5 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -73,7 +73,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index 005810cb45..c3fcf079d5 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -73,7 +73,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { 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 005810cb45..c3fcf079d5 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 @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -73,7 +73,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index c5971abd08..4e2d8f2a67 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -72,7 +72,16 @@ public class AcquireSkillList extends ServerPacket writeLong(item.getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index e926af84c7..325c5d157e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,9 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; +import java.util.LinkedList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -61,7 +60,7 @@ public class AcquireSkillList extends ServerPacket for (SkillLearn skill : _learnable) { writeInt(skill.getSkillId()); - writeShort(skill.getSkillLevel()); // Main writeD, Essence writeH. + writeShort(skill.getSkillLevel()); // Main writeInt, Essence writeShort. writeLong(skill.getLevelUpSp()); writeByte(skill.getGetLevel()); writeByte(0); // Skill dual class level. @@ -74,12 +73,21 @@ public class AcquireSkillList extends ServerPacket writeLong(item.get(0).getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { writeInt(removed.getId()); - writeShort(removed.getLevel()); // Main writeD, Essence writeH. + writeShort(removed.getLevel()); // Main writeInt, Essence writeShort. } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index e926af84c7..325c5d157e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,9 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; +import java.util.LinkedList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -61,7 +60,7 @@ public class AcquireSkillList extends ServerPacket for (SkillLearn skill : _learnable) { writeInt(skill.getSkillId()); - writeShort(skill.getSkillLevel()); // Main writeD, Essence writeH. + writeShort(skill.getSkillLevel()); // Main writeInt, Essence writeShort. writeLong(skill.getLevelUpSp()); writeByte(skill.getGetLevel()); writeByte(0); // Skill dual class level. @@ -74,12 +73,21 @@ public class AcquireSkillList extends ServerPacket writeLong(item.get(0).getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { writeInt(removed.getId()); - writeShort(removed.getLevel()); // Main writeD, Essence writeH. + writeShort(removed.getLevel()); // Main writeInt, Essence writeShort. } } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index e926af84c7..325c5d157e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,9 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; +import java.util.LinkedList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -61,7 +60,7 @@ public class AcquireSkillList extends ServerPacket for (SkillLearn skill : _learnable) { writeInt(skill.getSkillId()); - writeShort(skill.getSkillLevel()); // Main writeD, Essence writeH. + writeShort(skill.getSkillLevel()); // Main writeInt, Essence writeShort. writeLong(skill.getLevelUpSp()); writeByte(skill.getGetLevel()); writeByte(0); // Skill dual class level. @@ -74,12 +73,21 @@ public class AcquireSkillList extends ServerPacket writeLong(item.get(0).getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { writeInt(removed.getId()); - writeShort(removed.getLevel()); // Main writeD, Essence writeH. + writeShort(removed.getLevel()); // Main writeInt, Essence writeShort. } } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index e926af84c7..325c5d157e 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -17,9 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; +import java.util.LinkedList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.model.SkillLearn; @@ -61,7 +60,7 @@ public class AcquireSkillList extends ServerPacket for (SkillLearn skill : _learnable) { writeInt(skill.getSkillId()); - writeShort(skill.getSkillLevel()); // Main writeD, Essence writeH. + writeShort(skill.getSkillLevel()); // Main writeInt, Essence writeShort. writeLong(skill.getLevelUpSp()); writeByte(skill.getGetLevel()); writeByte(0); // Skill dual class level. @@ -74,12 +73,21 @@ public class AcquireSkillList extends ServerPacket writeLong(item.get(0).getCount()); } - final Collection removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); + final List removeSkills = new LinkedList<>(); + for (int id : skill.getRemoveSkills()) + { + final Skill removeSkill = _player.getKnownSkill(id); + if (removeSkill != null) + { + removeSkills.add(removeSkill); + } + } + writeByte(removeSkills.size()); for (Skill removed : removeSkills) { writeInt(removed.getId()); - writeShort(removed.getLevel()); // Main writeD, Essence writeH. + writeShort(removed.getLevel()); // Main writeInt, Essence writeShort. } } }