From d907d4fed80c5149bdb8eea351e94b3523604d65 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sun, 3 Nov 2013 23:32:47 +0000
Subject: [PATCH] BETA: Continuing with [6249] rework: 	* Adding method
 overload (just wrappers) to `L2Skill`.applyEffects(..) to avoid useless
 parameters. 		* Suggested by: jurchiks 	* Added a new
 parameter to `L2Skill`.applyEffects(..) to customize skill abnormal time upon
 casting. 	* Changed the way we check if we can apply a buff (debuff,
 etc) to a character. 		* Now all checks must be done on
 `AbstractEffect`#canStart(`BuffInfo`), this way we prevent executing
 `AbstractEffect`#onStart(`BuffInfo`) logic if the effect won't be added to
 the effect list. 			* `AbstractEffect`#onStart(`BuffInfo`)
 is void now. 		* Now `AbstractEffect`#onStart(`BuffInfo`) is called
 when the effect is already placed in the effect list, the old effect has been
 removed and we are sure the new effect should be activated. 		*
 Reported by: nBd 		* Suggested by: nBd 	* Reworked the way
 effects are restored into characters (players, summons). 		*
 Avoiding the restoration of instant effects. 			* Reported by:
 nBd, UnAfraid, Nos 		* Reusing `L2Skill`.applyEffects(..) code! 
 * Fixed effects flags not being computed for players (sleep, hide, etc not
 removed). 		* Reported by: nBd, thorl2 		* Suggested
 by: nBd 	* Fixed many system messages: 		* "$c1 has resisted
 your $s2" is not displayed when adding active skills or switching subclasses.
 			* Reported by: nBd, UnAfraid, Adry_85 		* "$s1
 has worn off" is not displayed for passive skills when they are removed. 
 * Fixing summons not getting buffed when master receives  buffs. 	
 * Reported by: nBd 	* Fixed summons not getting Celestial Shield. 	
 * Reported by: Zeldak

'''Note to developers:''' Instant effects should not override `AbstractEffect`#canStart(`BuffInfo`), all checks should be done `AbstractEffect`#onStart(`BuffInfo`).
---
 .../scripts/ai/group_template/DenOfEvil.java  |  2 +-
 .../scripts/ai/group_template/FairyTrees.java |  2 +-
 .../data/scripts/ai/individual/QueenAnt.java  |  2 +-
 .../ai/npc/NpcBuffers/NpcBufferAI.java        |  8 ++--
 .../RainbowSpringsChateau.java                |  2 +-
 .../data/scripts/custom/IOPRace/IOPRace.java  |  4 +-
 .../bypasshandlers/OlympiadManagerLink.java   |  6 +--
 .../handlers/effecthandlers/AddHate.java      |  5 +--
 .../handlers/effecthandlers/AttackTrait.java  |  3 +-
 .../handlers/effecthandlers/Backstab.java     | 13 +++---
 .../handlers/effecthandlers/Betray.java       | 17 ++++----
 .../handlers/effecthandlers/BigHead.java      |  3 +-
 .../handlers/effecthandlers/Blink.java        |  3 +-
 .../handlers/effecthandlers/BlockAction.java  | 15 ++++---
 .../effecthandlers/BlockBuffSlot.java         |  9 +----
 .../handlers/effecthandlers/BlockChat.java    | 14 +++----
 .../handlers/effecthandlers/BlockParty.java   | 14 +++----
 .../handlers/effecthandlers/Bluff.java        |  7 ++--
 .../handlers/effecthandlers/CallParty.java    | 20 +++++-----
 .../handlers/effecthandlers/CallPc.java       |  8 ++--
 .../effecthandlers/ChameleonRest.java         |  3 +-
 .../effecthandlers/ChanceSkillTrigger.java    |  3 +-
 .../handlers/effecthandlers/ChangeFace.java   |  5 +--
 .../effecthandlers/ChangeHairColor.java       |  5 +--
 .../effecthandlers/ChangeHairStyle.java       |  5 +--
 .../effecthandlers/CharmOfCourage.java        | 15 +++----
 .../handlers/effecthandlers/CharmOfLuck.java  | 12 +++---
 .../handlers/effecthandlers/ClanGate.java     |  3 +-
 .../handlers/effecthandlers/Confuse.java      |  3 +-
 .../handlers/effecthandlers/ConsumeBody.java  |  6 +--
 .../handlers/effecthandlers/ConvertItem.java  | 21 +++++-----
 .../handlers/effecthandlers/CpDamPercent.java |  4 +-
 .../handlers/effecthandlers/CpHeal.java       |  8 ++--
 .../effecthandlers/CpHealPercent.java         |  8 ++--
 .../effecthandlers/CrystalGradeModify.java    | 16 ++++----
 .../handlers/effecthandlers/CubicMastery.java | 12 +++---
 .../handlers/effecthandlers/DeathLink.java    |  5 +--
 .../handlers/effecthandlers/DefenceTrait.java |  3 +-
 .../handlers/effecthandlers/DeleteHate.java   |  5 +--
 .../effecthandlers/DeleteHateOfMe.java        |  5 +--
 .../handlers/effecthandlers/Disarm.java       | 14 +++----
 .../handlers/effecthandlers/DispelAll.java    |  3 +-
 .../effecthandlers/DispelByCategory.java      |  5 +--
 .../handlers/effecthandlers/DispelBySlot.java |  5 +--
 .../DispelBySlotProbability.java              |  5 +--
 .../handlers/effecthandlers/EnemyCharge.java  | 10 ++---
 .../handlers/effecthandlers/EnergyAttack.java |  5 +--
 .../effecthandlers/EnlargeAbnormalSlot.java   |  8 ++--
 .../handlers/effecthandlers/Escape.java       |  6 +--
 .../handlers/effecthandlers/FakeDeath.java    |  3 +-
 .../handlers/effecthandlers/FatalBlow.java    |  5 +--
 .../scripts/handlers/effecthandlers/Fear.java | 23 +++++------
 .../scripts/handlers/effecthandlers/Flag.java | 15 ++++---
 .../handlers/effecthandlers/FocusEnergy.java  |  6 +--
 .../effecthandlers/FocusMaxEnergy.java        |  4 +-
 .../handlers/effecthandlers/FocusSouls.java   |  6 +--
 .../handlers/effecthandlers/GetAgro.java      |  5 +--
 .../handlers/effecthandlers/GiveSp.java       |  5 +--
 .../scripts/handlers/effecthandlers/Grow.java |  4 +-
 .../handlers/effecthandlers/Harvesting.java   |  8 ++--
 .../scripts/handlers/effecthandlers/Heal.java |  5 +--
 .../handlers/effecthandlers/HealOverTime.java |  3 +-
 .../handlers/effecthandlers/HealPercent.java  |  5 +--
 .../scripts/handlers/effecthandlers/Hide.java |  3 +-
 .../effecthandlers/HolythingPossess.java      |  5 +--
 .../handlers/effecthandlers/HpByLevel.java    |  6 +--
 .../handlers/effecthandlers/HpDrain.java      |  5 +--
 .../handlers/effecthandlers/ImmobileBuff.java |  3 +-
 .../effecthandlers/ImmobilePetBuff.java       |  4 +-
 .../handlers/effecthandlers/Lethal.java       |  7 ++--
 .../handlers/effecthandlers/Lucky.java        | 12 +++---
 .../effecthandlers/MagicalAttack.java         |  5 +--
 .../effecthandlers/MagicalAttackMp.java       |  5 +--
 .../effecthandlers/MagicalSoulAttack.java     |  5 +--
 .../handlers/effecthandlers/ManaHeal.java     |  5 +--
 .../effecthandlers/ManaHealByLevel.java       |  5 +--
 .../effecthandlers/ManaHealPercent.java       |  5 +--
 .../handlers/effecthandlers/MpByLevel.java    |  6 +--
 .../scripts/handlers/effecthandlers/Mute.java |  3 +-
 .../effecthandlers/NoblesseBless.java         | 12 +++---
 .../effecthandlers/OpenCommonRecipeBook.java  |  8 ++--
 .../effecthandlers/OpenDwarfRecipeBook.java   |  8 ++--
 .../handlers/effecthandlers/Paralyze.java     |  3 +-
 .../handlers/effecthandlers/Passive.java      |  5 +--
 .../effecthandlers/Petrification.java         |  3 +-
 .../handlers/effecthandlers/PhoenixBless.java | 12 +++---
 .../effecthandlers/PhysicalAttack.java        |  7 ++--
 .../effecthandlers/PhysicalAttackHpLink.java  |  7 ++--
 .../effecthandlers/PhysicalAttackMute.java    |  3 +-
 .../handlers/effecthandlers/PhysicalMute.java |  3 +-
 .../effecthandlers/PhysicalSoulAttack.java    |  7 ++--
 .../effecthandlers/ProtectionBlessing.java    | 12 +++---
 .../effecthandlers/RandomizeHate.java         |  8 ++--
 .../handlers/effecthandlers/RebalanceHP.java  |  5 +--
 .../handlers/effecthandlers/Recovery.java     |  4 +-
 .../effecthandlers/RefuelAirship.java         |  3 +-
 .../handlers/effecthandlers/Relax.java        |  3 +-
 .../handlers/effecthandlers/Restoration.java  |  7 ++--
 .../effecthandlers/RestorationRandom.java     | 11 +++--
 .../handlers/effecthandlers/Resurrection.java |  3 +-
 .../scripts/handlers/effecthandlers/Root.java |  3 +-
 .../handlers/effecthandlers/SetSkill.java     |  8 ++--
 .../handlers/effecthandlers/SkillTurning.java |  5 +--
 .../handlers/effecthandlers/Sleep.java        |  3 +-
 .../handlers/effecthandlers/SoulBlow.java     |  6 +--
 .../handlers/effecthandlers/SoulEating.java   |  3 +-
 .../handlers/effecthandlers/Spoil.java        |  7 ++--
 .../handlers/effecthandlers/StaticDamage.java |  5 +--
 .../effecthandlers/StealAbnormal.java         |  8 ++--
 .../scripts/handlers/effecthandlers/Stun.java |  3 +-
 .../effecthandlers/SummonAgathion.java        |  7 ++--
 .../handlers/effecthandlers/SummonCubic.java  |  9 ++---
 .../handlers/effecthandlers/SummonNpc.java    | 13 +++---
 .../handlers/effecthandlers/SummonPet.java    | 15 ++++---
 .../handlers/effecthandlers/SummonTrap.java   | 12 +++---
 .../handlers/effecthandlers/Sweeper.java      | 15 ++++---
 .../handlers/effecthandlers/TargetCancel.java |  3 +-
 .../handlers/effecthandlers/TargetMe.java     | 11 ++---
 .../effecthandlers/TargetMeProbability.java   | 10 +----
 .../handlers/effecthandlers/Teleport.java     |  3 +-
 .../effecthandlers/TeleportToTarget.java      |  5 +--
 .../handlers/effecthandlers/ThrowUp.java      |  7 ++--
 .../effecthandlers/TransferDamage.java        |  3 +-
 .../handlers/effecthandlers/TransferHate.java | 39 +++++++++---------
 .../effecthandlers/Transformation.java        | 14 ++++---
 .../effecthandlers/TriggerSkillByDamage.java  | 29 +++-----------
 .../handlers/effecthandlers/Unsummon.java     | 40 +++++++++----------
 .../effecthandlers/UnsummonAgathion.java      |  3 +-
 .../effecthandlers/VitalityPointUp.java       | 17 ++++----
 .../handlers/itemhandlers/EventItem.java      |  2 +-
 .../scripts/handlers/skillhandlers/Dummy.java |  6 +--
 .../voicedcommandhandlers/Wedding.java        |  2 +-
 .../CrystalCaverns/CrystalCaverns.java        | 18 ++++-----
 .../HellboundTown/HellboundTown.java          |  4 +-
 .../scripts/instances/Kamaloka/Kamaloka.java  |  6 +--
 .../NornilsGarden/NornilsGarden.java          |  8 ++--
 .../mods/eventmodRabbits/eventmodRabbits.java |  4 +-
 .../mods/eventmodRace/eventmodRace.java       |  2 +-
 .../Q10273_GoodDayToFly.java                  |  8 ++--
 .../Q10275_ContainingTheAttributePower.java   |  4 +-
 140 files changed, 457 insertions(+), 593 deletions(-)

diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java
index 96ca632ba2..5e3d6e1acc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java
@@ -211,7 +211,7 @@ public class DenOfEvil extends AbstractNpcAI
 				if (character.isPlayable())
 				{
 					L2Skill skill = SkillTable.getInstance().getInfo(6149, 1);
-					skill.applyEffects(character, null, character, null, false, false); // apply effect
+					skill.applyEffects(character, character);
 				}
 				else
 				{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
index 8936150994..f0f826a7d6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
@@ -68,7 +68,7 @@ public class FairyTrees extends AbstractNpcAI
 					L2Skill skill = SkillTable.getInstance().getInfo(4243, 1);
 					if ((skill != null) && (originalKiller != null))
 					{
-						skill.applyEffects(newNpc, null, originalKiller, null, false, false);
+						skill.applyEffects(newNpc, originalKiller);
 					}
 				}
 			}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
index b3d4e32dbe..e499252600 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
@@ -316,7 +316,7 @@ public class QueenAnt extends AbstractNpcAI
 			if (curse != null)
 			{
 				npc.broadcastPacket(new MagicSkillUse(npc, character, curse.getId(), curse.getLevel(), 300, 0));
-				curse.applyEffects(npc, null, character, null, false, false);
+				curse.applyEffects(npc, character);
 			}
 			
 			((L2Attackable) npc).stopHating(character); // for calling again
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java
index 1943435bff..ef0d180eee 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java
@@ -63,7 +63,7 @@ public class NpcBufferAI implements Runnable
 				{
 					if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, _npc, player, true))
 					{
-						skill.applyEffects(player, null, player, null, false, false);
+						skill.applyEffects(player, player);
 					}
 				}
 				else
@@ -72,7 +72,7 @@ public class NpcBufferAI implements Runnable
 					{
 						if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, _npc, member, true))
 						{
-							skill.applyEffects(player, null, member, null, false, false);
+							skill.applyEffects(player, member);
 						}
 					}
 				}
@@ -88,7 +88,7 @@ public class NpcBufferAI implements Runnable
 						{
 							if (isFriendly(player, target))
 							{
-								skill.applyEffects(target, null, target, null, false, false);
+								skill.applyEffects(target, target);
 							}
 							break;
 						}
@@ -96,7 +96,7 @@ public class NpcBufferAI implements Runnable
 						{
 							if (!isFriendly(player, target))
 							{
-								skill.applyEffects(target, null, target, null, false, false);
+								skill.applyEffects(target, target);
 							}
 							break;
 						}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index 0dfc8e9702..fc4290d2f2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -792,7 +792,7 @@ public class RainbowSpringsChateau extends Quest
 				{
 					for (L2Skill sk : DEBUFFS)
 					{
-						sk.applyEffects(chr, null, chr, null, false, false);
+						sk.applyEffects(chr, chr);
 					}
 				}
 			}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/IOPRace/IOPRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/IOPRace/IOPRace.java
index f67ff3f63e..613404e4a3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/IOPRace/IOPRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/IOPRace/IOPRace.java
@@ -98,10 +98,10 @@ public class IOPRace extends Quest
 			L2Skill skill = SkillTable.getInstance().getInfo(5239, 5);
 			if (skill != null)
 			{
-				skill.applyEffects(npc, null, player, null, false, false);
+				skill.applyEffects(npc, player);
 				if (player.hasSummon())
 				{
-					skill.applyEffects(npc, null, player.getSummon(), null, false, false);
+					skill.applyEffects(npc, player.getSummon());
 				}
 			}
 			
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
index efdc193f3a..66c6af5f4c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
@@ -260,12 +260,12 @@ public class OlympiadManagerLink implements IBypassHandler
 					{
 						activeChar.olyBuff--;
 						target.broadcastPacket(new MagicSkillUse(target, activeChar, skill.getId(), skill.getLevel(), 0, 0));
-						skill.applyEffects(activeChar, null, activeChar, null, false, false);
-						L2Summon summon = activeChar.getSummon();
+						skill.applyEffects(activeChar, activeChar);
+						final L2Summon summon = activeChar.getSummon();
 						if (summon != null)
 						{
 							target.broadcastPacket(new MagicSkillUse(target, summon, skill.getId(), skill.getLevel(), 0, 0));
-							skill.applyEffects(summon, null, summon, null, false, false);
+							skill.applyEffects(summon, summon);
 						}
 					}
 				}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index fcf6b89292..3bcfc08f9d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -42,11 +42,11 @@ public final class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffected().isL2Attackable())
 		{
-			return false;
+			return;
 		}
 		
 		final double val = getValue();
@@ -58,6 +58,5 @@ public final class AddHate extends AbstractEffect
 		{
 			((L2Attackable) info.getEffected()).reduceHate(info.getEffector(), (int) -val);
 		}
-		return true;
 	}
 }
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 25041926e4..dc67ff13da 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
@@ -82,7 +82,7 @@ public final class AttackTrait extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		final CharStat charStat = info.getEffected().getStat();
 		synchronized (charStat.getAttackTraits())
@@ -93,6 +93,5 @@ public final class AttackTrait extends AbstractEffect
 				charStat.getAttackTraitsCount()[trait.getKey().getId()]++;
 			}
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java
index b368fd62e2..bb941c5222 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java
@@ -59,16 +59,15 @@ public final class Backstab extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		L2Character target = info.getEffected();
-		L2Character activeChar = info.getEffector();
-		
-		if (activeChar.isAlikeDead())
+		if (info.getEffector().isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
+		L2Character target = info.getEffected();
+		L2Character activeChar = info.getEffector();
 		boolean ss = info.getSkill().useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS);
 		byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
 		double damage = (int) Formulas.calcBackstabDamage(activeChar, target, info.getSkill(), shld, ss);
@@ -97,7 +96,5 @@ public final class Backstab extends AbstractEffect
 		
 		// Check if damage should be reflected
 		Formulas.calcDamageReflected(activeChar, target, info.getSkill(), true);
-		
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java
index 86c0e5ebc3..069f562712 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Betray.java
@@ -38,6 +38,12 @@ public final class Betray extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return info.getEffector().isPlayer() && info.getEffected().isSummon();
+	}
+	
 	@Override
 	public int getEffectFlags()
 	{
@@ -57,14 +63,9 @@ public final class Betray extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if (info.getEffector().isPlayer() && info.getEffected().isSummon())
-		{
-			L2PcInstance targetOwner = info.getEffected().getActingPlayer();
-			info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, targetOwner);
-			return true;
-		}
-		return false;
+		L2PcInstance targetOwner = info.getEffected().getActingPlayer();
+		info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, targetOwner);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BigHead.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BigHead.java
index 6db66f7230..11cef708e4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BigHead.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BigHead.java
@@ -49,9 +49,8 @@ public final class BigHead extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().startAbnormalEffect(AbnormalVisualEffect.BIG_HEAD);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Blink.java
index 436a2512f9..27add77ba9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Blink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Blink.java
@@ -59,7 +59,7 @@ public final class Blink extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		final L2Character effected = isSelfEffect() ? info.getEffector() : info.getEffected();
 		final int radius = info.getSkill().getFlyRadius();
@@ -88,6 +88,5 @@ public final class Blink extends AbstractEffect
 		effected.abortCast();
 		effected.setXYZ(x, y, z);
 		effected.broadcastPacket(new ValidateLocation(effected));
-		return true;
 	}
 }
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 5c9a820882..c43751b4ce 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
@@ -59,6 +59,12 @@ public final class BlockAction extends AbstractEffect
 		}
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return (info.getEffected() != null) && info.getEffected().isPlayer();
+	}
+	
 	@Override
 	public boolean checkCondition(Object id)
 	{
@@ -79,13 +85,8 @@ public final class BlockAction extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if ((info.getEffected() == null) || !info.getEffected().isPlayer())
-		{
-			return false;
-		}
-		
 		if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID))
 		{
 			PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, info.getEffected().getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "block action debuff", "system", true));
@@ -95,7 +96,5 @@ public final class BlockAction extends AbstractEffect
 		{
 			PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, info.getEffected().getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "block action debuff", "system", true));
 		}
-		
-		return true;
 	}
 }
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 4e4c7adc6b..70a6fa9deb 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
@@ -62,15 +62,8 @@ public final class BlockBuffSlot extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if (_blockBuffSlots.isEmpty())
-		{
-			return false;
-		}
-		
 		info.getEffected().getEffectList().addBlockedBuffSlots(_blockBuffSlots);
-		
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java
index 6930873529..7c8a507eaf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java
@@ -39,6 +39,12 @@ public final class BlockChat extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return (info.getEffected() != null) && info.getEffected().isPlayer();
+	}
+	
 	@Override
 	public L2EffectType getEffectType()
 	{
@@ -52,14 +58,8 @@ public final class BlockChat extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if ((info.getEffected() == null) || !info.getEffected().isPlayer())
-		{
-			return false;
-		}
-		
 		PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, info.getEffected().getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true));
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java
index 3b6e33cdd2..175451e5b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java
@@ -38,6 +38,12 @@ public final class BlockParty extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return (info.getEffected() != null) && info.getEffected().isPlayer();
+	}
+	
 	@Override
 	public void onExit(BuffInfo info)
 	{
@@ -45,14 +51,8 @@ public final class BlockParty extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if ((info.getEffected() == null) || !info.getEffected().isPlayer())
-		{
-			return false;
-		}
-		
 		PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, info.getEffected().getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true));
-		return true;
 	}
 }
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 dc5d0b46ba..4cc6eb18fe 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
@@ -56,16 +56,15 @@ public final class Bluff extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if ((info.getEffected() instanceof L2NpcInstance) || ((info.getEffected().isNpc()) && (info.getEffected().getId() == 35062)) || (info.getEffected() instanceof L2SiegeSummonInstance))
+		if ((info.getEffected() instanceof L2NpcInstance) || (info.getEffected().isNpc() && (info.getEffected().getId() == 35062)) || (info.getEffected() instanceof L2SiegeSummonInstance))
 		{
-			return false;
+			return;
 		}
 		
 		info.getEffected().broadcastPacket(new StartRotation(info.getEffected().getObjectId(), info.getEffected().getHeading(), 1, 65535));
 		info.getEffected().broadcastPacket(new StopRotation(info.getEffected().getObjectId(), info.getEffector().getHeading(), 65535));
 		info.getEffected().setHeading(info.getEffector().getHeading());
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallParty.java
index 94927ecd16..0815527a5b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallParty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallParty.java
@@ -42,22 +42,22 @@ public final class CallParty extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if (info.getEffector().isInParty())
+		if (!info.getEffector().isInParty())
 		{
-			for (L2PcInstance partyMember : info.getEffector().getParty().getMembers())
+			return;
+		}
+		
+		for (L2PcInstance partyMember : info.getEffector().getParty().getMembers())
+		{
+			if (CallPc.checkSummonTargetStatus(partyMember, info.getEffector().getActingPlayer()))
 			{
-				if (CallPc.checkSummonTargetStatus(partyMember, info.getEffector().getActingPlayer()))
+				if (info.getEffector() != partyMember)
 				{
-					if (info.getEffector() != partyMember)
-					{
-						partyMember.teleToLocation(info.getEffector().getLocation(), true);
-					}
+					partyMember.teleToLocation(info.getEffector().getLocation(), true);
 				}
 			}
-			return true;
 		}
-		return false;
 	}
 }
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 03454b6013..3b01e5160b 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
@@ -57,11 +57,11 @@ public final class CallPc extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected() == info.getEffector())
 		{
-			return false;
+			return;
 		}
 		
 		L2PcInstance target = info.getEffected().getActingPlayer();
@@ -75,7 +75,7 @@ public final class CallPc extends AbstractEffect
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_REQUIRED_FOR_SUMMONING);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return false;
+					return;
 				}
 				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, activeChar, target);
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
@@ -90,9 +90,7 @@ public final class CallPc extends AbstractEffect
 			confirm.addTime(30000);
 			confirm.addRequesterId(activeChar.getObjectId());
 			target.sendPacket(confirm);
-			return true;
 		}
-		return false;
 	}
 	
 	public static boolean checkSummonTargetStatus(L2PcInstance target, L2PcInstance activeChar)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
