diff --git a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
index 4cb90fe976f1117ecb2b184266e91047608e3419..e5b7679ad0b488ee04bb22f2bac52e9449f2b6c3 100644
--- a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Oct 15 19:54:03 UYST 2011
+#Sat Oct 15 19:54:02 UYST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -10,6 +10,7 @@ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
@@ -30,11 +31,24 @@ org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=no_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -47,9 +61,9 @@ org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
@@ -62,13 +76,13 @@ org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.ui.prefs b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.ui.prefs
index e410040d22577024a9deae2c2df45d02508fef32..3621f22178e95e5a1d1798cabc0d292b7716c2ef 100644
--- a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.ui.prefs
+++ b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.ui.prefs
@@ -1,5 +1,4 @@
-#Sat Oct 01 02:05:53 UYT 2011
-"=id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+#Sat Oct 01 02:05:14 UYT 2011
 cleanup.add_default_serial_version_id=true
 cleanup.add_generated_serial_version_id=false
 cleanup.add_missing_annotations=true
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
index f44438cd5ccccea224944ac4283660022061cffd..acd5640c2f1a7afc0be4d5af080af74a497c9f42 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
@@ -111,8 +111,7 @@ public class BeastFarm extends L2AttackableAIScript
 					else
 						return _skillSuccessNpcIdList.get(SKILL_CRYSTAL_SPICE);
 				}
-				else
-					return -1;
+				return -1;
 			}
 			else if (_growthLevel == 2 && Rnd.get(100) < TAME_CHANCE)
 				return _tameNpcId;
@@ -373,10 +372,8 @@ public class BeastFarm extends L2AttackableAIScript
 		{
 			return super.onSkillSee(npc, caster, skill, targets, isPet);
 		}
-		else
-		{
-			_FeedInfo.put(objectId, caster.getObjectId());
-		}
+		
+		_FeedInfo.put(objectId, caster.getObjectId());
 		
 		// display the social action of the beast eating the food.
 		npc.broadcastSocialAction(2);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
index 41ac662901d091254022d1b3030efa10a6382413..68bd0cb5d8fd3d3986dc91ac6a3b133ed2508161 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
@@ -507,10 +507,8 @@ public class FeedableBeasts extends L2AttackableAIScript
 		{
 			return super.onSkillSee(npc, caster, skill, targets, isPet);
 		}
-		else
-		{
-			_FeedInfo.put(objectId, caster.getObjectId());
-		}
+		
+		_FeedInfo.put(objectId, caster.getObjectId());
 		
 		int food = 0;
 		if (skillId == SKILL_GOLDEN_SPICE)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
index d81dab0d94081652dc89cd9d52b3ab0811d1e9f8..1d3c868b43350cacd307ec5c922dd289ae0fd5f2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
@@ -400,24 +400,29 @@ public class Beleth extends L2AttackableAIScript
 	}
 	
 	@Override
-	public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
+	public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
 	{
-		if ((npc.getNpcId() == 29118) && (player != null))
+		if (npc == null)
 		{
-			if (player.getParty() != null)
+			return super.onKill(npc, killer, isPet);
+		}
+		
+		if ((npc.getNpcId() == 29118) && (killer != null))
+		{
+			if (killer.getParty() != null)
 			{
-				if (player.getParty().getCommandChannel() != null)
+				if (killer.getParty().getCommandChannel() != null)
 				{
-					belethKiller = player.getParty().getCommandChannel().getChannelLeader();
+					belethKiller = killer.getParty().getCommandChannel().getChannelLeader();
 				}
 				else
 				{
-					belethKiller = player.getParty().getLeader();
+					belethKiller = killer.getParty().getLeader();
 				}
 			}
 			else
 			{
-				belethKiller = player;
+				belethKiller = killer;
 			}
 			GrandBossManager.getInstance().setBossStatus(29118, 3);
 			long respawnTime = (long) Config.INTERVAL_OF_BELETH_SPAWN + Rnd.get(Config.RANDOM_OF_BELETH_SPAWN);
@@ -426,10 +431,7 @@ public class Beleth extends L2AttackableAIScript
 			GrandBossManager.getInstance().setStatsSet(29118, info);
 			ThreadPoolManager.getInstance().scheduleGeneral(new unlock(), respawnTime);
 			deleteAll();
-			if (npc != null)
-			{
-				npc.deleteMe();
-			}
+			npc.deleteMe();
 			movie = true;
 			beleth = spawn(29118, new Location(16323, 213170, -9357, 49152));
 			beleth.setIsInvul(true);
@@ -483,8 +485,13 @@ public class Beleth extends L2AttackableAIScript
 	}
 	
 	@Override
-	public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isPet)
+	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isPet)
 	{
+		if (npc == null)
+		{
+			return super.onAttack(npc, attacker, damage, isPet);
+		}
+		
 		if ((npc.getNpcId() == 29118) || (npc.getNpcId() == 29119))
 		{
 			if ((npc.getObjectId() == allowObjectId) && !attacked)
@@ -501,24 +508,24 @@ public class Beleth extends L2AttackableAIScript
 			{
 				return null;
 			}
-			final double distance = Math.sqrt(npc.getPlanDistanceSq(player.getX(), player.getY()));
+			final double distance = Math.sqrt(npc.getPlanDistanceSq(attacker.getX(), attacker.getY()));
 			if ((distance > 500) || (Rnd.get(100) < 80))
 			{
 				for (L2Npc beleth : minions)
 				{
-					if ((beleth != null) && !beleth.isDead() && Util.checkIfInRange(900, beleth, player, false) && !beleth.isCastingNow())
+					if ((beleth != null) && !beleth.isDead() && Util.checkIfInRange(900, beleth, attacker, false) && !beleth.isCastingNow())
 					{
-						beleth.setTarget(player);
+						beleth.setTarget(attacker);
 						beleth.doCast(Fireball);
 					}
 				}
-				if ((beleth != null) && !beleth.isDead() && Util.checkIfInRange(900, beleth, player, false) && !beleth.isCastingNow())
+				if ((beleth != null) && !beleth.isDead() && Util.checkIfInRange(900, beleth, attacker, false) && !beleth.isCastingNow())
 				{
-					beleth.setTarget(player);
+					beleth.setTarget(attacker);
 					beleth.doCast(Fireball);
 				}
 			}
-			else if ((npc != null) && !npc.isDead() && !npc.isCastingNow())
+			else if (!npc.isDead() && !npc.isCastingNow())
 			{
 				if (!npc.getKnownList().getKnownPlayersInRadius(200).isEmpty())
 				{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
index c55c5975c84b772d715d42f8d8970bc3dbaec0f8..3b2b4a440f15d57a471ad462c158b0e0e8ba1cd3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
@@ -327,33 +327,33 @@ public class IceFairySirra extends L2AttackableAIScript
 		if (event.equalsIgnoreCase("check_condition"))
 		{
 			if (npc.isBusy())//should never happen
+			{
 				return super.onAdvEvent(event, npc, player);
-			else
+			}
+			
+			String filename = "";
+			if (player.isInParty() && player.getParty().getPartyLeaderOID() == player.getObjectId())
 			{
-				String filename = "";
-				if (player.isInParty() && player.getParty().getPartyLeaderOID() == player.getObjectId())
+				if (checkItems(player))
 				{
-					if (checkItems(player) == true)
-					{
-						startQuestTimer("start",100000,null,player);
-						_player = player;
-						destroyItems(player);
-						player.getInventory().addItem("Scroll",8379,3,player,null);
-						npc.setBusy(true);
-						screenMessage(player,NpcStringId.STEWARD_PLEASE_WAIT_A_MOMENT,100000);
-						filename = getHtmlPath(3);
-					}
-					else
-					{
-						filename = getHtmlPath(2);
-					}
+					startQuestTimer("start",100000,null,player);
+					_player = player;
+					destroyItems(player);
+					player.getInventory().addItem("Scroll",8379,3,player,null);
+					npc.setBusy(true);
+					screenMessage(player,NpcStringId.STEWARD_PLEASE_WAIT_A_MOMENT,100000);
+					filename = getHtmlPath(3);
 				}
 				else
 				{
-					filename = getHtmlPath(1);
+					filename = getHtmlPath(2);
 				}
-				sendHtml(npc, player, filename);
 			}
+			else
+			{
+				filename = getHtmlPath(1);
+			}
+			sendHtml(npc, player, filename);
 		}
 		else if (event.equalsIgnoreCase("start"))
 		{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
index 5c74021adef09ecd904a044fc2384a66cdcdfd34..cbd4031f06497d595df87fce740dd67b76e5bb55 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
@@ -53,6 +53,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
 	 * @param questId
 	 * @param name
 	 * @param descr
+	 * @param hallId 
 	 */
 	public FortressOfResistance(int questId, String name, String descr, final int hallId)
 	{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
index d996609dc2e1c373fd99bad03113283d0785c1d0..e47dc57699d92cdec44bbf17067f741fc95f16c4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
@@ -43,6 +43,7 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
 	 * @param questId
 	 * @param name
 	 * @param descr
+	 * @param hallId 
 	 */
 	public FortressOfTheDead(int questId, String name, String descr, final int hallId)
 	{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java
index df10d7525ceb80dcf5b3b982ae461d7af5848962..ed55c9fa0ca65f1ac989abc1786524b262be41bd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java
@@ -37,7 +37,7 @@ public class MissQueen extends Quest
 	};
 
 	// enable/disable coupon give
-	private static final boolean QUEEN_ENABLED = false;
+	private static boolean QUEEN_ENABLED = false;
 	// Newbie/one time rewards section
 	// Any quest should rely on a unique bit, but
 	// it could be shared among quest that were mutually
@@ -65,52 +65,52 @@ public class MissQueen extends Quest
 		String htmltext = event;
 		
 		if (!QUEEN_ENABLED)
+		{
 			return htmltext;
-		else
+		}
+		
+		QuestState st = player.getQuestState(qn);
+		int newbie = player.getNewbie();
+		int level = player.getLevel();
+		int occupation_level = player.getClassId().level();
+		int pkkills = player.getPkKills();
+		if (event.equals("newbie_give_coupon"))
 		{
-			QuestState st = player.getQuestState(qn);
-			int newbie = player.getNewbie();
-			int level = player.getLevel();
-			int occupation_level = player.getClassId().level();
-			int pkkills = player.getPkKills();
-			if (event.equals("newbie_give_coupon"))
+			/*
+			 * TODO: check if this is the very first character for this account would need a bit of SQL, or a core method to determine it. This condition should be stored by the core in the account_data table upon character creation.
+			 */
+			if (level >= 6 && level <= 25 && pkkills == 0 && occupation_level == 0)
 			{
-				/*
-				 * TODO: check if this is the very first charactr for this account would need a bit of SQL, or a core method to determine it. This condition should be stored by the core in the account_data table upon character creation.
-				 */
-				if (level >= 6 && level <= 25 && pkkills == 0 && occupation_level == 0)
+				if ((newbie | NEWBIE_REWARD) != newbie)
 				{
-					if ((newbie | NEWBIE_REWARD) != newbie)
-					{
-						player.setNewbie(newbie | NEWBIE_REWARD);
-						st.giveItems(COUPNE_ONE, 1);
-						htmltext = "31760-2.htm"; // here's the coupon you requested
-					}
-					else
-						htmltext = "31760-1.htm"; // you got a coupon already!
+					player.setNewbie(newbie | NEWBIE_REWARD);
+					st.giveItems(COUPNE_ONE, 1);
+					htmltext = "31760-2.htm"; // here's the coupon you requested
 				}
 				else
-					htmltext = "31760-3.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
+					htmltext = "31760-1.htm"; // you got a coupon already!
 			}
-			else if (event.equals("traveller_give_coupon"))
-			{
-				if (level >= 6 && level <= 25 && pkkills == 0 && occupation_level == 1)
-				{ // check the player state against this quest newbie rewarding mark.
-					if ((newbie | TRAVELER_REWARD) != newbie)
-					{
-						player.setNewbie(newbie | TRAVELER_REWARD);
-						st.giveItems(COUPNE_TWO, 1);
-						htmltext = "31760-5.htm"; // here's the coupon you requested
-					}
-					else
-						htmltext = "31760-4.htm"; // you got a coupon already!
+			else
+				htmltext = "31760-3.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
+		}
+		else if (event.equals("traveller_give_coupon"))
+		{
+			if (level >= 6 && level <= 25 && pkkills == 0 && occupation_level == 1)
+			{ // check the player state against this quest newbie rewarding mark.
+				if ((newbie | TRAVELER_REWARD) != newbie)
+				{
+					player.setNewbie(newbie | TRAVELER_REWARD);
+					st.giveItems(COUPNE_TWO, 1);
+					htmltext = "31760-5.htm"; // here's the coupon you requested
 				}
 				else
-					htmltext = "31760-6.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
+					htmltext = "31760-4.htm"; // you got a coupon already!
 			}
-			
-			return htmltext;
+			else
+				htmltext = "31760-6.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
 		}
+		
+		return htmltext;
 	}
 
 	@Override
@@ -118,7 +118,7 @@ public class MissQueen extends Quest
 	{
 		QuestState st = player.getQuestState(qn);
 		if (st == null)
-			st = this.newQuestState(player);
+			st = newQuestState(player);
 		return "31760.htm";
 	}
 
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
index fbff2d7d15865cae860bc81a2066856403a6288d..9b7d8f8476e06faea8a138eafbe96a329dc35b04 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
@@ -116,8 +116,7 @@ public class NewbieCoupons extends Quest
 				MultiSell.getInstance().separateAndSend(WEAPON_MULTISELL, player, npc, false);
 				return null;
 			}
-			else
-				htmltext = "30598-7.htm"; // you're not eligible to use warehouse
+			htmltext = "30598-7.htm"; // you're not eligible to use warehouse
 		}
 		else if (event.equals("newbie_show_armor"))
 		{
@@ -126,8 +125,7 @@ public class NewbieCoupons extends Quest
 				MultiSell.getInstance().separateAndSend(ACCESORIES_MULTISELL, player, npc, false);
 				return null;
 			}
-			else
-				htmltext = "30598-8.htm"; // you're not eligible to use warehouse
+			htmltext = "30598-8.htm"; // you're not eligible to use warehouse
 		}
 
 		return htmltext;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index a6f39edde6454be1e5b9008c41b51d7f5cad48b6..9e51fe6795fb4ee974ead88e28f719f82ade9eb3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -156,8 +156,7 @@ public class HeavyMedal extends Quest
 		{
 			if (st.getQuestItemsCount(GLITTERING_MEDAL) < MEDALS[level])
 				return "31229-no.htm";
-			else
-				return "31229-game.htm";
+			return "31229-game.htm";
 		}
 		else if (event.equalsIgnoreCase("heads") || event.equalsIgnoreCase("tails"))
 		{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java
index 2ab41be94af0bba948f99bf6061c1783c4728ef9..dc18c547bc1243434ba28889db47af7ce725da2d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java
@@ -44,6 +44,7 @@ public class L2ArtefactInstanceAction implements IActionHandler
 	 * <li>Client packet : Action, AttackRequest</li><BR>
 	 * <BR>
 	 */
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		if (!((L2Npc)target).canTarget(activeChar))
@@ -73,6 +74,7 @@ public class L2ArtefactInstanceAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2ArtefactInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
index 63bc101a8d2276ff52efee362c21c47e8f29cc5c..5e19e9a6cf3b68b01bf7d6427476b0f8e3449b10 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 
 public class L2DecoyAction implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		// Aggression target lock effect
@@ -38,6 +39,7 @@ public class L2DecoyAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2Decoy;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
index c759d76974829bd2d901dec0aed5a53348903485..ed1b6d36eb72650b2dec1517bbecb6316e10cff2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 public class L2DoorInstanceAction implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		// Check if the L2PcInstance already target the L2NpcInstance
@@ -109,6 +110,7 @@ public class L2DoorInstanceAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2DoorInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
index ceb72bd562d62561dc27a264025a55f744ab2497..61038e59dfe247b0bd04dc4e2adc23bc9a2e3d9a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.network.serverpackets.StaticObject;
 
 public class L2DoorInstanceActionShift implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		if (activeChar.getAccessLevel().isGm())
@@ -72,6 +73,7 @@ public class L2DoorInstanceActionShift implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2DoorInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java
index a9143cc370a5d44472c0c6bbf89c60135e2dad4a..f914b7c7fef0f0eb82e1c14b9a55b429cf9c1578 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java
@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 
 public class L2ItemInstanceAction implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		// this causes the validate position handler to do the pickup if the location is reached.
@@ -46,6 +47,7 @@ public class L2ItemInstanceAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2ItemInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
index 23a76d74a1d73db9a55c64c3e1f91d423148df92..8c3562146e1ca97a649d8994148c3afc8257c73b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
@@ -24,6 +24,7 @@ import com.l2jserver.util.StringUtil;
 
 public class L2ItemInstanceActionShift implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		if (activeChar.getAccessLevel().isGm())
@@ -49,6 +50,7 @@ public class L2ItemInstanceActionShift implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2ItemInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java
index 349dfade99751cee1b61953df6d78515d0dd81b4..c05711004d39df9086c9fc2bd2859a112c4ad3c5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java
@@ -55,6 +55,7 @@ public class L2NpcAction implements IActionHandler
 	 * @param activeChar The L2PcInstance that start an action on the L2Npc
 	 *
 	 */
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		if (!((L2Npc)target).canTarget(activeChar))
@@ -151,6 +152,7 @@ public class L2NpcAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2Npc;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
index b2636959dad8f5e0f580809583f33aa44006fdfa..deed6ac0f85869f80a91a2880e9dfee9ed8e322d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
@@ -49,6 +49,7 @@ public class L2PcInstanceAction implements IActionHandler
 	 * @param activeChar The player that start an action on target L2PcInstance
 	 *
 	 */
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		// See description in TvTEvent.java
@@ -130,6 +131,7 @@ public class L2PcInstanceAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2PcInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
index 3b5512895e85a9dd920b13e394b4e7b39a6616c1..86e13f8745bc7bde62a2f30d49d6a0fa03b101cd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
@@ -31,6 +31,7 @@ import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 public class L2PetInstanceAction implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		// Aggression target lock effect
@@ -106,6 +107,7 @@ public class L2PetInstanceAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2PetInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java
index cdb415fd87b44add339930ede3b22ffba85b9409..81556c6b18ad2e028fbb8537ecf6a07ee728dcf8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java
@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 
 public class L2StaticObjectInstanceAction implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		if(((L2StaticObjectInstance)target).getType() < 0)
@@ -71,6 +72,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2StaticObjectInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
index 5a13c7dca20dbc622beb3965c9bf00598b9896e8..17504c49e4480e6b26c1d8c7f19e49843798331c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
@@ -26,6 +26,7 @@ import com.l2jserver.util.StringUtil;
 
 public class L2StaticObjectInstanceActionShift implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		if (activeChar.getAccessLevel().isGm())
@@ -60,6 +61,7 @@ public class L2StaticObjectInstanceActionShift implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2StaticObjectInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
index fdafe79570b9ef6b5a0832496b67cb51caf8af29..13d9474ad841f69f7f116efda1b87e16c17e8e4a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
@@ -32,6 +32,7 @@ import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 public class L2SummonAction implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		// Aggression target lock effect
@@ -100,6 +101,7 @@ public class L2SummonAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2Summon;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
index b680139f734031a81f3cb1748f07627cb975704a..226ea8bddc5b15032df7200576b450d086162d3c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 
 public class L2TrapAction implements IActionHandler
 {
+	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
 	{
 		// Aggression target lock effect
@@ -39,6 +40,7 @@ public class L2TrapAction implements IActionHandler
 		return true;
 	}
 	
+	@Override
 	public InstanceType getInstanceType()
 	{
 		return InstanceType.L2Trap;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBBS.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBBS.java
index 3d1ebb459fd8a11b07f3aa4cb806e03e876d994b..62cf99c706c83d53b9ad96f02784bcd954d33146 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBBS.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBBS.java
@@ -31,6 +31,7 @@ public class AdminBBS implements IAdminCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		AdminBBSManager.getInstance().parsecmd(command, activeChar);
@@ -41,6 +42,7 @@ public class AdminBBS implements IAdminCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
 	 */
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java
index 4974206adee628143d86da91fade03c6d2ed8e37..0ca28f8ffcf18128aa7567f4c760548385c0b443 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.util.GMAudit;
 
-
 /**
  * This class handles following admin commands:
  * - ban_acc <account_name> = changes account access level to -100 and logs him off. If no account is specified target's account is used.
@@ -44,7 +43,8 @@ import com.l2jserver.gameserver.util.GMAudit;
  * @version $Revision: 1.1.6.3 $ $Date: 2005/04/11 10:06:06 $
  * con.close() change by Zoey76 24/02/2011
  */
-public class AdminBan implements IAdminCommandHandler {
+public class AdminBan implements IAdminCommandHandler
+{
 	private static final String[] ADMIN_COMMANDS =
 	{
 		"admin_ban", // returns ban commands
@@ -59,6 +59,7 @@ public class AdminBan implements IAdminCommandHandler {
 		"admin_unjail"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		StringTokenizer st = new StringTokenizer(command);
@@ -133,11 +134,8 @@ public class AdminBan implements IAdminCommandHandler {
 				activeChar.sendMessage("Usage: //ban_char <char_name> (if none, target char is banned)");
 				return false;
 			}
-			else
-			{
-				auditAction(command, activeChar, (targetPlayer == null ? player : targetPlayer.getName()));
-				return changeCharAccessLevel(targetPlayer, player, activeChar, -100);
-			}
+			auditAction(command, activeChar, (targetPlayer == null ? player : targetPlayer.getName()));
+			return changeCharAccessLevel(targetPlayer, player, activeChar, -100);
 		}
 		else if (command.startsWith("admin_ban_chat"))
 		{
@@ -435,8 +433,7 @@ public class AdminBan implements IAdminCommandHandler {
 					activeChar.sendMessage("Character not found or access level unaltered.");
 					return false;
 				}
-				else
-					activeChar.sendMessage(player + " now has an access level of " + lvl);
+				activeChar.sendMessage(player + " now has an access level of " + lvl);
 			}
 			catch (SQLException se)
 			{
@@ -453,6 +450,7 @@ public class AdminBan implements IAdminCommandHandler {
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList() {
 		return ADMIN_COMMANDS;
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index 8bc14d3738b99cdb0f6aeebe85cf5b3420dc1690..a2679bdf97770d45fe7c7dfceffc7574cda45348 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -43,6 +43,7 @@ public class AdminBuffs implements IAdminCommandHandler
 		"admin_switch_gm_buffs"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		
@@ -72,11 +73,8 @@ public class AdminBuffs implements IAdminCommandHandler
 					showBuffs(activeChar, player, page);
 					return true;
 				}
-				else
-				{
-					activeChar.sendMessage("The player " + playername + " is not online");
-					return false;
-				}
+				activeChar.sendMessage("The player " + playername + " is not online");
+				return false;
 			}
 			else if ((activeChar.getTarget() != null) && (activeChar.getTarget() instanceof L2Character))
 			{
@@ -207,11 +205,8 @@ public class AdminBuffs implements IAdminCommandHandler
 				activeChar.sendMessage("You have succefully changed to target " + (toAuraSkills ? "aura" : "one") + " special skills.");
 				return true;
 			}
-			else
-			{
-				activeChar.sendMessage("There is nothing to switch.");
-				return false;
-			}
+			activeChar.sendMessage("There is nothing to switch.");
+			return false;
 		}
 		else
 		{
@@ -219,6 +214,7 @@ public class AdminBuffs implements IAdminCommandHandler
 		}
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCache.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCache.java
index 7fda0941dc505147f1a7cf9db8e31932d1c51425..96825ad598eac1921045750571feb25f79016373 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCache.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCache.java
@@ -40,11 +40,13 @@ public class AdminCache implements IAdminCommandHandler
 		"admin_cache_crest_fix"
 	};
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
 	}
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCamera.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCamera.java
index ce16a0f1800235035d2860c017d1e801ac0fd6d5..761a1c0be2558d13757f13aa7985470a23875325 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCamera.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCamera.java
@@ -26,6 +26,7 @@ public class AdminCamera implements IAdminCommandHandler
 		"admin_camera"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		try
@@ -46,6 +47,7 @@ public class AdminCamera implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
index 14f92f5e9ff73403cf3fa2beee40b8ab1756b081..c00b159caf2e0c6851936096c9393c2397dde305 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
@@ -41,12 +41,14 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
 		"admin_changelvl"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		handleChangeLevel(command, activeChar);
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
index 80c9e6d82a2aa5e133c977e8f610f7b480ea8013..3a775bcbcde60b64f5e04bc373445f87b76ab341 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
@@ -50,6 +50,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
 	
 	private int itemId;
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		
@@ -232,6 +233,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java
index c7c2104a1886279c5d9190ec0372ec0bc76fdc93..305bf875e2f8aaec439bbab7a9da921430e85efb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java
@@ -27,6 +27,7 @@ public class AdminDebug implements IAdminCommandHandler
 		"admin_debug"
 	};
 	
+	@Override
 	public final boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		String[] commandSplit = command.split(" ");
@@ -53,6 +54,7 @@ public class AdminDebug implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public final String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java
index 689b5c0b86833a3dd77e525b926bd2410d3d9459..bae57e2530cfa45d0f2f226ccc9ff6aec5ecf7e0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java
@@ -34,6 +34,7 @@ public class AdminDelete implements IAdminCommandHandler
 		"admin_delete"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_delete"))
@@ -41,6 +42,7 @@ public class AdminDelete implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java
index a0761feac5e0d0eb0b455985d1659b6b1eaf1895..35889d0b9eaabb1748b145be19eaa3619307fba0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java
@@ -31,6 +31,7 @@ public class AdminDisconnect implements IAdminCommandHandler
 		"admin_character_disconnect"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_character_disconnect"))
@@ -40,6 +41,7 @@ public class AdminDisconnect implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java
index 69557f377eca44a5528f0b44383b71a38e7c01ee..b1deb62502aae7d28ada6894c264904da180dd65 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java
@@ -50,6 +50,7 @@ public class AdminDoorControl implements IAdminCommandHandler
 		"admin_closeall"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		try
@@ -131,6 +132,7 @@ public class AdminDoorControl implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 277553ac31ebe9de803eda01df71e8dd8e9b9320..344cc408043cbf6e204efed329d48cac98a85b53 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1165,12 +1165,10 @@ public class AdminEditChar implements IAdminCommandHandler
 				{
 					continue;
 				}
-				else
-				{
-					ip = client.getConnection().getInetAddress().getHostAddress();
-					if (!ip.equals(IpAdress))
-						continue;
-				}
+				
+				ip = client.getConnection().getInetAddress().getHostAddress();
+				if (!ip.equals(IpAdress))
+					continue;
 			}
 			
 			name = player.getName();
@@ -1246,6 +1244,7 @@ public class AdminEditChar implements IAdminCommandHandler
 	
 	/**
 	 * @param activeChar
+	 * @param multibox 
 	 */
 	private void findDualbox(L2PcInstance activeChar, int multibox)
 	{
@@ -1262,22 +1261,22 @@ public class AdminEditChar implements IAdminCommandHandler
 		{
 			client = player.getClient();
 			if (client == null || client.isDetached())
+			{
 				continue;
-			else
+			}
+			
+			ip = client.getConnection().getInetAddress().getHostAddress();
+			if (ipMap.get(ip) == null)
+				ipMap.put(ip, new ArrayList<L2PcInstance>());
+			ipMap.get(ip).add(player);
+			
+			if (ipMap.get(ip).size() >= multibox)
 			{
-				ip = client.getConnection().getInetAddress().getHostAddress();
-				if (ipMap.get(ip) == null)
-					ipMap.put(ip, new ArrayList<L2PcInstance>());
-				ipMap.get(ip).add(player);
-				
-				if (ipMap.get(ip).size() >= multibox)
-				{
-					Integer count = dualboxIPs.get(ip);
-					if (count == null)
-						dualboxIPs.put(ip, multibox);
-					else
-						dualboxIPs.put(ip, count + 1);
-				}
+				Integer count = dualboxIPs.get(ip);
+				if (count == null)
+					dualboxIPs.put(ip, multibox);
+				else
+					dualboxIPs.put(ip, count + 1);
 			}
 		}
 		
@@ -1319,22 +1318,22 @@ public class AdminEditChar implements IAdminCommandHandler
 		{
 			client = player.getClient();
 			if (client == null || client.isDetached())
+			{
 				continue;
-			else
+			}
+			
+			IpPack pack = new IpPack(client.getConnection().getInetAddress().getHostAddress(), client.getTrace());
+			if (ipMap.get(pack) == null)
+				ipMap.put(pack, new ArrayList<L2PcInstance>());
+			ipMap.get(pack).add(player);
+			
+			if (ipMap.get(pack).size() >= multibox)
 			{
-				IpPack pack = new IpPack(client.getConnection().getInetAddress().getHostAddress(), client.getTrace());
-				if (ipMap.get(pack) == null)
-					ipMap.put(pack, new ArrayList<L2PcInstance>());
-				ipMap.get(pack).add(player);
-				
-				if (ipMap.get(pack).size() >= multibox)
-				{
-					Integer count = dualboxIPs.get(pack);
-					if (count == null)
-						dualboxIPs.put(pack, multibox);
-					else
-						dualboxIPs.put(pack, count + 1);
-				}
+				Integer count = dualboxIPs.get(pack);
+				if (count == null)
+					dualboxIPs.put(pack, multibox);
+				else
+					dualboxIPs.put(pack, count + 1);
 			}
 		}
 		
@@ -1482,6 +1481,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			_player = player;
 		}
 
+		@Override
 		public void run()
 		{
 			_player.untransform();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index a8ad77bfb4f96ab351593fb3bc8a3e4ad3f37d0b..b78c73bb583dbf97969552d9e831ec8534382a70 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -708,8 +708,7 @@ public class AdminEffects implements IAdminCommandHandler
 				character.startAbnormalEffect(action);
 			return true;
 		}
-		else
-			return false;
+		return false;
 	}
 	
 	private boolean performSpecial(int action, L2Object target)
@@ -723,8 +722,7 @@ public class AdminEffects implements IAdminCommandHandler
 				character.startSpecialEffect(action);
 			return true;
 		}
-		else
-			return false;
+		return false;
 	}
 	
 	private boolean performSocial(int action, L2Object target, L2PcInstance activeChar)
@@ -765,6 +763,7 @@ public class AdminEffects implements IAdminCommandHandler
 	 * @param type - atmosphere type (signssky,sky)
 	 * @param state - atmosphere state(night,day)
 	 * @param duration
+	 * @param activeChar 
 	 */
 	private void adminAtmosphere(String type, String state, int duration, L2PcInstance activeChar)
 	{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
index 566dd65b1e79426843b072e73dc1d7afa56dd19e..b6f9033b0dc283a080c219be01749dc421438f73 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
@@ -45,6 +45,7 @@ public class AdminElement implements IAdminCommandHandler
 		"admin_setls"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		int armorType = -1;
@@ -90,6 +91,7 @@ public class AdminElement implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
index 1a8515ff0765389e67646ea701bdaa197aece944..b6ea7041bc6dfbd8a5869b43aee8dc9de6643fb1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
@@ -59,6 +59,7 @@ public class AdminEnchant implements IAdminCommandHandler
 		"admin_enchant"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_enchant"))
@@ -189,6 +190,7 @@ public class AdminEnchant implements IAdminCommandHandler
 		AdminHelpPage.showHelpPage(activeChar, "enchant.htm");
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index 1d1c3e44d19efffc39efce111aff70adf251a02b..6f0289357e3310d62a373f2320247e17cc9cddbd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -84,6 +84,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 	private static String tempName = "";
 	private static boolean npcsDeleted = false;
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		StringTokenizer st = new StringTokenizer(command);
@@ -422,6 +423,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java
index 38e77b4105632d6b71d7cc7b89d66155263481d5..a85051b333939f299c0ce493cc1744882e91ff07 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java
@@ -36,11 +36,13 @@ public class AdminEvents implements IAdminCommandHandler
 		"admin_event_bypass"
 	};
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
 	}
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (activeChar == null)
@@ -72,11 +74,9 @@ public class AdminEvents implements IAdminCommandHandler
 							activeChar.sendMessage("Event '"+_event_name+"' started.");
 							return true;
 						}
-						else
-						{
-							activeChar.sendMessage("There is problem with starting '"+_event_name+"' event.");
-							return true;
-						}
+						
+						activeChar.sendMessage("There is problem with starting '"+_event_name+"' event.");
+						return true;
 					}
 				}
 			}
