From 878d7b6e3dd9f876bf55580c5d53c0f7b2828dee Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 7 Jun 2018 20:26:23 +0000 Subject: [PATCH] Skills on reuse time should count as disabled. --- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 5 +++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 5 +++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 5 +++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 5 +++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 5 +++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 5 +++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 5 +++++ 7 files changed, 35 insertions(+) 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 27e2df675c..28be2596cc 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 @@ -1553,6 +1553,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return true; } + if (hasSkillReuse(skill.getReuseHashCode())) + { + return true; + } + return isSkillDisabledByReuse(skill.getReuseHashCode()); } 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 27e2df675c..28be2596cc 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 @@ -1553,6 +1553,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return true; } + if (hasSkillReuse(skill.getReuseHashCode())) + { + return true; + } + return isSkillDisabledByReuse(skill.getReuseHashCode()); } 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 27e2df675c..28be2596cc 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 @@ -1553,6 +1553,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return true; } + if (hasSkillReuse(skill.getReuseHashCode())) + { + return true; + } + return isSkillDisabledByReuse(skill.getReuseHashCode()); } 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 27e2df675c..28be2596cc 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 @@ -1553,6 +1553,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return true; } + if (hasSkillReuse(skill.getReuseHashCode())) + { + return true; + } + return isSkillDisabledByReuse(skill.getReuseHashCode()); } 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 27e2df675c..28be2596cc 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 @@ -1553,6 +1553,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return true; } + if (hasSkillReuse(skill.getReuseHashCode())) + { + return true; + } + return isSkillDisabledByReuse(skill.getReuseHashCode()); } 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 27e2df675c..28be2596cc 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 @@ -1553,6 +1553,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return true; } + if (hasSkillReuse(skill.getReuseHashCode())) + { + return true; + } + return isSkillDisabledByReuse(skill.getReuseHashCode()); } 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 27e2df675c..28be2596cc 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 @@ -1553,6 +1553,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return true; } + if (hasSkillReuse(skill.getReuseHashCode())) + { + return true; + } + return isSkillDisabledByReuse(skill.getReuseHashCode()); }