index a146709943..33341b206b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java
@@ -77,7 +77,7 @@ public final class ChameleonRest extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayer())
 		{
@@ -87,6 +87,5 @@ public final class ChameleonRest extends AbstractEffect
 		{
 			info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_REST);
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java
index 0981981a30..befcf37c85 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java
@@ -52,10 +52,9 @@ public final class ChanceSkillTrigger extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().addChanceTrigger(this);
 		info.getEffected().onStartChanceEffect(info.getSkill().getElement());
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
index 81983abc5f..f1981e1ffd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
@@ -42,16 +42,15 @@ public final class ChangeFace extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isPlayer() || info.getEffected().isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		player.getAppearance().setFace((int) getValue());
 		player.broadcastUserInfo();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
index 9c5ec2d6a8..a9bec2f9ec 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
@@ -42,16 +42,15 @@ public final class ChangeHairColor extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isPlayer() || info.getEffected().isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		player.getAppearance().setHairColor((int) getValue());
 		player.broadcastUserInfo();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java
index 1d6604b751..388771dfa8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java
@@ -42,16 +42,15 @@ public final class ChangeHairStyle extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isPlayer() || info.getEffected().isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		player.getAppearance().setHairStyle((int) getValue());
 		player.broadcastUserInfo();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfCourage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfCourage.java
index 01481b2b51..3a12745437 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfCourage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfCourage.java
@@ -37,6 +37,12 @@ public final class CharmOfCourage extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return info.getEffected().isPlayer();
+	}
+	
 	@Override
 	public int getEffectFlags()
 	{
@@ -59,13 +65,8 @@ public final class CharmOfCourage extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if (info.getEffected().isPlayer())
-		{
-			info.getEffected().broadcastPacket(new EtcStatusUpdate(info.getEffected().getActingPlayer()));
-			return true;
-		}
-		return false;
+		info.getEffected().broadcastPacket(new EtcStatusUpdate(info.getEffected().getActingPlayer()));
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfLuck.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfLuck.java
index 4db30aa249..d7231c93da 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfLuck.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CharmOfLuck.java
@@ -37,20 +37,20 @@ public final class CharmOfLuck extends AbstractEffect
 	}
 	
 	@Override
-	public int getEffectFlags()
+	public boolean canStart(BuffInfo info)
 	{
-		return EffectFlag.CHARM_OF_LUCK.getMask();
+		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
 	}
 	
 	@Override
-	public L2EffectType getEffectType()
+	public int getEffectFlags()
 	{
-		return L2EffectType.CHARM_OF_LUCK;
+		return EffectFlag.CHARM_OF_LUCK.getMask();
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public L2EffectType getEffectType()
 	{
-		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
+		return L2EffectType.CHARM_OF_LUCK;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java
index 4dcea57e0a..3129aeb5f3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java
@@ -52,7 +52,7 @@ public final class ClanGate extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().startAbnormalEffect(AbnormalVisualEffect.MAGIC_CIRCLE);
 		if (info.getEffected().isPlayer())
@@ -64,6 +64,5 @@ public final class ClanGate extends AbstractEffect
 				clan.broadcastToOtherOnlineMembers(msg, info.getEffected().getActingPlayer());
 			}
 		}
-		return true;
 	}
 }
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 e8f2ff27e8..954c9e878c 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
@@ -75,7 +75,7 @@ public final class Confuse extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_CONFUSED);
 		
@@ -98,6 +98,5 @@ public final class Confuse extends AbstractEffect
 			info.getEffected().setTarget(target);
 			info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 6b70ca60a0..843b3af124 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -42,13 +42,13 @@ public final class ConsumeBody extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffected().isNpc())
 		{
-			return false;
+			return;
 		}
+		
 		((L2Npc) info.getEffected()).endDecayTask();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java
index d605ff82b7..4d5b6871d5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java
@@ -49,23 +49,23 @@ public final class ConvertItem extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || info.getEffected().isAlikeDead() || !info.getEffected().isPlayer())
 		{
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffected().getActingPlayer();
 		if (player.isEnchanting())
 		{
-			return false;
+			return;
 		}
 		
 		final L2Weapon weaponItem = player.getActiveWeaponItem();
 		if (weaponItem == null)
 		{
-			return false;
+			return;
 		}
 		
 		L2ItemInstance wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
@@ -76,13 +76,13 @@ public final class ConvertItem extends AbstractEffect
 		
 		if ((wpn == null) || wpn.isAugmented() || (weaponItem.getChangeWeaponId() == 0))
 		{
-			return false;
+			return;
 		}
 		
 		final int newItemId = weaponItem.getChangeWeaponId();
 		if (newItemId == -1)
 		{
-			return false;
+			return;
 		}
 		
 		final int enchantLevel = wpn.getEnchantLevel();
@@ -97,7 +97,7 @@ public final class ConvertItem extends AbstractEffect
 		
 		if (unequiped.length <= 0)
 		{
-			return false;
+			return;
 		}
 		byte count = 0;
 		for (L2ItemInstance item : unequiped)
@@ -125,19 +125,19 @@ public final class ConvertItem extends AbstractEffect
 		
 		if (count == unequiped.length)
 		{
-			return false;
+			return;
 		}
 		
 		final L2ItemInstance destroyItem = player.getInventory().destroyItem("ChangeWeapon", wpn, player, null);
 		if (destroyItem == null)
 		{
-			return false;
+			return;
 		}
 		
 		final L2ItemInstance newItem = player.getInventory().addItem("ChangeWeapon", newItemId, 1, player, destroyItem);
 		if (newItem == null)
 		{
-			return false;
+			return;
 		}
 		
 		if ((elementals != null) && (elementals.getElement() != -1) && (elementals.getValue() != -1))
@@ -167,6 +167,5 @@ public final class ConvertItem extends AbstractEffect
 		player.sendPacket(u);
 		
 		player.broadcastUserInfo();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
index a3d6963392..5da3b06cce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
@@ -49,7 +49,7 @@ public final class CpDamPercent extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayer())
 		{
@@ -77,8 +77,6 @@ public final class CpDamPercent extends AbstractEffect
 			}
 			// Check if damage should be reflected
 			Formulas.calcDamageReflected(info.getEffector(), info.getEffected(), info.getSkill(), false);
-			return true;
 		}
-		return false;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index baede6c5ad..55e74a2537 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -51,12 +51,12 @@ public final class CpHeal extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		if ((target == null) || target.isDead() || target.isDoor())
 		{
-			return false;
+			return;
 		}
 		
 		double amount = getValue();
@@ -67,9 +67,9 @@ public final class CpHeal extends AbstractEffect
 		{
 			target.setCurrentCp(amount + target.getCurrentCp());
 		}
-		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED);
+		
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED);
 		sm.addNumber((int) amount);
 		target.sendPacket(sm);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index 7a930c93a6..70626d2166 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -51,12 +51,12 @@ public final class CpHealPercent extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		if ((target == null) || target.isDead() || target.isDoor())
 		{
-			return false;
+			return;
 		}
 		
 		double amount = 0;
@@ -70,9 +70,9 @@ public final class CpHealPercent extends AbstractEffect
 		{
 			target.setCurrentCp(amount + target.getCurrentCp());
 		}
-		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED);
+		
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED);
 		sm.addNumber((int) amount);
 		target.sendPacket(sm);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
index 29723184e7..f85058f7c1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
@@ -35,6 +35,12 @@ public final class CrystalGradeModify extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return info.getEffected().isPlayer();
+	}
+	
 	@Override
 	public void onExit(BuffInfo info)
 	{
@@ -46,14 +52,8 @@ public final class CrystalGradeModify extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		final L2PcInstance player = info.getEffected().getActingPlayer();
-		if (player != null)
-		{
-			player.setExpertisePenaltyBonus((int) getValue());
-			return true;
-		}
-		return false;
+		info.getEffected().getActingPlayer().setExpertisePenaltyBonus((int) getValue());
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java
index 8d08b7be8d..b06b97eb1c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java
@@ -18,20 +18,20 @@ public final class CubicMastery extends AbstractEffect
 	}
 	
 	@Override
-	public L2EffectType getEffectType()
+	public boolean canStart(BuffInfo info)
 	{
-		return L2EffectType.CUBIC_MASTERY;
+		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
 	}
 	
 	@Override
-	public boolean onActionTime(BuffInfo info)
+	public L2EffectType getEffectType()
 	{
-		return info.getSkill().isPassive();
+		return L2EffectType.CUBIC_MASTERY;
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public boolean onActionTime(BuffInfo info)
 	{
-		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
+		return info.getSkill().isPassive();
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
index e9078e4eeb..2e47f0aaf7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
@@ -53,14 +53,14 @@ public final class DeathLink extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		
 		if (activeChar.isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
@@ -102,6 +102,5 @@ public final class DeathLink extends AbstractEffect
 		{
 			activeChar.doDie(activeChar);
 		}
-		return true;
 	}
 }
\ No newline at end of file
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 eefa58e65c..a9046fc40c 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
@@ -92,7 +92,7 @@ public final class DefenceTrait extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		final CharStat charStat = info.getEffected().getStat();
 		synchronized (charStat.getDefenceTraits())
@@ -110,6 +110,5 @@ public final class DefenceTrait extends AbstractEffect
 				}
 			}
 		}
-		return true;
 	}
 }
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 cf1ee24892..34170cfcc5 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
@@ -60,17 +60,16 @@ public final class DeleteHate extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffected().isL2Attackable())
 		{
-			return false;
+			return;
 		}
 		
 		L2Attackable target = (L2Attackable) info.getEffected();
 		target.clearAggroList();
 		target.setWalking();
 		target.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
-		return true;
 	}
 }
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 e7380f1e6c..12e2fedc30 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
@@ -60,17 +60,16 @@ public final class DeleteHateOfMe extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffected().isL2Attackable())
 		{
-			return false;
+			return;
 		}
 		
 		L2Attackable target = (L2Attackable) info.getEffected();
 		target.stopHating(info.getEffector());
 		target.setWalking();
 		target.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Disarm.java
index 0b9aee96b4..db4318f002 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Disarm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Disarm.java
@@ -35,6 +35,12 @@ public final class Disarm extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return info.getEffected().isPlayer();
+	}
+	
 	@Override
 	public int getEffectFlags()
 	{
@@ -42,14 +48,8 @@ public final class Disarm extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if (!info.getEffected().isPlayer())
-		{
-			return false;
-		}
-		
 		info.getEffected().getActingPlayer().disarmWeapons();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java
index 37bb17869b..613414d37c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java
@@ -48,9 +48,8 @@ public final class DispelAll extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().stopAllEffects();
-		return true;
 	}
 }
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 3d9ee5d2e2..0672506bf1 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
@@ -58,11 +58,11 @@ public final class DispelByCategory extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isDead())
 		{
-			return false;
+			return;
 		}
 		
 		final List<BuffInfo> canceled = Formulas.calcCancelStealEffects(info.getEffector(), info.getEffected(), info.getSkill(), _slot, _rate, _max);
@@ -70,6 +70,5 @@ public final class DispelByCategory extends AbstractEffect
 		{
 			info.getEffected().getEffectList().stopSkillEffects(true, can.getSkill());
 		}
-		return true;
 	}
 }
\ No newline at end of file
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 5578e2400e..7043aaed46 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
@@ -74,11 +74,11 @@ public final class DispelBySlot extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (_dispelAbnormals.isEmpty())
 		{
-			return false;
+			return;
 		}
 		
 		final L2Character effected = info.getEffected();
@@ -109,6 +109,5 @@ public final class DispelBySlot extends AbstractEffect
 				effectList.stopSkillEffects(true, entry.getKey());
 			}
 		}
-		return true;
 	}
 }
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 5b9d806b69..31cdb73dab 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
@@ -77,11 +77,11 @@ public final class DispelBySlotProbability extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (_dispelAbnormals.isEmpty())
 		{
-			return false;
+			return;
 		}
 		
 		final L2Character effected = info.getEffected();
@@ -114,6 +114,5 @@ public final class DispelBySlotProbability extends AbstractEffect
 				}
 			}
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java
index c9dd956c26..a40aebe051 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java
@@ -43,11 +43,11 @@ public final class EnemyCharge extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isMovementDisabled())
 		{
-			return false;
+			return;
 		}
 		
 		// Get current position of the L2Character
@@ -63,7 +63,7 @@ public final class EnemyCharge extends AbstractEffect
 		if (distance > 2000)
 		{
 			_log.info("EffectEnemyCharge was going to use invalid coordinates for characters, getEffector: " + curX + "," + curY + " and getEffected: " + info.getEffected().getX() + "," + info.getEffected().getY());
-			return false;
+			return;
 		}
 		int offset = Math.max((int) distance - info.getSkill().getFlyRadius(), 30);
 		
