浏览代码

BETA: Effects implementation review.
* Fixed minor typo in `CallPc`.
* Added missing !JavaDocs.
* Minor cleanup.

Zoey76 11 年之前
父节点
当前提交
7f68c6bf40
共有 60 个文件被更改,包括 140 次插入105 次删除
  1. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
  2. 1 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java
  3. 1 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java
  4. 3 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
  5. 3 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
  6. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
  7. 0 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java
  8. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
  9. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
  10. 25 23
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
  11. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
  12. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
  13. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
  14. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
  15. 2 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
  16. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
  17. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
  18. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java
  19. 3 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Detection.java
  20. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
  21. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java
  22. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java
  23. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java
  24. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java
  25. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fishing.java
  26. 3 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java
  27. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
  28. 27 27
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java
  29. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java
  30. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
  31. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
  32. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java
  33. 3 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Pumping.java
  34. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
  35. 3 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Reeling.java
  36. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
  37. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java
  38. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java
  39. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java
  40. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java
  41. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java
  42. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java
  43. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sow.java
  44. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
  45. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
  46. 4 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java
  47. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java
  48. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
  49. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java
  50. 1 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java
  51. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java
  52. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java
  53. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java
  54. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java
  55. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
  56. 5 12
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java
  57. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java
  58. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
  59. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java
  60. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.stats.TraitType;
 import com.l2jserver.gameserver.model.stats.TraitType;
 
 
 /**
 /**
- * Attack Trait effect implementation
+ * Attack Trait effect implementation.
  * @author Nos
  * @author Nos
  */
  */
 public final class AttackTrait extends AbstractEffect
 public final class AttackTrait extends AbstractEffect

+ 1 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java

@@ -20,7 +20,6 @@ package handlers.effecthandlers;
 
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
@@ -65,7 +64,6 @@ public final class Betray extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		L2PcInstance targetOwner = info.getEffected().getActingPlayer();
-		info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, targetOwner);
+		info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, info.getEffected().getActingPlayer());
 	}
 	}
 }
 }

+ 1 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java

