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.

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);
 		}
 	}
 	

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));
 		}
 	}
 	

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<>();

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

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

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

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

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

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

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

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

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;

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

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

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);

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

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

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

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!");
 		}

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

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!");
 		}

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

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!");

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

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

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

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!");
 		}

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

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);

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

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

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

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");
 	}
 	

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");
 	}
 	

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

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