@@ -81,7 +81,7 @@ public final class EnemyCharge extends AbstractEffect
 		// If no distance
 		if ((distance < 1) || ((distance - offset) <= 0))
 		{
-			return false;
+			return;
 		}
 		
 		// Calculate movement angles needed
@@ -104,7 +104,5 @@ public final class EnemyCharge extends AbstractEffect
 		// maybe is need force set X,Y,Z
 		info.getEffector().setXYZ(x, y, z);
 		info.getEffector().broadcastPacket(new ValidateLocation(info.getEffector()));
-		
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java
index 046a622509..3103b67a81 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java
@@ -59,13 +59,13 @@ public final class EnergyAttack extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		if (activeChar.isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		boolean ss = info.getSkill().isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS);
@@ -102,6 +102,5 @@ public final class EnergyAttack extends AbstractEffect
 		{
 			activeChar.sendPacket(SystemMessageId.ATTACK_FAILED);
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java
index f5c9495749..bbd6e72a68 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java
@@ -35,14 +35,14 @@ public final class EnlargeAbnormalSlot extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onActionTime(BuffInfo info)
+	public boolean canStart(BuffInfo info)
 	{
-		return info.getSkill().isPassive();
+		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public boolean onActionTime(BuffInfo info)
 	{
-		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
+		return info.getSkill().isPassive();
 	}
 }
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 ffa47ab639..eeef75b455 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
@@ -53,15 +53,15 @@ public final class Escape extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (_escapeType == null)
 		{
-			return false;
+			return;
 		}
+		
 		info.getEffected().teleToLocation(MapRegionManager.getInstance().getTeleToLocation(info.getEffected(), _escapeType), true);
 		info.getEffected().getActingPlayer().setIsIn7sDungeon(false);
 		info.getEffected().setInstanceId(0);
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
index 7af1c88aea..03e63f09f0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
@@ -81,9 +81,8 @@ public final class FakeDeath extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().startFakeDeath();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java
index f45aec585c..a9a9bad40a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java
@@ -59,14 +59,14 @@ public final class FatalBlow extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		
 		if (activeChar.isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		boolean ss = info.getSkill().useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS);
@@ -98,6 +98,5 @@ public final class FatalBlow extends AbstractEffect
 		
 		// Check if damage should be reflected
 		Formulas.calcDamageReflected(activeChar, target, info.getSkill(), true);
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fear.java
index 279cf944ef..56b0b81b66 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fear.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fear.java
@@ -48,6 +48,16 @@ public final class Fear extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		if ((info.getEffected() instanceof L2NpcInstance) || (info.getEffected() instanceof L2DefenderInstance) || (info.getEffected() instanceof L2FortCommanderInstance) || (info.getEffected() instanceof L2SiegeFlagInstance) || (info.getEffected() instanceof L2SiegeSummonInstance))
+		{
+			return false;
+		}
+		return !info.getEffected().isAfraid();
+	}
+	
 	@Override
 	public int getEffectFlags()
 	{
@@ -99,18 +109,8 @@ public final class Fear extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if ((info.getEffected() instanceof L2NpcInstance) || (info.getEffected() instanceof L2DefenderInstance) || (info.getEffected() instanceof L2FortCommanderInstance) || (info.getEffected() instanceof L2SiegeFlagInstance) || (info.getEffected() instanceof L2SiegeSummonInstance))
-		{
-			return false;
-		}
-		
-		if (info.getEffected().isAfraid())
-		{
-			return false;
-		}
-		
 		if (info.getEffected().isCastingNow() && info.getEffected().canAbortCast())
 		{
 			info.getEffected().abortCast();
@@ -118,6 +118,5 @@ public final class Fear extends AbstractEffect
 		
 		info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
 		onActionTime(info);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Flag.java
index 3ad1485c70..c934dcf462 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Flag.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Flag.java
@@ -34,6 +34,12 @@ public final class Flag extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return (info.getEffected() != null) && info.getEffected().isPlayer();
+	}
+	
 	@Override
 	public void onExit(BuffInfo info)
 	{
@@ -41,15 +47,8 @@ public final class Flag extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if ((info.getEffected() == null) || !info.getEffected().isPlayer())
-		{
-			return false;
-		}
-		
 		info.getEffected().updatePvPFlag(1);
-		
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java
index 00d8c5aeed..8bab0add49 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java
@@ -41,13 +41,13 @@ public final class FocusEnergy extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffected().isPlayer())
 		{
-			return false;
+			return;
 		}
+		
 		info.getEffected().getActingPlayer().increaseCharges(1, (int) getValue());
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java
index c3c946d63b..b537307c1d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java
@@ -42,7 +42,7 @@ public final class FocusMaxEnergy extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayer())
 		{
@@ -53,9 +53,7 @@ public final class FocusMaxEnergy extends AbstractEffect
 			{
 				int count = maxCharge - info.getEffected().getActingPlayer().getCharges();
 				info.getEffected().getActingPlayer().increaseCharges(count, maxCharge);
-				return true;
 			}
 		}
-		return false;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java
index c5e4506260..e02326226e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java
@@ -44,11 +44,11 @@ public final class FocusSouls extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffected().isPlayer() || info.getEffected().isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		final L2PcInstance target = info.getEffected().getActingPlayer();
@@ -64,9 +64,7 @@ public final class FocusSouls extends AbstractEffect
 			else
 			{
 				target.sendPacket(SystemMessageId.SOUL_CANNOT_BE_INCREASED_ANYMORE);
-				return false;
 			}
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 6b3aecf8d2..5fd7f4bcf3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -50,15 +50,14 @@ public final class GetAgro extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected() instanceof L2NpcInstance)
 		{
-			return false;
+			return;
 		}
 		
 		CtrlIntention intention = (info.getEffected().isInCombat() || info.getEffected().isL2Attackable()) ? CtrlIntention.AI_INTENTION_ATTACK : CtrlIntention.AI_INTENTION_FOLLOW;
 		info.getEffected().getAI().setIntention(intention, info.getEffector());
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
index 8e81627d75..2209696bd6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
@@ -41,14 +41,13 @@ public final class GiveSp extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isPlayer() || info.getEffected().isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		info.getEffector().getActingPlayer().addExpAndSp(0, (int) getValue());
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Grow.java
index a2c1d4dd93..f200908e1e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Grow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Grow.java
@@ -57,7 +57,7 @@ public final class Grow extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isNpc())
 		{
@@ -67,8 +67,6 @@ public final class Grow extends AbstractEffect
 			npc.setCollisionRadius((npc.getCollisionRadius() * 1.19));
 			
 			info.getEffected().startAbnormalEffect(AbnormalVisualEffect.GROW);
-			return true;
 		}
-		return false;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java
index 3b9e215b17..0fdcb0f95a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java
@@ -78,18 +78,18 @@ public final class Harvesting extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isNpc() || !info.getEffected().isDead())
 		{
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		final L2Object[] targets = info.getSkill().getTargetList(player, false, info.getEffected());
 		if ((targets == null) || (targets.length == 0))
 		{
-			return false;
+			return;
 		}
 		
 		L2MonsterInstance monster;
@@ -162,7 +162,6 @@ public final class Harvesting extends AbstractEffect
 							{
 								player.sendPacket(new ItemList(player, false));
 							}
-							return true;
 						}
 					}
 				}
@@ -176,6 +175,5 @@ public final class Harvesting extends AbstractEffect
 				player.sendPacket(SystemMessageId.THE_HARVEST_FAILED_BECAUSE_THE_SEED_WAS_NOT_SOWN);
 			}
 		}
-		return false;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
index f5cde769fc..27b7792182 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
@@ -56,13 +56,13 @@ public final class Heal extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		if ((target == null) || target.isDead() || target.isDoor())
 		{
-			return false;
+			return;
 		}
 		
 		double amount = getValue();
@@ -136,6 +136,5 @@ public final class Heal extends AbstractEffect
 				}
 			}
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
index e944fc5af9..df92c63ef1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
@@ -65,12 +65,11 @@ public final class HealOverTime extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayer() && (getTicks() > 0))
 		{
 			info.getEffected().sendPacket(new ExRegMax(getValue(), info.getAbnormalTime(), info.getAbnormalTime() / getTicks()));
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
index 8eb08897cc..46e78d9e10 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
@@ -51,12 +51,12 @@ public final class HealPercent extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		if ((target == null) || target.isDead() || target.isDoor())
 		{
-			return false;
+			return;
 		}
 		
 		double amount = 0;
@@ -82,6 +82,5 @@ public final class HealPercent extends AbstractEffect
 		}
 		sm.addNumber((int) amount);
 		target.sendPacket(sm);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Hide.java
index c61cd4b78f..81eba7eb1c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Hide.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Hide.java
@@ -55,7 +55,7 @@ public final class Hide extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayer())
 		{
@@ -91,6 +91,5 @@ public final class Hide extends AbstractEffect
 				}
 			}
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HolythingPossess.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HolythingPossess.java
index 2b207a2b27..42cb3ecf46 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HolythingPossess.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HolythingPossess.java
@@ -45,16 +45,15 @@ public final class HolythingPossess extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffector().isPlayer())
 		{
-			return false;
+			return;
 		}
 		
 		Castle castle = CastleManager.getInstance().getCastle(info.getEffector());
 		castle.engrave(info.getEffector().getActingPlayer().getClan(), info.getEffected());
 		castle.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.OPPONENT_STARTED_ENGRAVING), false);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java
index ae27c3d722..de0fe255f9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java
@@ -50,12 +50,13 @@ public final class HpByLevel extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffector() == null)
 		{
-			return false;
+			return;
 		}
+		
 		// Calculation
 		final int abs = (int) getValue();
 		final double absorb = ((info.getEffector().getCurrentHp() + abs) > info.getEffector().getMaxHp() ? info.getEffector().getMaxHp() : (info.getEffector().getCurrentHp() + abs));
@@ -65,6 +66,5 @@ public final class HpByLevel extends AbstractEffect
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_RESTORED);
 		sm.addNumber(restored);
 		info.getEffector().sendPacket(sm);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
index 45e5365cbf..d1ada140ce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
@@ -51,7 +51,7 @@ public final class HpDrain extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
@@ -59,7 +59,7 @@ public final class HpDrain extends AbstractEffect
 		// TODO: Unhardcode Cubic Skill to avoid double damage
 		if (activeChar.isAlikeDead() || (info.getSkill().getId() == 4050))
 		{
-			return false;
+			return;
 		}
 		
 		boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
@@ -101,6 +101,5 @@ public final class HpDrain extends AbstractEffect
 			target.reduceCurrentHp(damage, activeChar, info.getSkill());
 			target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit);
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java
index d94927aa61..b27d9d2961 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java
@@ -47,9 +47,8 @@ public final class ImmobileBuff extends Buff
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().setIsImmobilized(true);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java
index 90e5ec1d16..b5a720b938 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java
@@ -49,13 +49,11 @@ public final class ImmobilePetBuff extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isSummon() && info.getEffector().isPlayer() && (((L2Summon) info.getEffected()).getOwner() == info.getEffector()))
 		{
 			info.getEffected().setIsImmobilized(true);
-			return true;
 		}
-		return false;
 	}
 }
\ No newline at end of file
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 532e342f17..545972d518 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
@@ -57,18 +57,18 @@ public final class Lethal extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		if (activeChar.isPlayer() && !activeChar.getAccessLevel().canGiveDamage())
 		{
-			return false;
+			return;
 		}
 		
 		if (!target.isLethalable() || target.isInvul())
 		{
-			return false;
+			return;
 		}
 		
 		double levelBonus = Formulas.calcLvlBonusMod(activeChar, target, info.getSkill());
@@ -109,6 +109,5 @@ public final class Lethal extends AbstractEffect
 			}
 			activeChar.sendPacket(SystemMessageId.HALF_KILL);
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lucky.java
index 2ac57ccad9..3522f4d942 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lucky.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lucky.java
@@ -36,20 +36,20 @@ public final class Lucky extends AbstractEffect
 	}
 	
 	@Override
-	public L2EffectType getEffectType()
+	public boolean canStart(BuffInfo info)
 	{
-		return L2EffectType.LUCKY;
+		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
 	}
 	
 	@Override
