Fixed skill mastery double abnormal time.

Contributed by Liamxroy.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -951,16 +951,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -951,16 +951,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -951,16 +951,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -251,7 +251,8 @@ public class SkillCaster implements Runnable
 		int reuseDelay = caster.getStat().getReuseTime(_skill);
 		if (reuseDelay > 10)
 		{
-			if (Formulas.calcSkillMastery(caster, _skill))
+			// Skill mastery doesn't affect static skills / A2 and item skills on reuse.
+			if (Formulas.calcSkillMastery(caster, _skill) && !_skill.isStatic() && (_skill.getReferenceItemId() == 0) && (_skill.getOperateType() == SkillOperateType.A1))
 			{
 				reuseDelay = 100;
 				caster.sendPacket(SystemMessageId.A_SKILL_IS_READY_TO_BE_USED_AGAIN);

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -950,16 +950,6 @@ public class Formulas
 		{
 			return false;
 		}
-		// Static skills are not affected by Skill Mastery.
-		if (skill.isStatic())
-		{
-			return false;
-		}
-		// Item skills are not affected by Skill Mastery.
-		if (skill.getReferenceItemId() > 0)
-		{
-			return false;
-		}
 		
 		final int val = (int) actor.getStat().getAdd(Stats.SKILL_CRITICAL, -1);
 		if (val == -1)