diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/Skill.java index b2233f4f44..0cc914fca8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/Skill.java index b2233f4f44..0cc914fca8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/Skill.java index b2233f4f44..0cc914fca8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java index b2233f4f44..0cc914fca8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java index 1ed15ccd3b..adc65da058 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -258,7 +258,7 @@ public abstract class DocumentBase if (attrs.getNamedItem("time") != null) { time = Integer.decode(getValue(attrs.getNamedItem("time").getNodeValue(), template)); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(((Skill) template).getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(((Skill) template).getId()) && !((Skill) template).isToggle()) { if (((Skill) template).getLevel() < 100) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java index 1ed15ccd3b..adc65da058 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -258,7 +258,7 @@ public abstract class DocumentBase if (attrs.getNamedItem("time") != null) { time = Integer.decode(getValue(attrs.getNamedItem("time").getNodeValue(), template)); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(((Skill) template).getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(((Skill) template).getId()) && !((Skill) template).isToggle()) { if (((Skill) template).getLevel() < 100) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skill/Skill.java index 0965118da6..b0949b77bc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -236,7 +236,7 @@ public class Skill implements IIdentifiable _abnormalLevel = set.getInt("abnormalLevel", 0); _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -247,7 +247,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skill/Skill.java index 9dc13218a9..8ee61a99a9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -237,7 +237,7 @@ public class Skill implements IIdentifiable _abnormalLevel = set.getInt("abnormalLevel", 0); _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -248,7 +248,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/Skill.java index 98b88d2407..2f5e11e4ce 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -239,7 +239,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -250,7 +250,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/Skill.java index 8d3cfe22bc..6bb0e6aa79 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -238,7 +238,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -249,7 +249,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/Skill.java index 98b88d2407..2f5e11e4ce 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -239,7 +239,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -250,7 +250,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/Skill.java index 98b88d2407..2f5e11e4ce 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -239,7 +239,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -250,7 +250,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null)); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/Skill.java index 98b88d2407..2f5e11e4ce 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -239,7 +239,7 @@ public class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T)) { if ((_level < 100) || (_level > 140)) { @@ -250,7 +250,6 @@ public class Skill implements IIdentifiable abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } - _abnormalTime = abnormalTime; _isAbnormalInstant = set.getBoolean("abnormalInstant", false); parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));