Эх сурвалжийг харах

BETA: Removed '''hasParameters''' and '''getParameters''' methods from `AbstractEffect` to reduce unnecessary memory usage.

Reviewed by: !UnAfraid, Adry_85
Nos 11 жил өмнө
parent
commit
072b6091ed
35 өөрчлөгдсөн 62 нэмэгдсэн , 62 устгасан
  1. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
  2. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java
  3. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java
  4. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
  5. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
  6. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
  7. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
  8. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
  9. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
  10. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java
  11. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
  12. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
  13. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java
  14. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
  15. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java
  16. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java
  17. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java
  18. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
  19. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
  20. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java
  21. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java
  22. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java
  23. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java
  24. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java
  25. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
  26. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java
  27. 6 6
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
  28. 5 5
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
  29. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java
  30. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java
  31. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java
  32. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java
  33. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
  34. 7 7
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
  35. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java

+ 2 - 2
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
 				{

+ 1 - 1
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)
 		{

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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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
 			{

+ 1 - 1
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

+ 1 - 1
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

+ 3 - 3
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

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

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

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
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

+ 1 - 1
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

+ 3 - 3
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

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

+ 6 - 6
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

+ 5 - 5
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

+ 2 - 2
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 7 - 7
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

+ 1 - 1
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