@@ -101,11 +101,9 @@ public class AdminEvents implements IAdminCommandHandler
 							activeChar.sendMessage("Event '"+_event_name+"' stopped.");
 							return true;
 						}
-						else
-						{
-							activeChar.sendMessage("There is problem with stoping '"+_event_name+"' event.");
-							return true;
-						}
+						
+						activeChar.sendMessage("There is problem with stoping '"+_event_name+"' event.");
+						return true;
 					}
 				}
 			}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
index cfc304025fac291df69409d4ebd27595ba2ff3bc..ec87f2b208966c901980e0b0ee830e13363b6c21 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
@@ -42,6 +42,7 @@ public class AdminExpSp implements IAdminCommandHandler
 		"admin_remove_exp_sp"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.startsWith("admin_add_exp_sp"))
@@ -74,6 +75,7 @@ public class AdminExpSp implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
@@ -118,31 +120,29 @@ public class AdminExpSp implements IAdminCommandHandler
 		{
 			return false;
 		}
-		else
+		
+		String exp = st.nextToken();
+		String sp = st.nextToken();
+		long expval = 0;
+		int spval = 0;
+		try
 		{
-			String exp = st.nextToken();
-			String sp = st.nextToken();
-			long expval = 0;
-			int spval = 0;
-			try
-			{
-				expval = Long.parseLong(exp);
-				spval = Integer.parseInt(sp);
-			}
-			catch (Exception e)
-			{
-				return false;
-			}
-			if (expval != 0 || spval != 0)
-			{
-				//Common character information
-				player.sendMessage("Admin is adding you " + expval + " xp and " + spval + " sp.");
-				player.addExpAndSp(expval, spval);
-				//Admin information
-				activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
-				if (Config.DEBUG)
-					_log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + ".");
-			}
+			expval = Long.parseLong(exp);
+			spval = Integer.parseInt(sp);
+		}
+		catch (Exception e)
+		{
+			return false;
+		}
+		if (expval != 0 || spval != 0)
+		{
+			//Common character information
+			player.sendMessage("Admin is adding you " + expval + " xp and " + spval + " sp.");
+			player.addExpAndSp(expval, spval);
+			//Admin information
+			activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
+			if (Config.DEBUG)
+				_log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + ".");
 		}
 		return true;
 	}
@@ -162,32 +162,32 @@ public class AdminExpSp implements IAdminCommandHandler
 		}
 		StringTokenizer st = new StringTokenizer(ExpSp);
 		if (st.countTokens() != 2)
+		{
 			return false;
-		else
+		}
+		
+		String exp = st.nextToken();
+		String sp = st.nextToken();
+		long expval = 0;
+		int spval = 0;
+		try
 		{
-			String exp = st.nextToken();
-			String sp = st.nextToken();
-			long expval = 0;
-			int spval = 0;
-			try
-			{
-				expval = Long.parseLong(exp);
-				spval = Integer.parseInt(sp);
-			}
-			catch (Exception e)
-			{
-				return false;
-			}
-			if (expval != 0 || spval != 0)
-			{
-				//Common character information
-				player.sendMessage("Admin is removing you " + expval + " xp and " + spval + " sp.");
-				player.removeExpAndSp(expval, spval);
-				//Admin information
-				activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + ".");
-				if (Config.DEBUG)
-					_log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + ".");
-			}
+			expval = Long.parseLong(exp);
+			spval = Integer.parseInt(sp);
+		}
+		catch (Exception e)
+		{
+			return false;
+		}
+		if (expval != 0 || spval != 0)
+		{
+			//Common character information
+			player.sendMessage("Admin is removing you " + expval + " xp and " + spval + " sp.");
+			player.removeExpAndSp(expval, spval);
+			//Admin information
+			activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + ".");
+			if (Config.DEBUG)
+				_log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + ".");
 		}
 		return true;
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 23d08754da2f1a888dbabc3e7189a7414757f3f8..0649605138b96eab61237de7c8bacc8494180516 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -46,6 +46,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	};
 	
 	//TODO: remove from gm list etc etc
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		try
@@ -63,6 +64,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index 0accc3bdbc63a249f6c264edfaad48809300f458..e6b26dc2c377de58e8bbd28a75b0cd02cdc39a7e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -51,6 +51,7 @@ public class AdminFortSiege implements IAdminCommandHandler
 		"admin_removefort"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		StringTokenizer st = new StringTokenizer(command, " ");
@@ -167,6 +168,7 @@ public class AdminFortSiege implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeoEditor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeoEditor.java
index 718b01d570213d6ac1e8c4376d878cdee4156688..4583587dca61faec6ccc0ad1df3beda916e3fa57 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeoEditor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeoEditor.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.geoeditorcon.GeoEditorListener;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
  * @author  Luno, Dezmond
  */
@@ -35,6 +34,7 @@ public class AdminGeoEditor implements IAdminCommandHandler
 		"admin_ge_leave"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (!Config.ACCEPT_GEOEDITOR_CONN)
@@ -104,6 +104,7 @@ public class AdminGeoEditor implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
index aca05831aebe8522c0aa83268414f844cbb4d873..dc9e464d667de7658a9987ea4bce51ecf2e74f86 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- *
  * @author  -Nemesiss-
  */
 public class AdminGeodata implements IAdminCommandHandler
@@ -37,6 +36,7 @@ public class AdminGeodata implements IAdminCommandHandler
 		"admin_geo_unload"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (Config.GEODATA < 1)
@@ -148,6 +148,7 @@ public class AdminGeodata implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java
index 20e74b7d82dc25e44d2278149964cf521f60f508..730a15da141ee6f243509a8500ddcef3e1fe675d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.datatables.AccessLevels;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
  * This class handles following admin commands:
  * - gm = turns gm mode off
@@ -37,6 +36,7 @@ public class AdminGm implements IAdminCommandHandler
 		"admin_gm"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		
@@ -46,6 +46,7 @@ public class AdminGm implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
index 5255e8b3537a68bd7550bc1efe014a8d68381905..c703195270dcba702f938e4190f7063a5976b837 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
@@ -40,6 +40,7 @@ public class AdminGmChat implements IAdminCommandHandler
 		"admin_gmchat_menu"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.startsWith("admin_gmchat"))
@@ -80,6 +81,7 @@ public class AdminGmChat implements IAdminCommandHandler
 		activeChar.addSnooped(player);
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java
index 9a6e5404ed663f0396d3b6baed9b67f321a55cdc..5c4b72a5c96ab6d2dbc1cbefe27c8bc15e54c959 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java
@@ -32,9 +32,9 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
 	};
 	
 	/**
-	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		StringTokenizer st = new StringTokenizer(command, " ");
@@ -76,6 +76,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
 	 */
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHelpPage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHelpPage.java
index bb4f94526458426ca20ff94148f21ba3bc3a1012..c657599ad8c8deeb421ce600aa00827076080614 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHelpPage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHelpPage.java
@@ -33,6 +33,7 @@ public class AdminHelpPage implements IAdminCommandHandler
 		"admin_help"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		
@@ -52,6 +53,7 @@ public class AdminHelpPage implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java
index c301e6fc1e76dac99d2868e13e6094c78334ff45..2c3c7f163dc5508197ff3acf0e63feb59312628d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.entity.Instance;
 
 /**
  * @author evill33t, GodKratos
- * 
  */
 public class AdminInstance implements IAdminCommandHandler
 {
@@ -40,6 +39,7 @@ public class AdminInstance implements IAdminCommandHandler
 		"admin_listinstances"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		StringTokenizer st = new StringTokenizer(command);
@@ -92,31 +92,29 @@ public class AdminInstance implements IAdminCommandHandler
 					activeChar.sendMessage("Instance " + val + " doesnt exist.");
 					return false;
 				}
-				else
+				
+				L2Object target = activeChar.getTarget();
+				if (target == null || target instanceof L2Summon) // Don't separate summons from masters
 				{
-					L2Object target = activeChar.getTarget();
-					if (target == null || target instanceof L2Summon) // Don't separate summons from masters
-					{
-						activeChar.sendMessage("Incorrect target.");
-						return false;
-					}
-					target.setInstanceId(val);
-					if (target instanceof L2PcInstance)
+					activeChar.sendMessage("Incorrect target.");
+					return false;
+				}
+				target.setInstanceId(val);
+				if (target instanceof L2PcInstance)
+				{
+					L2PcInstance player = (L2PcInstance) target;
+					player.sendMessage("Admin set your instance to:" + val);
+					player.teleToLocation(player.getX(), player.getY(), player.getZ());
+					L2Summon pet = player.getPet();
+					if (pet != null)
 					{
-						L2PcInstance player = (L2PcInstance) target;
-						player.sendMessage("Admin set your instance to:" + val);
-						player.teleToLocation(player.getX(), player.getY(), player.getZ());
-						L2Summon pet = player.getPet();
-						if (pet != null)
-						{
-							pet.setInstanceId(val);
-							pet.teleToLocation(pet.getX(), pet.getY(), pet.getZ());
-							player.sendMessage("Admin set " + pet.getName() + "'s instance to:" + val);
-						}
+						pet.setInstanceId(val);
+						pet.teleToLocation(pet.getX(), pet.getY(), pet.getZ());
+						player.sendMessage("Admin set " + pet.getName() + "'s instance to:" + val);
 					}
-					activeChar.sendMessage("Moved " + target.getName() + " to instance " + target.getInstanceId() + ".");
-					return true;
 				}
+				activeChar.sendMessage("Moved " + target.getName() + " to instance " + target.getInstanceId() + ".");
+				return true;
 			}
 			catch (Exception e)
 			{
@@ -162,6 +160,7 @@ public class AdminInstance implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index fa163dbf8201050d6817858106dee31bdf286ba6..3887242038fe9e95bb2493d25ac0b355313f2ed5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -20,6 +20,7 @@ public class AdminInstanceZone implements IAdminCommandHandler
 		"admin_instancezone_clear"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
@@ -86,6 +87,7 @@ public class AdminInstanceZone implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java
index 3560305e0c182c8c179b952cb68e163637cb94e8..f3c53321a63473d80d2190f02011e5e19bfc6c80 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java
@@ -37,6 +37,7 @@ public class AdminInvul implements IAdminCommandHandler
 		"admin_setinvul"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		
@@ -56,6 +57,7 @@ public class AdminInvul implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
index 1d7074c52fdcbf40f8801566aa26b782c3b15602..31b876b1837489ff47b789864dbb522b37ded521 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
@@ -45,6 +45,7 @@ public class AdminKill implements IAdminCommandHandler
 		"admin_kill_monster"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.startsWith("admin_kill"))
@@ -80,10 +81,7 @@ public class AdminKill implements IAdminCommandHandler
 							return false;
 						}
 					}
-					else
-					{
-						kill(activeChar, plyr);
-					}
+					kill(activeChar, plyr);
 				}
 				else
 				{
@@ -150,6 +148,7 @@ public class AdminKill implements IAdminCommandHandler
 			_log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ")" + " killed character " + target.getObjectId());
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java
index 19b96c6c712bd8fb0120ee73447659cdc2843f49..4cae3e02deb674e20338d5f845c4b677ce473f56 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java
@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
-
 public class AdminLevel implements IAdminCommandHandler
 {
 	private static final String[] ADMIN_COMMANDS =
@@ -33,9 +32,9 @@ public class AdminLevel implements IAdminCommandHandler
 	};
 	
 	/**
-	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		L2Object targetChar = activeChar.getTarget();
@@ -105,6 +104,7 @@ public class AdminLevel implements IAdminCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
 	 */
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
index a40964367fa590493055dd3a505e7eb90df69aaf..bfd4703b284ae779f96179fe973ea66b33a8cb96 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
@@ -45,6 +45,7 @@ public class AdminLogin implements IAdminCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_server_gm_only"))
@@ -164,7 +165,7 @@ public class AdminLogin implements IAdminCommandHandler
 	}
 	
 	/**
-	 *
+	 * @param activeChar 
 	 */
 	private void showMainPage(L2PcInstance activeChar)
 	{
@@ -241,6 +242,7 @@ public class AdminLogin implements IAdminCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
 	 */
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMammon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMammon.java
index 0cab3d493d788a64b0778dd4f6a46f3abdfe2a2f..2c20d5926a7d79128f14ae5e77e2916abf5b5ecb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMammon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMammon.java
@@ -32,6 +32,7 @@ public class AdminMammon implements IAdminCommandHandler
 	
 	private boolean _isSealValidation = SevenSigns.getInstance().isSealValidationPeriod();
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		int teleportIndex = -1;
@@ -126,6 +127,7 @@ public class AdminMammon implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java
index eb55a26b311b396bdb4bd7c1735d33cbcc2d7bc9..7e9589359f5756586e73c0f0c844f412542ee6f6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java
@@ -51,6 +51,7 @@ public class AdminManor implements IAdminCommandHandler
 		"admin_manor_disable"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		StringTokenizer st = new StringTokenizer(command);
@@ -133,6 +134,7 @@ public class AdminManor implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return _adminCommands;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
index faa076f1d919c91e95b24607c4156f726d750c55..a0823ba857b553514d490b1fa94a9700d4c3577e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
@@ -54,6 +54,7 @@ public class AdminMobGroup implements IAdminCommandHandler
 		"admin_mobgroup_invul"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_mobmenu"))
@@ -105,6 +106,7 @@ public class AdminMobGroup implements IAdminCommandHandler
 	
 	/**
 	 * @param activeChar
+	 * @param command 
 	 */
 	private void showMainPage(L2PcInstance activeChar, String command)
 	{
@@ -566,6 +568,7 @@ public class AdminMobGroup implements IAdminCommandHandler
 		activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java
index 05a24f2190877c889ca3664bf67748d3903623a1..c4705ff95c063763ac50523b770a6c7c3670f87f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java
@@ -41,6 +41,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
 	
 	protected static int state = -1;
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equalsIgnoreCase("admin_mons"))
@@ -50,6 +51,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
@@ -125,6 +127,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
 			activeChar = pActiveChar;
 		}
 		
+		@Override
 		public void run()
 		{
 			//int[][] speeds1 = MonsterRace.getInstance().getSpeeds();
@@ -158,6 +161,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
 			activeChar = pActiveChar;
 		}
 		
