From 072b6091ed1b5b7d92965a91926569b7acbc4020 Mon Sep 17 00:00:00 2001
From: Nos <NosBit@users.noreply.github.com>
Date: Wed, 26 Feb 2014 21:00:43 +0000
Subject: [PATCH] BETA: Removed '''hasParameters''' and '''getParameters'''
methods from `AbstractEffect` to reduce unnecessary memory usage.
Reviewed by: !UnAfraid, Adry_85
---
.../handlers/effecthandlers/AttackTrait.java | 4 ++--
.../handlers/effecthandlers/BlockAction.java | 2 +-
.../handlers/effecthandlers/BlockBuffSlot.java | 2 +-
.../scripts/handlers/effecthandlers/Bluff.java | 2 +-
.../scripts/handlers/effecthandlers/CallPc.java | 4 ++--
.../scripts/handlers/effecthandlers/CallSkill.java | 2 +-
.../scripts/handlers/effecthandlers/Confuse.java | 2 +-
.../handlers/effecthandlers/DamOverTime.java | 2 +-
.../effecthandlers/DamOverTimePercent.java | 2 +-
.../handlers/effecthandlers/DefenceTrait.java | 4 ++--
.../handlers/effecthandlers/DeleteHate.java | 2 +-
.../handlers/effecthandlers/DeleteHateOfMe.java | 2 +-
.../handlers/effecthandlers/DispelByCategory.java | 6 +++---
.../handlers/effecthandlers/DispelBySlot.java | 2 +-
.../effecthandlers/DispelBySlotProbability.java | 4 ++--
.../scripts/handlers/effecthandlers/Escape.java | 2 +-
.../handlers/effecthandlers/HeadquarterCreate.java | 2 +-
.../scripts/handlers/effecthandlers/Lethal.java | 4 ++--
.../handlers/effecthandlers/RandomizeHate.java | 2 +-
.../handlers/effecthandlers/Restoration.java | 4 ++--
.../handlers/effecthandlers/Resurrection.java | 2 +-
.../scripts/handlers/effecthandlers/SetSkill.java | 4 ++--
.../handlers/effecthandlers/SkillTurning.java | 2 +-
.../handlers/effecthandlers/SoulEating.java | 2 +-
.../handlers/effecthandlers/StealAbnormal.java | 6 +++---
.../handlers/effecthandlers/SummonAgathion.java | 2 +-
.../handlers/effecthandlers/SummonCubic.java | 12 ++++++------
.../scripts/handlers/effecthandlers/SummonNpc.java | 10 +++++-----
.../handlers/effecthandlers/SummonTrap.java | 4 ++--
.../handlers/effecthandlers/TargetCancel.java | 2 +-
.../effecthandlers/TargetMeProbability.java | 2 +-
.../scripts/handlers/effecthandlers/Teleport.java | 2 +-
.../handlers/effecthandlers/TransferHate.java | 2 +-
.../effecthandlers/TriggerSkillByDamage.java | 14 +++++++-------
.../scripts/handlers/effecthandlers/Unsummon.java | 2 +-
35 files changed, 62 insertions(+), 62 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 881906cc0d..cd9eea1eb9 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 4666a1b048..5f7ee19edd 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 5106d5b90d..92ee44c6c3 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 25654ddbd7..3aca0fd784 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 4ce9a7e512..3f4dee6d00 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 835d1d67d7..badb602abc 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 f21c2f97a9..2a6e6eb8f6 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 0f7ae423c0..4544254dbc 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 4deae41ef0..1e3d96c8d7 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 ff27f87c47..0abbcf85df 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 88ff30e097..af050a8d66 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 be4110db01..6b2a39dca1 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 a8e1652684..c819cedd9f 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 c41cc0b0d0..7b37c95bc8 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 9204cd4679..bbc8670cd5 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 27a6eb8b29..ed1b30fdcd 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 921e86eb25..5d1149410e 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 4221671a57..35114c5daa 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 2841d7ec01..1fa9f56b7b 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 34ccc416c4..e69e7094c0 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 e5c26e0844..7ae0ee611d 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 3b5475d94b..4acec834ef 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 3f6d348b15..f9da12b549 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 3fdfedd833..60ba068c57 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 64d72b8cc0..27a54c42bd 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 8bf457b696..975684a9cf 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 66715f534a..feb2333cf4 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 41bcff6a34..4e7d50a18b 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 7efc255d35..949cb2c87a 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 7a7a2dc804..6c1cedea14 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 b1e7edcad5..15b319e1ca 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 ed358ab526..38743de7f4 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 66f5f61127..cb4b8d96e0 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 5d3035df5c..c702fd0678 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 0ad102a9b9..c447d05397 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
--
GitLab