lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consider skill reuseDelay for item equip delay configurations.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-12 03:28:52 +00:00
parent 3264cd1e2f
commit 722e712cf2
52 changed files with 260 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_01.0_Ertheia/dist/game/config/Character.ini vendored
View File

@@ -166,11 +166,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -566,7 +566,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -622,7 +623,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -685,7 +687,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -804,7 +807,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_02.5_Underground/dist/game/config/Character.ini vendored
View File

@@ -166,11 +166,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -572,7 +572,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -628,7 +629,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -691,7 +693,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -810,7 +813,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_03.0_Helios/dist/game/config/Character.ini vendored
View File

@@ -166,11 +166,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -572,7 +572,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -628,7 +629,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -691,7 +693,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -810,7 +813,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_04.0_GrandCrusade/dist/game/config/Character.ini vendored
View File

@@ -166,11 +166,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -572,7 +572,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -628,7 +629,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -691,7 +693,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -810,7 +813,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_05.0_Salvation/dist/game/config/Character.ini vendored
View File

@@ -166,11 +166,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -582,7 +582,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -638,7 +639,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -701,7 +703,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -823,7 +826,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_05.5_EtinasFate/dist/game/config/Character.ini vendored
View File

@@ -166,11 +166,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -605,7 +605,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -661,7 +662,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -724,7 +726,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -846,7 +849,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_06.0_Fafurion/dist/game/config/Character.ini vendored
View File

@@ -170,11 +170,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -605,7 +605,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -661,7 +662,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -724,7 +726,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -846,7 +849,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_07.0_PreludeOfWar/dist/game/config/Character.ini vendored
View File

@@ -170,11 +170,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -599,7 +599,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -655,7 +656,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -718,7 +720,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -840,7 +843,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_08.2_Homunculus/dist/game/config/Character.ini vendored
View File

@@ -170,11 +170,13 @@ CalculateMagicSuccessBySkillMagicLevel = False
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -581,7 +581,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -637,7 +638,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -700,7 +702,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -822,7 +825,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Character.ini vendored
View File

@@ -170,11 +170,13 @@ CalculateMagicSuccessBySkillMagicLevel = False
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -581,7 +581,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -637,7 +638,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -700,7 +702,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -822,7 +825,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_10.2_MasterClass/dist/game/config/Character.ini vendored
View File

@@ -170,11 +170,13 @@ CalculateMagicSuccessBySkillMagicLevel = False
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -582,7 +582,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -638,7 +639,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -701,7 +703,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -823,7 +826,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_10.3_MasterClass/dist/game/config/Character.ini vendored
View File

@@ -170,11 +170,13 @@ CalculateMagicSuccessBySkillMagicLevel = False
BlowRateChanceLimit = 80 BlowRateChanceLimit = 80
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -582,7 +582,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -638,7 +639,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -701,7 +703,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -823,7 +826,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_1.0/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -568,7 +568,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -624,7 +625,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -687,7 +689,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -806,7 +809,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -568,7 +568,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -624,7 +625,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -687,7 +689,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -806,7 +809,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -574,7 +574,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -630,7 +631,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -693,7 +695,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -812,7 +815,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -574,7 +574,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -630,7 +631,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -693,7 +695,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -812,7 +815,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -584,7 +584,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -640,7 +641,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -703,7 +705,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -825,7 +828,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -607,7 +607,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -663,7 +664,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -726,7 +728,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -848,7 +851,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -607,7 +607,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -663,7 +664,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -726,7 +728,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -848,7 +851,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -607,7 +607,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -663,7 +664,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -726,7 +728,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -848,7 +851,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -601,7 +601,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -657,7 +658,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -720,7 +722,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -842,7 +845,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Classic_Interlude/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -566,7 +566,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -622,7 +623,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -685,7 +687,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -804,7 +807,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{ {
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = False
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -625,7 +625,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -726,7 +727,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -792,7 +794,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -957,7 +960,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Character.ini vendored
View File

@@ -227,11 +227,13 @@ CalculateMagicSuccessBySkillMagicLevel = False
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -634,7 +634,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -735,7 +736,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -801,7 +803,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -966,7 +969,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/Character.ini vendored
View File

@@ -227,11 +227,13 @@ CalculateMagicSuccessBySkillMagicLevel = False
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -634,7 +634,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -735,7 +736,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -801,7 +803,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -966,7 +969,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;

2
L2J_Mobius_Essence_6.3_Crusader/dist/game/config/Character.ini vendored
View File

@@ -227,11 +227,13 @@ CalculateMagicSuccessBySkillMagicLevel = False
BlowRateChanceLimit = 100 BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip. # Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 300000 (5 minutes). # Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000 ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip. # Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable. # Use 0 to disable.
# Default: 60000 (1 minute). # Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000 ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -634,7 +634,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -735,7 +736,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld()) if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
} }
updateTimestamp = true; updateTimestamp = true;
@@ -801,7 +803,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE); final long reuse = playable.getSkillRemainingReuseTime(skill.getReuseHashCode());
playable.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true; updateTimestamp = true;
} }
} }
@@ -966,7 +969,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip. // 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()) if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && playable.getActingPlayer().hasEnteredWorld())
{ {
playable.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE); 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);
} }
updateTimeStamp = true; updateTimeStamp = true;