+		@Override
 		public void run()
 		{
 			DeleteObject obj = null;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
index a56dfd21eb02d633df382c28f405d71aa100d098..fa25b59dc5f67b0d76b63c162564fdf62bb4301f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
@@ -45,6 +45,7 @@ public class AdminPForge implements IAdminCommandHandler
 		"admin_forge3"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_forge"))
@@ -273,6 +274,7 @@ public class AdminPForge implements IAdminCommandHandler
 		return false;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
index 81327d574f6d40db243e2972250fe744a21c41e5..0d688eeb07b3d96da8ae39b04b661015093dcf72 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
@@ -34,6 +34,7 @@ public class AdminPathNode implements IAdminCommandHandler
 		"admin_find_path",
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_pn_info"))
@@ -83,6 +84,7 @@ public class AdminPathNode implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java
index 9520fa7e5eae660b751119f2cf906570a7a68eef..36ae19eb76186370ba05e1e198da3b583bbfccdb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
  * This class handles commands for GMs to respond to petitions.
  *
  * @author Tempy
- *
  */
 public class AdminPetition implements IAdminCommandHandler
 {
@@ -38,6 +37,7 @@ public class AdminPetition implements IAdminCommandHandler
 		"admin_force_peti"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		int petitionId = -1;
@@ -113,6 +113,7 @@ public class AdminPetition implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index f88947d32be0988c9f864b71f603130558824307..9a6958a318e81b7f2470a878916b48b58d4d0b7f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
@@ -44,6 +44,7 @@ public class AdminPledge implements IAdminCommandHandler
 		"admin_pledge"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		L2Object target = activeChar.getTarget();
@@ -143,6 +144,7 @@ public class AdminPledge implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
index c2a85d43fbedaa6bd1612433949a1f0e5bd6adc7..60798f1698f6ef9faa2a3057e1ce1b0738611bee 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
@@ -45,6 +45,7 @@ public class AdminPolymorph implements IAdminCommandHandler
 		"admin_untransform_menu",
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (activeChar.isMounted())
@@ -133,6 +134,7 @@ public class AdminPolymorph implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
@@ -140,7 +142,7 @@ public class AdminPolymorph implements IAdminCommandHandler
 	
 	/**
 	 * @param activeChar
-	 * @param target
+	 * @param obj 
 	 * @param id
 	 * @param type
 	 */
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 1f8b97ebc48b4a9f9890a48eec8ce5caadc63d4d..b7d6bacbffa188ef69075e91ce92cfa158cd0ff2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -36,6 +36,7 @@ public class AdminQuest implements IAdminCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (activeChar == null)
@@ -132,6 +133,7 @@ public class AdminQuest implements IAdminCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
 	 */
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java
index 40e5e1dda85a1507cf46f0256a6ba69a07e9ff8e..20a1a9734ca59e1b472d7417f6245cadf94771c6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java
@@ -39,12 +39,14 @@ public class AdminRepairChar implements IAdminCommandHandler
 		"admin_repair"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		handleRepair(command);
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java
index 34b8166cdf0886a235fa58cbe75c44708f2c6209..71ab5f9f8ea163fa9bc3f60fb6c3a7187069c663 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java
@@ -42,6 +42,7 @@ public class AdminRes implements IAdminCommandHandler
 		"admin_res_monster"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.startsWith("admin_res "))
@@ -56,6 +57,7 @@ public class AdminRes implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
index 2dbd1a292c58a6313c33e81a74e192d47087d9ce..48ffc4619e449c510e1ea47d992f9146504b3f1c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
@@ -41,6 +41,7 @@ public class AdminRide implements IAdminCommandHandler
 	
 	private static final int JET_BIKE_TRANSFORMATION_ID = 20001;
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		L2PcInstance player = getRideTarget(activeChar);
@@ -123,6 +124,7 @@ public class AdminRide implements IAdminCommandHandler
 		return player;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java
index 29d366646f43a50a96195ca477fc6648dd945727..2952da619ff7d42fdbaa9d47ee22f98e69b86f65 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java
@@ -42,6 +42,7 @@ public class AdminShop implements IAdminCommandHandler
 		"admin_gmshop"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.startsWith("admin_buy"))
@@ -62,6 +63,7 @@ public class AdminShop implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
index 992631573f7ba0a3e549a457aaa02617193d29af..f84e0edeefc7a3e31d2d2ec9e42fd46729054da9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
@@ -17,7 +17,6 @@ package handlers.admincommandhandlers;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 
 import javolution.text.TextBuilder;
 
@@ -47,6 +46,7 @@ public class AdminShowQuests implements IAdminCommandHandler
 		"admin_setcharquest"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		String[] cmdParams = command.split(" ");
@@ -144,7 +144,7 @@ public class AdminShowQuests implements IAdminCommandHandler
 		actor.sendPacket(adminReply);
 	}
 	
-	private void showquestmenu(L2PcInstance target, L2PcInstance actor, String[] val) throws SQLException
+	private void showquestmenu(L2PcInstance target, L2PcInstance actor, String[] val)
 	{
 		Connection con = null;
 		try
@@ -179,9 +179,10 @@ public class AdminShowQuests implements IAdminCommandHandler
 				while(rs.next()){
 					String var_name = rs.getString(1);
 					if (var_name.equals("<state>"))
+					{
 						continue;
-					else
-						replyMSG.append("<tr><td>"+var_name+"</td><td>"+rs.getString(2)+"</td><td><edit var=\"var"+var_name+"\" width=80 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" "+var_name+" $var"+var_name+"\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Del\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" "+var_name+" delete\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
+					}
+					replyMSG.append("<tr><td>"+var_name+"</td><td>"+rs.getString(2)+"</td><td><edit var=\"var"+var_name+"\" width=80 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" "+var_name+" $var"+var_name+"\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Del\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" "+var_name+" delete\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
 				}
 				replyMSG.append("</table><br><br><table width=250><tr><td>Repeatable quest:</td><td>Unrepeatable quest:</td></tr>");
 				replyMSG.append("<tr><td><button value=\"Quest Complete\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" state COMLETED 1\" width=120 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>");
@@ -241,9 +242,10 @@ public class AdminShowQuests implements IAdminCommandHandler
 						{
 							String var_name = rs.getString(1);
 							if (var_name.equals("<state>"))
+							{
 								continue;
-							else
-								replyMSG.append("<tr><td>"+var_name+"</td><td>"+rs.getString(2)+"</td><td><edit var=\"var"+var_name+"\" width=80 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" "+var_name+" $var"+var_name+"\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Del\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" "+var_name+" delete\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
+							}
+							replyMSG.append("<tr><td>"+var_name+"</td><td>"+rs.getString(2)+"</td><td><edit var=\"var"+var_name+"\" width=80 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" "+var_name+" $var"+var_name+"\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Del\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" "+var_name+" delete\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
 						}
 						replyMSG.append("</table><br><br><table width=250><tr><td>Repeatable quest:</td><td>Unrepeatable quest:</td></tr>");
 						replyMSG.append("<tr><td><button value=\"Quest Complete\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" state COMLETED 1\" width=100 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>");
@@ -337,6 +339,7 @@ public class AdminShowQuests implements IAdminCommandHandler
 		{};
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java
index d272bbeafb47e6eb96c21a6533a5adc9d8e6d31e..7060077b0be870c39aac077404c81ded0bca7dae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java
@@ -43,6 +43,7 @@ public class AdminShutdown implements IAdminCommandHandler
 		"admin_server_abort"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.startsWith("admin_server_shutdown"))
@@ -77,6 +78,7 @@ public class AdminShutdown implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
index 8ad8fe36ca5e826069793b63a5ede07ca8c99c48..180aa423f0f6051af3ad344b4437958766d2f223 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
@@ -67,6 +67,7 @@ public class AdminSiege implements IAdminCommandHandler
 		"admin_clanhallteleportself"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		StringTokenizer st = new StringTokenizer(command, " ");
@@ -420,6 +421,7 @@ public class AdminSiege implements IAdminCommandHandler
 		activeChar.sendPacket(msg);
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 9bb3951b9259ed2ebfa0ff0c8bd4093fd8a22e32..f380adc0192662ca23ec05d09da4088eca263387 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -74,6 +74,7 @@ public class AdminSkill implements IAdminCommandHandler
 	
 	private static L2Skill[] adminSkills;
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_show_skills"))
@@ -185,7 +186,8 @@ public class AdminSkill implements IAdminCommandHandler
 	
 	/**
 	 * This function will give all the skills that the target can learn at his/her level
-	 * @param activeChar: the gm char
+	 * @param activeChar the active char
+	 * @param includedByFs if {@code true} Forgotten Scroll skills will be delivered.
 	 */
 	private void adminGiveAllSkills(L2PcInstance activeChar, boolean includedByFs)
 	{
@@ -203,6 +205,7 @@ public class AdminSkill implements IAdminCommandHandler
 		player.sendSkillList();
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
@@ -490,36 +493,29 @@ public class AdminSkill implements IAdminCommandHandler
 			showMainPage(activeChar);
 			return;
 		}
-		else
+		
+		final L2Skill skill = SkillTable.getInstance().getInfo(id, level);
+		if (skill == null)
 		{
-			L2Skill skill = SkillTable.getInstance().getInfo(id, level);
-			if (skill != null)
-			{
-				String skillname = skill.getName();
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_SKILL_S1_ADDED);
-				sm.addSkillName(skill);
-				player.sendPacket(sm);
-				final L2Clan clan = player.getClan();
-				clan.broadcastToOnlineMembers(sm);
-				clan.addNewSkill(skill);
-				activeChar.sendMessage("You gave the Clan Skill: " + skillname + " to the clan " + clan.getName() + ".");
-				
-				clan.broadcastToOnlineMembers(new PledgeSkillList(clan));
-				for (L2PcInstance member : clan.getOnlineMembers(0))
-				{
-					member.sendSkillList();
-				}
-				
-				showMainPage(activeChar);
-				return;
-			}
-			else
-			{
-				activeChar.sendMessage("Error: there is no such skill.");
-				return;
-			}
-			
+			activeChar.sendMessage("Error: there is no such skill.");
+		}
+		
+		String skillname = skill.getName();
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_SKILL_S1_ADDED);
+		sm.addSkillName(skill);
+		player.sendPacket(sm);
+		final L2Clan clan = player.getClan();
+		clan.broadcastToOnlineMembers(sm);
+		clan.addNewSkill(skill);
+		activeChar.sendMessage("You gave the Clan Skill: " + skillname + " to the clan " + clan.getName() + ".");
+		
+		clan.broadcastToOnlineMembers(new PledgeSkillList(clan));
+		for (L2PcInstance member : clan.getOnlineMembers(0))
+		{
+			member.sendSkillList();
 		}
+		
+		showMainPage(activeChar);
 	}
 	
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 0f651c16b9ea1235b04fe7802a8b0e8cf82a84a8..e8aee04a0356dc881b46a01e89c80e755c051f32 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -47,7 +47,6 @@ import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Broadcast;
 import com.l2jserver.util.StringUtil;
 
-
 /**
  * This class handles following admin commands: - show_spawns = shows menu -
  * spawn_index lvl = shows menu for monsters with respective level -
@@ -57,6 +56,7 @@ import com.l2jserver.util.StringUtil;
  */
 public class AdminSpawn implements IAdminCommandHandler
 {
+	private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName());
 	
 	private static final String[] ADMIN_COMMANDS =
 	{
@@ -80,8 +80,8 @@ public class AdminSpawn implements IAdminCommandHandler
 		"admin_spawn_debug_print",
 		"admin_spawn_debug_print_menu"
 	};
-	public static Logger _log = Logger.getLogger(AdminSpawn.class.getName());
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_show_spawns"))
@@ -303,6 +303,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java
index c6ffd0bfdbdf3353ab918be87a4c89f1fe51bf3c..18658d65b8834cd69210c998d298c70fb4d66a6e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java
@@ -31,6 +31,7 @@ public class AdminTarget implements IAdminCommandHandler
 		"admin_target"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.startsWith("admin_target"))
