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 881906cc0d9f8639ee45d72c3cdb2e2468afd8ac..cd9eea1eb957f757bfdfce9e2e9aa2eb7234ca0b 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,9 +41,9 @@ public final class AttackTrait extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if (hasParameters())
+ if (params != null)
{
- for (Entry<String, Object> param : getParameters().getSet().entrySet())
+ for (Entry<String, Object> param : params.getSet().entrySet())
{
try
{
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 4666a1b04831e0e2a0b1b84ffa23620765f91477..5f7ee19edd4e64f3ad42daef5d324d23040ed627 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
@@ -43,7 +43,7 @@ public final class BlockAction extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- String[] rawActions = getParameters().getString("blockedActions").split(",");
+ String[] rawActions = params.getString("blockedActions").split(",");
_blockedActions = new ArrayList<>(rawActions.length);
for (String act : rawActions)
{
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 5106d5b90d26934de67e971367ff72816639e57d..92ee44c6c30da2ab7164b02e9c5b269db1a9756f 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 = hasParameters() ? getParameters().getString("slot", null) : null;
+ String blockBuffSlots = params != null ? params.getString("slot", null) : 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 25654ddbd7cf31143d5ea69b5f18c6edaa7d2544..3aca0fd784c4b6f716c566e2b2fdc7f27ef25106 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 = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index 4ce9a7e51239adf0ad3e55ce7bac35bb2d5622a3..3f4dee6d00dc886fc6256ea14a8d6cf15b217e90 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -46,8 +46,8 @@ public final class CallPc extends AbstractEffect
public CallPc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _itemId = getParameters().getInt("itemId", 0);
- _itemCount = getParameters().getInt("itemCount", 0);
+ _itemId = params.getInt("itemId", 0);
+ _itemCount = params.getInt("itemCount", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 835d1d67d75531e4fbdcca2a5890d3fe3e83576a..badb602abc3c5b04a834392152b3a89a80b3c02c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -34,7 +34,7 @@ public class CallSkill extends AbstractEffect
public CallSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _skill = new SkillHolder(getParameters().getInt("skillId"), getParameters().getInt("skillLevel", 1));
+ _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
}
@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 f21c2f97a98469a639bea7f1aef997ee35c9e6df..2a6e6eb8f6afed18244c8595a9d92d920f4998b1 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
@@ -44,7 +44,7 @@ public final class Confuse extends AbstractEffect
public Confuse(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _chance = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 100;
}
@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 0f7ae423c09cb35ce82be1cac3194407d2c6152c..4544254dbcbfa3543b4920db084584c2addbb2e1 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
@@ -35,7 +35,7 @@ public final class DamOverTime extends AbstractEffect
public DamOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _canKill = hasParameters() && getParameters().getBoolean("canKill", false);
+ _canKill = (params != null) && 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 4deae41ef01f09b8947edb4230b88126527e239e..1e3d96c8d7d615259d46283b004597c48c1b5296 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
@@ -36,7 +36,7 @@ public final class DamOverTimePercent extends AbstractEffect
public DamOverTimePercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _canKill = hasParameters() && getParameters().getBoolean("canKill", false);
+ _canKill = (params != null) && 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 ff27f87c47b44809b4f9bd2e2990314395c4f8ee..0abbcf85dfa56578b79b03ac99ebf433c479771c 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,13 +41,13 @@ public final class DefenceTrait extends AbstractEffect
{
super(attachCond, applyCond, set, params);
- if (!hasParameters())
+ if (params == null)
{
_log.warning(getClass().getSimpleName() + ": must have parameters.");
return;
}
- for (Entry<String, Object> param : getParameters().getSet().entrySet())
+ for (Entry<String, Object> param : params.getSet().entrySet())
{
try
{
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 88ff30e097355030ffc7b59b1a66d8fe3edf8dfb..af050a8d6696cd02575130d3f726855026b406da 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
@@ -38,7 +38,7 @@ public final class DeleteHate extends AbstractEffect
public DeleteHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _chance = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 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 be4110db01326474a9a789bf1a8b9f4df778565d..6b2a39dca1ea864d625ec4cdf51bcb3c7148ff6b 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
@@ -38,7 +38,7 @@ public final class DeleteHateOfMe extends AbstractEffect
public DeleteHateOfMe(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _chance = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 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 a8e1652684f8efe2b19312d9a37ba4ce4fe9fa97..c819cedd9f4a986a5cd31bec61b08a9755def58e 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,9 +40,9 @@ public final class DispelByCategory extends AbstractEffect
public DispelByCategory(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _slot = getParameters().getString("slot", null);
- _rate = getParameters().getInt("rate", 0);
- _max = getParameters().getInt("max", 0);
+ _slot = params.getString("slot", null);
+ _rate = params.getInt("rate", 0);
+ _max = params.getInt("max", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
index c41cc0b0d024567b217e857882b11d307bd24bf9..7b37c95bc86120372ebb6dcc17bd44f7b8fd74a5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
@@ -44,7 +44,7 @@ public final class DispelBySlot extends AbstractEffect
public DispelBySlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _dispel = getParameters().getString("dispel", null);
+ _dispel = params.getString("dispel", null);
if ((_dispel != null) && !_dispel.isEmpty())
{
_dispelAbnormals = new EnumMap<>(AbnormalType.class);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java
index 9204cd4679d733e82ac678d145684adfbcab5383..bbc8670cd5f453594c315cdc07b997260f256ac8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java
@@ -46,8 +46,8 @@ public final class DispelBySlotProbability extends AbstractEffect
public DispelBySlotProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _dispel = getParameters().getString("dispel", null);
- _rate = getParameters().getInt("rate", 0);
+ _dispel = params.getString("dispel", null);
+ _rate = params.getInt("rate", 0);
if ((_dispel != null) && !_dispel.isEmpty())
{
_dispelAbnormals = new EnumMap<>(AbnormalType.class);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java
index 27a6eb8b2931701d8dcdfff861ee83176467a664..ed1b30fdcdfc2d0a830865a9b9c994b54f49cead 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java
@@ -37,7 +37,7 @@ public final class Escape extends AbstractEffect
public Escape(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _escapeType = getParameters().getEnum("escapeType", TeleportWhereType.class, null);
+ _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null);
}
@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 921e86eb25ff96f235a157f9c8d501787cf9328d..5d1149410e9000bf8c81219fcbc0df3fb07ce277 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
@@ -45,7 +45,7 @@ public class HeadquarterCreate extends AbstractEffect
public HeadquarterCreate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _isAdvanced = hasParameters() ? getParameters().getBoolean("isAdvanced", false) : false;
+ _isAdvanced = params != null ? params.getBoolean("isAdvanced", false) : false;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
index 4221671a578404a3785f10cc8ab5c1c9abf9d191..35114c5daaa8a9d9908dbfcb3ae38546f718890e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
@@ -40,8 +40,8 @@ public final class Lethal extends AbstractEffect
public Lethal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _fullLethal = getParameters().getInt("fullLethal", 0);
- _halfLethal = getParameters().getInt("halfLethal", 0);
+ _fullLethal = params.getInt("fullLethal", 0);
+ _halfLethal = params.getInt("halfLethal", 0);
}
@Override
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 2841d7ec0174c16ee73db88bd810d2a7a902d712..1fa9f56b7bbd8bfcd13519a8ee378a2224ab11cf 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
@@ -40,7 +40,7 @@ public final class RandomizeHate extends AbstractEffect
public RandomizeHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _chance = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java
index 34ccc416c4e7f2dac16a6b56f2c5a9e5bbb61749..e69e7094c0f08af13dd40d497b3a94f3c3e22d15 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java
@@ -37,8 +37,8 @@ public final class Restoration extends AbstractEffect
public Restoration(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _itemId = getParameters().getInt("itemId", 0);
- _itemCount = getParameters().getInt("itemCount", 0);
+ _itemId = params.getInt("itemId", 0);
+ _itemCount = params.getInt("itemCount", 0);
}
@Override
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 e5c26e0844bf0b4ad40676981f1d94f59ccb5235..7ae0ee611dd35d6f37647b239b68cbb4e69b3fd0 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
@@ -38,7 +38,7 @@ public final class Resurrection extends AbstractEffect
public Resurrection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _power = hasParameters() ? getParameters().getInt("power", 0) : 0;
+ _power = params != null ? params.getInt("power", 0) : 0;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java
index 3b5475d94bf09b71c556362a50cdb41419df3a17..4acec834ef18534458afa87d3015be3df382c4e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java
@@ -37,8 +37,8 @@ public final class SetSkill extends AbstractEffect
public SetSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _skillId = getParameters().getInt("skillId", 0);
- _skillLvl = getParameters().getInt("skillLvl", 1);
+ _skillId = params.getInt("skillId", 0);
+ _skillLvl = params.getInt("skillLvl", 1);
}
@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 3f6d348b15a41be960a4bb3f34b9fcacc0652d9f..f9da12b54989bcb5942f52f417687cf99ac0b1f3 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
@@ -34,7 +34,7 @@ public final class SkillTurning extends AbstractEffect
public SkillTurning(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _chance = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java
index 3fdfedd833b6596aab81753f8012f753ea9acbae..60ba068c57fff637c5ff49e37fb1611700faf7e5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java
@@ -41,7 +41,7 @@ public final class SoulEating extends AbstractEffect implements IExperienceRecei
public SoulEating(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _expNeeded = getParameters().getInt("expNeeded");
+ _expNeeded = params.getInt("expNeeded");
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
index 64d72b8cc01b7cd91e7801487b0ffd3e8b3bcde9..27a54c42bdd40093885d31afdb1b52eb44d453c5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
@@ -43,9 +43,9 @@ public final class StealAbnormal extends AbstractEffect
public StealAbnormal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _slot = getParameters().getString("slot", null);
- _rate = getParameters().getInt("rate", 0);
- _max = getParameters().getInt("max", 0);
+ _slot = params.getString("slot", null);
+ _rate = params.getInt("rate", 0);
+ _max = params.getInt("max", 0);
}
@Override
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 8bf457b696819a6bc50ca269014fa2465e896f37..975684a9cf664531494a8d01acae506e78530be6 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
@@ -36,7 +36,7 @@ public final class SummonAgathion extends AbstractEffect
public SummonAgathion(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- if (hasParameters())
+ if (params != null)
{
_npcId = params.getInt("npcId", 0);
}
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 66715f534aaa5feca1f39747d539dbb214bcf161..feb2333cf4a22200eab84c5e8e2c7c318a670796 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,13 +49,13 @@ public final class SummonCubic extends AbstractEffect
public SummonCubic(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _cubicId = getParameters().getInt("cubicId", -1);
+ _cubicId = params.getInt("cubicId", -1);
// Custom AI data.
- _cubicPower = getParameters().getInt("cubicPower", 0);
- _cubicDuration = getParameters().getInt("cubicDuration", 0);
- _cubicDelay = getParameters().getInt("cubicDelay", 0);
- _cubicMaxCount = getParameters().getInt("cubicMaxCount", -1);
- _cubicSkillChance = getParameters().getInt("cubicSkillChance", 0);
+ _cubicPower = params.getInt("cubicPower", 0);
+ _cubicDuration = params.getInt("cubicDuration", 0);
+ _cubicDelay = params.getInt("cubicDelay", 0);
+ _cubicMaxCount = params.getInt("cubicMaxCount", -1);
+ _cubicSkillChance = params.getInt("cubicSkillChance", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 41bcff6a3410cd2860795a8ab662eb0547a160f2..4e7d50a18b660b2162bf67b40158fb5b093e8b45 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -49,11 +49,11 @@ public final class SummonNpc extends AbstractEffect
public SummonNpc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _despawnDelay = getParameters().getInt("despawnDelay", 20000);
- _npcId = getParameters().getInt("npcId", 0);
- _npcCount = getParameters().getInt("npcCount", 1);
- _randomOffset = getParameters().getBoolean("randomOffset", false);
- _isSummonSpawn = getParameters().getBoolean("isSummonSpawn", false);
+ _despawnDelay = params.getInt("despawnDelay", 20000);
+ _npcId = params.getInt("npcId", 0);
+ _npcCount = params.getInt("npcCount", 1);
+ _randomOffset = params.getBoolean("randomOffset", false);
+ _isSummonSpawn = params.getBoolean("isSummonSpawn", false);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java
index 7efc255d3591d7d231aba03243747c4c1993141d..949cb2c87a5ef6f3bc659b32f4f6d429361a8525 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java
@@ -40,8 +40,8 @@ public final class SummonTrap extends AbstractEffect
public SummonTrap(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _despawnTime = getParameters().getInt("despawnTime", 0);
- _npcId = getParameters().getInt("npcId", 0);
+ _despawnTime = params.getInt("despawnTime", 0);
+ _npcId = params.getInt("npcId", 0);
}
@Override
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 7a7a2dc804da033b5a1ab0ca1a206f98e815099c..6c1cedea14481f8f137eba5ac918f055a03a8570 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
@@ -36,7 +36,7 @@ public final class TargetCancel extends AbstractEffect
public TargetCancel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _chance = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 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 b1e7edcad548af03bd748c15b2ab6a05f50a1371..15b319e1ca8aaed1662af8caf4a50d81034f4c43 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
@@ -36,7 +36,7 @@ public final class TargetMeProbability extends AbstractEffect
public TargetMeProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _chance = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java
index ed358ab5269fec4299be8f98cf8fb70ad59e6477..38743de7f43db4d16920b5aeb08e6bb9e8082542 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java
@@ -36,7 +36,7 @@ public final class Teleport extends AbstractEffect
public Teleport(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _loc = new Location(getParameters().getInt("x", 0), getParameters().getInt("y", 0), getParameters().getInt("z", 0));
+ _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0));
}
@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 66f5f611275feec86f9a476825b93b4b87236bb3..cb4b8d96e0b5cd104360114dd0a9c46fcb898d87 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
@@ -38,7 +38,7 @@ public final class TransferHate extends AbstractEffect
public TransferHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _chance = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index 5d3035df5c4e797a4b6fc2e29b45972ded860eac..c702fd067871ce13c09036f836397881b8b03555 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -50,13 +50,13 @@ public class TriggerSkillByDamage extends AbstractEffect implements IDamageRecei
public TriggerSkillByDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _minAttackerLevel = getParameters().getInt("minAttackerLevel", 1);
- _maxAttackerLevel = getParameters().getInt("maxAttackerLevel", 100);
- _minDamage = getParameters().getInt("minDamage", 1);
- _chance = getParameters().getInt("chance", 100);
- _skill = new SkillHolder(getParameters().getInt("skillId"), getParameters().getInt("skillLevel", 1));
- _targetType = getParameters().getEnum("targetType", L2TargetType.class, L2TargetType.SELF);
- _attackerType = getParameters().getEnum("attackerType", InstanceType.class, InstanceType.L2Character);
+ _minAttackerLevel = params.getInt("minAttackerLevel", 1);
+ _maxAttackerLevel = params.getInt("maxAttackerLevel", 100);
+ _minDamage = params.getInt("minDamage", 1);
+ _chance = params.getInt("chance", 100);
+ _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
+ _targetType = params.getEnum("targetType", L2TargetType.class, L2TargetType.SELF);
+ _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.L2Character);
}
@Override
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 0ad102a9b987216851f92a9fd6f1bc6a59d90fc5..c447d053974061068589fdad5a200c0981790de6 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
@@ -40,7 +40,7 @@ public final class Unsummon extends AbstractEffect
public Unsummon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
- _chance = hasParameters() ? getParameters().getInt("chance", 100) : 100;
+ _chance = params != null ? params.getInt("chance", 100) : 100;
}
@Override