From e60a34f37b31f5384eb6881371ede404c518e535 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 7 Jun 2018 20:47:56 +0000
Subject: [PATCH] Dropped isSkillDisabledByReuse method.

---
 .../gameserver/model/actor/L2Character.java         | 13 ++-----------
 .../gameserver/model/actor/L2Character.java         | 13 ++-----------
 .../gameserver/model/actor/L2Character.java         | 13 ++-----------
 .../gameserver/model/actor/L2Character.java         | 13 ++-----------
 .../gameserver/model/actor/L2Character.java         | 12 ++----------
 .../gameserver/model/actor/L2Character.java         | 13 ++-----------
 .../gameserver/model/actor/L2Character.java         | 13 ++-----------
 .../gameserver/model/actor/L2Character.java         | 13 ++-----------
 8 files changed, 16 insertions(+), 87 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 28be2596cc..5bc263def0 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1558,32 +1558,23 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return true;
 		}
 		
-		return isSkillDisabledByReuse(skill.getReuseHashCode());
-	}
-	
-	/**
-	 * Verifies if the skill is under reuse.
-	 * @param hashCode the skill hash code
-	 * @return {@code true} if the skill is disabled, {@code false} otherwise
-	 */
-	public boolean isSkillDisabledByReuse(long hashCode)
-	{
 		if (_disabledSkills == null)
 		{
 			return false;
 		}
 		
+		final long hashCode = skill.getReuseHashCode();
 		final Long stamp = _disabledSkills.get(hashCode);
 		if (stamp == null)
 		{
 			return false;
 		}
-		
 		if (stamp < System.currentTimeMillis())
 		{
 			_disabledSkills.remove(hashCode);
 			return false;
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 28be2596cc..5bc263def0 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1558,32 +1558,23 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return true;
 		}
 		
-		return isSkillDisabledByReuse(skill.getReuseHashCode());
-	}
-	
-	/**
-	 * Verifies if the skill is under reuse.
-	 * @param hashCode the skill hash code
-	 * @return {@code true} if the skill is disabled, {@code false} otherwise
-	 */
-	public boolean isSkillDisabledByReuse(long hashCode)
-	{
 		if (_disabledSkills == null)
 		{
 			return false;
 		}
 		
+		final long hashCode = skill.getReuseHashCode();
 		final Long stamp = _disabledSkills.get(hashCode);
 		if (stamp == null)
 		{
 			return false;
 		}
-		
 		if (stamp < System.currentTimeMillis())
 		{
 			_disabledSkills.remove(hashCode);
 			return false;
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 28be2596cc..5bc263def0 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1558,32 +1558,23 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return true;
 		}
 		
-		return isSkillDisabledByReuse(skill.getReuseHashCode());
-	}
-	
-	/**
-	 * Verifies if the skill is under reuse.
-	 * @param hashCode the skill hash code
-	 * @return {@code true} if the skill is disabled, {@code false} otherwise
-	 */
-	public boolean isSkillDisabledByReuse(long hashCode)
-	{
 		if (_disabledSkills == null)
 		{
 			return false;
 		}
 		
+		final long hashCode = skill.getReuseHashCode();
 		final Long stamp = _disabledSkills.get(hashCode);
 		if (stamp == null)
 		{
 			return false;
 		}
-		
 		if (stamp < System.currentTimeMillis())
 		{
 			_disabledSkills.remove(hashCode);
 			return false;
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 28be2596cc..5bc263def0 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1558,32 +1558,23 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return true;
 		}
 		
-		return isSkillDisabledByReuse(skill.getReuseHashCode());
-	}
-	
-	/**
-	 * Verifies if the skill is under reuse.
-	 * @param hashCode the skill hash code
-	 * @return {@code true} if the skill is disabled, {@code false} otherwise
-	 */
-	public boolean isSkillDisabledByReuse(long hashCode)
-	{
 		if (_disabledSkills == null)
 		{
 			return false;
 		}
 		
+		final long hashCode = skill.getReuseHashCode();
 		final Long stamp = _disabledSkills.get(hashCode);
 		if (stamp == null)
 		{
 			return false;
 		}
-		
 		if (stamp < System.currentTimeMillis())
 		{
 			_disabledSkills.remove(hashCode);
 			return false;
 		}
+		
 		return true;
 	}
 	
diff --git 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
index 324f579e6c..ba51cc830b 100644
--- 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
@@ -2342,21 +2342,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return true;
 		}
 		
-		return isSkillDisabledByReuse(skill.getReuseHashCode());
-	}
-	
-	/**
-	 * Verifies if the skill is disabled.
-	 * @param hashCode the skill hash code
-	 * @return {@code true} if the skill is disabled, {@code false} otherwise
-	 */
-	public boolean isSkillDisabledByReuse(int hashCode)
-	{
 		if (_disabledSkills == null)
 		{
 			return false;
 		}
 		
+		final int hashCode = skill.getReuseHashCode();
 		final Long stamp = _disabledSkills.get(hashCode);
 		if (stamp == null)
 		{
@@ -2368,6 +2359,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			_disabledSkills.remove(hashCode);
 			return false;
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 28be2596cc..5bc263def0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1558,32 +1558,23 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return true;
 		}
 		
-		return isSkillDisabledByReuse(skill.getReuseHashCode());
-	}
-	
-	/**
-	 * Verifies if the skill is under reuse.
-	 * @param hashCode the skill hash code
-	 * @return {@code true} if the skill is disabled, {@code false} otherwise
-	 */
-	public boolean isSkillDisabledByReuse(long hashCode)
-	{
 		if (_disabledSkills == null)
 		{
 			return false;
 		}
 		
+		final long hashCode = skill.getReuseHashCode();
 		final Long stamp = _disabledSkills.get(hashCode);
 		if (stamp == null)
 		{
 			return false;
 		}
-		
 		if (stamp < System.currentTimeMillis())
 		{
 			_disabledSkills.remove(hashCode);
 			return false;
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 28be2596cc..5bc263def0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1558,32 +1558,23 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return true;
 		}
 		
-		return isSkillDisabledByReuse(skill.getReuseHashCode());
-	}
-	
-	/**
-	 * Verifies if the skill is under reuse.
-	 * @param hashCode the skill hash code
-	 * @return {@code true} if the skill is disabled, {@code false} otherwise
-	 */
-	public boolean isSkillDisabledByReuse(long hashCode)
-	{
 		if (_disabledSkills == null)
 		{
 			return false;
 		}
 		
+		final long hashCode = skill.getReuseHashCode();
 		final Long stamp = _disabledSkills.get(hashCode);
 		if (stamp == null)
 		{
 			return false;
 		}
-		
 		if (stamp < System.currentTimeMillis())
 		{
 			_disabledSkills.remove(hashCode);
 			return false;
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 28be2596cc..5bc263def0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1558,32 +1558,23 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return true;
 		}
 		
-		return isSkillDisabledByReuse(skill.getReuseHashCode());
-	}
-	
-	/**
-	 * Verifies if the skill is under reuse.
-	 * @param hashCode the skill hash code
-	 * @return {@code true} if the skill is disabled, {@code false} otherwise
-	 */
-	public boolean isSkillDisabledByReuse(long hashCode)
-	{
 		if (_disabledSkills == null)
 		{
 			return false;
 		}
 		
+		final long hashCode = skill.getReuseHashCode();
 		final Long stamp = _disabledSkills.get(hashCode);
 		if (stamp == null)
 		{
 			return false;
 		}
-		
 		if (stamp < System.currentTimeMillis())
 		{
 			_disabledSkills.remove(hashCode);
 			return false;
 		}
+		
 		return true;
 	}