@@ -38,6 +39,7 @@ public class AdminTarget implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java
index e5b210100bf09fcb5ef22135af2c9ea5ad05539c..368dd83c879f1e40cf63dc38cd25738a6bb4d713 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
  */
 public class AdminTargetSay implements IAdminCommandHandler
 {
-	
 	private static final String[] ADMIN_COMMANDS =
 	{
 		"admin_targetsay"
@@ -42,19 +41,17 @@ public class AdminTargetSay implements IAdminCommandHandler
 		{
 			try
 			{
-				String message = command.substring(16);
-				
-				L2Object obj = activeChar.getTarget();
-				
+				final L2Object obj = activeChar.getTarget();
 				if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character))
 				{
 					activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
 					return false;
 				}
-				else
-				{
-					talk(activeChar, (L2Character) obj, message);
-				}
+				
+				final String message = command.substring(16);
+				final L2Character target = (L2Character) obj;
+				
+				target.broadcastPacket(new CreatureSay(target.getObjectId(), Say2.ALL, target.getName(), message));
 			}
 			catch (StringIndexOutOfBoundsException e)
 			{
@@ -65,11 +62,6 @@ public class AdminTargetSay implements IAdminCommandHandler
 		return true;
 	}
 	
-	private void talk(L2PcInstance activeChar, L2Character target, String message)
-	{
-		target.broadcastPacket(new CreatureSay(target.getObjectId(), Say2.ALL, target.getName(), message));
-	}
-	
 	@Override
 	public String[] getAdminCommandList()
 	{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index c56b6410676167f5d16024089c37f3fc28a51e20..e054e38448cff587b5d5a91ca33925d22792d89f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -41,7 +41,6 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.util.StringUtil;
 
-
 /**
  * This class handles following admin commands:
  * - show_moves
@@ -82,6 +81,7 @@ public class AdminTeleport implements IAdminCommandHandler
 		"admin_instant_move"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_teleto"))
@@ -246,6 +246,7 @@ public class AdminTeleport implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
@@ -364,6 +365,7 @@ public class AdminTeleport implements IAdminCommandHandler
 	 * @param x
 	 * @param y
 	 * @param z
+	 * @param activeChar 
 	 */
 	private void teleportCharacter(L2PcInstance player, int x, int y, int z, L2PcInstance activeChar)
 	{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java
index 41771e9b58aed84bc3166ebf6eb3db474ecaa6bd..b2b576bf926c7e5b7041ff7b7ea5206f8de7d384 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java
@@ -43,9 +43,7 @@ public class AdminTest implements IAdminCommandHandler
 		"admin_known"
 	};
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.L2PcInstance)
-	 */
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_stats"))
@@ -90,6 +88,7 @@ public class AdminTest implements IAdminCommandHandler
 	/**
 	 * @param activeChar
 	 * @param id
+	 * @param msu 
 	 */
 	private void adminTestSkill(L2PcInstance activeChar, int id, boolean msu)
 	{
@@ -114,6 +113,7 @@ public class AdminTest implements IAdminCommandHandler
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
 	 */
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
index 7609b54cd653e1409b122e933c6eff648a140e3c..7c69eccd321a714c0d8b25e826b7c8110585f0af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
@@ -34,6 +34,7 @@ public class AdminTvTEvent implements IAdminCommandHandler
 		"admin_tvt_advance"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (command.equals("admin_tvt_add"))
@@ -68,6 +69,7 @@ public class AdminTvTEvent implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java
index 6b96ed324c38ab31be3cb4522639b20b4cc1b460..b2f35d36b44e003431a4e15068ebb9a1770c4909 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java
@@ -19,7 +19,6 @@ import java.util.logging.Logger;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
  * This class handles following admin commands:
  * <ul>
@@ -30,8 +29,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class AdminUnblockIp implements IAdminCommandHandler
 {
-	
-	private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName());
+	private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName());
 	
 	private static final String[] ADMIN_COMMANDS =
 	{
@@ -39,9 +37,9 @@ public class AdminUnblockIp implements IAdminCommandHandler
 	};
 	
 	/**
-	 * 
 	 * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		
@@ -65,6 +63,7 @@ public class AdminUnblockIp implements IAdminCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java
index 19180880e6f36d46557174a49440416935bd9512..cf9d7d2079bd8440355a19793dae3a324a77c5e5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java
@@ -36,6 +36,7 @@ public class AdminVitality implements IAdminCommandHandler
 		"admin_get_vitality"
 	};
 	
+	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (activeChar == null)
@@ -115,13 +116,11 @@ public class AdminVitality implements IAdminCommandHandler
 			}
 			return true;
 		}
-		else
-		{
-			activeChar.sendMessage("Target not found or not a player");
-			return false;
-		}
+		activeChar.sendMessage("Target not found or not a player");
+		return false;
 	}
 	
+	@Override
 	public String[] getAdminCommandList()
 	{
 		return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
index 96efd47d841b543acecf584fe8a195f17d1e650a..662fecb5afd22c1ee9a5a5a6c542715670353399 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
@@ -61,283 +61,281 @@ public class Festival implements IBypassHandler
 				npc.showChatWindow(activeChar, val, null, true);
 				return true;
 			}
-			else
+			
+			final L2Party party;
+			val = Integer.parseInt(command.substring(9, 10));
+			switch (val)
 			{
-				final L2Party party;
-				val = Integer.parseInt(command.substring(9, 10));
-				switch (val)
-				{
-					case 1: // Become a Participant
-						// Check if the festival period is active, if not then don't allow registration.
-						if (SevenSigns.getInstance().isSealValidationPeriod())
-						{
-							npc.showChatWindow(activeChar, 2, "a", false);
-							return true;
-						}
-						
-						// Check if a festival is in progress, then don't allow registration yet.
-						if (SevenSignsFestival.getInstance().isFestivalInitialized())
-						{
-							activeChar.sendMessage("You cannot sign up while a festival is in progress.");
-							return true;
-						}
-						
-						// Check if the player is in a formed party already.
-						if (!activeChar.isInParty())
-						{
-							npc.showChatWindow(activeChar, 2, "b", false);
-							return true;
-						}
-						
-						party = activeChar.getParty();
-						
-						// Check if the player is the party leader.
-						if (!party.isLeader(activeChar))
-						{
-							npc.showChatWindow(activeChar, 2, "c", false);
-							return true;
-						}
-						
-						// Check to see if the party has at least 5 members.
-						if (party.getMemberCount() < Config.ALT_FESTIVAL_MIN_PLAYER)
-						{
-							npc.showChatWindow(activeChar, 2, "b", false);
-							return true;
-						}
-						
-						// Check if all the party members are in the required level range.
-						if (party.getLevel() > SevenSignsFestival.getMaxLevelForFestival(npc.getFestivalType()))
-						{
-							npc.showChatWindow(activeChar, 2, "d", false);
-							return true;
-						}
-						
-						// Check to see if the player has already signed up
-						if (activeChar.isFestivalParticipant())
-						{
-							SevenSignsFestival.getInstance().setParticipants(npc.getFestivalOracle(), npc.getFestivalType(), party);
-							npc.showChatWindow(activeChar, 2, "f", false);
-							return true;
-						}
-						
-						npc.showChatWindow(activeChar, 1, null, false);
-						break;
-					case 2: // Seal Stones
-						final int stoneType = Integer.parseInt(command.substring(11));
-						final int stoneCount = npc.getStoneCount(stoneType);
-						if (stoneCount <= 0)
-						{
-							return false;
-						}
-						
-						if (!activeChar.destroyItemByItemId("SevenSigns", stoneType, stoneCount, npc, true))
-						{
-							return false;
-						}
-						
-						SevenSignsFestival.getInstance().setParticipants(npc.getFestivalOracle(), npc.getFestivalType(), activeChar.getParty());
-						SevenSignsFestival.getInstance().addAccumulatedBonus(npc.getFestivalType(), stoneType, stoneCount);
-						
-						npc.showChatWindow(activeChar, 2, "e", false);
-						break;
-					case 3: // Score Registration
-						// Check if the festival period is active, if not then don't register the score.
-						if (SevenSigns.getInstance().isSealValidationPeriod())
-						{
-							npc.showChatWindow(activeChar, 3, "a", false);
-							return true;
-						}
-						
-						// Check if a festival is in progress, if it is don't register the score.
-						if (SevenSignsFestival.getInstance().isFestivalInProgress())
-						{
-							activeChar.sendMessage("You cannot register a score while a festival is in progress.");
-							return true;
-						}
-						
-						// Check if the player is in a party.
-						if (!activeChar.isInParty())
-						{
-							npc.showChatWindow(activeChar, 3, "b", false);
-							return true;
-						}
-						
-						final List<Integer> prevParticipants = SevenSignsFestival.getInstance().getPreviousParticipants(npc.getFestivalOracle(), npc.getFestivalType());
-						
-						// Check if there are any past participants.
-						if ((prevParticipants == null) || prevParticipants.isEmpty() || !prevParticipants.contains(activeChar.getObjectId()))
-						{
-							npc.showChatWindow(activeChar, 3, "b", false);
-							return true;
-						}
-						
-						// Check if this player was the party leader in the festival.
-						if (activeChar.getObjectId() != prevParticipants.get(0))
-						{
-							npc.showChatWindow(activeChar, 3, "b", false);
-							return true;
-						}
-						
-						final L2ItemInstance bloodOfferings = activeChar.getInventory().getItemByItemId(SevenSignsFestival.FESTIVAL_OFFERING_ID);
-						
-						// Check if the player collected any blood offerings during the festival.
-						if (bloodOfferings == null)
-						{
-							activeChar.sendMessage("You do not have any blood offerings to contribute.");
-							return true;
-						}
-						
-						final long offeringScore = bloodOfferings.getCount() * SevenSignsFestival.FESTIVAL_OFFERING_VALUE;
-						if (!activeChar.destroyItem("SevenSigns", bloodOfferings, npc, false))
-						{
-							return true;
-						}
-						
-						final boolean isHighestScore = SevenSignsFestival.getInstance().setFinalScore(activeChar, npc.getFestivalOracle(), npc.getFestivalType(), offeringScore);
-						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONTRIB_SCORE_INCREASED_S1);
-						sm.addItemNumber(offeringScore);
-						activeChar.sendPacket(sm);
-						
-						if (isHighestScore)
-						{
-							npc.showChatWindow(activeChar, 3, "c", false);
+				case 1: // Become a Participant
+					// Check if the festival period is active, if not then don't allow registration.
+					if (SevenSigns.getInstance().isSealValidationPeriod())
+					{
+						npc.showChatWindow(activeChar, 2, "a", false);
+						return true;
+					}
+					
+					// Check if a festival is in progress, then don't allow registration yet.
+					if (SevenSignsFestival.getInstance().isFestivalInitialized())
+					{
+						activeChar.sendMessage("You cannot sign up while a festival is in progress.");
+						return true;
+					}
+					
+					// Check if the player is in a formed party already.
+					if (!activeChar.isInParty())
+					{
+						npc.showChatWindow(activeChar, 2, "b", false);
+						return true;
+					}
+					
+					party = activeChar.getParty();
+					
+					// Check if the player is the party leader.
+					if (!party.isLeader(activeChar))
+					{
+						npc.showChatWindow(activeChar, 2, "c", false);
+						return true;
+					}
+					
+					// Check to see if the party has at least 5 members.
+					if (party.getMemberCount() < Config.ALT_FESTIVAL_MIN_PLAYER)
+					{
+						npc.showChatWindow(activeChar, 2, "b", false);
+						return true;
+					}
+					
+					// Check if all the party members are in the required level range.
+					if (party.getLevel() > SevenSignsFestival.getMaxLevelForFestival(npc.getFestivalType()))
+					{
+						npc.showChatWindow(activeChar, 2, "d", false);
+						return true;
+					}
+					
+					// Check to see if the player has already signed up
+					if (activeChar.isFestivalParticipant())
+					{
+						SevenSignsFestival.getInstance().setParticipants(npc.getFestivalOracle(), npc.getFestivalType(), party);
+						npc.showChatWindow(activeChar, 2, "f", false);
+						return true;
+					}
+					
+					npc.showChatWindow(activeChar, 1, null, false);
+					break;
+				case 2: // Seal Stones
+					final int stoneType = Integer.parseInt(command.substring(11));
+					final int stoneCount = npc.getStoneCount(stoneType);
+					if (stoneCount <= 0)
+					{
+						return false;
+					}
+					
+					if (!activeChar.destroyItemByItemId("SevenSigns", stoneType, stoneCount, npc, true))
+					{
+						return false;
+					}
+					
+					SevenSignsFestival.getInstance().setParticipants(npc.getFestivalOracle(), npc.getFestivalType(), activeChar.getParty());
+					SevenSignsFestival.getInstance().addAccumulatedBonus(npc.getFestivalType(), stoneType, stoneCount);
+					
+					npc.showChatWindow(activeChar, 2, "e", false);
+					break;
+				case 3: // Score Registration
+					// Check if the festival period is active, if not then don't register the score.
+					if (SevenSigns.getInstance().isSealValidationPeriod())
+					{
+						npc.showChatWindow(activeChar, 3, "a", false);
+						return true;
+					}
+					
+					// Check if a festival is in progress, if it is don't register the score.
+					if (SevenSignsFestival.getInstance().isFestivalInProgress())
+					{
+						activeChar.sendMessage("You cannot register a score while a festival is in progress.");
+						return true;
+					}
+					
+					// Check if the player is in a party.
+					if (!activeChar.isInParty())
+					{
+						npc.showChatWindow(activeChar, 3, "b", false);
+						return true;
+					}
+					
+					final List<Integer> prevParticipants = SevenSignsFestival.getInstance().getPreviousParticipants(npc.getFestivalOracle(), npc.getFestivalType());
+					
+					// Check if there are any past participants.
+					if ((prevParticipants == null) || prevParticipants.isEmpty() || !prevParticipants.contains(activeChar.getObjectId()))
+					{
+						npc.showChatWindow(activeChar, 3, "b", false);
+						return true;
+					}
+					
+					// Check if this player was the party leader in the festival.
+					if (activeChar.getObjectId() != prevParticipants.get(0))
+					{
+						npc.showChatWindow(activeChar, 3, "b", false);
+						return true;
+					}
+					
+					final L2ItemInstance bloodOfferings = activeChar.getInventory().getItemByItemId(SevenSignsFestival.FESTIVAL_OFFERING_ID);
+					
+					// Check if the player collected any blood offerings during the festival.
+					if (bloodOfferings == null)
+					{
+						activeChar.sendMessage("You do not have any blood offerings to contribute.");
+						return true;
+					}
+					
+					final long offeringScore = bloodOfferings.getCount() * SevenSignsFestival.FESTIVAL_OFFERING_VALUE;
+					if (!activeChar.destroyItem("SevenSigns", bloodOfferings, npc, false))
+					{
+						return true;
+					}
+					
+					final boolean isHighestScore = SevenSignsFestival.getInstance().setFinalScore(activeChar, npc.getFestivalOracle(), npc.getFestivalType(), offeringScore);
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONTRIB_SCORE_INCREASED_S1);
+					sm.addItemNumber(offeringScore);
+					activeChar.sendPacket(sm);
+					
+					if (isHighestScore)
+					{
+						npc.showChatWindow(activeChar, 3, "c", false);
+					}
+					else
+					{
+						npc.showChatWindow(activeChar, 3, "d", false);
+					}
+					break;
+				case 4: // Current High Scores
+					final StringBuilder strBuffer = StringUtil.startAppend(500, "<html><body>Festival Guide:<br>These are the top scores of the week, for the ");
+					
+					final StatsSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, npc.getFestivalType());
+					final StatsSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, npc.getFestivalType());
+					final StatsSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(npc.getFestivalType());
+					
+					final int dawnScore = dawnData.getInteger("score");
+					final int duskScore = duskData.getInteger("score");
+					int overallScore = 0;
+					
+					// If no data is returned, assume there is no record, or all scores are 0.
+					if (overallData != null)
+					{
+						overallScore = overallData.getInteger("score");
+					}
+					
+					StringUtil.append(strBuffer, SevenSignsFestival.getFestivalName(npc.getFestivalType()), " festival.<br>");
+					
+					if (dawnScore > 0)
+					{
+						StringUtil.append(strBuffer, "Dawn: ", calculateDate(dawnData.getString("date")), ". Score ", String.valueOf(dawnScore), "<br>", dawnData.getString("members"), "<br>");
+					}
+					else
+					{
+						strBuffer.append("Dawn: No record exists. Score 0<br>");
+					}
+					
+					if (duskScore > 0)
+					{
+						StringUtil.append(strBuffer, "Dusk: ", calculateDate(duskData.getString("date")), ". Score ", String.valueOf(duskScore), "<br>", duskData.getString("members"), "<br>");
+					}
+					else
+					{
+						strBuffer.append("Dusk: No record exists. Score 0<br>");
+					}
+					
+					if (overallScore > 0)
+					{
+						final String cabalStr;
+						if (overallData.getString("cabal").equals("dawn"))
+						{
+							cabalStr = "Children of Dawn";
 						}
 						else
 						{
-							npc.showChatWindow(activeChar, 3, "d", false);
-						}
-						break;
-					case 4: // Current High Scores
-						final StringBuilder strBuffer = StringUtil.startAppend(500, "<html><body>Festival Guide:<br>These are the top scores of the week, for the ");
-						
-						final StatsSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, npc.getFestivalType());
-						final StatsSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, npc.getFestivalType());
-						final StatsSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(npc.getFestivalType());
-						
-						final int dawnScore = dawnData.getInteger("score");
-						final int duskScore = duskData.getInteger("score");
-						int overallScore = 0;
-						
-						// If no data is returned, assume there is no record, or all scores are 0.
-						if (overallData != null)
-						{
-							overallScore = overallData.getInteger("score");
-						}
-						
-						StringUtil.append(strBuffer, SevenSignsFestival.getFestivalName(npc.getFestivalType()), " festival.<br>");
-						
-						if (dawnScore > 0)
-						{
-							StringUtil.append(strBuffer, "Dawn: ", calculateDate(dawnData.getString("date")), ". Score ", String.valueOf(dawnScore), "<br>", dawnData.getString("members"), "<br>");
-						}
-						else
-						{
-							strBuffer.append("Dawn: No record exists. Score 0<br>");
-						}
-						
-						if (duskScore > 0)
-						{
-							StringUtil.append(strBuffer, "Dusk: ", calculateDate(duskData.getString("date")), ". Score ", String.valueOf(duskScore), "<br>", duskData.getString("members"), "<br>");
-						}
-						else
-						{
-							strBuffer.append("Dusk: No record exists. Score 0<br>");
-						}
-						
-						if (overallScore > 0)
-						{
-							final String cabalStr;
-							if (overallData.getString("cabal").equals("dawn"))
-							{
-								cabalStr = "Children of Dawn";
-							}
-							else
-							{
-								cabalStr = "Children of Dusk";
-							}
-							
-							StringUtil.append(strBuffer, "Consecutive top scores: ", calculateDate(overallData.getString("date")), ". Score ", String.valueOf(overallScore), "<br>Affilated side: ", cabalStr, "<br>", overallData.getString("members"), "<br>");
-						}
-						else
-						{
-							strBuffer.append("Consecutive top scores: No record exists. Score 0<br>");
-						}
-						
-						StringUtil.append(strBuffer, "<a action=\"bypass -h npc_", String.valueOf(npc.getObjectId()), "_Chat 0\">Go back.</a></body></html>");
-						
-						NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
-						html.setHtml(strBuffer.toString());
-						activeChar.sendPacket(html);
-						break;
-					case 8: // Increase the Festival Challenge
-						if (!activeChar.isInParty())
-						{
-							return true;
-						}
-						
-						if (!SevenSignsFestival.getInstance().isFestivalInProgress())
-						{
-							return true;
-						}
-						
-						party = activeChar.getParty();
-						if (!party.isLeader(activeChar))
-						{
-							npc.showChatWindow(activeChar, 8, "a", false);
-							return true;
-						}
-						
-						if (SevenSignsFestival.getInstance().increaseChallenge(npc.getFestivalOracle(), npc.getFestivalType()))
-						{
-							npc.showChatWindow(activeChar, 8, "b", false);
+							cabalStr = "Children of Dusk";
+						}
+						
+						StringUtil.append(strBuffer, "Consecutive top scores: ", calculateDate(overallData.getString("date")), ". Score ", String.valueOf(overallScore), "<br>Affilated side: ", cabalStr, "<br>", overallData.getString("members"), "<br>");
+					}
+					else
+					{
+						strBuffer.append("Consecutive top scores: No record exists. Score 0<br>");
+					}
+					
+					StringUtil.append(strBuffer, "<a action=\"bypass -h npc_", String.valueOf(npc.getObjectId()), "_Chat 0\">Go back.</a></body></html>");
+					
+					NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
+					html.setHtml(strBuffer.toString());
+					activeChar.sendPacket(html);
+					break;
+				case 8: // Increase the Festival Challenge
+					if (!activeChar.isInParty())
+					{
+						return true;
+					}
+					
+					if (!SevenSignsFestival.getInstance().isFestivalInProgress())
+					{
+						return true;
+					}
+					
+					party = activeChar.getParty();
+					if (!party.isLeader(activeChar))
+					{
+						npc.showChatWindow(activeChar, 8, "a", false);
+						return true;
+					}
+					
+					if (SevenSignsFestival.getInstance().increaseChallenge(npc.getFestivalOracle(), npc.getFestivalType()))
+					{
+						npc.showChatWindow(activeChar, 8, "b", false);
+					}
+					else
+					{
+						npc.showChatWindow(activeChar, 8, "c", false);
+					}
+					break;
+				case 9: // Leave the Festival
+					if (!activeChar.isInParty())
+					{
+						return true;
+					}
+					
+					party = activeChar.getParty();
+					if (party.isLeader(activeChar))
+					{
+						SevenSignsFestival.getInstance().updateParticipants(activeChar, null);
+					}
+					else
+					{
+						if (party.getMemberCount() > Config.ALT_FESTIVAL_MIN_PLAYER)
+						{
+							party.removePartyMember(activeChar, messageType.Expelled);
 						}
 						else
 						{
-							npc.showChatWindow(activeChar, 8, "c", false);
-						}
-						break;
-					case 9: // Leave the Festival
-						if (!activeChar.isInParty())
-						{
-							return true;
-						}
-						
-						party = activeChar.getParty();
-						if (party.isLeader(activeChar))
-						{
-							SevenSignsFestival.getInstance().updateParticipants(activeChar, null);
-						}
-						else
-						{
-							if (party.getMemberCount() > Config.ALT_FESTIVAL_MIN_PLAYER)
-							{
-								party.removePartyMember(activeChar, messageType.Expelled);
-							}
-							else
-							{
-								activeChar.sendMessage("Only the party leader can leave a festival when a party has minimum number of members.");
-							}
-						}
-						break;
-					case 0: // Distribute Accumulated Bonus
-						if (!SevenSigns.getInstance().isSealValidationPeriod())
-						{
-							activeChar.sendMessage("Bonuses cannot be paid during the competition period.");
-							return true;
-						}
-						
-						if (SevenSignsFestival.getInstance().distribAccumulatedBonus(activeChar) > 0)
-						{
-							npc.showChatWindow(activeChar, 0, "a", false);
-						}
-						else
-						{
-							npc.showChatWindow(activeChar, 0, "b", false);
-						}
-						break;
-					default:
-						npc.showChatWindow(activeChar, val, null, false);
-				}
+							activeChar.sendMessage("Only the party leader can leave a festival when a party has minimum number of members.");
+						}
+					}
+					break;
+				case 0: // Distribute Accumulated Bonus
+					if (!SevenSigns.getInstance().isSealValidationPeriod())
+					{
+						activeChar.sendMessage("Bonuses cannot be paid during the competition period.");
+						return true;
+					}
+					
+					if (SevenSignsFestival.getInstance().distribAccumulatedBonus(activeChar) > 0)
+					{
+						npc.showChatWindow(activeChar, 0, "a", false);
+					}
+					else
+					{
+						npc.showChatWindow(activeChar, 0, "b", false);
+					}
+					break;
+				default:
+					npc.showChatWindow(activeChar, val, null, false);
 			}
 			return true;
 		}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
index e32f7214f044bab5f18ff27ecee7def9af48b352..41413d4d3f310a68ec26500add87f9f281ea087c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
@@ -71,10 +71,8 @@ public class FortSiege implements IBypassHandler
 			}
 			return false;
 		}
-		else
-		{
-			((L2Npc) target).showChatWindow(activeChar, 10);
-		}
+		
+		((L2Npc) target).showChatWindow(activeChar, 10);
 		
 		return true;
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
index b01d0ba016d7a6822ffd5c43a749bbbb25689172..c1b1cbeaef2269d0932da19a786e68e5928cae34 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
@@ -203,32 +203,29 @@ public class OlympiadObservation implements IBypassHandler
 				activeChar.sendPacket(message);
 				return true;
 			}
-			else
-			// change
+			
+			if (isManager)
 			{
-				if (isManager)
+				if (OlympiadManager.getInstance().isRegisteredInComp(activeChar))
 				{
-					if (OlympiadManager.getInstance().isRegisteredInComp(activeChar))
-					{
-						activeChar.sendPacket(SystemMessageId.WHILE_YOU_ARE_ON_THE_WAITING_LIST_YOU_ARE_NOT_ALLOWED_TO_WATCH_THE_GAME);
-						return false;
-					}
-					if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(activeChar.getObjectId()))
-					{
-						activeChar.sendMessage("You can not observe games while registered for TvT");
-						return false;
-					}
+					activeChar.sendPacket(SystemMessageId.WHILE_YOU_ARE_ON_THE_WAITING_LIST_YOU_ARE_NOT_ALLOWED_TO_WATCH_THE_GAME);
+					return false;
 				}
-				
-				final int arenaId = Integer.parseInt(command.substring(12).trim());
-				final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(arenaId);
-				if (nextArena != null)
+				if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(activeChar.getObjectId()))
 				{
-					activeChar.enterOlympiadObserverMode(nextArena.getZone().getSpawns().get(0), arenaId);
-					activeChar.setInstanceId(OlympiadGameManager.getInstance().getOlympiadTask(arenaId).getZone().getInstanceId());
-					return true;
+					activeChar.sendMessage("You can not observe games while registered for TvT");
+					return false;
 				}
 			}
+			
+			final int arenaId = Integer.parseInt(command.substring(12).trim());
+			final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(arenaId);
+			if (nextArena != null)
+			{
+				activeChar.enterOlympiadObserverMode(nextArena.getZone().getSpawns().get(0), arenaId);
+				activeChar.setInstanceId(OlympiadGameManager.getInstance().getOlympiadTask(arenaId).getZone().getInstanceId());
+				return true;
+			}
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java
index 9fc29dbb064d2df1404d86324a8ad28fc599244b..4d25b49feb1106491cfe20e66d12b3a485b55c5b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java
@@ -74,10 +74,7 @@ public class RemoveDeathPenalty implements IBypassHandler
 							activeChar.sendPacket(new EtcStatusUpdate(activeChar));
 							return true;
 						}
-						else
-						{
-							replyMSG.append("The wound you have received from death's touch is too deep to be healed for the money you have to give me. Find more money if you wish death's mark to be fully removed from you.");
-						}
+						replyMSG.append("The wound you have received from death's touch is too deep to be healed for the money you have to give me. Find more money if you wish death's mark to be fully removed from you.");
 					}
 					else
 					{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java
index 80d11bc6ab4ad609307d6f80b1e9c0c722a0df7d..e76ee262cb6088ebbbab067b98eb9d26b44622a4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java
@@ -64,6 +64,9 @@ public class SupportMagic implements IBypassHandler
 	 * <FONT COLOR=#FF0000><B> Newbie Helper Buff list is define in sql table helper_buff_list</B></FONT><BR>
 	 * <BR>
 	 * @param player The L2PcInstance that talk with the L2NpcInstance
+	 * @param npc 
+	 * @param isSummon 
+	 * @return 
 	 */
 	public static boolean makeSupportMagic(L2PcInstance player, L2Npc npc, boolean isSummon)
 	{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java
index 7eceecd93a289cd63e8fbbeeea651a8b3a94a704..e35b4ad9a9eddbcdbf24df600df56337da362d35 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java
@@ -45,7 +45,7 @@ public class ChatAll implements IChatHandler
 	
 	/**
 	 * Handle chat type 'all'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String params, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java
index e599727c876b8b1e905a3eb0f3e205ee4bcd8a5e..9b18faf4cff2772ac1733644678df17f0cd43b87 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java
@@ -30,8 +30,9 @@ public class ChatAlliance implements IChatHandler
 	
 	/**
 	 * Handle chat type 'alliance'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
 	{
 		if (activeChar.getClan() != null)
@@ -51,6 +52,7 @@ public class ChatAlliance implements IChatHandler
 	 * Returns the chat types registered to this handler
 	 * @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
 	 */
+	@Override
 	public int[] getChatTypeList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java
index fb44dfc6604b4d4f293d703522ac1fdc19869dca..d92e4e10b99716005ac2dca5f702cb01fc8d5ee7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java
@@ -37,7 +37,7 @@ public class ChatBattlefield implements IChatHandler
 	
 	/**
 	 * Handle chat type 'battlefield'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java
index 590ee1f02028411710572b0f5a74e48ac53d4c5f..cecec4f94423d39dc932a1875c449e78adce9306 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java
@@ -35,8 +35,9 @@ public class ChatClan implements IChatHandler
 	
 	/**
 	 * Handle chat type 'clan'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
 	{
 		if (activeChar.getClan() != null)
@@ -56,6 +57,7 @@ public class ChatClan implements IChatHandler
 	 * Returns the chat types registered to this handler
 	 * @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
 	 */
+	@Override
 	public int[] getChatTypeList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java
index c0937bd171a74a03d36fe2bd9df34fb39e516455..b1dbf4bb642e20d608e7ac2cc339b388773be1c9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java
@@ -38,7 +38,7 @@ public class ChatHeroVoice implements IChatHandler
 	
 	/**
 	 * Handle chat type 'hero voice'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java
index 41e9c160d586e91d5d9114575ff09a14d2dd9c8f..77e15f0b50612232cab9a8ed71dd0e78ac08e176 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java
@@ -35,8 +35,9 @@ public class ChatParty implements IChatHandler
 	
 	/**
 	 * Handle chat type 'party'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
 	{
 		if (activeChar.isInParty())
@@ -56,6 +57,7 @@ public class ChatParty implements IChatHandler
 	 * Returns the chat types registered to this handler
 	 * @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
 	 */
+	@Override
 	public int[] getChatTypeList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java
index 26abaa3f5f89b321255454efb9ecaca9716f887d..d081452f453c636608b2c123d3dc832d7d0ca05c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java
@@ -36,7 +36,9 @@ public class ChatPartyMatchRoom implements IChatHandler
 	
 	/**
 	 * Handle chat type 'partymatchroom'
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
 	{
 		if (activeChar.isInPartyMatchRoom())
@@ -62,6 +64,7 @@ public class ChatPartyMatchRoom implements IChatHandler
 	/**
 	 * Returns the chat types registered to this handler
 	 */
+	@Override
 	public int[] getChatTypeList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java
index e94792b42e81ab56c97dddeb09b3f554223ae6f4..7bbf419398306cea2891180d0221b3f0f64111b6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java
@@ -35,8 +35,9 @@ public class ChatPartyRoomAll implements IChatHandler
 	
 	/**
 	 * Handle chat type 'party room all'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
 	{
 		if (activeChar.isInParty())
@@ -59,6 +60,7 @@ public class ChatPartyRoomAll implements IChatHandler
 	 * Returns the chat types registered to this handler
 	 * @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
 	 */
+	@Override
 	public int[] getChatTypeList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java
index 5c8bbcdd447408828a35dfaf2131e2f75fd31da7..565d0bc1960e8a45194004cb3441ed2a02491c9a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java
@@ -35,8 +35,9 @@ public class ChatPartyRoomCommander implements IChatHandler
 	
 	/**
 	 * Handle chat type 'party room commander'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
 	{
 		if (activeChar.isInParty())
@@ -59,6 +60,7 @@ public class ChatPartyRoomCommander implements IChatHandler
 	 * Returns the chat types registered to this handler
 	 * @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
 	 */
+	@Override
 	public int[] getChatTypeList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java
index f9d3adb045dcac0fbfcb1614b5d43a8883cd1173..4c520a132459dc02ec6bf077fdf728b37e12268e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java
@@ -36,8 +36,9 @@ public class ChatPetition implements IChatHandler
 	
 	/**
 	 * Handle chat type 'petition player'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
 	{
 		if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
@@ -59,6 +60,7 @@ public class ChatPetition implements IChatHandler
 	 * Returns the chat types registered to this handler
 	 * @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
 	 */
+	@Override
 	public int[] getChatTypeList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java
index 29119b3123103d8174bf010710581e8851355eba..91372958e2da4abcd0722bccd9f6fa1a20210156 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java
@@ -39,7 +39,7 @@ public class ChatShout implements IChatHandler
 	
 	/**
 	 * Handle chat type 'shout'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java
index 2a01c4f806333b2624a16cc9b78072665d7f60a0..53cf61ca5e48ee7314df3aeab298d3b94d82f3a0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java
@@ -37,8 +37,9 @@ public class ChatTell implements IChatHandler
 	
 	/**
 	 * Handle chat type 'tell'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
 	{
 		if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
@@ -99,6 +100,7 @@ public class ChatTell implements IChatHandler
 	 * Returns the chat types registered to this handler
 	 * @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
 	 */
+	@Override
 	public int[] getChatTypeList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java
index a5236e1248505b947655d4b5d28c0de609b7b225..8a33f2eeb9c9952c2aa6ec8c4116335767e845a4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java
@@ -39,7 +39,7 @@ public class ChatTrade implements IChatHandler
 	
 	/**
 	 * Handle chat type 'trade'
-	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+	 * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void handleChat(int type, L2PcInstance activeChar, String target, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java
index 20f3c034e774501d218e627a5f4748d57fff4b91..d1b974eb8248250187fadbd2c8e43d2fd2e4d43e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java
@@ -55,6 +55,7 @@ public class Fusion extends L2Effect
 		return L2EffectType.FUSION;
 	}
 	
+	@Override
 	public void increaseEffect()
 	{
 		if (_effect < _maxEffect)
@@ -64,6 +65,7 @@ public class Fusion extends L2Effect
 		}
 	}
 	
+	@Override
 	public void decreaseForce()
 	{
 		_effect--;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
index 3a54c0f3ffce0c012795fe479924dc2780ed9fb2..f69ba35a55e0bbc10e31c001e3e966c3dd6b7c84 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
@@ -33,8 +33,9 @@ public class BeastSoulShot implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (playable == null)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
index fee83cd52de586bf727759ff5cc8d6804f507a61..bb7f4802516d15071ebadf2809b0a8aef1c819af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
@@ -27,8 +27,9 @@ public class BeastSpice implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
index 608777eb77f4f3e87093dc764166e53445765fa9..158190f603fde0da3a12ddc4628fb6eafb6c0eea 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
@@ -33,8 +33,9 @@ public class BeastSpiritShot implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (playable == null)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
index ee28fbce3432cf81341dddb7f77d35c7426f0d66..5a635929af9e7645726e3ae770bc09c3ce4105d8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
@@ -34,8 +34,9 @@ public class BlessedSpiritShot implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public synchronized void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
index 78589762be6640d0af17872852f16f5ad490bc68..2790e9589b05552408c5d232909a00ea4a0a72d5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
@@ -26,8 +26,9 @@ public class Book implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
index fc32ca551343475dd8bd59ca323e810e6ad19da7..2238db4cc756e22a46adbf026bb37c4cab1c8cfc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
@@ -27,8 +27,9 @@ public class ChristmasTree implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		L2PcInstance activeChar = (L2PcInstance) playable;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
index 9b4fc09895344432483658506d56169a2c1f574e..f09875b4add8278b47a6f809aab2c94c7b74b945 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
@@ -32,8 +32,9 @@ public class Disguise implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
index 8f4e7afff25a222365009d1a003230896602bee5..dfc770c3fe7e469e0ea986bb895c43a7e8df5bed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
@@ -23,7 +23,7 @@ public class Elixir extends ItemSkills
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
index 2e72c4be8d6c595958bbaaa1f300de6369421fc6..eedcb4f9ca4ae3ac36985c581c78e4a6f03567c2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
@@ -23,6 +23,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExChooseInventoryAttribute
 
 public class EnchantAttribute implements IItemHandler
 {
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
index 1975e8dfa6f1c95f833dd35a3dd615cb5f5e14cb..63b46db675b3d67a6ecdfe938b27e22a004e77b4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
@@ -25,8 +25,9 @@ public class EnchantScrolls implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
index 8efed471fd55dd9f96c64075a70e870aff81a2b7..c552451a5706d8a75bc38766620af032ba4cd123 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
@@ -27,7 +27,7 @@ public class EnergyStarStone extends ItemSkills
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
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 d59a0b385d76d4ffc825a900d69e21d854d605b5..dac536d65b6be37cd9a78e4a1b792ff8d2c0c782 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
@@ -21,7 +21,7 @@ public class EventItem implements IItemHandler
 	private static final Logger _log = Logger.getLogger(EventItem.class.getName());
 	
 	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
index 285c282a072ae7e87b0fac844b01bc309f343539..99952d1dd5b546e60b7236292270be1cc5c005a3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
@@ -36,6 +36,7 @@ public class ExtractableItems implements IItemHandler
 {
 	private static Logger _log = Logger.getLogger(ItemTable.class.getName());
 	
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
index d86054168c6995b7ebd8d8b03ed57b60ee6fca00..603c349a82d072b0f7b75fd1b07d7fca67701faa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
@@ -39,8 +39,9 @@ public class FishShots implements IItemHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
index d73177caf44c76b324363b75fa4db6011e7e50d9..3089492c4b46ae142abed6f38f0323a6a98b393c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
@@ -35,8 +35,9 @@ public class Harvester implements IItemHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance _item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
index fbfea9e44e5728c6e7420e5bd2da72c874b8bd5e..b3eacfa33a05d4eb58beaa4baf0f905a9f49bbf2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
@@ -26,7 +26,7 @@ public class ItemSkills extends ItemSkillsTemplate
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 50e38e4d8efc01fc337d9c5ed037f09d8a3fe546..d691ccc911ad1a2f5c482c6529dc1ff99f714cfc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ExUseSharedGroupItem;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.skills.SkillHolder;
+import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
 
 /**
@@ -40,7 +41,7 @@ public class ItemSkillsTemplate implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
@@ -153,13 +154,21 @@ public class ItemSkillsTemplate implements IItemHandler
 					else
 					{
 						playable.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+						
+						// TODO: Remove when reuse time for sub-class is implemented.
+						if (activeChar.isSubClassActive() && (itemSkill.getSkillType() == L2SkillType.EXTRACTABLE) && (itemSkill.getReuseDelay() > 5000) && (itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0))
+						{
+							activeChar.sendPacket(SystemMessageId.MAIN_CLASS_SKILL_ONLY);
+							return;
+						}
+						
 						if (!playable.useMagic(itemSkill, forceUse, false))
 							return;
 						
-						//consume
+						// Consume.
 						if (itemSkill.getItemConsumeId() == 0 && itemSkill.getItemConsume() > 0)
 						{
-							if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
+							if (!activeChar.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
 							{
 								activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
 								return;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
index b4549f5bd31c9c748c47a51c7b523c87f16d0961..98d47eacd8be1697b9340137c6c654dc9bebc09d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
@@ -23,7 +23,7 @@ public class ManaPotion extends ItemSkills
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
 	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java
index 2359ce05e33d12b074305728ebcba2b52d0ae4e2..1be76f4f2598fed0c96fab3e010814460f857709 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java
@@ -31,8 +31,9 @@ public class Maps implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java
index 6bcb7962dbbd73d6c8a71dbcaceba1391b7f78db..f2da7e2f05cf854a09345f96caac8f45e6902871 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java
@@ -22,6 +22,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExRequestChangeNicknameCol
 
 public class NicknameColor implements IItemHandler
 {
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
index ae9758880f1d490cc6525c851bc12617e4329ec4..94f38e02e96d1a6237902ab6cfe661a31e5d0f54 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
@@ -34,8 +34,9 @@ public class PaganKeys implements IItemHandler
 	
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		int itemId = item.getItemId();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
index 98fb845d78f076541777cf6e64b6568211031fb8..85416d98decd7bd7e1c17ffeaed93e94d6a773d4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
@@ -33,6 +33,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class PetFood implements IItemHandler
 {
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		int itemId = item.getItemId();
@@ -106,20 +107,14 @@ public class PetFood implements IItemHandler
 						}
 						return true;
 					}
-					else
-					{
-						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
-						sm.addItemName(item);
-						activeChar.sendPacket(sm);
-						return false;
-					}
-				}
-				else
-				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
 					sm.addItemName(item);
 					activeChar.sendPacket(sm);
+					return false;
 				}
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+				sm.addItemName(item);
+				activeChar.sendPacket(sm);
 				return false;
 			}
 		}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
index 588a546e8bd9d4d9715427e23a020a87ef877f77..461d4606651f67bb924d488996cd6fb13d5896d6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
@@ -28,6 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public class Recipes implements IItemHandler
 {
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
index 897039abefc047b4517a3e8daaa42c3534dab4c6..ebc7528f4f78df0d818e751d7d83cbdef4709bca 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
@@ -35,8 +35,9 @@ public class RollingDice implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
index d02c5b598f0abde80fad2b6b6c5aad3779c3c5e1..38521a86424ed1aee7a0e2ebfc02ae25b5472381 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
@@ -39,8 +39,9 @@ public class ScrollOfResurrection implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
index 7a1d96aedd9e2bb8b157d26329ff77088c80a9dc..aa15a76c89e3cafee2ff1053176a58d4f52b20d3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
@@ -38,8 +38,9 @@ public class Seed implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java
index 5c66470ddea8923c5b78a567d4b64bb8e3a1df03..d78c5291da6eeab2d7143b70cac6410f7240ddd9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java
@@ -29,8 +29,9 @@ public class SevenSignsRecord implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java
index 1d4ec17415b91fd85bf91819e837a74b8af49754..81d1bd202f8e35764287d0ecb08078edce1ae83b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java
@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.util.Broadcast;
 
 public class SoulShots implements IItemHandler
 {
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java
index 5dce7784088ff6e6a8724db8b44ea9be1a8d6dff..25b50fe7fbb21ca15f032deb60f1a413744de68c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java
@@ -28,8 +28,9 @@ public class SpecialXMas implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
index 4205e1d22b63fc5598977eeb424798d1e9882408..62e75973dd4642bf17612d2a6b24fbe1d3c4be8f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
@@ -34,8 +34,9 @@ public class SpiritShot implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public synchronized void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
index 427d824f6cdcc866d752871795ddf56c3ad83cac..f086ccfa6a467e71b2005cc79fdedce3fdd8c2c3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
@@ -51,8 +51,9 @@ public class SummonItems implements IItemHandler
 {
 	/**
 	 * 
-	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+	 * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
 	 */
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (!(playable instanceof L2PcInstance))
@@ -178,6 +179,7 @@ public class SummonItems implements IItemHandler
 			_petSummon = petSummon;
 		}
 		
+		@Override
 		public void run()
 		{
 			try
@@ -208,6 +210,7 @@ public class SummonItems implements IItemHandler
 			_item = item;
 		}
 		
+		@Override
 		public void run()
 		{
 			try
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
index a381a099f46dd85a58c638c335a764973e20f4ac..55ad6091bf6d39289cecd490049d5f931d04c10c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public class TeleportBookmark implements IItemHandler
 {
-	
+	@Override
 	public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
 	{
 		if (playable == null || item == null || !(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
index 6cdcd4d420a02faa108f4db5fdd3e160e52aa5e6..b640a48ebc741d81f21efe3840f9fce30113674f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
@@ -30,6 +30,7 @@ public class BallistaBomb implements ISkillHandler
 		L2SkillType.BALLISTA
 	};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -55,6 +56,7 @@ public class BallistaBomb implements ISkillHandler
 	/**
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java
index 64d17f1a7a95b88ff8bfac883090b7026d69d800..261b886a9a3477e687aedada6077705d2185a0dd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java
@@ -39,6 +39,7 @@ public class BeastSkills implements ISkillHandler
 		L2SkillType.BEAST_ACCOMPANY
 	};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -80,6 +81,7 @@ public class BeastSkills implements ISkillHandler
 		}
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java
index 4ef485a3b40b36b4a8f2e556fff178d9c0491a09..97e6c30ea35b4100d1ecdca6ad1b0144555c525a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java
@@ -48,6 +48,7 @@ public class Blow implements ISkillHandler
 	};
 
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (activeChar.isAlikeDead())
@@ -212,6 +213,7 @@ public class Blow implements ISkillHandler
 
 	
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java
index f06a17b7bee4b30a83b6d7e7867c5ad7ad0640e8..72a1fe76a0c18291d59f3a247da51d2954ac595e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java
@@ -41,6 +41,7 @@ public class Charge implements ISkillHandler
 	private static final L2SkillType[] SKILL_IDS =
 	{/*L2SkillType.CHARGE*/};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		
@@ -64,6 +65,7 @@ public class Charge implements ISkillHandler
 		}
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
index f25e292d9e22fdd31088add7a469975d91929344..bd329f588415eeb3cdba59134facdda68a4d597f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
@@ -68,6 +68,7 @@ public class Continuous implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		boolean acted = true;
@@ -266,6 +267,7 @@ public class Continuous implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java
index b8c2764f0a0b24f3575483bf32dfc6055f8b7e5d..3aeab9c7c17739eb889bf8fae8e564a27117c760 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java
@@ -37,6 +37,7 @@ public class CpDam implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (activeChar.isAlikeDead())
@@ -121,6 +122,7 @@ public class CpDam implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java
index 4633d54b5f7a53c94ea56b3ebff8841d76a0a2e4..9b88c98b93116ad36fddec405418d8fd8e5dafe3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java
@@ -37,6 +37,7 @@ public class CpDamPercent implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (activeChar.isAlikeDead())
@@ -121,6 +122,7 @@ public class CpDamPercent implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
index 5d0a33867b77ba5a80b6bf1888b30deb917782e1..aa14d81af7744c421643f5749af93df288ef736d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
@@ -41,6 +41,7 @@ public class Craft implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -60,6 +61,7 @@ public class Craft implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java
index ca1b1af997866baca47149f3687daa630d9b1342..8143c766e3ce468381de2060b118cad709406347 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java
@@ -41,6 +41,7 @@ public class DeluxeKey implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -64,6 +65,7 @@ public class DeluxeKey implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
index 057bab30393214ec0b90c10d9c356317a372bee9..a245f4e306384debfa5d4c014160ac1281e444ed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
@@ -34,6 +34,7 @@ public class Detection implements ISkillHandler
 		L2SkillType.DETECTION
 	};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		final boolean hasParty;
@@ -71,6 +72,7 @@ public class Detection implements ISkillHandler
 		}
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
index 6dce452458531d1d0b1d2536487f009455bbd4a4..54ddad81b3a6996a38d4ecbc374c32ea469072ab 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
@@ -614,7 +614,7 @@ public class Disablers implements ISkillHandler
 	 * 
 	 * @param target
 	 * @param type
-	 * @param power
+	 * @param negateLvl 
 	 * @param maxRemoved
 	 * @return
 	 */
@@ -627,7 +627,7 @@ public class Disablers implements ISkillHandler
 	 * 
 	 * @param target
 	 * @param type
-	 * @param power
+	 * @param negateLvl 
 	 * @param skillId
 	 * @param maxRemoved
 	 * @return
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
index 6df1db4d95d77a5ea6aeced04ef718fe8ca9fd14..b19ac9e4542c3422ef44172c566afcf50812d3ea 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
@@ -24,25 +24,21 @@ import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
 /**
- * @author Zoey76, based on previous version.
+ * @author Zoey76
  */
 public class Extractable implements ISkillHandler
 {
-	//FIXME: Remove this once skill reuse will be global for main/subclass.
-	private static final int[] protectedSkillIds = { 323, 324, 419, 519, 520, 620, 1324, 1387 };
-	
 	private static final L2SkillType[] SKILL_TYPES =
 	{
 		L2SkillType.EXTRACTABLE,
 		L2SkillType.EXTRACTABLE_FISH
 	};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -50,8 +46,7 @@ public class Extractable implements ISkillHandler
 			return;
 		}
 		
-		L2ExtractableSkill exItem = skill.getExtractableSkill();
-		
+		final L2ExtractableSkill exItem = skill.getExtractableSkill();
 		if (exItem == null)
 		{
 			return;
@@ -101,71 +96,42 @@ public class Extractable implements ISkillHandler
 			chanceFrom += chance;
 		}
 		
-		L2PcInstance player = (L2PcInstance) activeChar;
-		
-		//FIXME: Remove this once skill reuse will be global for main/subclass.
-		if (player.isSubClassActive() && (skill.getReuseDelay() > 0) && !Util.contains(protectedSkillIds, skill.getId()))
-		{
-			player.sendPacket(SystemMessageId.MAIN_CLASS_SKILL_ONLY);
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
-			sm.addSkillName(skill);
-			player.sendPacket(sm);
-			return;
-		}
-		
+		final L2PcInstance player = activeChar.getActingPlayer();
 		if (createItemID[0] <= 0)
 		{
 			player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
 			return;
 		}
-		else
+		
+		for (int i = 0; i < createItemID.length; i++)
 		{
-			for (int i = 0; i < createItemID.length; i++)
+			if (createItemID[i] <= 0)
 			{
-				if (createItemID[i] <= 0)
-				{
-					continue;
-				}
-				
-				if (ItemTable.getInstance().createDummyItem(createItemID[i]) == null)
-				{
-					_log.warning("Extractable Item Skill Id:" + skill.getId() + " createItemID " + createItemID[i] + " doesn't have a template!");
-					player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
-					return;
-				}
-				
-				if (ItemTable.getInstance().createDummyItem(createItemID[i]).isStackable())
-				{
-					player.addItem("Extract", createItemID[i], createAmount[i], targets[0], false);
-				}
-				else
-				{
-					for (int j = 0; j < createAmount[i]; j++)
-					{
-						player.addItem("Extract", createItemID[i], 1, targets[0], false);
-					}
-				}
-				
-				if (createItemID[i] == 57)
-				{
-					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);;
-					sm.addNumber(createAmount[i]);
-					player.sendPacket(sm);
-				}
-				else
+				continue;
+			}
+			
+			if (ItemTable.getInstance().createDummyItem(createItemID[i]) == null)
+			{
+				_log.warning("Extractable Item Skill Id:" + skill.getId() + " createItemID " + createItemID[i] + " doesn't have a template!");
+				player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
+				return;
+			}
+			
+			if (ItemTable.getInstance().createDummyItem(createItemID[i]).isStackable())
+			{
+				player.addItem("Extract", createItemID[i], createAmount[i], targets[0], true);
+			}
+			else
+			{
+				for (int j = 0; j < createAmount[i]; j++)
 				{
-					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);;
-					sm.addItemName(createItemID[i]);
-					if (createAmount[i] > 1)
-					{
-						sm.addNumber(createAmount[i]);
-					}
-					player.sendPacket(sm);
+					player.addItem("Extract", createItemID[i], 1, targets[0], true);
 				}
 			}
 		}
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_TYPES;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java
index 347744346df0e88b76eae61f38ade43a10db3b03..596bb24c8b8ccf67ca363476280f8a72b796f9f0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java
@@ -42,6 +42,7 @@ public class Fishing implements ISkillHandler
 		L2SkillType.FISHING
 	};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -214,6 +215,7 @@ public class Fishing implements ISkillHandler
 		player.startFishing(x, y, z);
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
index 07178bb19d2ce4caeaec62a7a62d1dd675364722..47df4c2a95a97d7deeff2b7438ca549738d86967 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
@@ -38,6 +38,7 @@ public class FishingSkill implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -99,6 +100,7 @@ public class FishingSkill implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java
index 9aae33aa6bdbfba74cb3772477f4405a93a34f43..691129b6a4a20052650676818a0f8257865cdd4c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java
@@ -38,6 +38,7 @@ public class GetPlayer implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (activeChar.isAlikeDead())
@@ -60,6 +61,7 @@ public class GetPlayer implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
index c3a2b63e2a898fbd9c38d991b939780dfda7eda3..821b77ff69b243aeb5d2d8b1280250b8c2dbe194 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
@@ -40,6 +40,7 @@ public class GiveReco implements ISkillHandler
 	 *
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		for (L2Object obj : targets)
@@ -73,6 +74,7 @@ public class GiveReco implements ISkillHandler
 	 *
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java
index 4b05689b0c91fc7d354350a5c5d0903ac1731a2f..bd74aca95037210fb6922f581e9eaf799ac353dc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java
@@ -36,6 +36,7 @@ public class GiveSp implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		for (L2Object obj : targets)
@@ -53,6 +54,7 @@ public class GiveSp implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java
index 21ff0bf552616d77060911e25a2c2def2d793cc8..e8835d3042ba4ebc12bd89a4d831c3d60bc83f2f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java
@@ -31,6 +31,7 @@ public class GiveVitality implements ISkillHandler
 		L2SkillType.GIVE_VITALITY
 	};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		for (L2Object target : targets)
