2
0
Эх сурвалжийг харах

BETA: Small fix in getMinLevelForNewSkill, should only consider skills learn from Npc.

Zoey76 14 жил өмнө
parent
commit
b8c93350da

+ 8 - 7
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTreesData.java

@@ -1017,19 +1017,20 @@ public final class SkillTreesData
 	public int getMinLevelForNewSkill(L2PcInstance player, FastMap<Integer, L2SkillLearn> skillTree)
 	public int getMinLevelForNewSkill(L2PcInstance player, FastMap<Integer, L2SkillLearn> skillTree)
 	{
 	{
 		int minLevel = 0;
 		int minLevel = 0;
-		if (skillTree.size() < 1)
+		if (skillTree.isEmpty())
 		{
 		{
 			_log.warning(getClass().getSimpleName() + ": SkillTree is not defined for getMinLevelForNewSkill!");
 			_log.warning(getClass().getSimpleName() + ": SkillTree is not defined for getMinLevelForNewSkill!");
-			return minLevel;
 		}
 		}
-		
-		for (L2SkillLearn s : skillTree.values())
+		else
 		{
 		{
-			if (player.getLevel() >= s.getGetLevel())
+			for (L2SkillLearn s : skillTree.values())
 			{
 			{
-				if ((minLevel == 0) || (s.getGetLevel() < minLevel))
+				if (s.isLearnedByNpc() && (player.getLevel() < s.getGetLevel()))
 				{
 				{
-					minLevel = s.getGetLevel();
+					if ((minLevel == 0) || (minLevel > s.getGetLevel()))
+					{
+						minLevel = s.getGetLevel();
+					}
 				}
 				}
 			}
 			}
 		}
 		}