Skilltree getAllAvailableSkills method cleanup.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -750,27 +750,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -794,8 +801,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -750,27 +750,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -794,8 +801,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -750,27 +750,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -794,8 +801,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -750,27 +750,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -794,8 +801,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -750,27 +750,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -794,8 +801,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java

@@ -597,33 +597,28 @@ public class SkillTreeTable
 		return 0;
 	}
 	
-	/**
-	 * @param player
-	 * @param classId
-	 * @return
-	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId)
 	{
-		// Get available skills
-		int unLearnable = 0;
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player.getSkills());
-		List<SkillLearn> learnable = getAvailableSkills(player, classId, holder);
+		List<SkillLearn> learnable;
-		while (learnable.size() > unLearnable)
+		for (int i = 0; i < 1000; i++)
 		{
-			for (SkillLearn s : learnable)
+			learnable = getAvailableSkills(player, classId, holder);
+			if (learnable.isEmpty())
 			{
-				final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
+				break;
-				if ((sk == null) || ((sk.getId() == Skill.SKILL_DIVINE_INSPIRATION) && !Config.AUTO_LEARN_DIVINE_INSPIRATION && !player.isGM()))
+			}
+			
+			for (SkillLearn skillLearn : learnable)
+			{
+				final Skill skill = SkillTable.getInstance().getSkill(skillLearn.getId(), skillLearn.getLevel());
+				if ((skill == null) || ((skill.getId() == Skill.SKILL_DIVINE_INSPIRATION) && !Config.AUTO_LEARN_DIVINE_INSPIRATION))
 				{
-					unLearnable++;
 					continue;
 				}
 				
-				holder.addSkill(sk);
+				holder.addSkill(skill);
 			}
-			
-			// Get new available skills, some skills depend of previous skills to be available.
-			learnable = getAvailableSkills(player, classId, holder);
 		}
 		return holder.getSkills().values();
 	}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java

@@ -597,33 +597,28 @@ public class SkillTreeTable
 		return 0;
 	}
 	
-	/**
-	 * @param player
-	 * @param classId
-	 * @return
-	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId)
 	{
-		// Get available skills
-		int unLearnable = 0;
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player.getSkills());
-		List<SkillLearn> learnable = getAvailableSkills(player, classId, holder);
+		List<SkillLearn> learnable;
-		while (learnable.size() > unLearnable)
+		for (int i = 0; i < 1000; i++)
 		{
-			for (SkillLearn s : learnable)
+			learnable = getAvailableSkills(player, classId, holder);
+			if (learnable.isEmpty())
 			{
-				final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
+				break;
-				if ((sk == null) || ((sk.getId() == Skill.SKILL_DIVINE_INSPIRATION) && !Config.AUTO_LEARN_DIVINE_INSPIRATION && !player.isGM()))
+			}
+			
+			for (SkillLearn skillLearn : learnable)
+			{
+				final Skill skill = SkillTable.getInstance().getSkill(skillLearn.getId(), skillLearn.getLevel());
+				if ((skill == null) || ((skill.getId() == Skill.SKILL_DIVINE_INSPIRATION) && !Config.AUTO_LEARN_DIVINE_INSPIRATION))
 				{
-					unLearnable++;
 					continue;
 				}
 				
-				holder.addSkill(sk);
+				holder.addSkill(skill);
 			}
-			
-			// Get new available skills, some skills depend of previous skills to be available.
-			learnable = getAvailableSkills(player, classId, holder);
 		}
 		return holder.getSkills().values();
 	}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -578,19 +578,21 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
-		List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+		List<SkillLearn> learnable;
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		for (int i = 0; i < 1000; i++)
 		{
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			if (learnable.isEmpty())
+			{
+				break;
+			}
+			
 			for (SkillLearn skillLearn : learnable)
 			{
 				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				holder.addSkill(skill);
 			}
-			
-			// Get new available skills, some skills depend of previous skills to be available.
-			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 		}
 		return holder.getSkills().values();
 	}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -578,19 +578,21 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
-		List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+		List<SkillLearn> learnable;
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		for (int i = 0; i < 1000; i++)
 		{
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			if (learnable.isEmpty())
+			{
+				break;
+			}
+			
 			for (SkillLearn skillLearn : learnable)
 			{
 				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				holder.addSkill(skill);
 			}
-			
-			// Get new available skills, some skills depend of previous skills to be available.
-			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 		}
 		return holder.getSkills().values();
 	}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -745,27 +745,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -789,8 +796,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -747,27 +747,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -791,8 +798,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -745,27 +745,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -789,8 +796,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -745,27 +745,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -789,8 +796,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -745,27 +745,34 @@ public class SkillTreeData implements IXmlReader
 	 */
 	public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems)
 	{
-		// Get available skills
 		final PlayerSkillHolder holder = new PlayerSkillHolder(player);
 		final Set<Integer> removed = new HashSet<>();
-		for (int i = 0; i < 1000; i++) // Infinite loop warning
+		List<SkillLearn> learnable;
+		for (int i = 0; i < 1000; i++)
 		{
-			final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
 			if (learnable.isEmpty())
 			{
-				// No more skills to learn
 				break;
 			}
 			
-			if (learnable.stream().allMatch(skillLearn -> removed.contains(skillLearn.getSkillId())))
+			// All remaining skills have been removed.
+			boolean allRemoved = true;
+			SEARCH: for (SkillLearn skillLearn : learnable)
+			{
+				if (!removed.contains(skillLearn.getSkillId()))
+				{
+					allRemoved = false;
+					break SEARCH;
+				}
+			}
+			if (allRemoved)
 			{
-				// All remaining skills has been removed
 				break;
 			}
 			
 			for (SkillLearn skillLearn : learnable)
 			{
-				final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 				// Cleanup skills that has to be removed
 				for (int skillId : skillLearn.getRemoveSkills())
 				{
@@ -789,8 +796,9 @@ public class SkillTreeData implements IXmlReader
 					}
 				}
 				
-				if (!removed.contains(skill.getId()))
+				if (!removed.contains(skillLearn.getSkillId()))
 				{
+					final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
 					holder.addSkill(skill);
 				}
 			}