@@ -51,6 +52,7 @@ public class GiveVitality implements ISkillHandler
 		}
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
index cfd38db7f82aa8dec7622352d18efe286636bff7..e28dff709587ab73ed241d42640c0b2e1d665942 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
@@ -48,6 +48,7 @@ public class Harvest implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -137,6 +138,8 @@ public class Harvest implements ISkillHandler
 	
 	/**
 	 * 
+	 * @param activeChar 
+	 * @param target 
 	 * @return
 	 */
 	private boolean calcSuccess(L2Character activeChar, L2Character target)
@@ -165,6 +168,7 @@ public class Harvest implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java
index 085dca562d14f90bcba062be64688e0ac89def0e..2dfa3e3fd10464c6efc60f0022d917c09be4b575 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java
@@ -45,6 +45,7 @@ public class InstantJump implements ISkillHandler
 		L2SkillType.INSTANT_JUMP
 	};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		L2Character target = (L2Character) targets[0];
@@ -121,6 +122,7 @@ public class InstantJump implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java
index 8fe887508de5393728d176957e9a4ad1c66b4e69..1430f9f2246e2727cc5fea5739a598e2258a0798 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java
@@ -45,6 +45,7 @@ public class ManaHeal implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character actChar, L2Skill skill, L2Object[] targets)
 	{
 		for (L2Character target: (L2Character[]) targets)
@@ -146,6 +147,7 @@ public class ManaHeal implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
index 3396b479649a7c6c3fecdff54bed2fc520326d77..b9525054f8ebf142fb863de3102f83c7d29bb362 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
@@ -44,6 +44,7 @@ public class Manadam implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (activeChar.isAlikeDead())
@@ -163,6 +164,7 @@ public class Manadam implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java
index 4b6de44e6432b73e1e35211196ac66b730343cc1..a3bada56e325376ce742cf41bcad2070f43abdf6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java
@@ -49,6 +49,7 @@ public class Mdam implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (activeChar.isAlikeDead())
@@ -215,6 +216,7 @@ public class Mdam implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
index 6ea3cba1131b213807ef82f0486feb9eae42b4f0..6e5a5d749b4d91f10c546736426d7155a78f20d9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
@@ -33,6 +33,7 @@ public class NornilsPower implements ISkillHandler
 		L2SkillType.NORNILS_POWER
 	};
 
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -67,6 +68,7 @@ public class NornilsPower implements ISkillHandler
 			activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
 	}
 
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
index b165fedc39452fc95fd41697eccbbca542c76206..c1f7432fa56b6f330d940b4b1532608952a3c548 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
@@ -51,6 +51,7 @@ public class Pdam implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (activeChar.isAlikeDead())
@@ -271,6 +272,7 @@ public class Pdam implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java
index 52ba75accdfbd0ab48d1b9a79448c2af5ff5d50b..9457fed497f245c2b4c9bf66a0c32e2e07a2e17c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java
@@ -34,6 +34,7 @@ public class RefuelAirShip implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -53,6 +54,7 @@ public class RefuelAirShip implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
index 0a5cba63b8570c31d4b3c85060488dd42599778d..277b63707a74de0e0e5fee5c9bf0220bf6e4d323 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
@@ -36,6 +36,7 @@ public class Resurrect implements ISkillHandler
 		L2SkillType.RESURRECT
 	};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		L2PcInstance player = null;
@@ -83,6 +84,7 @@ public class Resurrect implements ISkillHandler
 			}
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java
index f68b1e3b8db0461a26252b62dff96242368d2055..373cd7ce3294a86e2c3ffba422bc6539c9526692 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java
@@ -32,6 +32,7 @@ public class ShiftTarget implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (targets == null)
@@ -57,6 +58,7 @@ public class ShiftTarget implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java
index 22cca7af1f5c9cd844558d75f4e7ab69f3129993..d6ff73edf57191e627cd82eb96dc98ef333c7704 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java
@@ -40,6 +40,7 @@ public class Soul implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance) || activeChar.isAlikeDead())
@@ -79,6 +80,7 @@ public class Soul implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
index 6bf855232034b4ab118194422d737168bc0d8722..dbf0328ca08697706c68e674730049aadea78e0d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
@@ -49,6 +49,7 @@ public class Sow implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -145,6 +146,7 @@ public class Sow implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
index ab31aaf80a343f2529af999b29821776fab40bf9..c66a2ffcc65d2540f586677a44a64c98363b0d4b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
@@ -36,6 +36,7 @@ public class Spoil implements ISkillHandler
 		L2SkillType.SPOIL
 	};
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -81,6 +82,7 @@ public class Spoil implements ISkillHandler
 		}
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
index f31de94cc88def5aa8b813060f51f377c53ccd72..2d68ecfefd16b7dcdaa71c4b7783523b04e50290 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
@@ -43,6 +43,7 @@ public class StealBuffs implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		// discharge shots
@@ -206,6 +207,7 @@ public class StealBuffs implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java
index b14ba23d91393cc4da3aeb74c333f8d2fdcc1380..cbb42aeff88534cf126d31379badf902b51ade13 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java
@@ -43,6 +43,7 @@ public class StrSiegeAssault implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		
@@ -121,6 +122,7 @@ public class StrSiegeAssault implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java
index e37082e514a1cf96a231b240994a29c124781e25..16642ac9db4e1b2eac3fd84d5c3120d3e1b0e584 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java
@@ -35,6 +35,7 @@ public class SummonFriend implements ISkillHandler
 {
 	private static final L2SkillType[] SKILL_IDS = { L2SkillType.SUMMON_FRIEND };
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -120,6 +121,7 @@ public class SummonFriend implements ISkillHandler
 		}
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java
index 7e7d59cb12f630a206811ec314dbf73c8716f7f8..ddd67f9da69a038bb9435ebba69ae095620a4b24 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java
@@ -35,6 +35,7 @@ public class Sweep implements ISkillHandler
 	private static final L2SkillType[] SKILL_IDS = { L2SkillType.SWEEP };
 	private static final int maxSweepTime = 15000;
 	
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -124,6 +125,7 @@ public class Sweep implements ISkillHandler
 		}
 	}
 	
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
index e003c52f3692164292f44c6d7282f182477404a7..260522e27a68e7c8b8af33ebeb5039819f2e3445 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
@@ -38,6 +38,7 @@ public class TakeCastle implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -66,6 +67,7 @@ public class TakeCastle implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
index d749d1dfdeaa63db626267df5878fa68d8a34004..d4683aed2e31d9a35e2eddd917de3cc63c6c271c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
@@ -38,6 +38,7 @@ public class TakeFort implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))
@@ -65,6 +66,7 @@ public class TakeFort implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
index 6fe0a1b23374ede2cb19607a98e3499a834eacc8..5ebeae95e95ca7278c72c32ba8ebefc9ff78ed49 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
@@ -36,6 +36,7 @@ public class TransformDispel implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (activeChar.isAlikeDead())
@@ -62,6 +63,7 @@ public class TransformDispel implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
index f4e4c3f97d252f4c06f34f996db543beecd6ff1b..65aed11345ac4033156e9da9b303f4a7c145ad64 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
@@ -37,6 +37,7 @@ public class Trap implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
 	{
 		if (activeChar == null || skill == null)
@@ -99,6 +100,7 @@ public class Trap implements ISkillHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
 	 */
+	@Override
 	public L2SkillType[] getSkillIds()
 	{
 		return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
index fb89705831449302a47825245817323561e040be..2e45048c6eb296fb1bf47a7e525e04b83391d7bd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
@@ -101,31 +101,27 @@ public class Unlock implements ISkillHandler
 			else if (target instanceof L2ChestInstance)
 			{
 				L2ChestInstance chest = (L2ChestInstance) target;
-				if (chest.getCurrentHp() <= 0
-						|| chest.isInteracted()
-						|| activeChar.getInstanceId() != chest.getInstanceId())
+				if ((chest.getCurrentHp() <= 0) || chest.isInteracted() || activeChar.getInstanceId() != chest.getInstanceId())
 				{
 					activeChar.sendPacket(ActionFailed.STATIC_PACKET);
 					return;
 				}
+				
+				chest.setInteracted();
+				if (chestUnlock(skill, chest))
+				{
+					activeChar.broadcastSocialAction(3);
+					chest.setSpecialDrop();
+					chest.setMustRewardExpSp(false);
+					chest.reduceCurrentHp(99999999, activeChar, skill);
+				}
 				else
 				{
-					chest.setInteracted();
-					if (chestUnlock(skill, chest))
-					{
-						activeChar.broadcastSocialAction(3);
-						chest.setSpecialDrop();
-						chest.setMustRewardExpSp(false);
-						chest.reduceCurrentHp(99999999, activeChar, skill);
-					}
-					else
-					{
-						activeChar.broadcastSocialAction(13);
-						chest.addDamageHate(activeChar, 0, 1);
-						chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, activeChar);
-						if (chestTrap(chest))
-							chest.chestTrap(activeChar);
-					}
+					activeChar.broadcastSocialAction(13);
+					chest.addDamageHate(activeChar, 0, 1);
+					chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, activeChar);
+					if (chestTrap(chest))
+						chest.chestTrap(activeChar);
 				}
 			}
 		}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
