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 96ca632ba277636b121bfabce417a187b1dc8cc7..5e3d6e1acc33bf948972aed776bed623a21a2c33 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 893615099490e0ec1c4ae3fc0c0543b80e297619..f0f826a7d6f600dae8e37414e4c309d3a018ce01 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 b3d4e32dbe2427887ef3c9c6973522be862359e3..e499252600a0647eb67a01fbc5de975d92f0ea6f 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 1943435bffbfaa549c2641eb2f01c71299127007..ef0d180eee664c05b574a7cc3d120a04557f5e5a 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 0dfc8e9702965a54ca26586b5e746f726c11e0ed..fc4290d2f26c0f3aecae3465a20cf27ff6327a80 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 f67ff3f63ea663d011759dad35af78f30f02001a..613404e4a3c50626ab5348640d5f62ce353872db 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 efdc193f3a5c08b3dc17eba4c1fcb52842331bbf..66c6af5f4cfd0c9127abfa4cadea974b4cb94b33 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 fcf6b892929a35375f83ad496d5934e0a0053ced..3bcfc08f9db49a4455610fd442bcb314feadf097 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 25041926e436646c02d1c5aaac251b34e1f8d965..dc67ff13dafbf9b750ba4edbe56edd7c29095dff 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 b368fd62e23122a99f9c275a4a68ff5222ddb0d5..bb941c52228002ca6ddca734f3f9c4b9500272a7 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 86c0e5ebc35501abbe7144900bd574606fce7c04..069f5627123eb6cd83b0d3c14d2a2ed444f427c7 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 6db66f7230c10cdfb5ec5cbea56cb2893a526b80..11cef708e4550be4a594d94e8c6b5fce0d7d8c95 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 436a2512f96afd93cff12659e5ffade966aa4c5c..27add77ba902f13cf40d64c4fd62345d69a43b36 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 5c9a820882c40bed3f33330a8d3ca2ae66fe2874..c43751b4ce11e174ec3787f6a5c51e57b80f44a3 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 4e4c7adc6b08f4b349fadd87aa8e7a98a7213532..70a6fa9deb3f015dc7b073184bb3ac147f600e87 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 693087352920d7d88b9ad776cb794259afbfba49..7c8a507eaf80d0790bd8c31c3dffdc4e6b4686fd 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 3b6e33cdd204427800b27ca954ac643a86d46259..175451e5b887cf1349c67f09b7d8d4cae3d0ffc9 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 dc5d0b46baa20b25b6469012a5065afb9039385c..4cc6eb18feaadb819b390e3b7b10b74be9a42c3b 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 94927ecd1683940919889de4188f7942fa348078..0815527a5bf567e97fb0f7e0212375d6e32cf5e2 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 03454b60130798107fa1e9ffc8838f36037fae41..3b01e5160b913a08332a5be7b15385a1047c81ba 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 a146709943cf5cd87a09a08f0a7bea51cd1c99a3..33341b206b9b03d774e19fc8fd8c77dd2a9709be 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 0981981a30038a83ed64839b8048b770383e2d57..befcf37c85a1949e42c1d0a41f86c2ffda26ce76 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 81983abc5f0a544a5070f65d1113dea452f25082..f1981e1ffd766cd4bb84879b3841c9b25f6587ca 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 9c5ec2d6a8f6755aff0e7db134e1429ab31bcc52..a9bec2f9ec44adb110114c6432cf0c08786ccca7 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 1d6604b751d61ec624c46194131c3e5e6471f9d3..388771dfa87c1f75c5189587b0234b8150150266 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 01481b2b51239ec6cf70f134f7590a8ec5815e08..3a12745437eef27017f9427583a2404910189546 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 4db30aa249e9ee794c7bcc5886836b052f231108..d7231c93da6a298908cd1c5f3463aa02215bb216 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 4dcea57e0a2410b57156210cd37334d463f6997b..3129aeb5f3decf5b880475dbb14221acc756c4d8 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 e8f2ff27e83effd7b30b89fe5c416368eb164fd7..954c9e878c671c8e132d9061c35d5f707d79ba0c 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 6b70ca60a03d2d447d8da284d02f3da398616553..843b3af124feea54edfda4c8fe34958bb3e79c3e 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 d605ff82b734c39069beffeb8e5a32c6338cf872..4d5b6871d5bf015b6901fa200540a075d14fafc9 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 a3d696339209f67c02c4c26a8588400cfa871b4d..5da3b06cce1a6574bf9bc4403410cf6a882eea8f 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 baede6c5adb6685395de465951000ac020237b16..55e74a253768d315ec65de873ad845aa8802d066 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 7a930c93a6fcb8dc9881484ff8b4df9c592470f5..70626d21664d2103ecb7f1b2b49e706c5eb3ae44 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 29723184e766a16afd78f3a5061deb0887d15ee9..f85058f7c1a2bc04b58b80699db85315eb94c0a4 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 8d08b7be8d51c301602c8c52747127add304c270..b06b97eb1cc407dd5475f06cf7b6e6af96ef0068 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 e9078e4eeb0e5cc9e8184daa24b285358fb95df7..2e47f0aaf7f4cdacb8b55c555715e877fd0b2808 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 eefa58e65cd4ce0a28dbddb64e0a728f6b85aa30..a9046fc40c7ae54b397f6d1f3fd4fc74f82b0883 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 cf1ee248924d6808cfdcd88552d8b621c3682205..34170cfcc549d694cefcacb421115993c1046101 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 e7380f1e6c6d9d8ae38f1141ff3b551dd4e00956..12e2fedc30bd1408f50605d561563051480c3ca5 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 0b9aee96b4f59d04c01610933540544f91414686..db4318f002ae81e72e6099c05503e809210646e4 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 37bb17869bd963f1eb8a8cc76857c08107b298f6..613414d37cab3e6725664a04f1c27a331ed1e75c 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 3d9ee5d2e25c7890f90ca2c51179ff7a310933db..0672506bf170a1499b294bab72ef233af95a6e90 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 5578e2400e66c47007c86dad058aed0182bbb755..7043aaed46b45ddb900c78c2420906e97a06d5b7 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 5b9d806b69468c1ded97143501f976a1b17e6ade..31cdb73dab0a1d4ba0af7f90254196c425587e75 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 c9dd956c26be1aea3a5c65e024d8cda175db0a0d..a40aebe051837f4bb8bf2e129ee977c461dc6889 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 046a622509c3a487461e4a1fc56b1cff326cd75a..3103b67a819c3a19cbe6200a8d4f1e8362e9a06e 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 f5c9495749a7279b4d542da7521d94f600962147..bbd6e72a682231835a35d2425a6290a814c33408 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 ffa47ab6395e50751b1e2d8475fdf7aca66b788f..eeef75b455e488c4dd7615652a4a3a8d9912d95b 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 7af1c88aea699a10d2d97f362807a4d67fd0ed12..03e63f09f00d0593a10aa6aa10bce08a785e584e 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 f45aec585c5c7720a95f4af97fea14f6d60cf170..a9a9bad40a276ee11e52db49c0e3f05d8df476ac 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 279cf944ef19874e9dcc2a115489979a6d48f9dc..56b0b81b669ccad9202e03d93fd522186f4a361a 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 3ad1485c70cf841e842099a77f590b15c3287b97..c934dcf462a04fe95d9ca142a60fe098867508c7 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 00d8c5aeedf126384a483ffa796092bdf773991e..8bab0add49ddfbbd11a02864336e5a0c34c46fcd 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 c3c946d63beffcd5306f8d0866bb15a82de92489..b537307c1df234e8cdb2f70e9da739f051239c7d 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 c5e45062607b19f0ca77bcd5c8b26e4f83c83a70..e02326226ea58a3e9b32bfa6cc3de84e54d0655d 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 6b3aecf8d2c22f92ff312677c27353e3ecec10d5..5fd7f4bcf318574108f083af9b05620abef6df6a 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 8e81627d75b3ca8bfa2970d02cdd1933fab6d98b..2209696bd6c12e171e8827647a3d94209824fb48 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 a2c1d4dd936279b8960d1f7957838efdf666a10a..f200908e1e972fa4679e53875e6c6759036ca9cc 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 3b9e215b176ed1a666df2dc44c03dceb8546996f..0fdcb0f95a9d327ee0811c85966cf067c16740bf 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 f5cde769fc148c1fd7271e3b08a7b8780667eb02..27b7792182fa78d4042601edf9609addaef101b1 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 e944fc5af9ef746b454bb43853211c6582a21ce5..df92c63ef1d84f36d9bb5f02054ca8fe764f1a04 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 8eb08897ccf1b4a6fbe831c98d4031b28b89cdab..46e78d9e10a55007110338140cb4a7172bed1c10 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 c61cd4b78f08801e36b1e8895c191b144aa2d4f5..81eba7eb1cf4299a65fd3fdb8bbb046c2dd3fef7 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 2b207a2b276c1ed88f2e86d27ce8a24742c16a91..42cb3ecf46798205110e0f7c7136db7c8133cbd3 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 ae27c3d72292c77513cc47998af06f551aa486cc..de0fe255f932b7fd5e9853c5171d5d703c01c8eb 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 45e5365cbf483c3c6947b97c7cfa47785d87e88a..d1ada140cee47ca02793c1985fafab1acf2e8e36 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 d94927aa6174098a2ffa755769d6118b632aec2d..b27d9d296163d2c1eeec4a111201a487b0cbeabc 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 90e5ec1d1683110559671716705e66987163e2f5..b5a720b93822ef5dbe2753735d875c3c2301725a 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 532e342f17ab61187aba158bc4098f53d22b8a13..545972d5185f77e760b76dbb601d135cd38931d1 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 2ac57ccad9cd3030d2563d8498c99480031b0a26..3522f4d942fe56d1a496ed77d8d20cae0269c2c2 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 747540604f56df09a20c48072bca1a734c89a77b..2d5b3fc0046d5d94674fe8b3503d0f254022508d 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 0335c1691603b50ae41574dbbb028c509d7adf2b..3450e117829188670cbfeea51d970ce17bbd5e82 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 58cd2716e5e9933bec3130e42774ebb5119678c0..db47da189ae2d8de506c1b740b37a2f42ac247c6 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 730415cf5e19dede5173258d3ba3732b1160a99a..308782d79acd6dd8b7da6c887bcf7a2aca7e88a9 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 9d96a43df9db63a343be531bf6576d9d408f7a24..03f24c31b931b9b01c2784372aa7a64aadab829e 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 1b9af84f2722376f7652bcb8934851ab218a0001..4d80c3501846e375f53280c56db3bde97917b4b4 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 904fe8db70d4639f14afab8f21320848efdbf3f7..da25320fa6c71d83a319e8959af5e4f7d85a702b 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 7984b8e946b75f7a5f07a841f5c4846deab7b320..1d3330fb410d8ff52300340a8a275465b8bab5f8 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 f1f21495ec96fe1f2260b8149a97f7c0387f24f4..081088b2ae9a1facfde98a58c3749c08963c5b64 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 0e7e8756baf23c30b28a730a7341c919e1472a4d..43a216a7d4a250a81ba1baf0a2e9756e1333dd47 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 130622239bc443dfc6ab704dc48385bd64776292..d3e7df8752c68a142457eb4d94f825716f051807 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 a5d2efc5474b259de2ebe3e4694b7e01c4f5cfea..79b1180fb09b77dee50cc194ed5aa86c767e7ab6 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 3b538d8b74db01123f8b6e45a1e257d12f3bb0f8..38ba02cf6b38094cea201adfa9a8e072d820ae2d 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 06c9c92c0d6a0eb6ec8854b1873d1c50166529c3..6af51706590bd2bf153589e1d009373c2f7ebed5 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 acf022d970d141548dac062b44dfe193692bfd99..9a992333b2840875a9b1092ec52515275052205d 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 33a1469f9cb2af90f1b9c89cb9bd3cdd36d30afd..858656d7467444301d565a6f576e64596876c18a 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 251b302dc0664ca1b77ae8075a4efea13eddc10d..8e3aebec72467da0c3342dfd0a4b2a162b0c5f73 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 f3f5bf9b12c15e6b5895c81fdeb440c9bd945f37..ee46026ad4a931da4be1bae1f04640d8a8b6de6a 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 219c1ed68a0ea1168e6cdf4b882187f5cc31dea8..30464e37a667fbdba60dcc90fd001d943264e6fc 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 2907ff207054b7038e6165d620bae05f934f6e91..9788a611ed812ab9780c1fe2ae9f2ce9adbb013b 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 c96b0290e32e45ea97442d2b7a12fff8e2e7f605..234d465504ca086f567a72be386b8007a29a6784 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 1b12683df4da53b28756f03aa19c7faf5ce4d196..2fa3b359b6305ac7d3c2fe6bb27e28dfa57dfd1b 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 5ec7cd25c05c2bd4d6e42720056eec8b40c71b8e..df368d19c3bea2e0b1dff782a5a4cb30854bc64b 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 278be80427003650519be5b88f4e54c8c5a6ba80..ae85b93d614320f7ef45499a997881a5da2aeddf 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 581b7d35e47a0ce589d804e10cd35ed4afa0b44f..d33306aedb0e9fcf2962d57ae56eda41669fb4e2 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 d93fe478815fb9ac9d764ab400e09d4d943260a6..be74caa06087c10a1f340102eb2a9c6ed0b6b18d 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 2f37d56529a5dfa4f61d56062ca835e07411ef8c..65c9806c28b5f0336f9113f7a646710b467af0c4 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 475e56ad3bb7057023ac674937f3a96fa6921c68..29c662c8a961c9ea6cb9b2cb45bf85443ae0d90e 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 77f6352230c1618e4b8faea518a3ab8372626dfc..a2fba3a2a818a7125b361fc936d34f7534f5941d 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 424899c04ffe356420a0a00c53d8ab5310dbaf0f..e427c8121a68fa43e9d7acf914b615d2049ee8ba 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 88ffc148e5e5eeaa24916cb620d1d652358f6d46..57977251690347b0f8e152c73396c67c071b0898 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 a67b01c3c3e5b090b5efa66b5cde2bc3f36385d1..25d0fc8a5ef7246033ddc1bb219b97f8afa9bf73 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 bcfe493b3cbb61b4b7857cc68e18d8547993183d..dc6237e94f0570aaa9b28ef5ccf32c2241095fcf 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 f0ad527556bd5ff6c4551c2d7560cc8c1b757713..164a803609109a036b566fb7488f344a5a0096b6 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 6b7816b3ed7627277bb9b3b01518127c9070d96a..272a6c65b8e6b63e99a5cf0cd1e3a7841c43616f 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 873e8bbee1250aee95834f1c604a1ca52c4952e9..a24c7f374e8064008d5589abcf08fcedb1254fff 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 c1d853bb4e2921863dfd005879bbdea2e57ae65d..2d56a1ebcf6ce56c12ff1ce51604bef5ed53e238 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 bc9dd81bed9338fd564507530ebc2d54e5538ca9..71fd7f6353e94e9ba7490bca84e8bcf41e0c0ef7 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 fe96e6f62e82694f4ff17d278159018771f47a63..5cdf04f4116ccb3cf9a4301f9c7302c692fda985 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 313f28f9f5501a117068675123a34f5f424031df..daafe6f08c401c6054d50ba7cecbac92875ed6d2 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 be3b10c857f92a3f14d10003f6f2e6aba601ba24..6543c4a48e895fbb89d97123067b76ed37a2f46f 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 34582b3b21433d2f8a10c3cbce0c8279e2450b37..b87dc1e0b94f4b077386d1973f10da7742564175 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 73d9335445fca5e55cee5cad0d4a9e8cd3c7bb96..eb69f3d370256ffbf53ce4945d7c828cfc4a71a6 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 e3817f0b3da9851e18a4b86e4286ca1e038d35fb..969a9545a2eb5711145218dc3b602c9afbac62e4 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 e2ef561f36e7e5ca9281ec9f29caebb0d7ad553e..61ab094e120374afe6a321f02ecf6227926d12ef 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 c3522d1ba0d5fcaac6abd86ad97fba90f19b55be..781b9b37ca70ea3833171f07f1f57411d3c73d45 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 bd4cadff2d09ed87fd17bc13bb9d0f9b1be4610f..b046438899ccb31143ef7e9c2aa70be405ec0855 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 57dec60b8b1ed556b35803dccc01e0d75863b23b..433022e8c0c05177b2102671903eebd8665a9300 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 f78608454acc76e2714fb3a7d72e69f117538b31..5d6a539a5637020810b6b259939fb6d4d21d6e05 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 e731b1c853b057e3c648fcdb850bf83b443702e6..33a2fc91ceb36a12e02a9262708645d18185efc1 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 37be4f94d8ef6b9fb5dc28d76f158c9754a53589..d58ff3cd06db9f881a0f7abb75f079af53c3ef5c 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 1d87dd569a649106d9ccc333e27729c76aa2d1e8..3ec739637719dfaa4d3d055abb999fe48f96d44a 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 51e26b8348ff5b3180670aab67edc9296106629f..f7fd45149579e978a14ea59e43042b8522ba4baf 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 bbfccfa3c62afa383e578169b0cc9876a55fff5b..a6d8a0af3906c5ac6580ff66700014c3e39a47ee 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 c3721aa616da0c260511ac8c999aab853028858c..cf24febfaac63fa10ac5521d37156f313dae80d2 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 69d4f60d29f37dce190929b66d6b767ef2be6d0e..8a70265a73f827c6c084bfd37c6ea523b2ddde68 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 46d0e7dc70f0b25f4267cb0abc29f29d1b5c0345..6467bcab0fc23b88fb2d1f91bf2273e84862532d 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 cd0fa0633d05a7df7f6bbf1c205909a12d2cdc93..d7ed49e105f2e0f2f9c16cf99d724c68ce74f40e 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 ce9ded41b04f9850cdec1c713cb700d8ff8b0987..e47a707a772e1d70a0fe7c28b0371b889ac5d675 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 c0c6fc5b019b632fd8b1e7977b9ad077f488a98c..62b779eecc5703de3312d2c553f36498990b1a2f 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 de5851c6d87a669eac8a13a00c3eeb8545ace4df..b5838414aa903ac3a03a978f0952a25940aefbb2 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 7e43f3c941a5f8558589bb0bec81b18e0c48f800..c1a2fb80fae1fdf76889c5bb5cfc889fe1161335 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 4613f1d0f2ead4095211e0e48186ac4ddf717e65..18e53fbc1d0e743c2f28abc3cacb1a3e0e951954 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 359734af50aeba30ea5bed32f06b6dc0cbd31d92..53c11fb82675e0a34d224c9ee660482906928087 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 b7e07c06ac9b67c231e5607df733da9c36a56fe0..dc298479b94d4691d120a8612f555791b1c9eadf 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 a37bf2953ab74f95a9cf90861fd1c59ed243e7e5..b1b496ff02f4a5b972eb6513aed9fbb0b0584221 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 432cc913f77447c273b12e4a75e6112d75d2a94c..655ad280987eed9d0cfaa20903c0afea0da948b3 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 79806e0aeec8208482374e81dae4442053c50283..8795dfd0240caa04a2ab8fffe45e834ab793020c 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 3f263d9320ef178fea85169c2d81b9205eb67d63..72b7f134efeb254655ee3de2c4642f8fdcaaff0e 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;
 		}