From 98e76d281729236597837a7a67ec914d035ea262 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 4 Apr 2020 10:27:01 +0000 Subject: [PATCH] Use of primitive boolean for TriggerSkillByAttack critical parameter. --- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- .../handlers/effecthandlers/TriggerSkillByAttack.java | 10 +++------- 15 files changed, 45 insertions(+), 105 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 5f89a503ee..3b102e8ae4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; private int _allowWeapons; - private final Boolean _isCritical; + private final boolean _isCritical; private final boolean _allowNormalAttack; private final boolean _allowSkillAttack; private final boolean _allowReflect; - /** - * @param params - */ - public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); @@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); - _isCritical = params.getObject("isCritical", Boolean.class); + _isCritical = params.getBoolean("isCritical", false); _allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowReflect = params.getBoolean("allowReflect", false); @@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect } // Check if there is dependancy on critical. - if ((_isCritical != null) && (_isCritical != event.isCritical())) + if (_isCritical != event.isCritical()) { return; }