index 7e7eba49eec10d72c7851b5513015f8202c0ebe3..e80da167d7d7db76bf638dd1fd0b547f60eb24c9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
@@ -109,8 +109,7 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
 						targetList.add(target);
 						return targetList.toArray(new L2Object[targetList.size()]);
 					}
-					else
-						return new L2Character[] { target };
+					return new L2Character[] { target };
 				}
 			}
 		}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
index 2443796533451c91ef8672aa3db717ced4515a56..26d769768de6404a095c868f746f38c00b8a94e5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
@@ -51,14 +51,10 @@ public class TargetPartyMember implements ITargetTypeHandler
 				// If a target is found, return it in a table else send a system message TARGET_IS_INCORRECT
 				return new L2Character[] { target };
 			}
-			else
-				return _emptyTargetList;
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
 			return _emptyTargetList;
 		}
+		activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+		return _emptyTargetList;
 	}
 	
 	@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
index ba29b857d5ff62996249da3ceb1faeee84607738..6740e1497df371befd5025b63fbc2e713da6fd19 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
@@ -43,26 +43,24 @@ public class TargetPartyOther implements ITargetTypeHandler
 						// FORCE BUFFS may cancel here but there should be a proper condition
 						case 426:
 							if (!((L2PcInstance) target).isMageClass())
+							{
 								return new L2Character[] { target };
-							else
-								return _emptyTargetList;
+							}
+							return _emptyTargetList;
 						case 427:
 							if (((L2PcInstance) target).isMageClass())
+							{
 								return new L2Character[] { target };
-							else
-								return _emptyTargetList;
+							}
+							return _emptyTargetList;
 					}
 				}
 				return new L2Character[] { target };
 			}
-			else
-				return _emptyTargetList;
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
 			return _emptyTargetList;
 		}
+		activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+		return _emptyTargetList;
 	}
 	
 	@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
index 0083ebcaca311eb95bef522540c024e615caa15d..cacfad1c0b971eedce521183b59411cc569967c9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
@@ -45,8 +45,7 @@ public class TargetUnlockable implements ITargetTypeHandler
 			targetList.add(target);
 			return targetList.toArray(new L2Object[targetList.size()]);
 		}
-		else
-			return new L2Character[] { target };
+		return new L2Character[] { target };
 	}
 	
 	@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
index 2c6e651d1e84e1cfc1f1ddb8aee758c9a8c00094..2d2a1327c111d3454286d279b431517a07ad9c3d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
@@ -303,10 +303,7 @@ public class DebugHandler implements ITelnetHandler
 		{
 			return mbean.findDeadlockedThreads();
 		}
-		else
-		{
-			return mbean.findMonitorDeadlockedThreads();
-		}
+		return mbean.findMonitorDeadlockedThreads();
 	}
 	
 	private Thread findMatchingThread(ThreadInfo inf)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Birthday.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Birthday.java
index 7d976f65d4a2f4d49ba74e3847fba6f6942d07e6..efc2f689fb8dbda9a069efe94b885e309eeaa27c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Birthday.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Birthday.java
@@ -22,9 +22,8 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author JIV
  * Support for /mybirthday command
- * 
+ * @author JIV
  */
 public class Birthday implements IUserCommandHandler
 {
@@ -33,6 +32,7 @@ public class Birthday implements IUserCommandHandler
 		126
 	};
 	
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
@@ -50,6 +50,7 @@ public class Birthday implements IUserCommandHandler
 		return true;
 	}
 	
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java
index 885b3d4ceacf49f99437d6981dda2fb4a9e077ee..6908dde85087ffaa198b10e7157aa631284f3076 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java
@@ -35,6 +35,7 @@ public class ChannelDelete implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
@@ -61,6 +62,7 @@ public class ChannelDelete implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java
index ede6462b6e0c08a89bdcd949d96090ab9d1735e7..c2a1aca4304da2c3dc33c946c43164616f8b40de 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java
@@ -36,6 +36,7 @@ public class ChannelLeave implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
@@ -66,6 +67,7 @@ public class ChannelLeave implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelListUpdate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelListUpdate.java
index 3d4b8ac397c004c4f4495835721e9e1df4cbc426..344f068fba7ebd76b2010e4cce8c8ad7f7fcfdf5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelListUpdate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelListUpdate.java
@@ -34,6 +34,7 @@ public class ChannelListUpdate implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
@@ -52,6 +53,7 @@ public class ChannelListUpdate implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
index 4212f92c825a0e277338f7c39012e22bb61a526b..115298db0bb02d473070f66718ad6f54a45b62a8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
@@ -38,6 +38,7 @@ public class ClanPenalty implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
@@ -104,6 +105,7 @@ public class ClanPenalty implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
index d42b2ed5c2dc52665924f887cd73fcd227de19af..bd8a9b7b59739a55572a3d09a9d22e19d64298e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
@@ -43,6 +43,7 @@ public class ClanWarsList implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0] && id != COMMAND_IDS[1] && id != COMMAND_IDS[2])
@@ -135,6 +136,7 @@ public class ClanWarsList implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/DisMount.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/DisMount.java
index ca0ca485b529022acfa7074b3a63e76121e741ca..6d272256df8fa8bd3e0d59ce80d5244b834f98e1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/DisMount.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/DisMount.java
@@ -32,6 +32,7 @@ public class DisMount implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public synchronized boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
@@ -49,6 +50,7 @@ public class DisMount implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java
index 51772da2c9d29f88b5491d36e4e694e46c8f3e89..7f4ca82dc62470080604b99a6bab5ab580d00f54 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java
@@ -48,6 +48,7 @@ public class Escape implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		// Thanks nbd
@@ -138,6 +139,7 @@ public class Escape implements IUserCommandHandler
 			_activeChar = activeChar;
 		}
 		