-	public boolean onActionTime(BuffInfo info)
+	public L2EffectType getEffectType()
 	{
-		return info.getSkill().isPassive();
+		return L2EffectType.LUCKY;
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public boolean onActionTime(BuffInfo info)
 	{
-		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
+		return info.getSkill().isPassive();
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
index 747540604f..2d5b3fc004 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
@@ -53,7 +53,7 @@ public final class MagicalAttack extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
@@ -61,7 +61,7 @@ public final class MagicalAttack extends AbstractEffect
 		// TODO: Unhardcode Cubic Skill to avoid double damage
 		if (activeChar.isAlikeDead() || (info.getSkill().getId() == 4049))
 		{
-			return false;
+			return;
 		}
 		
 		if (target.isPlayer() && target.getActingPlayer().isFakeDeath())
@@ -102,6 +102,5 @@ public final class MagicalAttack extends AbstractEffect
 		{
 			activeChar.doDie(activeChar);
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java
index 0335c16916..3450e11782 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java
@@ -64,14 +64,14 @@ public final class MagicalAttackMp extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		
 		if (activeChar.isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
@@ -101,6 +101,5 @@ public final class MagicalAttackMp extends AbstractEffect
 			sm2.addNumber((int) mp);
 			activeChar.sendPacket(sm2);
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
index 58cd2716e5..db47da189a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
@@ -53,14 +53,14 @@ public final class MagicalSoulAttack extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		
 		if (activeChar.isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		if (target.isPlayer() && target.getActingPlayer().isFakeDeath())
@@ -109,6 +109,5 @@ public final class MagicalSoulAttack extends AbstractEffect
 				activeChar.sendDamageMessage(target, damage, mcrit, false, false);
 			}
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 730415cf5e..308782d79a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -52,12 +52,12 @@ public final class ManaHeal extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		if ((target == null) || target.isDead() || target.isDoor())
 		{
-			return false;
+			return;
 		}
 		
 		double amount = getValue();
@@ -85,6 +85,5 @@ public final class ManaHeal extends AbstractEffect
 		}
 		sm.addNumber((int) amount);
 		target.sendPacket(sm);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
index 9d96a43df9..03f24c31b9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
@@ -52,12 +52,12 @@ public final class ManaHealByLevel extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		if ((target == null) || target.isDead() || target.isDoor() || target.isInvul())
 		{
-			return false;
+			return;
 		}
 		
 		double amount = getValue();
@@ -129,6 +129,5 @@ public final class ManaHealByLevel extends AbstractEffect
 		}
 		sm.addNumber((int) amount);
 		target.sendPacket(sm);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
index 1b9af84f27..4d80c35018 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
@@ -51,12 +51,12 @@ public final class ManaHealPercent extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		if ((target == null) || target.isDead() || target.isDoor())
 		{
-			return false;
+			return;
 		}
 		
 		double amount = 0;
@@ -82,6 +82,5 @@ public final class ManaHealPercent extends AbstractEffect
 		}
 		sm.addNumber((int) amount);
 		target.sendPacket(sm);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpByLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpByLevel.java
index 904fe8db70..da25320fa6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpByLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpByLevel.java
@@ -50,12 +50,13 @@ public final class MpByLevel extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null))
 		{
-			return false;
+			return;
 		}
+		
 		// Calculation
 		final int abs = (int) getValue();
 		final double absorb = ((info.getEffected().getCurrentMp() + abs) > info.getEffected().getMaxMp() ? info.getEffected().getMaxMp() : (info.getEffected().getCurrentMp() + abs));
@@ -65,6 +66,5 @@ public final class MpByLevel extends AbstractEffect
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MP_RESTORED);
 		sm.addNumber(restored);
 		info.getEffected().sendPacket(sm);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Mute.java
index 7984b8e946..1d3330fb41 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Mute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Mute.java
@@ -49,10 +49,9 @@ public final class Mute extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().abortCast();
 		info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_MUTED);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java
index f1f21495ec..081088b2ae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java
@@ -37,20 +37,20 @@ public final class NoblesseBless extends AbstractEffect
 	}
 	
 	@Override
-	public int getEffectFlags()
+	public boolean canStart(BuffInfo info)
 	{
-		return EffectFlag.NOBLESS_BLESSING.getMask();
+		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayable();
 	}
 	
 	@Override
-	public L2EffectType getEffectType()
+	public int getEffectFlags()
 	{
-		return L2EffectType.NOBLESSE_BLESSING;
+		return EffectFlag.NOBLESS_BLESSING.getMask();
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public L2EffectType getEffectType()
 	{
-		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayable();
+		return L2EffectType.NOBLESSE_BLESSING;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java
index 0e7e8756ba..43a216a7d4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java
@@ -44,20 +44,20 @@ public final class OpenCommonRecipeBook extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffector().isPlayer())
 		{
-			return false;
+			return;
 		}
 		
 		L2PcInstance player = info.getEffector().getActingPlayer();
 		if (player.getPrivateStoreType() != L2PcInstance.STORE_PRIVATE_NONE)
 		{
 			player.sendPacket(SystemMessageId.CANNOT_CREATED_WHILE_ENGAGED_IN_TRADING);
-			return false;
+			return;
 		}
+		
 		RecipeController.getInstance().requestBookOpen(player, false);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java
index 130622239b..d3e7df8752 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java
@@ -44,20 +44,20 @@ public final class OpenDwarfRecipeBook extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffector().isPlayer())
 		{
-			return false;
+			return;
 		}
 		
 		L2PcInstance player = info.getEffector().getActingPlayer();
 		if (player.getPrivateStoreType() != L2PcInstance.STORE_PRIVATE_NONE)
 		{
 			player.sendPacket(SystemMessageId.CANNOT_CREATED_WHILE_ENGAGED_IN_TRADING);
-			return false;
+			return;
 		}
+		
 		RecipeController.getInstance().requestBookOpen(player, true);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java
index a5d2efc547..79b1180fb0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java
@@ -61,11 +61,10 @@ public final class Paralyze extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().startAbnormalEffect(AbnormalVisualEffect.HOLD_1);
 		info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, info.getEffector());
 		info.getEffected().startParalyze();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Passive.java
index 3b538d8b74..38ba02cf6b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Passive.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Passive.java
@@ -43,11 +43,11 @@ public final class Passive extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffected().isL2Attackable())
 		{
-			return false;
+			return;
 		}
 		
 		L2Attackable target = (L2Attackable) info.getEffected();
@@ -55,6 +55,5 @@ public final class Passive extends AbstractEffect
 		target.abortCast();
 		target.disableAllSkills();
 		target.setIsImmobilized(true);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Petrification.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Petrification.java
index 06c9c92c0d..6af5170659 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Petrification.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Petrification.java
@@ -60,10 +60,9 @@ public final class Petrification extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().startAbnormalEffect(AbnormalVisualEffect.HOLD_2);
 		info.getEffected().startParalyze();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhoenixBless.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhoenixBless.java
index acf022d970..9a992333b2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhoenixBless.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhoenixBless.java
@@ -37,20 +37,20 @@ public final class PhoenixBless extends AbstractEffect
 	}
 	
 	@Override
-	public int getEffectFlags()
+	public boolean canStart(BuffInfo info)
 	{
-		return EffectFlag.PHOENIX_BLESSING.getMask();
+		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
 	}
 	
 	@Override
-	public L2EffectType getEffectType()
+	public int getEffectFlags()
 	{
-		return L2EffectType.PHOENIX_BLESSING;
+		return EffectFlag.PHOENIX_BLESSING.getMask();
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public L2EffectType getEffectType()
 	{
-		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
+		return L2EffectType.PHOENIX_BLESSING;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java
index 33a1469f9c..858656d746 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java
@@ -60,14 +60,14 @@ public final class PhysicalAttack extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		
 		if (activeChar.isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		if (((info.getSkill().getFlyRadius() > 0) || (info.getSkill().getFlyType() != null)) && activeChar.isMovementDisabled())
@@ -75,7 +75,7 @@ public final class PhysicalAttack extends AbstractEffect
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
 			sm.addSkillName(info.getSkill());
 			activeChar.sendPacket(sm);
-			return false;
+			return;
 		}
 		
 		if (target.isPlayer() && target.getActingPlayer().isFakeDeath())
@@ -118,6 +118,5 @@ public final class PhysicalAttack extends AbstractEffect
 		{
 			activeChar.doDie(activeChar);
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
index 251b302dc0..8e3aebec72 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
@@ -60,14 +60,14 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		
 		if (activeChar.isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		if (activeChar.isMovementDisabled())
@@ -75,7 +75,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
 			sm.addSkillName(info.getSkill());
 			activeChar.sendPacket(sm);
-			return false;
+			return;
 		}
 		
 		final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
@@ -103,6 +103,5 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		{
 			activeChar.sendPacket(SystemMessageId.ATTACK_FAILED);
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java
index f3f5bf9b12..ee46026ad4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java
@@ -49,9 +49,8 @@ public final class PhysicalAttackMute extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().startPhysicalAttackMuted();
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java
index 219c1ed68a..30464e37a6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java
@@ -50,9 +50,8 @@ public final class PhysicalMute extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_MUTED);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
index 2907ff2070..9788a611ed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
@@ -60,14 +60,14 @@ public final class PhysicalSoulAttack extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		
 		if (activeChar.isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		if (((info.getSkill().getFlyRadius() > 0) || (info.getSkill().getFlyType() != null)) && activeChar.isMovementDisabled())
@@ -75,7 +75,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
 			sm.addSkillName(info.getSkill());
 			activeChar.sendPacket(sm);
-			return false;
+			return;
 		}
 		
 		if (target.isPlayer() && target.getActingPlayer().isFakeDeath())
@@ -124,6 +124,5 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		{
 			activeChar.doDie(activeChar);
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java
index c96b0290e3..234d465504 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java
@@ -37,20 +37,20 @@ public final class ProtectionBlessing extends AbstractEffect
 	}
 	
 	@Override
-	public int getEffectFlags()
+	public boolean canStart(BuffInfo info)
 	{
-		return EffectFlag.PROTECTION_BLESSING.getMask();
+		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
 	}
 	
 	@Override
-	public L2EffectType getEffectType()
+	public int getEffectFlags()
 	{
-		return L2EffectType.PROTECTION_BLESSING;
+		return EffectFlag.PROTECTION_BLESSING.getMask();
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public L2EffectType getEffectType()
 	{
-		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
+		return L2EffectType.PROTECTION_BLESSING;
 	}
 }
\ No newline at end of file
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 1b12683df4..2fa3b359b6 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
@@ -56,11 +56,11 @@ public final class RandomizeHate extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffected() == null) || (info.getEffected() == info.getEffector()) || !info.getEffected().isL2Attackable())
 		{
-			return false;
+			return;
 		}
 		
 		L2Attackable effectedMob = (L2Attackable) info.getEffected();
@@ -81,7 +81,7 @@ public final class RandomizeHate extends AbstractEffect
 		// if there is no target, exit function
 		if (targetList.isEmpty())
 		{
-			return true;
+			return;
 		}
 		
 		// Choosing randomly a new target
@@ -89,7 +89,5 @@ public final class RandomizeHate extends AbstractEffect
 		final int hate = effectedMob.getHating(info.getEffector());
 		effectedMob.stopHating(info.getEffector());
 		effectedMob.addDamageHate(target, 0, hate);
-		
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java
index 5ec7cd25c0..df368d19c3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java
@@ -51,11 +51,11 @@ public final class RebalanceHP extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffector().isPlayer() || !info.getEffector().isInParty())
 		{
-			return false;
+			return;
 		}
 		
 		double fullHP = 0;
@@ -95,6 +95,5 @@ public final class RebalanceHP extends AbstractEffect
 			}
 			member.setCurrentHp(newHP);
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Recovery.java
index 278be80427..ae85b93d61 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Recovery.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Recovery.java
@@ -41,13 +41,11 @@ public final class Recovery extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayer())
 		{
 			info.getEffected().getActingPlayer().reduceDeathPenaltyBuffLevel();
-			return true;
 		}
-		return false;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
index 581b7d35e4..d33306aedb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
@@ -49,11 +49,10 @@ public final class RefuelAirship extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		final L2AirShipInstance ship = info.getEffector().getActingPlayer().getAirShip();
 		ship.setFuel(ship.getFuel() + (int) getValue());
 		ship.updateAbnormalEffect();
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
index d93fe47881..be74caa060 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
@@ -90,7 +90,7 @@ public final class Relax extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayer())
 		{
@@ -100,6 +100,5 @@ public final class Relax extends AbstractEffect
 		{
 			info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_REST);
 		}
