From 2efffdf8df735668a23f6e85cff14515fb06bc6f Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sun, 2 Mar 2014 15:05:57 +0000
Subject: [PATCH] BETA: Datapack part for [L6447]: * Do not perform null
checks on `params`. * To verify if parameters has been loaded use
`StatsSet#isEmpty()`. * Minor cleanup.
'''Note:''' Do not hide or mask exceptions, they lead to harder debugging in most cases.
---
.../handlers/effecthandlers/AttackTrait.java | 26 +++++--------------
.../handlers/effecthandlers/BlockAction.java | 19 +++++---------
.../effecthandlers/BlockBuffSlot.java | 2 +-
.../handlers/effecthandlers/Bluff.java | 2 +-
.../handlers/effecthandlers/ChangeFace.java | 2 +-
.../effecthandlers/ChangeHairColor.java | 2 +-
.../effecthandlers/ChangeHairStyle.java | 3 ++-
.../handlers/effecthandlers/Confuse.java | 2 +-
.../effecthandlers/CrystalGradeModify.java | 2 +-
.../handlers/effecthandlers/DamOverTime.java | 2 +-
.../effecthandlers/DamOverTimePercent.java | 2 +-
.../handlers/effecthandlers/DefenceTrait.java | 2 +-
.../handlers/effecthandlers/DeleteHate.java | 2 +-
.../effecthandlers/DeleteHateOfMe.java | 2 +-
.../effecthandlers/DispelByCategory.java | 1 +
.../handlers/effecthandlers/GiveSp.java | 2 +-
.../effecthandlers/HeadquarterCreate.java | 2 +-
.../handlers/effecthandlers/OpenDoor.java | 4 +--
.../handlers/effecthandlers/Pumping.java | 2 +-
.../effecthandlers/RandomizeHate.java | 2 +-
.../handlers/effecthandlers/Reeling.java | 2 +-
.../effecthandlers/RefuelAirship.java | 2 +-
.../handlers/effecthandlers/ResistSkill.java | 16 +++++-------
.../handlers/effecthandlers/Resurrection.java | 2 +-
.../handlers/effecthandlers/SkillTurning.java | 2 +-
.../handlers/effecthandlers/StaticDamage.java | 2 +-
.../handlers/effecthandlers/Summon.java | 2 +-
.../effecthandlers/SummonAgathion.java | 9 +++----
.../handlers/effecthandlers/SummonCubic.java | 1 +
.../handlers/effecthandlers/TargetCancel.java | 2 +-
.../effecthandlers/TargetMeProbability.java | 2 +-
.../handlers/effecthandlers/TransferHate.java | 2 +-
.../handlers/effecthandlers/TrapDetect.java | 3 ++-
.../handlers/effecthandlers/TrapRemove.java | 3 ++-
.../handlers/effecthandlers/Unsummon.java | 2 +-
.../effecthandlers/VitalityPointUp.java | 2 +-
36 files changed, 58 insertions(+), 79 deletions(-)
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 88ed2a651d..c31b92c9ab 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 0c0764c9ed..2c813b0aef 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 92ee44c6c3..ba32e86b40 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 3aca0fd784..50c2c3da42 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 60eca17d60..92e056ca84 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 cd08fc8bc9..7e264ad158 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 6b802fb806..0228ac069e 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 3072fc32d2..96ae546bb6 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 fcc539d581..6ccd5b0b5c 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 6978ee8df0..6b5c5936c8 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 b87022051d..6bbcc58ca7 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 0abbcf85df..24f6b33110 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 87611e49ad..fba3217c76 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 3ffbeb88b3..3c00942b15 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 c819cedd9f..7919dcbec2 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 1b15a32eaa..d95c103bac 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 73c8db5390..48d2eea53e 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 ebf1ca17f1..80ddfd3600 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 eb1a4b0654..1cc3ecd8a4 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 5ac6823db1..392c7fcf72 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 810fba5a2f..f960598910 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 890d1688eb..bc7275c7a7 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 b99693fae3..cf92c78e0d 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 9fbb24a2cf..35d40dbe6c 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 cc162733f4..a947c845ce 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 477a5be0f1..49a2de527e 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 9f4df8304e..e056e6a25c 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 06ce126c05..ca919bb5a4 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 a70e51b3e8..e1b07ca6ba 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 4e69a41b4f..8af02a6e68 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 0d860abe68..204475258e 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 b35c769f61..ae55830d98 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 da9ba1ef9c..aa57366da2 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 996036bb31..704739e624 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 04454cf8f4..fd5d4d08af 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 b55bb9fca3..5770b4731b 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
--
GitLab