@@ -47,11 +47,9 @@ public final class BlockAction extends AbstractEffect
 		_blockedActions = new ArrayList<>(rawActions.length);
 		_blockedActions = new ArrayList<>(rawActions.length);
 		for (String act : rawActions)
 		for (String act : rawActions)
 		{
 		{
-			int id = -1;
 			try
 			try
 			{
 			{
-				id = Integer.parseInt(act);
-				_blockedActions.add(id);
+				_blockedActions.add(Integer.parseInt(act));
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{

+ 3 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -40,12 +40,13 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
  */
 public final class CallPc extends AbstractEffect
 public final class CallPc extends AbstractEffect
 {
 {
-	private static int _itemId;
-	private static int _itemCount;
+	private final int _itemId;
+	private final int _itemCount;
 	
 	
 	public CallPc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public CallPc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_itemId = params.getInt("itemId", 0);
 		_itemId = params.getInt("itemId", 0);
 		_itemCount = params.getInt("itemCount", 0);
 		_itemCount = params.getInt("itemCount", 0);
 	}
 	}

+ 3 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java

@@ -25,15 +25,17 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 
 /**
 /**
+ * Call Skill effect implementation.
  * @author Nos
  * @author Nos
  */
  */
-public class CallSkill extends AbstractEffect
+public final class CallSkill extends AbstractEffect
 {
 {
 	private final SkillHolder _skill;
 	private final SkillHolder _skill;
 	
 	
 	public CallSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public CallSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
 		_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java

@@ -35,6 +35,7 @@ public final class ChangeFace extends AbstractEffect
 	public ChangeFace(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public ChangeFace(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_value = params != null ? params.getInt("value", 0) : 0;
 		_value = params != null ? params.getInt("value", 0) : 0;
 	}
 	}
 	
 	

+ 0 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java

@@ -10,7 +10,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
  */
  */
 public final class ChangeFishingMastery extends AbstractEffect
 public final class ChangeFishingMastery extends AbstractEffect
 {
 {
-	
 	public ChangeFishingMastery(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public ChangeFishingMastery(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java

@@ -35,6 +35,7 @@ public final class ChangeHairColor extends AbstractEffect
 	public ChangeHairColor(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public ChangeHairColor(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_value = params != null ? params.getInt("value", 0) : 0;
 		_value = params != null ? params.getInt("value", 0) : 0;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java

@@ -44,6 +44,7 @@ public final class Confuse extends AbstractEffect
 	public Confuse(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Confuse(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 	}
 	}
 	
 	

+ 25 - 23
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java

@@ -51,32 +51,34 @@ public final class CpDamPercent extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		if (info.getEffected().isPlayer())
+		if (!info.getEffected().isPlayer())
 		{
 		{
-			if (info.getEffected().isPlayer() && info.getEffected().getActingPlayer().isFakeDeath())
-			{
-				info.getEffected().stopFakeDeath(true);
-			}
-			
-			int damage = (int) ((info.getEffected().getCurrentCp() * getValue()) / 100);
-			// Manage attack or cast break of the target (calculating rate, sending message)
-			if (!info.getEffected().isRaid() && Formulas.calcAtkBreak(info.getEffected(), damage))
-			{
-				info.getEffected().breakAttack();
-				info.getEffected().breakCast();
-			}
-			
-			if (damage > 0)
+			return;
+		}
+		
+		if (info.getEffected().isPlayer() && info.getEffected().getActingPlayer().isFakeDeath())
+		{
+			info.getEffected().stopFakeDeath(true);
+		}
+		
+		int damage = (int) ((info.getEffected().getCurrentCp() * getValue()) / 100);
+		// Manage attack or cast break of the target (calculating rate, sending message)
+		if (!info.getEffected().isRaid() && Formulas.calcAtkBreak(info.getEffected(), damage))
+		{
+			info.getEffected().breakAttack();
+			info.getEffected().breakCast();
+		}
+		
+		if (damage > 0)
+		{
+			info.getEffected().setCurrentCp(info.getEffected().getCurrentCp() - damage);
+			if (info.getEffected() != info.getEffector())
 			{
 			{
-				info.getEffected().setCurrentCp(info.getEffected().getCurrentCp() - damage);
-				if (info.getEffected() != info.getEffector())
-				{
-					info.getEffector().sendDamageMessage(info.getEffected(), damage, false, false, false);
-					info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, false);
-				}
+				info.getEffector().sendDamageMessage(info.getEffected(), damage, false, false, false);
+				info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, false);
 			}
 			}
-			// Check if damage should be reflected
-			Formulas.calcDamageReflected(info.getEffector(), info.getEffected(), info.getSkill(), false);
 		}
 		}
+		// Check if damage should be reflected
+		Formulas.calcDamageReflected(info.getEffector(), info.getEffected(), info.getSkill(), false);
 	}
 	}
 }
 }

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java

@@ -53,7 +53,7 @@ public final class CpHeal extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		L2Character target = info.getEffected();
+		final L2Character target = info.getEffected();
 		if ((target == null) || target.isDead() || target.isDoor())
 		if ((target == null) || target.isDead() || target.isDoor())
 		{
 		{
 			return;
 			return;

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java

@@ -53,7 +53,7 @@ public final class CpHealPercent extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		L2Character target = info.getEffected();
+		final L2Character target = info.getEffected();
 		if ((target == null) || target.isDead() || target.isDoor())
 		if ((target == null) || target.isDead() || target.isDoor())
 		{
 		{
 			return;
 			return;

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java

@@ -35,6 +35,7 @@ public final class CrystalGradeModify extends AbstractEffect
 	public CrystalGradeModify(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public CrystalGradeModify(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_grade = params != null ? params.getInt("grade", 0) : 0;
 		_grade = params != null ? params.getInt("grade", 0) : 0;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java

@@ -35,6 +35,7 @@ public final class DamOverTime extends AbstractEffect
 	public DamOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public DamOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_canKill = (params != null) && params.getBoolean("canKill", false);
 		_canKill = (params != null) && params.getBoolean("canKill", false);
 	}
 	}
 	
 	

+ 2 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 
 /**
 /**
- * Dam Over Time Percent effect implementation.
+ * Damage Over Time Percent effect implementation.
  * @author Adry_85
  * @author Adry_85
  */
  */
 public final class DamOverTimePercent extends AbstractEffect
 public final class DamOverTimePercent extends AbstractEffect
@@ -36,6 +36,7 @@ public final class DamOverTimePercent extends AbstractEffect
 	public DamOverTimePercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public DamOverTimePercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_canKill = (params != null) && params.getBoolean("canKill", false);
 		_canKill = (params != null) && params.getBoolean("canKill", false);
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java

@@ -38,6 +38,7 @@ public final class DeleteHate extends AbstractEffect
 	public DeleteHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public DeleteHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java

@@ -38,6 +38,7 @@ public final class DeleteHateOfMe extends AbstractEffect
 	public DeleteHateOfMe(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public DeleteHateOfMe(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 	}
 	}
 	
 	

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java

@@ -25,9 +25,10 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 
 /**
 /**
+ * Detect Hidden Objects effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class DetectHiddenObjects extends AbstractEffect
+public final class DetectHiddenObjects extends AbstractEffect
 {
 {
 	public DetectHiddenObjects(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public DetectHiddenObjects(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
@@ -43,7 +44,6 @@ public class DetectHiddenObjects extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
 		if (!info.getEffected().isDoor())
 		if (!info.getEffected().isDoor())
 		{
 		{
 			return;
 			return;

+ 3 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Detection.java

@@ -26,9 +26,10 @@ import com.l2jserver.gameserver.model.skills.AbnormalType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 
 /**
 /**
+ * Detection effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class Detection extends AbstractEffect
+public final class Detection extends AbstractEffect
 {
 {
 	public Detection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Detection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
@@ -44,11 +45,11 @@ public class Detection extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
 		if (!info.getEffector().isPlayer() || !info.getEffected().isPlayer())
 		if (!info.getEffector().isPlayer() || !info.getEffected().isPlayer())
 		{
 		{
 			return;
 			return;
 		}
 		}
+		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		final L2PcInstance target = info.getEffected().getActingPlayer();
 		final L2PcInstance target = info.getEffected().getActingPlayer();
 		final boolean hasParty = player.isInParty();
 		final boolean hasParty = player.isInParty();

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java

@@ -44,6 +44,7 @@ public final class DispelBySlot extends AbstractEffect
 	public DispelBySlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public DispelBySlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_dispel = params.getString("dispel", null);
 		_dispel = params.getString("dispel", null);
 		if ((_dispel != null) && !_dispel.isEmpty())
 		if ((_dispel != null) && !_dispel.isEmpty())
 		{
 		{

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java

@@ -46,6 +46,7 @@ public final class DispelBySlotProbability extends AbstractEffect
 	public DispelBySlotProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public DispelBySlotProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_dispel = params.getString("dispel", null);
 		_dispel = params.getString("dispel", null);
 		_rate = params.getInt("rate", 0);
 		_rate = params.getInt("rate", 0);
 		if ((_dispel != null) && !_dispel.isEmpty())
 		if ((_dispel != null) && !_dispel.isEmpty())

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java

@@ -29,6 +29,9 @@ import com.l2jserver.gameserver.network.serverpackets.FlyToLocation;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 
+/**
+ * Enemy Charge effect implementation.
+ */
 public final class EnemyCharge extends AbstractEffect
 public final class EnemyCharge extends AbstractEffect
 {
 {
 	public EnemyCharge(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public EnemyCharge(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -47,6 +47,7 @@ public final class EnergyAttack extends AbstractEffect
 	public EnergyAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public EnergyAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_power = params.getDouble("power", 0);
 		_power = params.getDouble("power", 0);
 		_criticalChance = params.getInt("criticalChance", 0);
 		_criticalChance = params.getInt("criticalChance", 0);
 		_ignoreShieldDefence = params.getBoolean("ignoreShieldDefence", false);
 		_ignoreShieldDefence = params.getBoolean("ignoreShieldDefence", false);

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java

@@ -37,6 +37,7 @@ public final class Escape extends AbstractEffect
 	public Escape(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Escape(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_escapeType = params.getEnum("escapeType", TeleportWhereType.class, null);
 		_escapeType = params.getEnum("escapeType", TeleportWhereType.class, null);
 	}
 	}
 	
 	

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fishing.java

@@ -43,9 +43,10 @@ import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.Rnd;
 
 
 /**
 /**
+ * Fishing effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class Fishing extends AbstractEffect
+public final class Fishing extends AbstractEffect
 {
 {
 	private static final int MIN_BAIT_DISTANCE = 90;
 	private static final int MIN_BAIT_DISTANCE = 90;
 	private static final int MAX_BAIT_DISTANCE = 250;
 	private static final int MAX_BAIT_DISTANCE = 250;
@@ -70,7 +71,6 @@ public class Fishing extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
 		final L2Character activeChar = info.getEffector();
 		final L2Character activeChar = info.getEffector();
 		if (!activeChar.isPlayer())
 		if (!activeChar.isPlayer())
 		{
 		{
@@ -215,7 +215,7 @@ public class Fishing extends AbstractEffect
 			}
 			}
 		}
 		}
 		
 		
-		if (!player.destroyItem("FishingSkillHandler", equipedLeftHand, 1, null, false))
+		if (!player.destroyItem("Fishing", equipedLeftHand, 1, null, false))
 		{
 		{
 			player.sendPacket(SystemMessageId.NOT_ENOUGH_BAIT);
 			player.sendPacket(SystemMessageId.NOT_ENOUGH_BAIT);
 			return;
 			return;
@@ -234,7 +234,7 @@ public class Fishing extends AbstractEffect
 	 * @param waterZone the water zone
 	 * @param waterZone the water zone
 	 * @return the bait z or {@link Integer#MIN_VALUE} when you cannot fish here
 	 * @return the bait z or {@link Integer#MIN_VALUE} when you cannot fish here
 	 */
 	 */
-	private int computeBaitZ(final L2PcInstance player, final int baitX, final int baitY, final L2FishingZone fishingZone, final L2WaterZone waterZone)
+	private static int computeBaitZ(final L2PcInstance player, final int baitX, final int baitY, final L2FishingZone fishingZone, final L2WaterZone waterZone)
 	{
 	{
 		if ((fishingZone == null))
 		if ((fishingZone == null))
 		{
 		{

+ 3 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java

@@ -29,15 +29,17 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 
 
 /**
 /**
+ * Give Recommendation effect implementation.
  * @author Nos
  * @author Nos
  */
  */
-public class GiveRecommendation extends AbstractEffect
+public final class GiveRecommendation extends AbstractEffect
 {
 {
 	private final int _amount;
 	private final int _amount;
 	
 	
 	public GiveRecommendation(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public GiveRecommendation(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_amount = params.getInt("amount", 0);
 		_amount = params.getInt("amount", 0);
 		if (_amount == 0)
 		if (_amount == 0)
 		{
 		{

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java

@@ -34,6 +34,7 @@ public final class GiveSp extends AbstractEffect
 	public GiveSp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public GiveSp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_sp = params != null ? params.getInt("sp", 0) : 0;
 		_sp = params != null ? params.getInt("sp", 0) : 0;
 	}
 	}
 	
 	

+ 27 - 27
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java

@@ -44,33 +44,6 @@ public final class Harvesting extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
 	}
 	}
 	
 	
-	private boolean calcSuccess(L2PcInstance activeChar, L2MonsterInstance target)
-	{
-		int basicSuccess = 100;
-		final int levelPlayer = activeChar.getLevel();
-		final int levelTarget = target.getLevel();
-		
-		int diff = (levelPlayer - levelTarget);
-		if (diff < 0)
-		{
-			diff = -diff;
-		}
-		
-		// apply penalty, target <=> player levels
-		// 5% penalty for each level
-		if (diff > 5)
-		{
-			basicSuccess -= (diff - 5) * 5;
-		}
-		
-		// success rate can't be less than 1%
-		if (basicSuccess < 1)
-		{
-			basicSuccess = 1;
-		}
-		return Rnd.nextInt(99) < basicSuccess;
-	}
-	
 	@Override
 	@Override
 	public boolean isInstant()
 	public boolean isInstant()
 	{
 	{
@@ -176,4 +149,31 @@ public final class Harvesting extends AbstractEffect
 			}
 			}
 		}
 		}
 	}
 	}
+	
+	private static boolean calcSuccess(L2PcInstance activeChar, L2MonsterInstance target)
+	{
+		int basicSuccess = 100;
+		final int levelPlayer = activeChar.getLevel();
+		final int levelTarget = target.getLevel();
+		
+		int diff = (levelPlayer - levelTarget);
+		if (diff < 0)
+		{
+			diff = -diff;
+		}
+		
+		// apply penalty, target <=> player levels
+		// 5% penalty for each level
+		if (diff > 5)
+		{
+			basicSuccess -= (diff - 5) * 5;
+		}
+		
+		// success rate can't be less than 1%
+		if (basicSuccess < 1)
+		{
+			basicSuccess = 1;
+		}
+		return Rnd.nextInt(99) < basicSuccess;
+	}
 }
 }

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java

@@ -45,6 +45,7 @@ public class HeadquarterCreate extends AbstractEffect
 	public HeadquarterCreate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public HeadquarterCreate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_isAdvanced = params != null ? params.getBoolean("isAdvanced", false) : false;
 		_isAdvanced = params != null ? params.getBoolean("isAdvanced", false) : false;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java

@@ -40,6 +40,7 @@ public final class Lethal extends AbstractEffect
 	public Lethal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Lethal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_fullLethal = params.getInt("fullLethal", 0);
 		_fullLethal = params.getInt("fullLethal", 0);
 		_halfLethal = params.getInt("halfLethal", 0);
 		_halfLethal = params.getInt("halfLethal", 0);
 	}
 	}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 
 /**
 /**
- * Mana Dam Over Time effect implementation.
+ * Mana Damage Over Time effect implementation.
  */
  */
 public final class ManaDamOverTime extends AbstractEffect
 public final class ManaDamOverTime extends AbstractEffect
 {
 {

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java

@@ -41,6 +41,7 @@ public final class OpenDoor extends AbstractEffect
 	public OpenDoor(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public OpenDoor(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 0) : 0;
 		_chance = params != null ? params.getInt("chance", 0) : 0;
 		_isItem = params != null ? params.getBoolean("isItem", false) : false;
 		_isItem = params != null ? params.getBoolean("isItem", false) : false;
 	}
 	}

+ 3 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Pumping.java

@@ -36,15 +36,17 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 
 
 /**
 /**
+ * Pumping effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class Pumping extends AbstractEffect
+public final class Pumping extends AbstractEffect
 {
 {
 	private final double _power;
 	private final double _power;
 	
 	
 	public Pumping(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Pumping(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		if ((params == null) || (params.getString("power", null) == null))
 		if ((params == null) || (params.getString("power", null) == null))
 		{
 		{
 			throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
 			throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
@@ -67,7 +69,6 @@ public class Pumping extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
 		final L2Character activeChar = info.getEffector();
 		final L2Character activeChar = info.getEffector();
 		if (!activeChar.isPlayer())
 		if (!activeChar.isPlayer())
 		{
 		{

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java

@@ -40,6 +40,7 @@ public final class RandomizeHate extends AbstractEffect
 	public RandomizeHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public RandomizeHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 	}
 	}
 	
 	

+ 3 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Reeling.java

@@ -36,15 +36,17 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 
 
 /**
 /**
+ * Reeling effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class Reeling extends AbstractEffect
+public final class Reeling extends AbstractEffect
 {
 {
 	private final double _power;
 	private final double _power;
 	
 	
 	public Reeling(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Reeling(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		if ((params == null) || (params.getString("power", null) == null))
 		if ((params == null) || (params.getString("power", null) == null))
 		{
 		{
 			throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
 			throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
@@ -67,7 +69,6 @@ public class Reeling extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
 		final L2Character activeChar = info.getEffector();
 		final L2Character activeChar = info.getEffector();
 		if (!activeChar.isPlayer())
 		if (!activeChar.isPlayer())
 		{
 		{

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java

@@ -36,6 +36,7 @@ public final class RefuelAirship extends AbstractEffect
 	public RefuelAirship(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public RefuelAirship(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_value = params != null ? params.getInt("value", 0) : 0;
 		_value = params != null ? params.getInt("value", 0) : 0;
 	}
 	}
 	
 	

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java

@@ -30,15 +30,17 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 
 /**
 /**
+ * Resist Skill effect implementaion.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class ResistSkill extends AbstractEffect
+public final class ResistSkill extends AbstractEffect
 {
 {
 	private final List<SkillHolder> _skills = new ArrayList<>();
 	private final List<SkillHolder> _skills = new ArrayList<>();
 	
 	
 	public ResistSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public ResistSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		if (params != null)
 		if (params != null)
 		{
 		{
 			for (int i = 1;; i++)
 			for (int i = 1;; i++)
@@ -61,7 +63,6 @@ public class ResistSkill extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
 		final L2Character effected = info.getEffected();
 		final L2Character effected = info.getEffected();
 		for (SkillHolder holder : _skills)
 		for (SkillHolder holder : _skills)
 		{
 		{
@@ -79,7 +80,6 @@ public class ResistSkill extends AbstractEffect
 			info.getEffected().removeInvulAgainst(holder);
 			info.getEffected().removeInvulAgainst(holder);
 			effected.sendDebugMessage("Removing invul against " + holder.getSkill());
 			effected.sendDebugMessage("Removing invul against " + holder.getSkill());
 		}
 		}
-		super.onExit(info);
 	}
 	}
 	
 	
 	@Override
 	@Override

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java

@@ -37,6 +37,7 @@ public final class Restoration extends AbstractEffect
 	public Restoration(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Restoration(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_itemId = params.getInt("itemId", 0);
 		_itemId = params.getInt("itemId", 0);
 		_itemCount = params.getInt("itemCount", 0);
 		_itemCount = params.getInt("itemCount", 0);
 	}
 	}

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java

@@ -38,6 +38,7 @@ public final class Resurrection extends AbstractEffect
 	public Resurrection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Resurrection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_power = params != null ? params.getInt("power", 0) : 0;
 		_power = params != null ? params.getInt("power", 0) : 0;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java

@@ -37,6 +37,7 @@ public final class SetSkill extends AbstractEffect
 	public SetSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public SetSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_skillId = params.getInt("skillId", 0);
 		_skillId = params.getInt("skillId", 0);
 		_skillLvl = params.getInt("skillLvl", 1);
 		_skillLvl = params.getInt("skillLvl", 1);
 	}
 	}

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java

@@ -34,6 +34,7 @@ public final class SkillTurning extends AbstractEffect
 	public SkillTurning(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public SkillTurning(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java

@@ -41,6 +41,7 @@ public final class SoulEating extends AbstractEffect implements IExperienceRecei
 	public SoulEating(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public SoulEating(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_expNeeded = params.getInt("expNeeded");
 		_expNeeded = params.getInt("expNeeded");
 	}
 	}
 	
 	

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sow.java

@@ -36,7 +36,7 @@ import com.l2jserver.util.Rnd;
  * Sow effect implementation.
  * Sow effect implementation.
  * @author Adry_85, l3x
  * @author Adry_85, l3x
  */
  */
-public class Sow extends AbstractEffect
+public final class Sow extends AbstractEffect
 {
 {
 	public Sow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Sow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
@@ -102,7 +102,7 @@ public class Sow extends AbstractEffect
 		target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 		target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 	}
 	}
 	
 	
-	private boolean calcSuccess(L2Character activeChar, L2Character target, int seedId)
+	private static boolean calcSuccess(L2Character activeChar, L2Character target, int seedId)
 	{
 	{
 		// TODO: check all the chances
 		// TODO: check all the chances
 		int basicSuccess = (ManorData.getInstance().isAlternative(seedId) ? 20 : 90);
 		int basicSuccess = (ManorData.getInstance().isAlternative(seedId) ? 20 : 90);

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java

@@ -35,6 +35,7 @@ public final class StaticDamage extends AbstractEffect
 	public StaticDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public StaticDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_power = params != null ? params.getInt("power", 0) : 0;
 		_power = params != null ? params.getInt("power", 0) : 0;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java

@@ -42,6 +42,7 @@ public final class StealAbnormal extends AbstractEffect
 	public StealAbnormal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public StealAbnormal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_slot = params.getString("slot", null);
 		_slot = params.getString("slot", null);
 		_rate = params.getInt("rate", 0);
 		_rate = params.getInt("rate", 0);
 		_max = params.getInt("max", 0);
 		_max = params.getInt("max", 0);

+ 4 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java

@@ -32,9 +32,10 @@ import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 
 /**
 /**
+ * Summon effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class Summon extends AbstractEffect
+public final class Summon extends AbstractEffect
 {
 {
 	private final int _npcId;
 	private final int _npcId;
 	private final float _expMultiplier;
 	private final float _expMultiplier;
@@ -45,10 +46,12 @@ public class Summon extends AbstractEffect
 	public Summon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Summon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		if (params == null)
 		if (params == null)
 		{
 		{
 			throw new IllegalArgumentException("Summon effect without parameters!");
 			throw new IllegalArgumentException("Summon effect without parameters!");
 		}
 		}
+		
 		_npcId = params.getInt("npcId");
 		_npcId = params.getInt("npcId");
 		_expMultiplier = params.getFloat("expMultiplier", 1);
 		_expMultiplier = params.getFloat("expMultiplier", 1);
 		_consumeItem = new ItemHolder(params.getInt("consumeItemId", 0), params.getInt("consumeItemCount", 1));
 		_consumeItem = new ItemHolder(params.getInt("consumeItemId", 0), params.getInt("consumeItemCount", 1));
@@ -65,8 +68,6 @@ public class Summon extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
-		
 		if (!info.getEffected().isPlayer() || info.getEffected().hasSummon())
 		if (!info.getEffected().isPlayer() || info.getEffected().hasSummon())
 		{
 		{
 			return;
 			return;

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java

@@ -36,6 +36,7 @@ public final class SummonAgathion extends AbstractEffect
 	public SummonAgathion(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public SummonAgathion(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		if (params != null)
 		if (params != null)
 		{
 		{
 			_npcId = params.getInt("npcId", 0);
 			_npcId = params.getInt("npcId", 0);

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java

@@ -49,6 +49,7 @@ public final class SummonNpc extends AbstractEffect
 	public SummonNpc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public SummonNpc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_despawnDelay = params.getInt("despawnDelay", 20000);
 		_despawnDelay = params.getInt("despawnDelay", 20000);
 		_npcId = params.getInt("npcId", 0);
 		_npcId = params.getInt("npcId", 0);
 		_npcCount = params.getInt("npcCount", 1);
 		_npcCount = params.getInt("npcCount", 1);

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java

@@ -40,6 +40,7 @@ public final class SummonTrap extends AbstractEffect
 	public SummonTrap(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public SummonTrap(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_despawnTime = params.getInt("despawnTime", 0);
 		_despawnTime = params.getInt("despawnTime", 0);
 		_npcId = params.getInt("npcId", 0);
 		_npcId = params.getInt("npcId", 0);
 	}
 	}

+ 1 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java

@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  * Take Fort Start effect implementation.
  * Take Fort Start effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class TakeFortStart extends AbstractEffect
+public final class TakeFortStart extends AbstractEffect
 {
 {
 	public TakeFortStart(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public TakeFortStart(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
@@ -49,8 +49,6 @@ public class TakeFortStart extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
-		
 		if (info.getEffector().isPlayer())
 		if (info.getEffector().isPlayer())
 		{
 		{
 			final L2PcInstance player = info.getEffector().getActingPlayer();
 			final L2PcInstance player = info.getEffector().getActingPlayer();

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java

@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  * Take Territory Flag effect implementation.
  * Take Territory Flag effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class TakeTerritoryFlag extends AbstractEffect
+public final class TakeTerritoryFlag extends AbstractEffect
 {
 {
 	private static final int FLAG_NPC_ID = 35062;
 	private static final int FLAG_NPC_ID = 35062;
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java

@@ -36,6 +36,7 @@ public final class TargetCancel extends AbstractEffect
 	public TargetCancel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public TargetCancel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java

@@ -36,6 +36,7 @@ public final class TargetMeProbability extends AbstractEffect
 	public TargetMeProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public TargetMeProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java

@@ -36,6 +36,7 @@ public final class Teleport extends AbstractEffect
 	public Teleport(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Teleport(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0));
 		_loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0));
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java

@@ -38,6 +38,7 @@ public final class TransferHate extends AbstractEffect
 	public TransferHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public TransferHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 	}
 	}
 	
 	

+ 5 - 12
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java

@@ -19,22 +19,23 @@
 package handlers.effecthandlers;
 package handlers.effecthandlers;
 
 
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 
 /**
 /**
+ * Trap Detect effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class TrapDetect extends AbstractEffect
+public final class TrapDetect extends AbstractEffect
 {
 {
 	private final int _power;
 	private final int _power;
 	
 	
 	public TrapDetect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public TrapDetect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		if (params == null)
 		if (params == null)
 		{
 		{
 			throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
 			throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
@@ -51,20 +52,12 @@ public class TrapDetect extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
-		
-		final L2Character target = info.getEffected();
-		if (!target.isTrap())
-		{
-			return;
-		}
-		
-		if (target.isAlikeDead())
+		if (!info.getEffected().isTrap() || info.getEffected().isAlikeDead())
 		{
 		{
 			return;
 			return;
 		}
 		}
 		
 		
-		final L2TrapInstance trap = (L2TrapInstance) target;
+		final L2TrapInstance trap = (L2TrapInstance) info.getEffected();
 		if (trap.getLevel() <= _power)
 		if (trap.getLevel() <= _power)
 		{
 		{
 			trap.setDetected(info.getEffector());
 			trap.setDetected(info.getEffector());

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java

@@ -30,15 +30,17 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 
 /**
 /**
+ * Trap Remove effect implementation.
  * @author UnAfraid
  * @author UnAfraid
  */
  */
-public class TrapRemove extends AbstractEffect
+public final class TrapRemove extends AbstractEffect
 {
 {
 	private final int _power;
 	private final int _power;
 	
 	
 	public TrapRemove(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public TrapRemove(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		if (params == null)
 		if (params == null)
 		{
 		{
 			throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
 			throw new IllegalArgumentException(getClass().getSimpleName() + ": effect without power!");
@@ -55,8 +57,6 @@ public class TrapRemove extends AbstractEffect
 	@Override
 	@Override
 	public void onStart(BuffInfo info)
 	public void onStart(BuffInfo info)
 	{
 	{
-		super.onStart(info);
-		
 		final L2Character target = info.getEffected();
 		final L2Character target = info.getEffected();
 		if (!target.isTrap())
 		if (!target.isTrap())
 		{
 		{

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java

@@ -50,6 +50,7 @@ public class TriggerSkillByDamage extends AbstractEffect implements IDamageRecei
 	public TriggerSkillByDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public TriggerSkillByDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_minAttackerLevel = params.getInt("minAttackerLevel", 1);
 		_minAttackerLevel = params.getInt("minAttackerLevel", 1);
 		_maxAttackerLevel = params.getInt("maxAttackerLevel", 100);
 		_maxAttackerLevel = params.getInt("maxAttackerLevel", 100);
 		_minDamage = params.getInt("minDamage", 1);
 		_minDamage = params.getInt("minDamage", 1);

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java

@@ -40,6 +40,7 @@ public final class Unsummon extends AbstractEffect
 	public Unsummon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public Unsummon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 		_chance = params != null ? params.getInt("chance", 100) : 100;
 	}
 	}
 	
 	

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java

@@ -35,6 +35,7 @@ public final class VitalityPointUp extends AbstractEffect
 	public VitalityPointUp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	public VitalityPointUp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 	{
 		super(attachCond, applyCond, set, params);
 		super(attachCond, applyCond, set, params);
+		
 		_value = params != null ? params.getFloat("value", 0) : 0;
 		_value = params != null ? params.getFloat("value", 0) : 0;
 	}
 	}