-		return true;
 	}
 }
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 2f37d56529..65c9806c28 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
@@ -48,18 +48,18 @@ public final class Restoration extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffected() == null) || !info.getEffected().isPlayable())
 		{
-			return false;
+			return;
 		}
 		
 		if ((_itemId <= 0) || (_itemCount <= 0))
 		{
 			info.getEffected().sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
 			_log.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!");
-			return false;
+			return;
 		}
 		
 		if (info.getEffected().isPlayer())
@@ -71,6 +71,5 @@ public final class Restoration extends AbstractEffect
 			info.getEffected().getInventory().addItem("Skill", _itemId, _itemCount, info.getEffected().getActingPlayer(), info.getEffector());
 			info.getEffected().getActingPlayer().sendPacket(new PetItemList(info.getEffected().getInventory().getItems()));
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java
index 475e56ad3b..29c662c8a9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java
@@ -53,23 +53,23 @@ public final class RestorationRandom extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isPlayer())
 		{
-			return false;
+			return;
 		}
 		
 		final L2ExtractableSkill exSkill = info.getSkill().getExtractableSkill();
 		if (exSkill == null)
 		{
-			return false;
+			return;
 		}
 		
 		if (exSkill.getProductItems().isEmpty())
 		{
 			_log.warning("Extractable Skill with no data, probably wrong/empty table in Skill Id: " + info.getSkill().getId());
-			return false;
+			return;
 		}
 		
 		final double rndNum = 100 * Rnd.nextDouble();
@@ -101,7 +101,7 @@ public final class RestorationRandom extends AbstractEffect
 		if (creationList.isEmpty())
 		{
 			player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
-			return false;
+			return;
 		}
 		
 		for (ItemHolder item : creationList)
@@ -112,6 +112,5 @@ public final class RestorationRandom extends AbstractEffect
 			}
 			player.addItem("Extract", item.getId(), (long) (item.getCount() * Config.RATE_EXTRACTABLE), info.getEffector(), true);
 		}
-		return true;
 	}
 }
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 77f6352230..a2fba3a2a8 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
@@ -54,7 +54,7 @@ public final class Resurrection extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
@@ -71,6 +71,5 @@ public final class Resurrection extends AbstractEffect
 			DecayTaskManager.getInstance().cancelDecayTask(target);
 			target.doRevive(Formulas.calculateSkillResurrectRestorePercent(_power, activeChar));
 		}
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Root.java
index 424899c04f..e427c8121a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Root.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Root.java
@@ -59,10 +59,9 @@ public final class Root extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().stopMove(null);
 		info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_ROOTED);
-		return true;
 	}
 }
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 88ffc148e5..5797725169 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
@@ -48,19 +48,19 @@ public final class SetSkill extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffected() == null) || !info.getEffected().isPlayer())
 		{
-			return false;
+			return;
 		}
 		
 		final L2Skill skill = SkillTable.getInstance().getInfo(_skillId, _skillLvl);
 		if (skill == null)
 		{
-			return false;
+			return;
 		}
+		
 		info.getEffected().getActingPlayer().addSkill(skill, true);
-		return true;
 	}
 }
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 a67b01c3c3..25d0fc8a5e 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
@@ -50,14 +50,13 @@ public final class SkillTurning extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffected() == null) || (info.getEffected() == info.getEffector()) || info.getEffected().isRaid())
 		{
-			return false;
+			return;
 		}
 		
 		info.getEffected().breakCast();
-		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sleep.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sleep.java
index bcfe493b3c..dc6237e94f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sleep.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sleep.java
@@ -59,12 +59,11 @@ public final class Sleep extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().abortAttack();
 		info.getEffected().abortCast();
 		info.getEffected().stopMove(null);
 		info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_SLEEPING);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java
index f0ad527556..164a803609 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java
@@ -62,14 +62,14 @@ public final class SoulBlow extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character target = info.getEffected();
 		L2Character activeChar = info.getEffector();
 		
 		if (activeChar.isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		boolean ss = info.getSkill().useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS);
@@ -106,7 +106,5 @@ public final class SoulBlow extends AbstractEffect
 		}
 		// Check if damage should be reflected
 		Formulas.calcDamageReflected(activeChar, target, info.getSkill(), true);
-		
-		return true;
 	}
 }
\ No newline at end of file
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 6b7816b3ed..272a6c65b8 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
@@ -79,12 +79,11 @@ public final class SoulEating extends AbstractEffect implements IExperienceRecei
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayer())
 		{
 			info.getEffected().getEvents().registerListener(this);
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java
index 873e8bbee1..a24c7f374e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Spoil.java
@@ -51,25 +51,24 @@ public final class Spoil extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (!info.getEffected().isMonster() || info.getEffected().isDead())
 		{
 			info.getEffector().sendPacket(SystemMessageId.INCORRECT_TARGET);
-			return false;
+			return;
 		}
 		
 		final L2MonsterInstance target = (L2MonsterInstance) info.getEffected();
 		if (target.isSpoil())
 		{
 			info.getEffector().sendPacket(SystemMessageId.ALREADY_SPOILED);
-			return false;
+			return;
 		}
 		
 		target.setSpoil(true);
 		target.setIsSpoiledBy(info.getEffector().getObjectId());
 		info.getEffector().sendPacket(SystemMessageId.SPOIL_SUCCESS);
 		target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, info.getEffector());
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
index c1d853bb4e..2d56a1ebcf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
@@ -48,11 +48,11 @@ public final class StaticDamage extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffector().isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		info.getEffected().reduceCurrentHp(getValue(), info.getEffector(), info.getSkill());
@@ -62,6 +62,5 @@ public final class StaticDamage extends AbstractEffect
 		{
 			info.getEffector().sendDamageMessage(info.getEffected(), (int) getValue(), false, false, false);
 		}
-		return true;
 	}
 }
\ No newline at end of file
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 bc9dd81bed..71fd7f6353 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
@@ -53,14 +53,14 @@ public final class StealAbnormal extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffected() != null) && info.getEffected().isPlayer() && (info.getEffector() != info.getEffected()))
 		{
 			final List<BuffInfo> toSteal = Formulas.calcCancelStealEffects(info.getEffector(), info.getEffected(), info.getSkill(), _slot, _rate, _max);
 			if (toSteal.isEmpty())
 			{
-				return false;
+				return;
 			}
 			
 			for (BuffInfo infoToSteal : toSteal)
@@ -84,7 +84,7 @@ public final class StealAbnormal extends AbstractEffect
 								effect.onStart(stolen);
 							}
 						}
-						else if (effect.onStart(stolen))
+						else if (effect.canStart(stolen))
 						{
 							stolen.addEffect(effect);
 						}
@@ -93,8 +93,6 @@ public final class StealAbnormal extends AbstractEffect
 				info.getEffected().getEffectList().remove(infoToSteal);
 				info.getEffector().getEffectList().add(stolen);
 			}
-			return true;
 		}
-		return false;
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Stun.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Stun.java
index fe96e6f62e..5cdf04f411 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Stun.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Stun.java
@@ -55,9 +55,8 @@ public final class Stun extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().startStunning();
-		return true;
 	}
 }
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 313f28f9f5..daafe6f08c 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
@@ -43,22 +43,21 @@ public final class SummonAgathion extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffected() == null) || !info.getEffected().isPlayer())
 		{
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffected().getActingPlayer();
 		if (player.isInOlympiadMode())
 		{
 			player.sendPacket(SystemMessageId.THIS_SKILL_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
-			return false;
+			return;
 		}
 		
 		player.setAgathionId((info.getSkill() == null) ? 0 : info.getSkill().getNpcId());
 		player.broadcastUserInfo();
-		return true;
 	}
 }
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 be3b10c857..6543c4a48e 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
@@ -65,23 +65,23 @@ public final class SummonCubic extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffected() == null) || !info.getEffected().isPlayer() || info.getEffected().isAlikeDead() || info.getEffected().getActingPlayer().inObserverMode())
 		{
-			return false;
+			return;
 		}
 		
 		if (_cubicId < 0)
 		{
 			_log.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + info.getSkill().getId());
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffected().getActingPlayer();
 		if (player.inObserverMode() || player.isMounted())
 		{
-			return false;
+			return;
 		}
 		
 		// Gnacik: TODO: Make better method of calculation.
@@ -132,6 +132,5 @@ public final class SummonCubic extends AbstractEffect
 		// Adding a new cubic.
 		player.addCubic(_cubicId, _cubicSkillLevel, _cubicPower, _cubicDelay, _cubicSkillChance, _cubicMaxCount, _cubicDuration, info.getEffected() != info.getEffector());
 		player.broadcastUserInfo();
-		return true;
 	}
 }
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 34582b3b21..b87dc1e0b9 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
@@ -63,30 +63,30 @@ public final class SummonNpc extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffected() == null) || !info.getEffected().isPlayer() || info.getEffected().isAlikeDead() || info.getEffected().getActingPlayer().inObserverMode())
 		{
-			return false;
+			return;
 		}
 		
 		if ((_npcId <= 0) || (_npcCount <= 0))
 		{
 			_log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + info.getSkill().getId());
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffected().getActingPlayer();
 		if (player.isMounted())
 		{
-			return false;
+			return;
 		}
 		
 		final L2NpcTemplate npcTemplate = NpcTable.getInstance().getTemplate(_npcId);
 		if (npcTemplate == null)
 		{
 			_log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + info.getSkill().getId());
-			return false;
+			return;
 		}
 		
 		switch (npcTemplate.getType())
@@ -142,7 +142,7 @@ public final class SummonNpc extends AbstractEffect
 				catch (Exception e)
 				{
 					_log.warning(SummonNpc.class.getSimpleName() + ": " + e.getMessage());
-					return false;
+					return;
 				}
 				
 				int x = player.getX();
@@ -170,6 +170,5 @@ public final class SummonNpc extends AbstractEffect
 				npc.setIsRunning(false); // TODO: Fix broadcast info.
 			}
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java
index 73d9335445..eb69f3d370 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java
@@ -60,44 +60,44 @@ public final class SummonPet extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isPlayer() || info.getEffected().isAlikeDead())
 		{
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		if (player.isInOlympiadMode())
 		{
 			player.sendPacket(SystemMessageId.THIS_SKILL_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
-			return false;
+			return;
 		}
 		
 		if ((player.hasSummon() || player.isMounted()))
 		{
 			player.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_PET);
-			return false;
+			return;
 		}
 		
 		final PetItemHolder holder = player.removeScript(PetItemHolder.class);
 		if (holder == null)
 		{
 			_log.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable());
-			return false;
+			return;
 		}
 		
 		final L2ItemInstance item = holder.getItem();
 		if (player.getInventory().getItemByObjectId(item.getObjectId()) != item)
 		{
 			_log.log(Level.WARNING, "Player: " + player + " is trying to summon pet from item that he doesn't owns.");
-			return false;
+			return;
 		}
 		
 		final L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(item.getId());
 		if ((petData == null) || (petData.getNpcId() == -1))
 		{
-			return false;
+			return;
 		}
 		
 		final L2NpcTemplate npcTemplate = NpcTable.getInstance().getTemplate(petData.getNpcId());
@@ -138,6 +138,5 @@ public final class SummonPet extends AbstractEffect
 		
 		pet.getOwner().sendPacket(new PetItemList(pet.getInventory().getItems()));
 		pet.broadcastStatusUpdate();
-		return true;
 	}
 }
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 e3817f0b3d..969a9545a2 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
@@ -51,24 +51,25 @@ public final class SummonTrap extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffected() == null) || !info.getEffected().isPlayer() || info.getEffected().isAlikeDead() || info.getEffected().getActingPlayer().inObserverMode())
 		{
-			return false;
+			return;
 		}
 		
 		if (_npcId <= 0)
 		{
 			_log.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + info.getSkill().getId());
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffected().getActingPlayer();
 		if (player.inObserverMode() || player.isMounted())
 		{
-			return false;
+			return;
 		}
+		
 		// Unsummon previous trap
 		if (player.getTrap() != null)
 		{
@@ -79,7 +80,7 @@ public final class SummonTrap extends AbstractEffect
 		if (npcTemplate == null)
 		{
 			_log.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + info.getSkill().getId());
-			return false;
+			return;
 		}
 		
 		final L2TrapInstance trap = new L2TrapInstance(IdFactory.getInstance().getNextId(), npcTemplate, player, _despawnTime);
