Преглед изворни кода

Reducing visibility of the _skills in L2Character, does not need to be protected.

_DS_ пре 15 година
родитељ
комит
32a838c1ae

+ 3 - 6
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/L2Character.java

@@ -196,7 +196,7 @@ public abstract class L2Character extends L2Object
 	private Calculator[] _calculators;
 
 	/** FastMap(Integer, L2Skill) containing all skills of the L2Character */
-	protected final Map<Integer, L2Skill> _skills;
+	private final Map<Integer, L2Skill> _skills;
 	/** FastMap containing the active chance skills on this character */
 	protected ChanceSkillList _chanceSkills;
 
@@ -5911,13 +5911,10 @@ public abstract class L2Character extends L2Object
 	 */
 	public int getSkillLevel(int skillId)
 	{
-		if (_skills == null)
-			return -1;
-
-		L2Skill skill = _skills.get(skillId);
-
+		final L2Skill skill = getKnownSkill(skillId);
 		if (skill == null)
 			return -1;
+
 		return skill.getLevel();
 	}
 

+ 4 - 2
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PetInstance.java

@@ -1100,8 +1100,10 @@ public class L2PetInstance extends L2Summon
     @Override
 	public final int getSkillLevel(int skillId)
     {
-        if (_skills == null || _skills.get(skillId) == null) return -1;
-        int lvl = getLevel();
+        if (getKnownSkill(skillId) == null)
+        	return -1;
+
+        final int lvl = getLevel();
         return lvl > 70 ? 7 + (lvl - 70) / 5 : lvl / 10;
     }