Minor RequestAcquireSkill improvement and cleanup.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -640,15 +640,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-				{
-					if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-					}
 				});
 			}
 			

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -640,15 +640,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-				{
-					if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-					}
 				});
 			}
 			

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -640,15 +640,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-				{
-					if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-					}
 				});
 			}
 			

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -640,15 +640,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-				{
-					if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-					}
 				});
 			}
 			

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -590,15 +590,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-				{
-					if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-					}
 				});
 			}
 			

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -590,15 +590,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-				{
-					if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-					}
 				});
 			}
 			

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -590,15 +590,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-				{
-					if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-					}
 				});
 			}
 			

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -507,9 +507,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -592,15 +590,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -614,7 +609,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -515,9 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -621,15 +619,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -643,7 +638,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -515,9 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -621,15 +619,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -643,7 +638,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -515,9 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -621,15 +619,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -643,7 +638,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -515,9 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -621,15 +619,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -643,7 +638,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -474,9 +474,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -559,15 +557,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -581,7 +576,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -489,9 +489,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -595,15 +593,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -617,7 +612,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -489,9 +489,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -595,15 +593,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -617,7 +612,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -489,9 +489,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -595,15 +593,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -617,7 +612,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}
 	

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -489,9 +489,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 	 */
 	private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
 	{
-		if (skillLearn != null)
+		if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
-		{
-			if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
 		{
 			// Hack check.
 			if (skillLearn.getGetLevel() > player.getLevel())
@@ -595,15 +593,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			if (!skillLearn.getRemoveSkills().isEmpty())
 			{
 				skillLearn.getRemoveSkills().forEach(skillId ->
-					{
-						if (player.getSkillLevel(skillId) > 0)
 				{
 					final Skill skillToRemove = player.getKnownSkill(skillId);
 					if (skillToRemove != null)
 					{
 						player.removeSkill(skillToRemove, true);
 					}
-						}
 				});
 			}
 			
@@ -617,7 +612,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 			}
 			return true;
 		}
-		}
 		return false;
 	}