Prevent SkillHolder tapping into SkillData for each getSkill call.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -26,18 +26,21 @@ import org.l2jmobius.gameserver.model.skills.Skill;
 public class SkillHolder
 {
 	private final int _skillId;
-	private final int _skillLvl;
+	private final int _skillLevel;
+	private Skill _skill;
 	
-	public SkillHolder(int skillId, int skillLvl)
+	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
-		_skillLvl = skillLvl;
+		_skillLevel = skillLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
 	{
 		_skillId = skill.getId();
-		_skillLvl = skill.getLevel();
+		_skillLevel = skill.getLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -47,17 +50,48 @@ public class SkillHolder
 	
 	public int getSkillLevel()
 	{
-		return _skillLvl;
+		return _skillLevel;
 	}
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLvl, 1));
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1));
+		}
+		return _skill;
+	}
+	
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (!(obj instanceof SkillHolder))
+		{
+			return false;
+		}
+		
+		final SkillHolder holder = (SkillHolder) obj;
+		return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel);
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = (prime * result) + _skillId;
+		result = (prime * result) + _skillLevel;
+		return result;
 	}
 	
 	@Override
 	public String toString()
 	{
-		return "[SkillId: " + _skillId + " Level: " + _skillLvl + "]";
+		return "[SkillId: " + _skillId + " Level: " + _skillLevel + "]";
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -26,18 +26,21 @@ import org.l2jmobius.gameserver.model.skills.Skill;
 public class SkillHolder
 {
 	private final int _skillId;
-	private final int _skillLvl;
+	private final int _skillLevel;
+	private Skill _skill;
 	
-	public SkillHolder(int skillId, int skillLvl)
+	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
-		_skillLvl = skillLvl;
+		_skillLevel = skillLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
 	{
 		_skillId = skill.getId();
-		_skillLvl = skill.getLevel();
+		_skillLevel = skill.getLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -47,17 +50,48 @@ public class SkillHolder
 	
 	public int getSkillLevel()
 	{
-		return _skillLvl;
+		return _skillLevel;
 	}
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLvl, 1));
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1));
+		}
+		return _skill;
+	}
+	
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (!(obj instanceof SkillHolder))
+		{
+			return false;
+		}
+		
+		final SkillHolder holder = (SkillHolder) obj;
+		return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel);
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = (prime * result) + _skillId;
+		result = (prime * result) + _skillLevel;
+		return result;
 	}
 	
 	@Override
 	public String toString()
 	{
-		return "[SkillId: " + _skillId + " Level: " + _skillLvl + "]";
+		return "[SkillId: " + _skillId + " Level: " + _skillLevel + "]";
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java

@@ -28,12 +28,14 @@ public class SkillHolder
 	private final int _skillId;
 	private final int _skillLevel;
 	private final int _skillSubLevel;
+	private Skill _skill;
 	
 	public SkillHolder(int skillId, int skillLevel)
 	{
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = 0;
+		_skill = null;
 	}
 	
 	public SkillHolder(int skillId, int skillLevel, int skillSubLevel)
@@ -41,6 +43,7 @@ public class SkillHolder
 		_skillId = skillId;
 		_skillLevel = skillLevel;
 		_skillSubLevel = skillSubLevel;
+		_skill = null;
 	}
 	
 	public SkillHolder(Skill skill)
@@ -48,6 +51,7 @@ public class SkillHolder
 		_skillId = skill.getId();
 		_skillLevel = skill.getLevel();
 		_skillSubLevel = skill.getSubLevel();
+		_skill = skill;
 	}
 	
 	public int getSkillId()
@@ -67,7 +71,11 @@ public class SkillHolder
 	
 	public Skill getSkill()
 	{
-		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		if (_skill == null)
+		{
+			_skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel);
+		}
+		return _skill;
 	}
 	
 	@Override