diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 88ed2a651dfe1b7e5a476993817d961bbbdc8e67..c31b92c9abdc732dd8603593aa2e56a7eba78fdb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -41,29 +41,15 @@ public final class AttackTrait extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if (params != null)
+ if (params.isEmpty())
{
- for (Entry<String, Object> param : params.getSet().entrySet())
- {
- try
- {
- final TraitType traitType = TraitType.valueOf(param.getKey());
- final float value = (Float.parseFloat((String) param.getValue()) + 100) / 100;
- _attackTraits.put(traitType, value);
- }
- catch (NumberFormatException e)
- {
- _log.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found.");
- }
- catch (Exception e)
- {
- _log.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getValue());
- }
- }
+ _log.warning(getClass().getSimpleName() + ": this effect must have parameters!");
+ return;
}
- else
+
+ for (Entry<String, Object> param : params.getSet().entrySet())
{
- _log.warning(getClass().getSimpleName() + ": must have parameters.");
+ _attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java
index 0c0764c9ed0da227faa5afb2652fde2dfdbd8c55..2c813b0aef4ac7c3eac8fa59489f556f93fef5c7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java
@@ -18,8 +18,8 @@
*/
package handlers.effecthandlers;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
import com.l2jserver.gameserver.datatables.BotReportTable;
import com.l2jserver.gameserver.instancemanager.PunishmentManager;
@@ -37,23 +37,16 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
*/
public final class BlockAction extends AbstractEffect
{
- private final List<Integer> _blockedActions;
+ private final Set<Integer> _blockedActions = new HashSet<>();
public BlockAction(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- String[] rawActions = params.getString("blockedActions").split(",");
- _blockedActions = new ArrayList<>(rawActions.length);
- for (String act : rawActions)
+ final String[] actions = params.getString("blockedActions").split(",");
+ for (String action : actions)
{
- try
- {
- _blockedActions.add(Integer.parseInt(act));
- }
- catch (Exception e)
- {
- }
+ _blockedActions.add(Integer.parseInt(action));
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java
index 92ee44c6c30da2ab7164b02e9c5b269db1a9756f..ba32e86b40790228669aa8968be198a3b7a0f35f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java
@@ -40,7 +40,7 @@ public final class BlockBuffSlot extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- String blockBuffSlots = params != null ? params.getString("slot", null) : null;
+ String blockBuffSlots = params.getString("slot", null);
if ((blockBuffSlots != null) && !blockBuffSlots.isEmpty())
{
_blockBuffSlots = new HashSet<>();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
index 3aca0fd784c4b6f716c566e2b2fdc7f27ef25106..50c2c3da42fcf977600728ba0cde1a5d742afe4b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
@@ -39,7 +39,7 @@ public final class Bluff extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
index 60eca17d60c2329ed5479868cfdf2ceb73abd925..92e056ca844d1a113c4de105f4c5cc7a473c0474 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
@@ -36,7 +36,7 @@ public final class ChangeFace extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _value = params != null ? params.getInt("value", 0) : 0;
+ _value = params.getInt("value", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
index cd08fc8bc9ab0a1b58cf0501db0ce4fe42c2db2d..7e264ad1586b15ecb25d069361df43e2d1c4e5ce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
@@ -36,7 +36,7 @@ public final class ChangeHairColor extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _value = params != null ? params.getInt("value", 0) : 0;
+ _value = params.getInt("value", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java
index 6b802fb80664e54ada0d11fb445052600c70379f..0228ac069e200ca58d966d698b8cf47b68c41748 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java
@@ -35,7 +35,8 @@ public final class ChangeHairStyle extends AbstractEffect
public ChangeHairStyle(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _value = params != null ? params.getInt("value", 0) : 0;
+
+ _value = params.getInt("value", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
index 3072fc32d2186a1763a42ae780514d818e6e0340..96ae546bb6a38d3abfdddee8e4ced1c85d081bad 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
@@ -45,7 +45,7 @@ public final class Confuse extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
index fcc539d581d75eb601f8b794205814890259823b..6ccd5b0b5c6da0fb2850967283445d654662855e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
@@ -36,7 +36,7 @@ public final class CrystalGradeModify extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _grade = params != null ? params.getInt("grade", 0) : 0;
+ _grade = params.getInt("grade", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
index 6978ee8df01586fcd4d82f47af9dc52d14275f92..6b5c5936c839e90202a36d75f01f3a33e6c1edc8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
@@ -36,7 +36,7 @@ public final class DamOverTime extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _canKill = (params != null) && params.getBoolean("canKill", false);
+ _canKill = params.getBoolean("canKill", false);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index b87022051d1a112664b4ce4977ff4669729dc546..6bbcc58ca7f005a98d1781304be1cdb5c3ce25b0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -37,7 +37,7 @@ public final class DamOverTimePercent extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _canKill = (params != null) && params.getBoolean("canKill", false);
+ _canKill = params.getBoolean("canKill", false);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java
index 0abbcf85dfa56578b79b03ac99ebf433c479771c..24f6b331107b06f3bca0a3ff3663ae80e3fbaeef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java
@@ -41,7 +41,7 @@ public final class DefenceTrait extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if (params == null)
+ if (params.isEmpty())
{
_log.warning(getClass().getSimpleName() + ": must have parameters.");
return;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
index 87611e49ad932bf10464a08808b3b2f781b3ae0c..fba3217c76d2b118183e56b1491a84b2d6d28dd2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
@@ -39,7 +39,7 @@ public final class DeleteHate extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
index 3ffbeb88b3ef644f3fa2ff9d171d30340ddafaec..3c00942b15def713b2eabb1682b755903c8ca508 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
@@ -39,7 +39,7 @@ public final class DeleteHateOfMe extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java
index c819cedd9f4a986a5cd31bec61b08a9755def58e..7919dcbec2eb0731707ef87014a8e46cb482c6bd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java
@@ -40,6 +40,7 @@ public final class DispelByCategory extends AbstractEffect
public DispelByCategory(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
+
_slot = params.getString("slot", null);
_rate = params.getInt("rate", 0);
_max = params.getInt("max", 0);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
index 1b15a32eaacf2d6340188dcaf2ccaa1d66e27722..d95c103bac4cbea7e356a0f581dcaecc217c3431 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
@@ -35,7 +35,7 @@ public final class GiveSp extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _sp = params != null ? params.getInt("sp", 0) : 0;
+ _sp = params.getInt("sp", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java
index 73c8db5390d4edf1694b262d8db459c328222088..48d2eea53e8bb4aa9c89cee3a6f24766736313b2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java
@@ -46,7 +46,7 @@ public class HeadquarterCreate extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _isAdvanced = params != null ? params.getBoolean("isAdvanced", false) : false;
+ _isAdvanced = params.getBoolean("isAdvanced", false);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java
index ebf1ca17f1953d7a93d61c19c359d9515434fd7f..80ddfd36007371c49616700608a53547fa57a30d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java
@@ -42,8 +42,8 @@ public final class OpenDoor extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 0) : 0;
- _isItem = params != null ? params.getBoolean("isItem", false) : false;
+ _chance = params.getInt("chance", 0);
+ _isItem = params.getBoolean("isItem", false);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Pumping.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Pumping.java
index eb1a4b06545fb829bdb1c648e708d48e6c8af988..1cc3ecd8a4d95ddfaf1172f6ad7e45f61bd81098 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Pumping.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Pumping.java
@@ -47,7 +47,7 @@ public final class Pumping extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if ((params == null) || (params.getString("power", null) == null))
+ if (params.getString("power", null) == null)
{
throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
index 5ac6823db18d65316c436be3e210a4b47c4c63cd..392c7fcf7210684e039dca7ca36d8db2e234c16a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
@@ -41,7 +41,7 @@ public final class RandomizeHate extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Reeling.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Reeling.java
index 810fba5a2fe607a7a2ffd6f154916cc33464a133..f960598910b66470d2aca52846bcc4115a53deba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Reeling.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Reeling.java
@@ -47,7 +47,7 @@ public final class Reeling extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if ((params == null) || (params.getString("power", null) == null))
+ if (params.getString("power", null) == null)
{
throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
index 890d1688ebd6c14e67caa69d31052bb48724d698..bc7275c7a792da1d4a2edc5b9ab9c06c4f409389 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
@@ -37,7 +37,7 @@ public final class RefuelAirship extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _value = params != null ? params.getInt("value", 0) : 0;
+ _value = params.getInt("value", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java
index b99693fae38d6c1546c96d2eacf7c114ecdd0d7b..cf92c78e0de81a524e783b6fed92dfb8fc42a72f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java
@@ -41,19 +41,17 @@ public final class ResistSkill extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if (params != null)
+ for (int i = 1;; i++)
{
- for (int i = 1;; i++)
+ int skillId = params.getInt("skillId" + i, 0);
+ int skillLvl = params.getInt("skillLvl" + i, 0);
+ if (skillId == 0)
{
- int skillId = params.getInt("skillId" + i, 0);
- int skillLvl = params.getInt("skillLvl" + i, 0);
- if (skillId == 0)
- {
- break;
- }
- _skills.add(new SkillHolder(skillId, skillLvl));
+ break;
}
+ _skills.add(new SkillHolder(skillId, skillLvl));
}
+
if (_skills.isEmpty())
{
throw new IllegalArgumentException(getClass().getSimpleName() + ": Without parameters!");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java
index 9fbb24a2cf256f2a59cbabe5a4b8276db61f4854..35d40dbe6c53a214e827663bfb439a7e3aa9cc2c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java
@@ -39,7 +39,7 @@ public final class Resurrection extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _power = params != null ? params.getInt("power", 0) : 0;
+ _power = params.getInt("power", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java
index cc162733f4d22289b8e543716146b0c34ee6556a..a947c845ce431cfc3dff293f376361af8736a0ac 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java
@@ -35,7 +35,7 @@ public final class SkillTurning extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
index 477a5be0f1d6dddbf0021861a5abc5537437718c..49a2de527e0272401be675fd2e784f3fea8c5cd5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
@@ -36,7 +36,7 @@ public final class StaticDamage extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _power = params != null ? params.getInt("power", 0) : 0;
+ _power = params.getInt("power", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java
index 9f4df8304e5d49551cd1a92cb5cb8d448729a4cd..e056e6a25c5540aed12a368739063a7eea3f73b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java
@@ -47,7 +47,7 @@ public final class Summon extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if (params == null)
+ if (params.isEmpty())
{
throw new IllegalArgumentException("Summon effect without parameters!");
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java
index 06ce126c05b67121dc4f1642f1f04fee0141706c..ca919bb5a43ba9040c78684f07656dba43e6bc73 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java
@@ -37,15 +37,12 @@ public final class SummonAgathion extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if (params != null)
+ if (params.isEmpty())
{
- _npcId = params.getInt("npcId", 0);
- }
- else
- {
- _npcId = 0;
_log.warning(getClass().getSimpleName() + ": must have parameters.");
}
+
+ _npcId = params.getInt("npcId", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index a70e51b3e81b720ae8da6fe5e08832b284944afc..e1b07ca6bacac3bf26d631b99e48643e61ef96da 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -49,6 +49,7 @@ public final class SummonCubic extends AbstractEffect
public SummonCubic(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
+
_cubicId = params.getInt("cubicId", -1);
// Custom AI data.
_cubicPower = params.getInt("cubicPower", 0);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java
index 4e69a41b4f9cd9b169116a6946d9dcdf12531985..8af02a6e68811f2bd323c65393dd5f53ac0ebf37 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java
@@ -37,7 +37,7 @@ public final class TargetCancel extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java
index 0d860abe68cc1a4aef54cf7f373f137d6ed9137e..204475258e17bfc046f4e46ffadc613d78a62dbb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java
@@ -37,7 +37,7 @@ public final class TargetMeProbability extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
index b35c769f61c330a7b86fc533203690aca3c4641a..ae55830d984e82082f196dec38b559cbd3c4a5b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
@@ -39,7 +39,7 @@ public final class TransferHate extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java
index da9ba1ef9c78b77405c481142037616a4c52a75f..aa57366da26032b3dc7884891c820da14d061e11 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java
@@ -36,10 +36,11 @@ public final class TrapDetect extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if (params == null)
+ if (params.isEmpty())
{
throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
}
+
_power = params.getInt("power");
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java
index 996036bb31123a6debc641d2b33d9017a2a3b1e9..704739e6242571c4dfe16ef5e8f935f5cf000519 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java
@@ -41,10 +41,11 @@ public final class TrapRemove extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if (params == null)
+ if (params.isEmpty())
{
throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
}
+
_power = params.getInt("power");
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java
index 04454cf8f4caae4e80de373e43d88cb3e532eac7..fd5d4d08aff16a3aaa2bf820749cddac7a11fb8e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java
@@ -41,7 +41,7 @@ public final class Unsummon extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _chance = params != null ? params.getInt("chance", 100) : 100;
+ _chance = params.getInt("chance", 100);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
index b55bb9fca36387048d4b6457599bb869aa56bd31..5770b4731b65f141b0f838899b6368a391577819 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
@@ -36,7 +36,7 @@ public final class VitalityPointUp extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- _value = params != null ? params.getFloat("value", 0) : 0;
+ _value = params.getFloat("value", 0);
}
@Override