+		@Override
 		public void run()
 		{
 			if (_activeChar.isDead())
@@ -163,6 +165,7 @@ public class Escape implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
index 50c6e19623a3744511008cb6b4900f2168d57f63..f68901fab746ae3da69f3b1bdc38bd194be299a9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
@@ -36,6 +36,7 @@ public class InstanceZone implements IUserCommandHandler
 	/**
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
@@ -44,6 +45,7 @@ public class InstanceZone implements IUserCommandHandler
 	/**
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java
index a9a0a6c95b6fa15f6f433dc5021dd8167a630b52..9bd92b23208bb88f54058916ae7c347e6b67f729 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java
@@ -33,6 +33,7 @@ public class Loc implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		int region;
@@ -58,6 +59,7 @@ public class Loc implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Mount.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Mount.java
index 60497408104cdfbcdcbb4e9c53c5bc38ba4b9214..6bd150d5dee3afed47a6478a5907e5e790422516 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Mount.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Mount.java
@@ -33,6 +33,7 @@ public class Mount implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public synchronized boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
@@ -45,6 +46,7 @@ public class Mount implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java
index 859f0cbec1b1919bd67bee6103f9cb64846dbf35..4c106346efcc99252312ff7a76030485b09da0bf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java
@@ -32,6 +32,7 @@ public class OlympiadStat implements IUserCommandHandler
 	/**
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
@@ -78,6 +79,7 @@ public class OlympiadStat implements IUserCommandHandler
 	/**
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java
index e01fa83abbdaa46bba438ece40bae17815a31047..2134810aae1c07d2b49a58fa30ba1cc6190765eb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java
@@ -35,6 +35,7 @@ public class PartyInfo implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (id != COMMAND_IDS[0])
@@ -87,6 +88,7 @@ public class PartyInfo implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Time.java
index c045e335db0cd24f5af810f9e34f4585fe87004a..b94235ec78ca4690e345865609178bfb2ad6e334 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Time.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Time.java
@@ -36,6 +36,7 @@ public class Time implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
 	 */
+	@Override
 	public boolean useUserCommand(int id, L2PcInstance activeChar)
 	{
 		if (COMMAND_IDS[0] != id)
@@ -72,6 +73,7 @@ public class Time implements IUserCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
 	 */
+	@Override
 	public int[] getUserCommandList()
 	{
 		return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java
index 265e5e00e3a406e849302e41007524f0a90af046..5f069b113fae91c990d748c9afcf59c0ea60ec03 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java
@@ -36,6 +36,7 @@ public class Banking implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
 	 */
+	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
 	{
 		if (command.equalsIgnoreCase("bank"))
@@ -79,6 +80,7 @@ public class Banking implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
 	 */
+	@Override
 	public String[] getVoicedCommandList()
 	{
 		return _voicedCommands;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
index f352320f3d12a3335cd2b5391682bd80898b5aed..9fa3a1d5ec2d569f4d6e7473ba7ac6d82c0cc48b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
@@ -36,6 +36,7 @@ public class ChangePassword implements IVoicedCommandHandler
 		"changepassword"
 	};
 	
+	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
 	{
 		if (target != null)
@@ -92,6 +93,7 @@ public class ChangePassword implements IVoicedCommandHandler
 		return true;
 	}
 
+	@Override
 	public String[] getVoicedCommandList()
 	{
 		return _voicedCommands;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
index 036787b38eb508552da04baa40d2c2e4279597aa..b7007f606dad49ebcdddea28c1b9e26b50b8bebb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
@@ -34,6 +34,7 @@ public class ChatAdmin implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
 	 */
+	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
 	{
 		if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
@@ -157,6 +158,7 @@ public class ChatAdmin implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
 	 */
+	@Override
 	public String[] getVoicedCommandList()
 	{
 		return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
index becc6ccdd7d4ea443ace2dd988ace5fe077e7809..676543449879441fa84abe0fe21d9900f094c66b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
@@ -29,6 +29,7 @@ public class Debug implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
 	 */
+	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
 	{
 		if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
@@ -54,6 +55,7 @@ public class Debug implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
 	 */
+	@Override
 	public String[] getVoicedCommandList()
 	{
 		return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
index 5f3393090122b81f5fdaf359524eb2c251a4be91..fadb4bd08631a46f178ee37576cf54cce8af2703 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
@@ -33,6 +33,7 @@ public class Lang implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
 	 */
+	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
 	{
 		if (!Config.L2JMOD_MULTILANG_ENABLE
@@ -71,11 +72,8 @@ public class Lang implements IVoicedCommandHandler
 				activeChar.sendPacket(msg);
 				return true;
 			}
-			else
-			{
-				msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/Lang/Error.htm");
-				activeChar.sendPacket(msg);
-			}
+			msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/Lang/Error.htm");
+			activeChar.sendPacket(msg);
 		}
 		
 		return false;
@@ -85,6 +83,7 @@ public class Lang implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
 	 */
+	@Override
 	public String[] getVoicedCommandList()
 	{
 		return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
index 1f458739051f1fb5436b2853bd8ca98c0b17ff35..5234fa464a616906ddbdd8f4a07783e99a9fab72 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
@@ -39,6 +39,7 @@ public class TvTVoicedInfo implements IVoicedCommandHandler
 	private static final boolean USE_STATIC_HTML = true;
 	private static final String HTML = HtmCache.getInstance().getHtm(null, "data/html/mods/TvTEvent/Status.htm");
 	
+	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
 	{
 		if (command.equalsIgnoreCase("tvt"))
@@ -77,6 +78,7 @@ public class TvTVoicedInfo implements IVoicedCommandHandler
 		return true;
 	}
 	
+	@Override
 	public String[] getVoicedCommandList()
 	{
 		return _voicedCommands;
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 a57bc8d6946a5034bf6f5b8011731e68ab2e3499..b4aff32a804927a61de8a9d9f0f5b85b4f6e18d9 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
@@ -62,6 +62,7 @@ public class Wedding implements IVoicedCommandHandler
 	/**
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
 	 */
+	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
 	{
 		if (activeChar == null)
@@ -444,6 +445,7 @@ public class Wedding implements IVoicedCommandHandler
 			_to7sDungeon = to7sDungeon;
 		}
 		
+		@Override
 		public void run()
 		{
 			if (_activeChar.isDead())
@@ -473,6 +475,7 @@ public class Wedding implements IVoicedCommandHandler
 	/**
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
 	 */
+	@Override
 	public String[] getVoicedCommandList()
 	{
 		return _voicedCommands;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
index a83905cb107227cb0dce6567790b542f0c0c0ea0..b1538c7f889a77ed20b6cf7fa6320019810eb3e4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
@@ -37,6 +37,7 @@ public class castle implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
 	 */
+	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
 	{
 		if (command.startsWith("open doors") && params.equals("castle") && (activeChar.isClanLeader()))
@@ -77,6 +78,7 @@ public class castle implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
 	 */
+	@Override
 	public String[] getVoicedCommandList()
 	{
 		return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java
index e6152fc14bc8abf2a58407daacdbbe13d42d51bc..5dcc67f823f80fe3c39b4b0cbcfd426285afa894 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java
@@ -34,6 +34,7 @@ public class set implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
 	 */
+	@Override
 	public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
 	{
 		if (command.startsWith("set privileges"))
@@ -59,6 +60,7 @@ public class set implements IVoicedCommandHandler
 	 * 
 	 * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
 	 */
+	@Override
 	public String[] getVoicedCommandList()
 	{
 		return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
index ee9fcf84ec822d089c5260f4077ca79dfcf6f2e3..4f04ed4e9cf2f6b7ff9796ac53425b6a7840a598 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
@@ -57,10 +57,7 @@ public class BaseTower extends Quest
 		{
 			return "32301-02.htm";
 		}
-		else
-		{
-			return "32301-01.htm";
-		}
+		return "32301-01.htm";
 	}
 	
 	@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
index 2333259ea1831c32193666827d76a1c72c50944f..d688f77ddcb7b6022b82a95898c1e38dd330039e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
@@ -125,7 +125,7 @@ public class Engine extends Quest implements Runnable
 			}
 		}
 		
-		if (_cachedLevel >= 0)
+		if (_cachedLevel > 0)
 		{
 			Announcements.getInstance().announceToAll(ANNOUNCE.replace("%lvl%", String.valueOf(newLevel)));
 			_log.info("HellboundEngine: New Level: " + newLevel);
@@ -222,7 +222,7 @@ public class Engine extends Quest implements Runnable
 	public void run()
 	{
 		int level = HellboundManager.getInstance().getLevel();
-		if (level == _cachedLevel)
+		if ((level > 0) && (level == _cachedLevel))
 		{
 			if ((HellboundManager.getInstance().getTrust() == HellboundManager.getInstance().getMaxTrust()) && (level != 4)) // only exclusion is kill of Derek
 			{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java
index d52baea7ccedf39f02338859a6e1e85f06fd6032..80c6ae253a67b7c876de8c5ac2a3da073a122512 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java
@@ -120,14 +120,12 @@ public class Quarry extends Quest
 		{
 			return "32299.htm";
 		}
-		else
+		
+		if (player.getQuestState(getName()) == null)
 		{
-			if (player.getQuestState(getName()) == null)
-			{
-				newQuestState(player);
-			}
-			return "32299-01.htm";
+			newQuestState(player);
 		}
+		return "32299-01.htm";
 	}
 	
 	// Let's manage kill points in Engine
@@ -141,9 +139,9 @@ public class Quarry extends Quest
 	@Override
 	public final String onEnterZone(L2Character character, L2ZoneType zone)
 	{
-		if (character instanceof L2Npc)
+		if (character instanceof L2Attackable)
 		{
-			final L2Npc npc = (L2Npc) character;
+			final L2Attackable npc = (L2Attackable) character;
 			if (npc.getNpcId() == SLAVE)
 			{
 				if (!npc.isDead() && !npc.isDecayed() && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_FOLLOW))
@@ -186,7 +184,7 @@ public class Quarry extends Quest
 					{
 						if (Rnd.get(10000) < i[1])
 						{
-							((L2Attackable) _npc).dropItem((L2PcInstance) (_npc.getTarget()), i[0], (int) Config.RATE_DROP_ITEMS);
+							((L2Attackable) _npc).dropItem((L2PcInstance) _npc.getTarget(), i[0], (int) Config.RATE_DROP_ITEMS);
 							break;
 						}
 					}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
index a28046ba92079e2fbbb0176bdbed3f012b7debcf..f6f222e3d9869937531051bddfb92a9a2dfd068e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
@@ -515,10 +515,7 @@ public class TowerOfNaia extends Quest
 			{
 				return "18492-02.htm";
 			}
-			else
-			{
-				return "18492-01.htm";
-			}
+			return "18492-01.htm";
 		}
 		
 		else if ((npcId >= ROOM_MANAGER_FIRST) && (npcId <= ROOM_MANAGER_LAST))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
index 232404367498621f416805c62552039a231f96a6..25a38dacee3e1393bd1db65fa77f81a9285ee4b1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
@@ -1177,9 +1177,9 @@ public class TullyWorkshop extends Quest
 			L2MonsterInstance victim2 = spawnedFollowers.get(0); // KIRETCENAH
 			L2MonsterInstance actor = spawnedFollowers.get(2); // DRAXIUS
 			
-			double transferringHp = actor.getMaxHp() * 0.0001;
 			if ((actor != null) && !actor.isDead())
 			{
+				double transferringHp = actor.getMaxHp() * 0.0001;
 				if ((Rnd.get(10000) > 1500) && (victim1 != null) && !victim1.isDead())
 				{
 					if ((actor.getCurrentHp() - transferringHp) > 1)
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 dc79ef90de433f020be7926e1ac63cccb13acecb..2361ab99a2791d892d62f2be53f12a17d3960a20 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
@@ -543,41 +543,39 @@ public class CrystalCaverns extends Quest
 			teleportplayer(player, teleto);
 			return world.instanceId;
 		}
+		
 		// New instance
+		if (!checkConditions(player))
+			return 0;
+		L2Party party = player.getParty();
+		int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+		world = new CCWorld(System.currentTimeMillis() + 5400000);
+		world.instanceId = instanceId;
+		world.templateId = INSTANCEID;
+		InstanceManager.getInstance().addWorld(world);
+		_log.info("Crystal Caverns started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+		runOracle((CCWorld) world);
+		// teleport players
+		teleto.instanceId = instanceId;
+		if (player.getParty() == null)
+		{
+			// this can happen only if debug is true
+			player.sendMessage("Welcome to Crystal Caverns.");
+			InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCEID, ((System.currentTimeMillis() + INSTANCEPENALTY)));
+			teleportplayer(player, teleto);
+			world.allowed.add(player.getObjectId());
+		}
 		else
 		{
-			if (!checkConditions(player))
-				return 0;
-			L2Party party = player.getParty();
-			int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-			world = new CCWorld(System.currentTimeMillis() + 5400000);
-			world.instanceId = instanceId;
-			world.templateId = INSTANCEID;
-			InstanceManager.getInstance().addWorld(world);
-			_log.info("Crystal Caverns started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-			runOracle((CCWorld) world);
-			// teleport players
-			teleto.instanceId = instanceId;
-			if (player.getParty() == null)
-			{
-				// this can happen only if debug is true
-				player.sendMessage("Welcome to Crystal Caverns.");
-				InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCEID, ((System.currentTimeMillis() + INSTANCEPENALTY)));
-				teleportplayer(player, teleto);
-				world.allowed.add(player.getObjectId());
-			}
-			else
+			for (L2PcInstance partyMember : party.getPartyMembers())
 			{
-				for (L2PcInstance partyMember : party.getPartyMembers())
-				{
-					partyMember.sendMessage("Welcome to Crystal Caverns.");
-					InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCEID, ((System.currentTimeMillis() + INSTANCEPENALTY)));
-					teleportplayer(partyMember, teleto);
-					world.allowed.add(partyMember.getObjectId());
-				}
+				partyMember.sendMessage("Welcome to Crystal Caverns.");
+				InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCEID, ((System.currentTimeMillis() + INSTANCEPENALTY)));
+				teleportplayer(partyMember, teleto);
+				world.allowed.add(partyMember.getObjectId());
 			}
-			return instanceId;
 		}
+		return instanceId;
 	}
 	
 	protected void exitInstance(L2PcInstance player, teleCoord tele)
@@ -1783,20 +1781,19 @@ public class CrystalCaverns extends Quest
 						if (door.getDoorId() == (room + 24220000))
 						{
 							if (door.getOpen())
-								return "";
-							else
 							{
-								QuestState st = ((L2PcInstance) character).getQuestState(qn);
-								if (st == null)
-									st = newQuestState((L2PcInstance) character);
-								if (!st.hasQuestItems(RACE_KEY))
-									return "";
-								if (world.roomsStatus[zone.getId() - 20104] == 0)
-									runEmeraldRooms(world, spawns, room);
-								door.openMe();
-								st.takeItems(RACE_KEY, 1);
-								world.openedDoors.put(door, (L2PcInstance) character);
+								return "";
 							}
+							QuestState st = ((L2PcInstance) character).getQuestState(qn);
+							if (st == null)
+								st = newQuestState((L2PcInstance) character);
+							if (!st.hasQuestItems(RACE_KEY))
+								return "";
+							if (world.roomsStatus[zone.getId() - 20104] == 0)
+								runEmeraldRooms(world, spawns, room);
+							door.openMe();
+							st.takeItems(RACE_KEY, 1);
+							world.openedDoors.put(door, (L2PcInstance) character);
 							break;
 						}
 				}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 57372c56ef6058ac2ba6874a1dc4a392132ab530..14284d21b7c30ce59ad309d9e320bad81d9ed1e8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -225,45 +225,45 @@ public class DarkCloudMansion extends Quest
 	private boolean checkConditions(L2PcInstance player)
 	{
 		if (debug)
+		{
 			return true;
-		else
+		}
+		
+		L2Party party = player.getParty();
+		if (party == null)
 		{
-			L2Party party = player.getParty();
-			if (party == null)
-			{
-				player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
-				return false;
-			}
-			if (party.getLeader() != player)
+			player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
+			return false;
+		}
+		if (party.getLeader() != player)
+		{
+			player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
+			return false;
+		}
+		if (party.getMemberCount() > 2)
+		{
+			player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
+			return false;
+		}
+		for (L2PcInstance partyMember : party.getPartyMembers())
+		{
+			if (partyMember.getLevel() < 78)
 			{
-				player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LEVEL_REQUIREMENT_NOT_SUFFICIENT);
+				sm.addPcName(partyMember);
+				player.sendPacket(sm);
 				return false;
 			}
-			if (party.getMemberCount() > 2)
+			if (!partyMember.isInsideRadius(player, 1000, true, true))
 			{
-				player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_LOCATION_THAT_CANNOT_BE_ENTERED);
+				sm.addPcName(partyMember);
+				player.sendPacket(sm);
 				return false;
 			}
-			for (L2PcInstance partyMember : party.getPartyMembers())
-			{
-				if (partyMember.getLevel() < 78)
-				{
-					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LEVEL_REQUIREMENT_NOT_SUFFICIENT);
-					sm.addPcName(partyMember);
-					player.sendPacket(sm);
-					return false;
-				}
-				if (!partyMember.isInsideRadius(player, 1000, true, true))
-				{
-					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_LOCATION_THAT_CANNOT_BE_ENTERED);
-					sm.addPcName(partyMember);
-					player.sendPacket(sm);
-					return false;
-				}
-			}
-			
-			return true;
 		}
+		
+		return true;
 	}
 	
 	private void teleportplayer(L2PcInstance player, teleCoord teleto)
@@ -292,38 +292,35 @@ public class DarkCloudMansion extends Quest
 			return instanceId;
 		}
 		//New instance
+		if (!checkConditions(player))
+			return 0;
+		L2Party party = player.getParty();
+		instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+		world = new DMCWorld();
+		world.instanceId = instanceId;
+		world.templateId = INSTANCEID;
+		InstanceManager.getInstance().addWorld(world);
+		_log.info("DarkCloudMansion: started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+		runStartRoom((DMCWorld)world);
+		// teleport players
+		teleto.instanceId = instanceId;
+		if (debug && party == null)
+		{
+			world.allowed.add(player.getObjectId());
+			teleportplayer(player,teleto);
+		}
 		else
 		{
-			if (!checkConditions(player))
-				return 0;
-			L2Party party = player.getParty();
-			instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-			world = new DMCWorld();
-			world.instanceId = instanceId;
-			world.templateId = INSTANCEID;
-			InstanceManager.getInstance().addWorld(world);
-			_log.info("DarkCloudMansion: started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-			runStartRoom((DMCWorld)world);
-			// teleport players
-			teleto.instanceId = instanceId;
-			if (debug && party == null)
-			{
-				world.allowed.add(player.getObjectId());
-				teleportplayer(player,teleto);
-			}
-			else
+			for (L2PcInstance partyMember : party.getPartyMembers())
 			{
-				for (L2PcInstance partyMember : party.getPartyMembers())
-				{
-					if (partyMember.getQuestState(qn) == null)
-						newQuestState(partyMember);
-					world.allowed.add(partyMember.getObjectId());
-					teleportplayer(partyMember,teleto);
-				}
+				if (partyMember.getQuestState(qn) == null)
+					newQuestState(partyMember);
+				world.allowed.add(partyMember.getObjectId());
+				teleportplayer(partyMember,teleto);
 			}
-			
-			return instanceId;
 		}
+		
+		return instanceId;
 	}
 	
 	protected void exitInstance(L2PcInstance player, teleCoord tele)
@@ -817,9 +814,10 @@ public class DarkCloudMansion extends Quest
 		for (DMCNpc mob : SecondRoom.npcList)
 		{
 			if (mob.isDead)
+			{
 				continue;
-			else
-				return false;
+			}
+			return false;
 		}
 		
 		return true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java
index a05a1680338b91e1169c5681f4bf011973a25243..2737c194b146b9a0f39e75ec5cb4d98c36cec6e5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java
@@ -219,29 +219,27 @@ public class DemonPrinceFloor extends Quest
 			teleportPlayer(player, ENTRY_POINT, world.instanceId);
 			return world.instanceId;
 		}
-		else
+		
+		if (!checkTeleport(player))
 		{
-			if (!checkTeleport(player))
-			{
-				return 0;
-			}
-			
-			instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-			world = new DPWorld();
-			world.instanceId = instanceId;
-			world.templateId = INSTANCEID;
-			world.status = 0;
-			InstanceManager.getInstance().addWorld(world);
-			_log.info("Tower of Infinitum - Demon Prince floor started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-			
-			for (L2PcInstance partyMember : player.getParty().getPartyMembers())
-			{
-				teleportPlayer(partyMember, ENTRY_POINT, instanceId);
-				partyMember.destroyItemByItemId("Quest", SEAL_BREAKER_5, 1, null, true);
-				world.allowed.add(partyMember.getObjectId());
-			}
-			return instanceId;
+			return 0;
+		}
+		
+		instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+		world = new DPWorld();
+		world.instanceId = instanceId;
+		world.templateId = INSTANCEID;
+		world.status = 0;
+		InstanceManager.getInstance().addWorld(world);
+		_log.info("Tower of Infinitum - Demon Prince floor started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+		
+		for (L2PcInstance partyMember : player.getParty().getPartyMembers())
+		{
+			teleportPlayer(partyMember, ENTRY_POINT, instanceId);
+			partyMember.destroyItemByItemId("Quest", SEAL_BREAKER_5, 1, null, true);
+			world.allowed.add(partyMember.getObjectId());
 		}
+		return instanceId;
 	}
 	
 	public void setReenterTime(InstanceWorld world)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
index 886e45743f4f768fee298823ecb02d7966d2e970..45ed26fb8abb127d0ae39b13ef594dddc4359140 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -496,38 +496,36 @@ public class FinalEmperialTomb extends Quest
 			teleportPlayer(player, coords, world.instanceId);
 			return world.instanceId;
 		}
+		
 		//New instance
+		if (!checkConditions(player))
+			return 0;
+		if (!player.isGM() && !player.destroyItemByItemId("QUEST", 8073, 1, player, true))
+			return 0;
+		instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+		//Instance ins = InstanceManager.getInstance().getInstance(instanceId);
+		//ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
+		world = new FETWorld();
+		world.instanceId = instanceId;
+		world.status = 0;
+		InstanceManager.getInstance().addWorld(world);
+		controlStatus((FETWorld) world);
+		_log.info("Final Emperial Tomb started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+		// teleport players
+		if (player.getParty() == null || player.getParty().getCommandChannel() == null)
+		{
+			world.allowed.add(player.getObjectId());
+			teleportPlayer(player, coords, instanceId);
+		}
 		else
 		{
-			if (!checkConditions(player))
-				return 0;
-			if (!player.isGM() && !player.destroyItemByItemId("QUEST", 8073, 1, player, true))
-				return 0;
-			instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-			//Instance ins = InstanceManager.getInstance().getInstance(instanceId);
-			//ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
-			world = new FETWorld();
-			world.instanceId = instanceId;
-			world.status = 0;
-			InstanceManager.getInstance().addWorld(world);
-			controlStatus((FETWorld) world);
-			_log.info("Final Emperial Tomb started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-			// teleport players
-			if (player.getParty() == null || player.getParty().getCommandChannel() == null)
+			for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
 			{
-				world.allowed.add(player.getObjectId());
-				teleportPlayer(player, coords, instanceId);
-			}
-			else
-			{
-				for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
-				{
-					world.allowed.add(channelMember.getObjectId());
-					teleportPlayer(channelMember, coords, instanceId);
-				}
+				world.allowed.add(channelMember.getObjectId());
+				teleportPlayer(channelMember, coords, instanceId);
 			}
-			return instanceId;
 		}
+		return instanceId;
 	}
 	
 	protected synchronized boolean checkKillProgress(L2Npc mob, FETWorld world)
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 5c463855adc9771fe033ae914dbaac95ebe70a9a..7871d9f9ab2782327bddd435bacca9f68a5832e5 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
@@ -141,10 +141,7 @@ public class HellboundTown extends Quest
 		{
 			return "32358-02.htm";
 		}
-		else
-		{
-			return "32358-01.htm";
-		}
+		return "32358-01.htm";
 	}
 	
 	@Override
@@ -444,36 +441,31 @@ public class HellboundTown extends Quest
 				player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
 				return 0;
 			}
-			else
-			{
-				teleportPlayer(player, ENTRY_POINT, world.instanceId);
-				return world.instanceId;
-			}
+			teleportPlayer(player, ENTRY_POINT, world.instanceId);
+			return world.instanceId;
 		}
-		else
+		
+		if (!checkTeleport(player))
 		{
-			if (!checkTeleport(player))
-			{
-				return 0;
-			}
-			
-			instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-			world = new TownWorld();
-			world.instanceId = instanceId;
-			world.templateId = INSTANCEID;
-			world.status = 0;
-			InstanceManager.getInstance().addWorld(world);
-			_log.info("Hellbound Town started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-			
-			for (L2PcInstance partyMember : player.getParty().getPartyMembers())
-			{
-				teleportPlayer(partyMember, ENTRY_POINT, instanceId);
-				world.allowed.add(partyMember.getObjectId());
-			}
-			
-			((TownWorld) world).spawnedAmaskari = (L2MonsterInstance) addSpawn(AMASKARI, AMASKARI_SPAWN_POINT[0], AMASKARI_SPAWN_POINT[1], AMASKARI_SPAWN_POINT[2], AMASKARI_SPAWN_POINT[3], false, 0, false, instanceId);
-			return instanceId;
+			return 0;
 		}
+		
+		instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+		world = new TownWorld();
+		world.instanceId = instanceId;
+		world.templateId = INSTANCEID;
+		world.status = 0;
+		InstanceManager.getInstance().addWorld(world);
+		_log.info("Hellbound Town started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+		
+		for (L2PcInstance partyMember : player.getParty().getPartyMembers())
+		{
+			teleportPlayer(partyMember, ENTRY_POINT, instanceId);
+			world.allowed.add(partyMember.getObjectId());
+		}
+		
+		((TownWorld) world).spawnedAmaskari = (L2MonsterInstance) addSpawn(AMASKARI, AMASKARI_SPAWN_POINT[0], AMASKARI_SPAWN_POINT[1], AMASKARI_SPAWN_POINT[2], AMASKARI_SPAWN_POINT[3], false, 0, false, instanceId);
+		return instanceId;
 	}
 	
 	private static class CallAmaskari implements Runnable
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 015635918cfa9de4db4595d48b7ba8c58fe0f91e..bd6657bfa95c050e8c26190446ba1ea811c5db60 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
@@ -600,49 +600,46 @@ public class Kamaloka extends Quest
 			return;
 		}
 		// Creating new kamaloka instance
-		else
+		if (!checkConditions(player, index))
+			return;
+		
+		// Creating dynamic instance without template
+		final int instanceId = InstanceManager.getInstance().createDynamicInstance(null);
+		final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
+		// set name for the kamaloka
+		inst.setName(InstanceManager.getInstance().getInstanceIdName(templateId));
+		// set return location
+		final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
+		inst.setSpawnLoc(returnLoc);
+		// disable summon friend into instance
+		inst.setAllowSummon(false);
+		// set duration and empty destroy time
+		inst.setDuration(DURATION[index] * 60000);
+		inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);
+		
+		// Creating new instanceWorld, using our instanceId and templateId
+		world = new KamaWorld();
+		world.instanceId = instanceId;
+		world.templateId = templateId;
+		// set index for easy access to the arrays
+		((KamaWorld)world).index = index;
+		InstanceManager.getInstance().addWorld(world);
+		world.status = 0;
+		// spawn npcs
+		spawnKama((KamaWorld)world);
+		
+		// and finally teleport party into instance
+		final L2Party party = player.getParty();
+		for (L2PcInstance partyMember : party.getPartyMembers())
 		{
-			if (!checkConditions(player, index))
-				return;
+			if (partyMember.getQuestState(qn) == null)
+				newQuestState(partyMember);
+			world.allowed.add(partyMember.getObjectId());
 			
-			// Creating dynamic instance without template
-			final int instanceId = InstanceManager.getInstance().createDynamicInstance(null);
-			final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
-			// set name for the kamaloka
-			inst.setName(InstanceManager.getInstance().getInstanceIdName(templateId));
-			// set return location
-			final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
-			inst.setSpawnLoc(returnLoc);
-			// disable summon friend into instance
-			inst.setAllowSummon(false);
-			// set duration and empty destroy time
-			inst.setDuration(DURATION[index] * 60000);
-			inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);
-			
-			// Creating new instanceWorld, using our instanceId and templateId
-			world = new KamaWorld();
-			world.instanceId = instanceId;
-			world.templateId = templateId;
-			// set index for easy access to the arrays
-			((KamaWorld)world).index = index;
-			InstanceManager.getInstance().addWorld(world);
-			world.status = 0;
-			// spawn npcs
-			spawnKama((KamaWorld)world);
-			
-			// and finally teleport party into instance
-			final L2Party party = player.getParty();
-			for (L2PcInstance partyMember : party.getPartyMembers())
-			{
-				if (partyMember.getQuestState(qn) == null)
-					newQuestState(partyMember);
-				world.allowed.add(partyMember.getObjectId());
-				
-				removeBuffs(partyMember);
-				teleportPlayer(partyMember, TELEPORTS[index], instanceId);
-			}
-			return;
+			removeBuffs(partyMember);
+			teleportPlayer(partyMember, TELEPORTS[index], instanceId);
 		}
+		return;
 	}
 	
 	/**
@@ -824,10 +821,8 @@ public class Kamaloka extends Quest
 		{
 			if (player.isInParty() && player.getParty().isLeader(player))
 				return "32496.htm";
-			else
-				return "32496-no.htm";
+			return "32496-no.htm";
 		}
-		
 		return "";
 	}
 	
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 e71b0fa6ed7177bcb5ed61f40e8579979ac905c9..1aeab6f408dde627abaaa116efd2929578b2d97e 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
@@ -38,9 +38,8 @@ import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
 /**
- ** @author Gnacik
- **
- ** 2010-10-15 Based on official server Naia
+ * 2010-10-15 Based on official server Naia
+ * @author Gnacik
  */
 public class NornilsGarden extends Quest
 {
@@ -254,41 +253,38 @@ public class NornilsGarden extends Quest
 			return null;
 		}
 		// Creating new instance
-		else
+		String result = checkConditions(npc, player);
+		if (!(result.equalsIgnoreCase("ok")))
+			return result;
+
+		final int instanceId = InstanceManager.getInstance().createDynamicInstance("NornilsGarden.xml");
+		final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
+		
+		inst.setName(InstanceManager.getInstance().getInstanceIdName(INSTANCE_ID));
+		final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
+		inst.setSpawnLoc(returnLoc);
+		inst.setAllowSummon(false);
+		inst.setDuration(DURATION_TIME * 60000);
+		inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);
+		world = new NornilsWorld();
+		world.instanceId = instanceId;
+		world.templateId = INSTANCE_ID;
+		InstanceManager.getInstance().addWorld(world);
+		_log.info("Nornils Garden: started, Instance: " + instanceId + " created by player: " + player.getName());
+
+		prepareInstance((NornilsWorld) world);
+		
+		// and finally teleport party into instance
+		final L2Party party = player.getParty();
+		if(party != null)
 		{
-			String result = checkConditions(npc, player);
-			if (!(result.equalsIgnoreCase("ok")))
-				return result;
-
-			final int instanceId = InstanceManager.getInstance().createDynamicInstance("NornilsGarden.xml");
-			final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
-			
-			inst.setName(InstanceManager.getInstance().getInstanceIdName(INSTANCE_ID));
-			final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
-			inst.setSpawnLoc(returnLoc);
-			inst.setAllowSummon(false);
-			inst.setDuration(DURATION_TIME * 60000);
-			inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);			
-			world = new NornilsWorld();
-			world.instanceId = instanceId;
-			world.templateId = INSTANCE_ID;
-			InstanceManager.getInstance().addWorld(world);
-			_log.info("Nornils Garden: started, Instance: " + instanceId + " created by player: " + player.getName());
-
-			prepareInstance((NornilsWorld) world);
-			
-			// and finally teleport party into instance
-			final L2Party party = player.getParty();
-			if(party != null)
+			for (L2PcInstance partyMember : party.getPartyMembers())
 			{
-				for (L2PcInstance partyMember : party.getPartyMembers())
-				{
-					world.allowed.add(partyMember.getObjectId());
-					teleportPlayer(partyMember, SPAWN_PPL, instanceId);
-				}
+				world.allowed.add(partyMember.getObjectId());
+				teleportPlayer(partyMember, SPAWN_PPL, instanceId);
 			}
-			return null;
 		}
+		return null;
 	}
 	
 	private void prepareInstance(NornilsWorld world)
@@ -558,8 +554,7 @@ public class NornilsGarden extends Quest
 			{
 				return npc.getNpcId()+"-01.html";
 			}
-			else
-				return getNoQuestMsg(player);
+			return getNoQuestMsg(player);
 		}
 
 		return null;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
index c2c151f758342b9373aa8dddfe18ff6e4c821f69..871137ea61a653ef99c34911930b8659877a203c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
@@ -192,20 +192,17 @@ public class PailakaDevilsLegacy extends Quest
 			return;
 		}
 		//New instance
-		else
-		{
-			final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaDevilsLegacy.xml");
+		final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaDevilsLegacy.xml");
 
-			world = new InstanceWorld();
-			world.instanceId = instanceId;
-			world.templateId = INSTANCE_ID;
-			InstanceManager.getInstance().addWorld(world);
+		world = new InstanceWorld();
+		world.instanceId = instanceId;
+		world.templateId = INSTANCE_ID;
+		InstanceManager.getInstance().addWorld(world);
 
-			world.allowed.add(player.getObjectId());
-			teleportPlayer(player, TELEPORT, instanceId);
-			
-			_lematanNpc = addSpawn(LEMATAN, 88108, -209252, -3744, 64255, false, 0, false, instanceId);
-		}
+		world.allowed.add(player.getObjectId());
+		teleportPlayer(player, TELEPORT, instanceId);
+		
+		_lematanNpc = addSpawn(LEMATAN, 88108, -209252, -3744, 64255, false, 0, false, instanceId);
 		
 	}
 
@@ -242,10 +239,7 @@ public class PailakaDevilsLegacy extends Quest
 				st.set("cond","2");
 				return "32498-07.htm";
 			}
-			else
-			{
-				return "32498-09.htm";
-			}
+			return "32498-09.htm";
 		}
 		else if (event.equalsIgnoreCase("32498-05.htm"))
 		{
@@ -332,8 +326,7 @@ public class PailakaDevilsLegacy extends Quest
 		final QuestState st = player.getQuestState(qn);
 		if (st != null && npc.getNpcId() == ADVENTURER2 && st.isCompleted())
 			return "32511-03.htm";
-		else
-			return npc.getNpcId() + ".htm";
+		return npc.getNpcId() + ".htm";
 	}
 
 	@Override
@@ -358,8 +351,7 @@ public class PailakaDevilsLegacy extends Quest
 					case State.STARTED:
 						if (cond > 1)
 							return "32498-08.htm";
-						else
-							return "32498-06.htm";
+						return "32498-06.htm";
 					case State.COMPLETED:
 						return "32498-10.htm";
 					default:
@@ -368,8 +360,7 @@ public class PailakaDevilsLegacy extends Quest
 			case SUPPORTER:
 				if(st.getInt("cond") > 2)
 					return "32501-04.htm";
-				else
-					return "32501-01.htm";
+				return "32501-01.htm";
 			case ADVENTURER1:
 				if(player.getPet() == null)
 				{
@@ -382,8 +373,7 @@ public class PailakaDevilsLegacy extends Quest
 							st.giveItems(ENH_SWORD1, 1);
 							return "32508-03.htm";
 						}
-						else
-							return "32508-02.htm";
+						return "32508-02.htm";
 					}
 					else if (st.getQuestItemsCount(ENH_SWORD1) > 0)
 					{
@@ -394,16 +384,14 @@ public class PailakaDevilsLegacy extends Quest
 							st.giveItems(ENH_SWORD2, 1);
 							return "32508-05.htm";
 						}
-						else
-							return "32508-04.htm";
+						return "32508-04.htm";
 					}
 					else if (st.getQuestItemsCount(ENH_SWORD2) > 0)
 						return "32508-06.htm";
 					else
 						return "32508-00.htm";
 				}
-				else
-					return "32508-07.htm";
+				return "32508-07.htm";
 			case ADVENTURER2:
 				if (player.getPet() == null)
 				{
@@ -424,8 +412,7 @@ public class PailakaDevilsLegacy extends Quest
 					}
 					return "32511-01.htm";
 				}
-				else
-					return "32511-02.htm";
+				return "32511-02.htm";
 		}
 		return getNoQuestMsg(player);
 	}
@@ -558,6 +545,7 @@ public class PailakaDevilsLegacy extends Quest
 			_instanceId = id;
 		}
 
+		@Override
 		public void run()
 		{
 			try
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
index b75d5e75584f7ad9a1dcf7eac71948fef1c118d6..39fa8a751e01862d4021be670f938333508a7373 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
@@ -163,18 +163,15 @@ public class PailakaSongOfIceAndFire extends Quest
 			return;
 		}
 		//New instance
-		else
-		{
-			final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaSongOfIceAndFire.xml");
-			
-			world = new InstanceWorld();
-			world.instanceId = instanceId;
-			world.templateId = INSTANCE_ID;
-			InstanceManager.getInstance().addWorld(world);
-			
-			world.allowed.add(player.getObjectId());
-			teleportPlayer(player, TELEPORT, instanceId);
-		}
+		final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaSongOfIceAndFire.xml");
+		
+		world = new InstanceWorld();
+		world.instanceId = instanceId;
+		world.templateId = INSTANCE_ID;
+		InstanceManager.getInstance().addWorld(world);
+		
+		world.allowed.add(player.getObjectId());
+		teleportPlayer(player, TELEPORT, instanceId);
 		
 	}
 	
@@ -285,8 +282,7 @@ public class PailakaSongOfIceAndFire extends Quest
 					case State.STARTED:
 						if (cond > 1)
 							return "32497-00.htm";
-						else
-							return "32497-03.htm";
+						return "32497-03.htm";
 					case State.COMPLETED:
 						return "32497-07.htm";
 					default:
@@ -295,8 +291,7 @@ public class PailakaSongOfIceAndFire extends Quest
 			case SINAI:
 				if (cond > 1)
 					return "32500-00.htm";
-				else
-					return "32500-01.htm";
+				return "32500-01.htm";
 			case INSPECTOR:
 				switch (st.getInt("cond"))
 				{
@@ -433,6 +428,7 @@ public class PailakaSongOfIceAndFire extends Quest
 			_instanceId = id;
 		}
 		
+		@Override
 		public void run()
 		{
 			try
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/RankuFloor/RankuFloor.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/RankuFloor/RankuFloor.java
index 3b65a757c4feac6aae979c426e51c721753694ef..2fd5c0e04e9d5faed899137e68d603bee2c5d0cd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/RankuFloor/RankuFloor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/RankuFloor/RankuFloor.java
@@ -218,36 +218,31 @@ public class RankuFloor extends Quest
 				player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
 				return 0;
 			}
-			else
-			{
-				teleportPlayer(player, ENTRY_POINT, world.instanceId);
-				return world.instanceId;
-			}
+			teleportPlayer(player, ENTRY_POINT, world.instanceId);
+			return world.instanceId;
 		}