@@ -89,6 +90,5 @@ public final class SummonTrap extends AbstractEffect
 		trap.setHeading(player.getHeading());
 		trap.spawnMe(player.getX(), player.getY(), player.getZ());
 		player.setTrap(trap);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java
index e2ef561f36..61ab094e12 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java
@@ -46,34 +46,34 @@ public final class Sweeper extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isL2Attackable())
 		{
-			return false;
+			return;
 		}
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		final L2Attackable monster = (L2Attackable) info.getEffected();
 		if (!monster.checkSpoilOwner(player, false))
 		{
-			return false;
+			return;
 		}
 		
 		if (monster.isOldCorpse(player, MAX_SWEEPER_TIME, false))
 		{
-			return false;
+			return;
 		}
 		
 		if (!player.getInventory().checkInventorySlotsAndWeight(monster.getSpoilLootItems(), false, false))
 		{
-			return false;
+			return;
 		}
 		
-		ItemHolder[] items = monster.takeSweep();
+		final ItemHolder[] items = monster.takeSweep();
 		if ((items == null) || (items.length == 0))
 		{
-			return false;
+			return;
 		}
 		
 		for (ItemHolder item : items)
@@ -87,6 +87,5 @@ public final class Sweeper extends AbstractEffect
 				player.addItem("Sweeper", item, info.getEffected(), true);
 			}
 		}
-		return true;
 	}
 }
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 c3522d1ba0..781b9b37ca 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
@@ -52,12 +52,11 @@ public final class TargetCancel extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().setTarget(null);
 		info.getEffected().abortAttack();
 		info.getEffected().abortCast();
 		info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, info.getEffector());
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java
index bd4cadff2d..b046438899 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java
@@ -47,13 +47,13 @@ public final class TargetMe extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayable())
 		{
 			if (info.getEffected() instanceof L2SiegeSummonInstance)
 			{
-				return false;
+				return;
 			}
 			
 			if (info.getEffected().getTarget() != info.getEffector())
@@ -66,13 +66,8 @@ public final class TargetMe extends AbstractEffect
 					info.getEffected().setTarget(info.getEffector());
 				}
 			}
+			
 			((L2Playable) info.getEffected()).setLockedTarget(info.getEffector());
-			return true;
-		}
-		else if (info.getEffected().isL2Attackable() && !info.getEffected().isRaid())
-		{
-			return true;
 		}
-		return false;
 	}
 }
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 57dec60b8b..433022e8c0 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
@@ -53,13 +53,13 @@ public final class TargetMeProbability extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayable())
 		{
 			if (info.getEffected() instanceof L2SiegeSummonInstance)
 			{
-				return false;
+				return;
 			}
 			
 			if (info.getEffected().getTarget() != info.getEffector())
@@ -72,12 +72,6 @@ public final class TargetMeProbability extends AbstractEffect
 					info.getEffected().setTarget(info.getEffector());
 				}
 			}
-			return true;
 		}
-		else if (info.getEffected().isL2Attackable() && !info.getEffected().isRaid())
-		{
-			return true;
-		}
-		return false;
 	}
 }
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 f78608454a..5d6a539a56 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
@@ -52,9 +52,8 @@ public final class Teleport extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		info.getEffected().teleToLocation(_loc, true);
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java
index e731b1c853..33a2fc91ce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java
@@ -57,13 +57,13 @@ public final class TeleportToTarget extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		L2Character activeChar = info.getEffector();
 		L2Character target = info.getEffected();
 		if (target == null)
 		{
-			return false;
+			return;
 		}
 		
 		int x = 0, y = 0, z = 0;
@@ -94,6 +94,5 @@ public final class TeleportToTarget extends AbstractEffect
 		activeChar.abortCast();
 		activeChar.setXYZ(loc.getX(), loc.getY(), loc.getZ());
 		activeChar.broadcastPacket(new ValidateLocation(activeChar));
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java
index 37be4f94d8..d58ff3cd06 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java
@@ -53,7 +53,7 @@ public final class ThrowUp extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		// Get current position of the L2Character
 		final int curX = info.getEffected().getX();
@@ -68,7 +68,7 @@ public final class ThrowUp extends AbstractEffect
 		if (distance > 2000)
 		{
 			_log.info("EffectThrow was going to use invalid coordinates for characters, getEffected: " + curX + "," + curY + " and getEffector: " + info.getEffector().getX() + "," + info.getEffector().getY());
-			return false;
+			return;
 		}
 		int offset = Math.min((int) distance + info.getSkill().getFlyRadius(), 1400);
 		
@@ -86,7 +86,7 @@ public final class ThrowUp extends AbstractEffect
 		// If no distance
 		if (distance < 1)
 		{
-			return false;
+			return;
 		}
 		
 		// Calculate movement angles needed
@@ -109,6 +109,5 @@ public final class ThrowUp extends AbstractEffect
 		// TODO: Review.
 		info.getEffected().setXYZ(x, y, z);
 		info.getEffected().broadcastPacket(new ValidateLocation(info.getEffected()));
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java
index 1d87dd569a..3ec7396377 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java
@@ -52,12 +52,11 @@ public final class TransferDamage extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		if (info.getEffected().isPlayable() && info.getEffector().isPlayer())
 		{
 			((L2Playable) info.getEffected()).setTransferDamageTo(info.getEffector().getActingPlayer());
 		}
-		return true;
 	}
 }
\ No newline at end of file
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 51e26b8348..f7fd451495 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
@@ -47,6 +47,12 @@ public final class TransferHate extends AbstractEffect
 		return Formulas.calcProbability(_chance, info.getEffector(), info.getEffected(), info.getSkill());
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return Util.checkIfInRange(info.getSkill().getEffectRange(), info.getEffector(), info.getEffected(), true);
+	}
+	
 	@Override
 	public boolean isInstant()
 	{
@@ -54,29 +60,24 @@ public final class TransferHate extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if (Util.checkIfInRange(info.getSkill().getEffectRange(), info.getEffector(), info.getEffected(), true))
+		for (L2Character obj : info.getEffector().getKnownList().getKnownCharactersInRadius(info.getSkill().getAffectRange()))
 		{
-			for (L2Character obj : info.getEffector().getKnownList().getKnownCharactersInRadius(info.getSkill().getAffectRange()))
+			if ((obj == null) || !obj.isL2Attackable() || obj.isDead())
+			{
+				continue;
+			}
+			
+			final L2Attackable hater = ((L2Attackable) obj);
+			final int hate = hater.getHating(info.getEffector());
+			if (hate <= 0)
 			{
-				if ((obj == null) || !obj.isL2Attackable() || obj.isDead())
-				{
-					continue;
-				}
-				
-				final L2Attackable hater = ((L2Attackable) obj);
-				final int hate = hater.getHating(info.getEffector());
-				if (hate <= 0)
-				{
-					continue;
-				}
-				
-				hater.reduceHate(info.getEffector(), -hate);
-				hater.addDamageHate(info.getEffected(), 0, hate);
+				continue;
 			}
-			return true;
+			
+			hater.reduceHate(info.getEffector(), -hate);
+			hater.addDamageHate(info.getEffected(), 0, hate);
 		}
-		return false;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
index bbfccfa3c6..a6d8a0af39 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java
@@ -35,6 +35,12 @@ public final class Transformation extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return info.getEffected().isPlayer();
+	}
+	
 	@Override
 	public void onExit(BuffInfo info)
 	{
@@ -42,12 +48,8 @@ public final class Transformation extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if (!info.getEffected().isPlayer())
-		{
-			return false;
-		}
-		return TransformData.getInstance().transformPlayer((int) getValue(), info.getEffected().getActingPlayer());
+		TransformData.getInstance().transformPlayer((int) getValue(), info.getEffected().getActingPlayer());
 	}
 }
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 c3721aa616..cf24febfaa 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
@@ -18,8 +18,6 @@
  */
 package handlers.effecthandlers;
 
-import java.util.logging.Logger;
-
 import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.handler.TargetHandler;
@@ -29,7 +27,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.events.listeners.IDamageReceivedEventListener;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -42,8 +39,6 @@ import com.l2jserver.util.Rnd;
  */
 public class TriggerSkillByDamage extends AbstractEffect implements IDamageReceivedEventListener
 {
-	private static final Logger _log = Logger.getLogger(TriggerSkillByDamage.class.getName());
-	
 	private final int _minAttackerLevel;
 	private final int _maxAttackerLevel;
 	private final int _minDamage;
@@ -64,15 +59,14 @@ public class TriggerSkillByDamage extends AbstractEffect implements IDamageRecei
 		_attackerType = getParameters().getEnum("attackerType", InstanceType.class, InstanceType.L2Character);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.NONE;
-	}
-	
 	@Override
 	public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit)
 	{
+		if ((_chance == 0) || (_skill.getSkillLvl() == 0))
+		{
+			return;
+		}
+		
 		final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType);
 		if (targetHandler == null)
 		{
@@ -115,23 +109,12 @@ public class TriggerSkillByDamage extends AbstractEffect implements IDamageRecei
 	@Override
 	public void onExit(BuffInfo info)
 	{
-		if ((_chance == 0) || (_skill.getSkillLvl() == 0))
-		{
-			return;
-		}
-		
 		info.getEffected().getEvents().unregisterListener(this);
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if ((_chance == 0) || (_skill.getSkillLvl() == 0))
-		{
-			return false;
-		}
-		
 		info.getEffected().getEvents().registerListener(this);
-		return true;
 	}
 }
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 69d4f60d29..8a70265a73 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
@@ -59,6 +59,12 @@ public final class Unsummon extends AbstractEffect
 		return false;
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return info.getEffected().isSummon();
+	}
+	
 	@Override
 	public boolean isInstant()
 	{
@@ -66,32 +72,22 @@ public final class Unsummon extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if (!info.getEffected().isSummon())
+		final L2Summon summon = info.getEffected().getSummon();
+		if (summon.isPhoenixBlessed() || summon.isNoblesseBlessed())
 		{
-			return false;
+			summon.stopEffects(L2EffectType.NOBLESSE_BLESSING);
 		}
-		
-		final L2PcInstance summonOwner = info.getEffected().getActingPlayer();
-		final L2Summon summon = info.getEffected().getSummon();
-		if (summon != null)
+		else
 		{
-			if (summon.isPhoenixBlessed() || summon.isNoblesseBlessed())
-			{
-				summon.stopEffects(L2EffectType.NOBLESSE_BLESSING);
-			}
-			else
-			{
-				summon.stopAllEffectsExceptThoseThatLastThroughDeath();
-			}
-			
-			summon.abortAttack();
-			summon.abortCast();
-			summon.unSummon(summonOwner);
-			summonOwner.sendPacket(SystemMessageId.YOUR_SERVITOR_HAS_VANISHED);
-			return true;
+			summon.stopAllEffectsExceptThoseThatLastThroughDeath();
 		}
-		return false;
+		
+		summon.abortAttack();
+		summon.abortCast();
+		final L2PcInstance summonOwner = info.getEffected().getActingPlayer();
+		summon.unSummon(summonOwner);
+		summonOwner.sendPacket(SystemMessageId.YOUR_SERVITOR_HAS_VANISHED);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java
index 46d0e7dc70..6467bcab0f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java
@@ -42,7 +42,7 @@ public final class UnsummonAgathion extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		if (player != null)
@@ -50,6 +50,5 @@ public final class UnsummonAgathion extends AbstractEffect
 			player.setAgathionId(0);
 			player.broadcastUserInfo();
 		}
-		return true;
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
index cd0fa0633d..d7ed49e105 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
@@ -35,6 +35,12 @@ public final class VitalityPointUp extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
+	@Override
+	public boolean canStart(BuffInfo info)
+	{
+		return (info.getEffected() != null) && info.getEffected().isPlayer();
+	}
+	
 	@Override
 	public boolean isInstant()
 	{
@@ -42,14 +48,9 @@ public final class VitalityPointUp extends AbstractEffect
 	}
 	
 	@Override
