From 903d3f59df30f4d569424672d38f9386a4bc24e3 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:44:48 +0000 Subject: [PATCH] Reseting the remaining skill reuse time on each item equip is wrong. --- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- .../gameserver/model/itemcontainer/Inventory.java | 12 ++++-------- 26 files changed, 104 insertions(+), 208 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index fde8f6a8d1..35b875ec34 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -566,8 +566,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -623,8 +622,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -687,8 +685,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -807,8 +804,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 48cfd38844..24a761caf7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -572,8 +572,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -629,8 +628,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -693,8 +691,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -813,8 +810,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 48cfd38844..24a761caf7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -572,8 +572,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -629,8 +628,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -693,8 +691,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -813,8 +810,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 27d3db3d6a..e3f9ff8d07 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -572,8 +572,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -629,8 +628,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -693,8 +691,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -813,8 +810,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 480536d2da..8accee3e13 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -582,8 +582,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -639,8 +638,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -703,8 +701,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -826,8 +823,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 42d512a3f3..1ba16b5dfe 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -605,8 +605,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -662,8 +661,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -726,8 +724,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -849,8 +846,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 42d512a3f3..1ba16b5dfe 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -605,8 +605,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -662,8 +661,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -726,8 +724,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -849,8 +846,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 1b2bf831c0..631bbb2cbc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -599,8 +599,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -656,8 +655,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -720,8 +718,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -843,8 +840,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 450044ebbd..0042c9d220 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -581,8 +581,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -638,8 +637,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -702,8 +700,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -825,8 +822,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 450044ebbd..0042c9d220 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -581,8 +581,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -638,8 +637,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -702,8 +700,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -825,8 +822,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 64e94c0b46..1f24bc5dce 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -582,8 +582,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -639,8 +638,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -703,8 +701,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -826,8 +823,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 64e94c0b46..1f24bc5dce 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -582,8 +582,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -639,8 +638,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -703,8 +701,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -826,8 +823,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 235bda7cbd..b9f2cddb0c 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -568,8 +568,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -625,8 +624,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -689,8 +687,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -809,8 +806,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 235bda7cbd..b9f2cddb0c 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -568,8 +568,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -625,8 +624,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -689,8 +687,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -809,8 +806,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 3075e726ef..cb437b4b4f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -574,8 +574,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -631,8 +630,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -695,8 +693,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -815,8 +812,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 3075e726ef..cb437b4b4f 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -574,8 +574,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -631,8 +630,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -695,8 +693,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -815,8 +812,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 1baf0577e2..eb0c470f05 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -584,8 +584,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -641,8 +640,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -705,8 +703,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -828,8 +825,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 3412671a85..7ae0f0c46c 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -607,8 +607,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -664,8 +663,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -728,8 +726,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -851,8 +848,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 3412671a85..7ae0f0c46c 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -607,8 +607,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -664,8 +663,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -728,8 +726,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -851,8 +848,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 3412671a85..7ae0f0c46c 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -607,8 +607,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -664,8 +663,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -728,8 +726,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -851,8 +848,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 86b3f4136f..09913f8691 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -601,8 +601,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -658,8 +657,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -722,8 +720,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -845,8 +842,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 98a84a254f..5ae07bfd2f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -566,8 +566,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -623,8 +622,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -687,8 +685,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode()); - player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -807,8 +804,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) { - final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + player.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 14b3874974..7056424ff7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -625,8 +625,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -727,8 +726,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -794,8 +792,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -960,8 +957,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - playable.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 9262f3b6e5..55060228da 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -634,8 +634,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -736,8 +735,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -803,8 +801,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -969,8 +966,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - playable.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 9262f3b6e5..55060228da 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -634,8 +634,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -736,8 +735,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -803,8 +801,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -969,8 +966,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - playable.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true; diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 9262f3b6e5..55060228da 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -634,8 +634,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -736,8 +735,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); } updateTimestamp = true; @@ -803,8 +801,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode()); - playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); updateTimestamp = true; } } @@ -969,8 +966,7 @@ public abstract class Inventory extends ItemContainer // Active, non offensive, skills start with reuse on equip. if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) { - final long reuse = playable.getSkillRemainingReuseTime(itemSkill.getReuseHashCode()); - playable.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); + playable.addTimeStamp(itemSkill, itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); } updateTimeStamp = true;