Updated L2Character isSkillDisabled method to match newer branches.

2018-06-07 20:30:33 +00:00 · 2018-06-07 20:30:33 +00:00 · f0896c5346
commit f0896c5346
parent 878d7b6e3d
1 changed files with 16 additions and 1 deletions
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@ -2327,7 +2327,22 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	 */
 	public boolean isSkillDisabled(Skill skill)
 	{
-		return (skill != null) && isSkillDisabled(skill.getReuseHashCode());
+		if (skill == null)
+		{
+			return false;
+		}
+		
+		if (_allSkillsDisabled)
+		{
+			return true;
+		}
+		
+		if (hasSkillReuse(skill.getReuseHashCode()))
+		{
+			return true;
+		}
+		
+		return isSkillDisabled(skill.getReuseHashCode());
 	}
 	
 	/**