-		else
+		
+		if (!checkTeleport(player))
 		{
-			if (!checkTeleport(player))
-			{
-				return 0;
-			}
-			
-			instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-			world = new RWorld();
-			world.instanceId = instanceId;
-			world.templateId = INSTANCEID;
-			world.status = 0;
-			InstanceManager.getInstance().addWorld(world);
-			_log.info("Tower of Infinitum - Ranku floor started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-			
-			for (L2PcInstance partyMember : player.getParty().getPartyMembers())
-			{
-				teleportPlayer(partyMember, ENTRY_POINT, instanceId);
-				partyMember.destroyItemByItemId("Quest", SEAL_BREAKER_10, 1, null, true);
-				world.allowed.add(partyMember.getObjectId());
-			}
-			
-			return instanceId;
+			return 0;
+		}
+		
+		instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+		world = new RWorld();
+		world.instanceId = instanceId;
+		world.templateId = INSTANCEID;
+		world.status = 0;
+		InstanceManager.getInstance().addWorld(world);
+		_log.info("Tower of Infinitum - Ranku floor started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+		
+		for (L2PcInstance partyMember : player.getParty().getPartyMembers())
+		{
+			teleportPlayer(partyMember, ENTRY_POINT, instanceId);
+			partyMember.destroyItemByItemId("Quest", SEAL_BREAKER_10, 1, null, true);
+			world.allowed.add(partyMember.getObjectId());
 		}
+		
+		return instanceId;
 	}
 	
 	public void setReenterTime(InstanceWorld world)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
index 3ba654dd2196d84f9d15e2099ef501a673300b8a..36d9576ea7f2c1caa5cb586db88e473f27dcbf74 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
@@ -431,36 +431,33 @@ public class Stage1 extends Quest
 			return world.instanceId;
 		}
 		//New instance
+		if (!checkConditions(player))
+			return 0;
+		instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+		world = new SOD1World();
+		world.instanceId = instanceId;
+		world.status = 0;
+		InstanceManager.getInstance().addWorld(world);
+		spawnState((SOD1World)world);
+		for (L2DoorInstance door : InstanceManager.getInstance().getInstance(instanceId).getDoors())
+			if (Util.contains(ATTACKABLE_DOORS, door.getDoorId()))
+				door.setIsAttackableDoor(true);
+		_log.info("Seed of Destruction started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+		// teleport players
+		if (player.getParty() == null || player.getParty().getCommandChannel() == null)
+		{
+			teleportPlayer(player, coords, instanceId);
+			world.allowed.add(player.getObjectId());
+		}
 		else
 		{
-			if (!checkConditions(player))
-				return 0;
-			instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-			world = new SOD1World();
-			world.instanceId = instanceId;
-			world.status = 0;
-			InstanceManager.getInstance().addWorld(world);
-			spawnState((SOD1World)world);
-			for (L2DoorInstance door : InstanceManager.getInstance().getInstance(instanceId).getDoors())
-				if (Util.contains(ATTACKABLE_DOORS, door.getDoorId()))
-					door.setIsAttackableDoor(true);
-			_log.info("Seed of Destruction started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-			// teleport players
-			if (player.getParty() == null || player.getParty().getCommandChannel() == null)
+			for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
 			{
-				teleportPlayer(player, coords, instanceId);
-				world.allowed.add(player.getObjectId());
-			}
-			else
-			{
-				for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
-				{
-					teleportPlayer(channelMember, coords, instanceId);
-					world.allowed.add(channelMember.getObjectId());
-				}
+				teleportPlayer(channelMember, coords, instanceId);
+				world.allowed.add(channelMember.getObjectId());
 			}
-			return instanceId;
 		}
+		return instanceId;
 	}
 
 	protected boolean checkKillProgress(L2Npc mob, SOD1World world)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
index 01e7696bd86665ad990cb58280c61392394565b9..c70b83b550c4c775490ec77bcd2ebc5749a1c0d8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
@@ -198,40 +198,37 @@ public class HallOfSuffering extends Quest
 			return world.instanceId;
 		}
 		//New instance
+		if (!checkConditions(player))
+			return 0;
+		L2Party party = player.getParty();
+		instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+		world = new HSWorld();
+		world.instanceId = instanceId;
+		world.templateId = INSTANCEID;
+		world.status = 0;
+		((HSWorld)world).startTime = System.currentTimeMillis();
+		((HSWorld)world).ptLeaderName = player.getName();
+		InstanceManager.getInstance().addWorld(world);
+		_log.info("Hall Of Suffering started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+		runTumors((HSWorld)world);
+		
+		// teleport players
+		if (player.getParty() == null)
+		{
+			teleportPlayer(player, coords, instanceId);
+			world.allowed.add(player.getObjectId());
+		}
 		else
 		{
-			if (!checkConditions(player))
-				return 0;
-			L2Party party = player.getParty();
-			instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-			world = new HSWorld();
-			world.instanceId = instanceId;
-			world.templateId = INSTANCEID;
-			world.status = 0;
-			((HSWorld)world).startTime = System.currentTimeMillis();
-			((HSWorld)world).ptLeaderName = player.getName();
-			InstanceManager.getInstance().addWorld(world);
-			_log.info("Hall Of Suffering started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-			runTumors((HSWorld)world);
-			
-			// teleport players
-			if (player.getParty() == null)
-			{
-				teleportPlayer(player, coords, instanceId);
-				world.allowed.add(player.getObjectId());
-			}
-			else
+			for (L2PcInstance partyMember : party.getPartyMembers())
 			{
-				for (L2PcInstance partyMember : party.getPartyMembers())
-				{
-					teleportPlayer(partyMember, coords, instanceId);
-					world.allowed.add(partyMember.getObjectId());
-					if (partyMember.getQuestState(qn) == null)
-						newQuestState(partyMember);
-				}
+				teleportPlayer(partyMember, coords, instanceId);
+				world.allowed.add(partyMember.getObjectId());
+				if (partyMember.getQuestState(qn) == null)
+					newQuestState(partyMember);
 			}
-			return instanceId;
 		}
+		return instanceId;
 	}
 	
 	protected boolean checkKillProgress(L2Npc mob, HSWorld world)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
index 2e55e6012fec9af842e30dc1158d8da3b63595eb..c0e004873ba726362cd70c2cd796f4b2f8131f89 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
@@ -175,6 +175,7 @@ public class eventmodElpies extends Event
 		// Schedule Event end
 		_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				timeUp();
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 118434dd2ba3ca9e3bbf06ddacab01af69fbc5a8..fff34cf1959fedf1554c8fec0da48259ec668835 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
@@ -144,6 +144,7 @@ public class eventmodRabbits extends Event
 		// Schedule Event end
 		_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				timeUp();
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 e202019ee5d4359b9492016dbd05c906d4e27ea7..45bf14c5552012060cf6d7ecda5c4b7db13e093e 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
@@ -36,8 +36,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.util.Rnd;
 
 /**
- ** @author Gnacik
- **
+ * @author Gnacik
  */
 public class eventmodRace extends Event
 {
@@ -137,6 +136,7 @@ public class eventmodRace extends Event
 		// Schedule Event end
 		_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				StartRace();
@@ -186,6 +186,7 @@ public class eventmodRace extends Event
 		// Schedule timeup for Race
 		_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
 		{
+			@Override
 			public void run()
 			{
 				timeUp();
@@ -319,8 +320,7 @@ public class eventmodRace extends Event
 				winRace(player);
 				return "900104-winner.htm";
 			}
-			else
-				return "900104-notrans.htm";
+			return "900104-notrans.htm";
 		}
 		return htmltext;
 	}
@@ -337,9 +337,10 @@ public class eventmodRace extends Event
 		if (npc.getNpcId() == _start_npc)
 		{
 			if (_isRaceStarted)
+			{
 				return _start_npc+"-started-"+isRacing(player)+".htm";
-			else
-				return _start_npc+"-"+isRacing(player)+".htm";
+			}
+			return _start_npc+"-"+isRacing(player)+".htm";
 		}
 		else if (npc.getNpcId() == _stop_npc && _isRaceStarted)
 		{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 0ad33e48c1b83d6cd3986a376aa73c3cb51f143a..c1ee955238b8c9d899d2565570c5d40adcbe57da 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -22,11 +22,9 @@ import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
 
 /**
- ** @author Gnacik
- **
- ** 2010-08-07 Based on Freya PTS
+ * 2010-08-07 Based on Freya PTS
+ * @author Gnacik
  */
-
 public class Q10288_SecretMission extends Quest
 {
 	private static final String qn = "10288_SecretMission";
@@ -143,9 +141,10 @@ public class Q10288_SecretMission extends Quest
 		if (npc.getNpcId() == _aquilani)
 		{
 			if (st.isCompleted())
+			{
 				return "32780-01.html";
-			else
-				return "32780-00.html";
+			}
+			return "32780-00.html";
 		}
 		return null;
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
index 341433bd70307562f1ca9ecf764adf2a68218fe4..fdbdcf49bce56021027cee4afdb6b4a0803b238e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
@@ -22,11 +22,9 @@ import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
 
 /**
- ** @author Gnacik
- **
- ** 2010-09-29 Based on official server Franz
+ * 2010-09-29 Based on official server Franz
+ * @author Gnacik
  */
-
 public class Q20_BringUpWithLove extends Quest
 {
 	private static final String qn = "20_BringUpWithLove";
@@ -57,9 +55,10 @@ public class Q20_BringUpWithLove extends Quest
 			else if (event.equalsIgnoreCase("31537-03.htm"))
 			{
 				if (st.hasQuestItems(_beast_whip))
+				{
 					return "31537-03a.htm";
-				else
-					st.giveItems(_beast_whip, 1);
+				}
+				st.giveItems(_beast_whip, 1);
 			}
 			else if (event.equalsIgnoreCase("31537-15.htm"))
 			{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
index 4edb1055aefcd682678f2fa842f33929008c1ff0..c627e7f79d708397d5e64fc6ef11e57146d0b9bb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
@@ -72,7 +72,7 @@ public class Q290_ThreatRemoval extends Quest
 		QuestState st = player.getQuestState(qn);
 		if (st == null)
 			return htmltext;
-		int[][] i = REWARD[(int) Rnd.get(REWARD.length)];
+		int[][] i = REWARD[Rnd.get(REWARD.length)];
 		int b = Rnd.get(i.length);
 
 		if (npc.getNpcId() == PINAPS)
@@ -148,7 +148,7 @@ public class Q290_ThreatRemoval extends Quest
 		if (Util.contains(MOBS1, npcId))
 		{
 			int chance = (int) (25 * Config.RATE_QUEST_DROP);
-			int numItems = (int) (chance / 100);
+			int numItems = (chance / 100);
 			chance = chance % 100;
 			if (st.getRandom(100) < chance)
 				numItems++;
@@ -161,7 +161,7 @@ public class Q290_ThreatRemoval extends Quest
 		else if (Util.contains(MOBS2, npcId))
 		{
 			int chance = (int) (30 * Config.RATE_QUEST_DROP);
-			int numItems = (int) (chance / 100);
+			int numItems = (chance / 100);
 			chance = chance % 100;
 			if (st.getRandom(100) < chance)
 				numItems++;
@@ -174,7 +174,7 @@ public class Q290_ThreatRemoval extends Quest
 		else if (Util.contains(MOBS3, npcId))
 		{
 			int chance = (int) (50 * Config.RATE_QUEST_DROP);
-			int numItems = (int) (chance / 100);
+			int numItems = (chance / 100);
 			chance = chance % 100;
 			if (st.getRandom(100) < chance)
 				numItems++;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
index 8f86eebc17d710274b86784f9c8e5e079ab0329f..38ad458315d730d886e5a917196a30641c2a123d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
@@ -232,6 +232,7 @@ public class Q309_ForAGoodCause extends Quest
 		return htmltext;
 	}
 	
+	@Override
 	public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
 	{
 		QuestState st = player.getQuestState(qn);
@@ -271,10 +272,7 @@ public class Q309_ForAGoodCause extends Quest
 			st.playSound("ItemSound.quest_finish");
 			return "32647-16.htm";
 		}
-		else
-		{
-			return "32647-15.htm";
-		}
+		return "32647-15.htm";
 	}
 	
 	private String onRecipeExchangeRequest(QuestState st, int recipe, int takeid, int quanty)
@@ -286,10 +284,7 @@ public class Q309_ForAGoodCause extends Quest
 			st.playSound("ItemSound.quest_finish");
 			return "32647-16.htm";
 		}
-		else
-		{
-			return "32647-15.htm";
-		}
+		return "32647-15.htm";
 	}
 	
 	public Q309_ForAGoodCause(int id, String name, String descr)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
index 5ea16082f204b22a5cad19ed55b7a5b4aad769f3..bd0b765d48bb47b26ac6abeeb95f89924444d8d7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
@@ -374,8 +374,8 @@ public class Q350_EnhanceYourWeapon extends Quest
 	
 	/**
 	 * Calculate the leveling chance of Soul Crystals based on the attacker that killed this L2Attackable
-	 *
-	 * @param attacker The player that last killed this L2Attackable
+	 * @param mob 
+	 * @param killer The player that last killed this L2Attackable
 	 * $ Rewrite 06.12.06 - Yesod
 	 * $ Rewrite 08.01.10 - Gigiikun
 	 */
@@ -524,8 +524,7 @@ public class Q350_EnhanceYourWeapon extends Quest
 			
 			if (ret != null)
 				return null;
-			else
-				ret = _soulCrystals.get(itemId);
+			ret = _soulCrystals.get(itemId);
 		}
 		return ret;
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q423_TakeYourBestShot/Q423_TakeYourBestShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q423_TakeYourBestShot/Q423_TakeYourBestShot.java
index 2c7dd17044bc1734dffd2bc92d50da558c88848e..67530f8408c3cbd65b3f621cb94993fb63974384 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q423_TakeYourBestShot/Q423_TakeYourBestShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q423_TakeYourBestShot/Q423_TakeYourBestShot.java
@@ -135,8 +135,7 @@ public class Q423_TakeYourBestShot extends Quest
 		
 		if (npc.isInsideRadius(96782, 85918, 100, true))
 			return "32740-ugoros.htm";
-		else
-			return "32740.htm";
+		return "32740.htm";
 	}
 	
 	@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
index 51da509fd96207d060707a50711f74968c6e389a..8d947e67bf080dea14a72abdd6be3c852b055395 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
@@ -35,9 +35,7 @@ import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
 /**
- * 
  * @author Gigiikun
- *
  */
 public final class Q511_AwlUnderFoot extends Quest
 {
@@ -133,44 +131,43 @@ public final class Q511_AwlUnderFoot extends Quest
 			return "";
 		}
 		//New instance
-		else
+		if (ret != null)
 		{
-			if (ret != null)
-				return ret;
-			ret = checkConditions(player);
-			if (ret != null)
-				return ret;
-			L2Party party = player.getParty();
-			int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-			Instance ins = InstanceManager.getInstance().getInstance(instanceId);
-			ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
-			world = new FAUWorld();
-			world.instanceId = instanceId;
-			world.templateId = dungeon.getInstanceId();
-			world.status = 0;
-			dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME);
-			InstanceManager.getInstance().addWorld(world);
-			_log.info("Fortress AwlUnderFoot started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-			ThreadPoolManager.getInstance().scheduleGeneral(new spawnRaid((FAUWorld) world), RAID_SPAWN_DELAY);
+			return ret;
+		}
+		ret = checkConditions(player);
+		if (ret != null)
+			return ret;
+		L2Party party = player.getParty();
+		int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+		Instance ins = InstanceManager.getInstance().getInstance(instanceId);
+		ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
+		world = new FAUWorld();
+		world.instanceId = instanceId;
+		world.templateId = dungeon.getInstanceId();
+		world.status = 0;
+		dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME);
+		InstanceManager.getInstance().addWorld(world);
+		_log.info("Fortress AwlUnderFoot started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+		ThreadPoolManager.getInstance().scheduleGeneral(new spawnRaid((FAUWorld) world), RAID_SPAWN_DELAY);
 
-			// teleport players
-			if (player.getParty() == null)
-			{
-				teleportPlayer(player, coords, instanceId);
-				world.allowed.add(player.getObjectId());
-			}
-			else
+		// teleport players
+		if (player.getParty() == null)
+		{
+			teleportPlayer(player, coords, instanceId);
+			world.allowed.add(player.getObjectId());
+		}
+		else
+		{
+			for (L2PcInstance partyMember : party.getPartyMembers())
 			{
-				for (L2PcInstance partyMember : party.getPartyMembers())
-				{
-					teleportPlayer(partyMember, coords, instanceId);
-					world.allowed.add(partyMember.getObjectId());
-					if (partyMember.getQuestState(qn) == null)
-						newQuestState(partyMember);
-				}
+				teleportPlayer(partyMember, coords, instanceId);
+				world.allowed.add(partyMember.getObjectId());
+				if (partyMember.getQuestState(qn) == null)
+					newQuestState(partyMember);
 			}
-			return getHtm(player.getHtmlPrefix(), "FortressWarden-08.htm").replace("%clan%", player.getClan().getName());
 		}
+		return getHtm(player.getHtmlPrefix(), "FortressWarden-08.htm").replace("%clan%", player.getClan().getName());
 	}
 	
 	private class spawnRaid  implements Runnable
@@ -182,6 +179,7 @@ public final class Q511_AwlUnderFoot extends Quest
 			_world = world;
 		}
 		
+		@Override
 		public void run()
 		{
 			try
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java
index 6da9377e11db8638c6bffcb97dc3b1caf5bec7ca..de74d90b93811b820d55239873894047c565f688 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java
@@ -97,13 +97,12 @@ public final class Q636_TruthBeyond extends Quest
 		}
 		else if (st.getState() == State.STARTED) // Flauron only
 		{
-			if (Integer.parseInt(st.get("cond")) == 1)
-				return "32010-01.htm";
-			else
+			if (st.getInt("cond") == 1)
 			{
-				st.exitQuest(true);
-				return "32010-03.htm";
+				return "32010-01.htm";
 			}
+			st.exitQuest(true);
+			return "32010-03.htm";
 		}
 		return getNoQuestMsg(player);
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
index ee8a891203c03d35de7993f14ed8db33fb5b85bf..59fcda7f050598669e2fef71f68310ce33949e5f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
@@ -110,8 +110,7 @@ public final class Q637_ThroughOnceMore extends Quest
 				st.playSound("ItemSound.quest_finish");
 				return "32010-05.htm";
 			}
-			else
-				return "32010-04.htm";
+			return "32010-04.htm";
 		}
 		return getNoQuestMsg(player);
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagaOfTheDuelist.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagaOfTheDuelist.java
index c03ade757b680fe66cd205a3374ec37c41d6ca2a..3901f57bd988fcab9080317d65a0c4147c39a88a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagaOfTheDuelist.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagaOfTheDuelist.java
@@ -88,13 +88,11 @@ public class SagaOfTheDuelist extends SagasSuperClass
 						st.giveItems(TOPQUALITYMEAT, 1);
 						return "tunatun_01.htm";
 					}
-					else
-						return "tunatun_02.htm";
+					return "tunatun_02.htm";
 				}
 			}
 			return htmltext;
 		}
-		else
-			return super.onTalk(npc, player);
+		return super.onTalk(npc, player);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
index e58dd66c2934de6ec580159ba672d8af63ae0265..94c0df17e92763a8ff59257a5998d7e6152d678f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
@@ -187,8 +187,7 @@ public class SagasSuperClass extends QuestJython
 		{
 			if (prevclass.length == 1)
 				return -1;
-			else
-				return prevclass[1];
+			return prevclass[1];
 		}
 		return prevclass[0];
 	}
@@ -779,21 +778,21 @@ public class SagasSuperClass extends QuestJython
 		{
 			L2PcInstance quest_player = (L2PcInstance) L2World.getInstance().findObject(_SpawnList.get(npc));
 			if (quest_player == null)
+			{
 				return null;
-			else
+			}
+			
+			for (L2Object obj : targets)
 			{
-				for (L2Object obj : targets)
+				if (obj == quest_player || obj == npc)
 				{
-					if (obj == quest_player || obj == npc)
-					{
-						QuestState st2 = findRightState(npc);
-						if (st2 == null)
-							return null;
-						AutoChat(npc, Text[5].replace("PLAYERNAME", player.getName()));
-						cancelQuestTimer("Archon Hellisha has despawned", npc, st2.getPlayer());
-						st2.set("spawned", "0");
-						DeleteSpawn(st2, npc);
-					}
+					QuestState st2 = findRightState(npc);
+					if (st2 == null)
+						return null;
+					AutoChat(npc, Text[5].replace("PLAYERNAME", player.getName()));
+					cancelQuestTimer("Archon Hellisha has despawned", npc, st2.getPlayer());
+					st2.set("spawned", "0");
+					DeleteSpawn(st2, npc);
 				}
 			}
 		}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/retail/PriestOfBlessing/PriestOfBlessing.java b/L2J_DataPack_BETA/dist/game/data/scripts/retail/PriestOfBlessing/PriestOfBlessing.java
index 6abb617dbe31c9b521e3dfd4684a878592d49089..95873acd951cdad703db5c1355c1cee916f56a15 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/retail/PriestOfBlessing/PriestOfBlessing.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/retail/PriestOfBlessing/PriestOfBlessing.java
@@ -161,10 +161,7 @@ public class PriestOfBlessing extends Quest
 				}
 				return null;
 			}
-			else
-			{
-				htmltext = "32783-adena.htm";
-			}
+			htmltext = "32783-adena.htm";
 		}
 		else if (event.equalsIgnoreCase("buy_hourglass"))
 		{
@@ -199,10 +196,7 @@ public class PriestOfBlessing extends Quest
 				}
 				return null;
 			}
-			else
-			{
-				htmltext = "32783-adena.htm";
-			}
+			htmltext = "32783-adena.htm";
 		}
 		return htmltext;
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java
index b1576851791c19bb822a103d814aa3a4cf6bc359..5eac2259681ea0cbbf3f4f211c74c1d103181962 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java
@@ -38,9 +38,10 @@ public class ElrokiTeleporters extends Quest
 		{
 			case 32111:
 				if (player.isInCombat())
+				{
 					return "32111-no.htm";
-				else
-					player.teleToLocation(4990,-1879,-3178);
+				}
+				player.teleToLocation(4990,-1879,-3178);
 				break;
 			case 32112:
 				player.teleToLocation(7557,-5513,-3221);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java
index fdd27bbec68c7aeab03764ed2740a96fc196a890..b6d9b50b271876f1dc5c56565deb358f856b4adb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java
@@ -375,6 +375,7 @@ public abstract class AirShipController extends Quest
 	
 	private final class DecayTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			if (_dockedShip != null)
@@ -384,6 +385,7 @@ public abstract class AirShipController extends Quest
 	
 	private final class DepartTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			if (_dockedShip != null
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/EngineerLekon/EngineerLekon.java b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/EngineerLekon/EngineerLekon.java
index 9dca21db53ef69baf750fb1ef0f311d85c003c35..c47d767dd2e700690b75a492963e889cf79ec20a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/EngineerLekon/EngineerLekon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/EngineerLekon/EngineerLekon.java
@@ -64,8 +64,7 @@ public class EngineerLekon extends Quest
 			player.addItem("AirShipLicense", LICENSE, 1, npc, true);
 			return null;
 		}
-		else
-			return event;
+		return event;
 	}
 	
 	@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
index 897b858ae998e8e4fb3c9161fb005c22377f7b78..815002831f9fee2f5519bc1b528684be8e4fcc42 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
@@ -283,7 +283,7 @@
 	<skill id="22018" levels="1" name="Santa Claus' Gift - Luck">
 		<!-- Confirmed CT2.5 -->
 		<table name="#extractableItems">
-			20107,1,99.99948;20108,1,0.00051
+			20108,1,100
 		</table>
 		<set name="capsuled_items_skill" val="#extractableItems" />
 		<set name="itemConsumeCount" val="1" />