-	public boolean onStart(BuffInfo info)
+	public void onStart(BuffInfo info)
 	{
-		if ((info.getEffected() != null) && info.getEffected().isPlayer())
-		{
-			info.getEffected().getActingPlayer().updateVitalityPoints((float) getValue(), false, false);
-			info.getEffected().getActingPlayer().sendPacket(new UserInfo(info.getEffected().getActingPlayer()));
-			return true;
-		}
-		return false;
+		info.getEffected().getActingPlayer().updateVitalityPoints((float) getValue(), false, false);
+		info.getEffected().getActingPlayer().sendPacket(new UserInfo(info.getEffected().getActingPlayer()));
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
index ce9ded41b0..e47a707a77 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
@@ -96,7 +96,7 @@ public class EventItem implements IItemHandler
 				final int enemyTeam = holder.getPlayerTeam(pc);
 				if ((enemyTeam != -1) && (enemyTeam != team))
 				{
-					sk.applyEffects(castor, null, pc, null, false, false);
+					sk.applyEffects(castor, pc);
 				}
 			}
 			return true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java
index c0c6fc5b01..62b779eecc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java
@@ -63,11 +63,11 @@ public class Dummy implements ISkillHandler
 					{
 						if (Formulas.calcBuffDebuffReflection(target, skill))
 						{
-							skill.applyEffects(target, null, activeChar, null, false, false);
+							skill.applyEffects(target, activeChar);
 						}
 						else
 						{
-							skill.applyEffects(activeChar, null, target, null, false, false);
+							skill.applyEffects(activeChar, target);
 						}
 					}
 				}
@@ -82,7 +82,7 @@ public class Dummy implements ISkillHandler
 			{
 				activeChar.stopSkillEffects(true, skill.getId());
 			}
-			skill.applyEffects(activeChar, null, activeChar, null, true, false);
+			skill.applyEffects(activeChar, activeChar);
 		}
 		
 		if (skill.useSpiritShot())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
index de5851c6d8..b5838414aa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
@@ -173,7 +173,7 @@ public class Wedding implements IVoicedCommandHandler
 				final L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
 				if (!activeChar.isAffectedBySkill(skillId))
 				{
-					skill.applyEffects(activeChar, null, activeChar, null, false, false);
+					skill.applyEffects(activeChar, activeChar);
 				}
 			}
 			return false;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index 7e43f3c941..c1a2fb80fa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -2104,7 +2104,7 @@ public class CrystalCaverns extends Quest
 				{
 					teleportPlayer(player, new Location(144653, 152606, -12126), world.getInstanceId());
 					player.stopSkillEffects(true, 5239);
-					SkillTable.getInstance().getInfo(5239, 1).applyEffects(player, null, player, null, false, false);
+					SkillTable.getInstance().getInfo(5239, 1).applyEffects(player, player);
 					startQuestTimer("Timer2", 300000, npc, player);
 				}
 			}
@@ -2537,14 +2537,14 @@ public class CrystalCaverns extends Quest
 						{
 							if (partyMember.getInstanceId() == world.getInstanceId())
 							{
-								SkillTable.getInstance().getInfo(5239, 1).applyEffects(partyMember, null, partyMember, null, false, false);
+								SkillTable.getInstance().getInfo(5239, 1).applyEffects(partyMember, partyMember);
 								startQuestTimer("Timer2", 300000, npc, partyMember);
 							}
 						}
 					}
 					else
 					{
-						SkillTable.getInstance().getInfo(5239, 1).applyEffects(player, null, player, null, false, false);
+						SkillTable.getInstance().getInfo(5239, 1).applyEffects(player, player);
 						startQuestTimer("Timer2", 300000, npc, player);
 					}
 					startQuestTimer("Timer21", 300000, npc, null);
@@ -2763,7 +2763,7 @@ public class CrystalCaverns extends Quest
 								if (partyMember.getInstanceId() == world.getInstanceId())
 								{
 									partyMember.stopSkillEffects(true, 5239);
-									SkillTable.getInstance().getInfo(5239, 2).applyEffects(partyMember, null, partyMember, null, false, false);
+									SkillTable.getInstance().getInfo(5239, 2).applyEffects(partyMember, partyMember);
 									startQuestTimer("Timer3", 600000, npc, partyMember);
 								}
 							}
@@ -2771,7 +2771,7 @@ public class CrystalCaverns extends Quest
 						else
 						{
 							player.stopSkillEffects(true, 5239);
-							SkillTable.getInstance().getInfo(5239, 2).applyEffects(player, null, player, null, false, false);
+							SkillTable.getInstance().getInfo(5239, 2).applyEffects(player, player);
 							startQuestTimer("Timer3", 600000, npc, player);
 						}
 						startQuestTimer("Timer31", 600000, npc, null);
@@ -2791,7 +2791,7 @@ public class CrystalCaverns extends Quest
 								if (partyMember.getInstanceId() == world.getInstanceId())
 								{
 									partyMember.stopSkillEffects(true, 5239);
-									SkillTable.getInstance().getInfo(5239, 4).applyEffects(partyMember, null, partyMember, null, false, false);
+									SkillTable.getInstance().getInfo(5239, 4).applyEffects(partyMember, partyMember);
 									startQuestTimer("Timer4", 1200000, npc, partyMember);
 								}
 							}
@@ -2799,7 +2799,7 @@ public class CrystalCaverns extends Quest
 						else
 						{
 							player.stopSkillEffects(true, 5239);
-							SkillTable.getInstance().getInfo(5239, 4).applyEffects(player, null, player, null, false, false);
+							SkillTable.getInstance().getInfo(5239, 4).applyEffects(player, player);
 							startQuestTimer("Timer4", 1200000, npc, player);
 						}
 						startQuestTimer("Timer41", 1200000, npc, null);
@@ -2819,7 +2819,7 @@ public class CrystalCaverns extends Quest
 								if (partyMember.getInstanceId() == world.getInstanceId())
 								{
 									partyMember.stopSkillEffects(true, 5239);
-									SkillTable.getInstance().getInfo(5239, 3).applyEffects(partyMember, null, partyMember, null, false, false);
+									SkillTable.getInstance().getInfo(5239, 3).applyEffects(partyMember, partyMember);
 									startQuestTimer("Timer5", 900000, npc, partyMember);
 								}
 							}
@@ -2827,7 +2827,7 @@ public class CrystalCaverns extends Quest
 						else
 						{
 							player.stopSkillEffects(true, 5239);
-							SkillTable.getInstance().getInfo(5239, 3).applyEffects(player, null, player, null, false, false);
+							SkillTable.getInstance().getInfo(5239, 3).applyEffects(player, player);
 							startQuestTimer("Timer5", 900000, npc, player);
 						}
 						startQuestTimer("Timer51", 900000, npc, null);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
index 4613f1d0f2..18e53fbc1d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
@@ -193,7 +193,7 @@ public class HellboundTown extends Quest
 			{
 				if (event.equalsIgnoreCase("rebuff") && !world.isAmaskariDead)
 				{
-					STONE.getSkill().applyEffects(npc, null, npc, null, false, false);
+					STONE.getSkill().applyEffects(npc, npc);
 				}
 				else if (event.equalsIgnoreCase("break_chains"))
 				{
@@ -238,7 +238,7 @@ public class HellboundTown extends Quest
 		{
 			((L2QuestGuardInstance) npc).setPassive(true);
 			((L2QuestGuardInstance) npc).setAutoAttackable(false);
-			STONE.getSkill().applyEffects(npc, null, npc, null, false, false);
+			STONE.getSkill().applyEffects(npc, npc);
 			startQuestTimer("rebuff", 357000, npc, null);
 		}
 		else if ((npc.getId() == TOWN_GUARD) || (npc.getId() == KEYMASTER))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 359734af50..53c11fb826 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -1693,7 +1693,7 @@ public class Kamaloka extends Quest
 							final L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLvl);
 							if (skill != null)
 							{
-								skill.applyEffects(world.boss, null, world.boss, null, false, false);
+								skill.applyEffects(world.boss, world.boss);
 							}
 						}
 					}
@@ -1734,7 +1734,7 @@ public class Kamaloka extends Quest
 							final L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLvl);
 							if (skill != null)
 							{
-								skill.applyEffects(world.boss, null, world.boss, null, false, false);
+								skill.applyEffects(world.boss, world.boss);
 							}
 						}
 					}
@@ -1757,7 +1757,7 @@ public class Kamaloka extends Quest
 						final L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLvl);
 						if (skill != null)
 						{
-							skill.applyEffects(world.boss, null, world.boss, null, false, false);
+							skill.applyEffects(world.boss, world.boss);
 						}
 					}
 				}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index b7e07c06ac..dc298479b9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -202,19 +202,19 @@ public class NornilsGarden extends Quest
 	{
 		if (skill1 != null)
 		{
-			skill1.applyEffects(ch, null, ch, null, false, false);
+			skill1.applyEffects(ch, ch);
 		}
 		if (skill2 != null)
 		{
-			skill2.applyEffects(ch, null, ch, null, false, false);
+			skill2.applyEffects(ch, ch);
 		}
 		if (skill3 != null)
 		{
-			skill3.applyEffects(ch, null, ch, null, false, false);
+			skill3.applyEffects(ch, ch);
 		}
 		if (skill4 != null)
 		{
-			skill4.applyEffects(ch, null, ch, null, false, false);
+			skill4.applyEffects(ch, ch);
 		}
 	}
 	
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
index a37bf2953a..b1b496ff02 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
@@ -217,7 +217,7 @@ public class eventmodRabbits extends Event
 				player.untransform();
 			}
 			
-			SkillTable.getInstance().getInfo(2428, 1).applyEffects(npc, null, player, null, false, false);
+			SkillTable.getInstance().getInfo(2428, 1).applyEffects(npc, player);
 			
 			return null;
 		}
@@ -270,7 +270,7 @@ public class eventmodRabbits extends Event
 		// So... Apply raid curse if player don't use skill on chest but attack it
 		if (_isactive && (npc.getId() == _npc_chest))
 		{
-			SkillTable.getInstance().getInfo(4515, 1).applyEffects(npc, null, attacker, null, false, false);
+			SkillTable.getInstance().getInfo(4515, 1).applyEffects(npc, attacker);
 		}
 		
 		return super.onAttack(npc, attacker, damage, isSummon);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
index 432cc913f7..655ad28098 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
@@ -413,7 +413,7 @@ public class eventmodRace extends Event
 		player.getEffectList().stopSkillEffects(true, AbnormalType.SPEED_UP);
 		player.stopSkillEffects(true, 268);
 		player.stopSkillEffects(true, 298); // Rabbit Spirit Totem
-		SkillTable.getInstance().getInfo(_skill, 1).applyEffects(player, null, player, null, false, false);
+		SkillTable.getInstance().getInfo(_skill, 1).applyEffects(player, player);
 	}
 	
 	private void sendMessage(L2PcInstance player, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 79806e0aee..8795dfd024 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -73,20 +73,20 @@ public class Q10273_GoodDayToFly extends Quest
 				break;
 			case "32557-09.html":
 				st.set("transform", "1");
-				AURA_BIRD_FALCON.getSkill().applyEffects(player, null, player, null, false, false);
+				AURA_BIRD_FALCON.getSkill().applyEffects(player, player);
 				break;
 			case "32557-10.html":
 				st.set("transform", "2");
-				AURA_BIRD_OWL.getSkill().applyEffects(player, null, player, null, false, false);
+				AURA_BIRD_OWL.getSkill().applyEffects(player, player);
 				break;
 			case "32557-13.html":
 				switch (st.getInt("transform"))
 				{
 					case 1:
-						AURA_BIRD_FALCON.getSkill().applyEffects(player, null, player, null, false, false);
+						AURA_BIRD_FALCON.getSkill().applyEffects(player, player);
 						break;
 					case 2:
-						AURA_BIRD_OWL.getSkill().applyEffects(player, null, player, null, false, false);
+						AURA_BIRD_OWL.getSkill().applyEffects(player, player);
 						break;
 				}
 				break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index 3f263d9320..72b7f134ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -109,12 +109,12 @@ public class Q10275_ContainingTheAttributePower extends Quest
 				break;
 			case "32325-09.html":
 				st.setCond(5, true);
-				BLESSING_OF_FIRE.getSkill().applyEffects(player, null, player, null, false, false);
+				BLESSING_OF_FIRE.getSkill().applyEffects(player, player);
 				giveItems(player, YINSWORD, 1, Elementals.FIRE, 10);
 				break;
 			case "32326-09.html":
 				st.setCond(10, true);
-				BLESSING_OF_EARTH.getSkill().applyEffects(player, null, player, null, false, false);
+				BLESSING_OF_EARTH.getSkill().applyEffects(player, player);
 				giveItems(player, YANGSWORD, 1, Elementals.EARTH, 10);
 				break;
 		}
-- 
GitLab