BETA: Target handlers can be loaded from MasterHandler directly

L2J_Server_BETA/java/com/l2jserver/gameserver/GameServer.java

@@ -74,14 +74,7 @@ import com.l2jserver.gameserver.datatables.SummonSkillsTable;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
 import com.l2jserver.gameserver.datatables.UITable;
 import com.l2jserver.gameserver.geoeditorcon.GeoEditorListener;
-import com.l2jserver.gameserver.handler.AdminCommandHandler;
-import com.l2jserver.gameserver.handler.ChatHandler;
 import com.l2jserver.gameserver.handler.EffectHandler;
-import com.l2jserver.gameserver.handler.ItemHandler;
-import com.l2jserver.gameserver.handler.SkillHandler;
-import com.l2jserver.gameserver.handler.TargetHandler;
-import com.l2jserver.gameserver.handler.UserCommandHandler;
-import com.l2jserver.gameserver.handler.VoicedCommandHandler;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.AirShipManager;
 import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
@@ -220,7 +213,6 @@ public class GameServer
 		GlobalVariablesManager.getInstance();
 		
 		printSection("Skills");
-		TargetHandler.getInstance().executeScript();
 		EffectHandler.getInstance().executeScript();
 		EnchantGroupsTable.getInstance();
 		SkillTable.getInstance();
@@ -377,13 +369,6 @@ public class GameServer
 		_log.info("AutoChatHandler: Loaded " + AutoChatHandler.getInstance().size() + " handlers in total.");
 		_log.info("AutoSpawnHandler: Loaded " + AutoSpawnHandler.getInstance().size() + " handlers in total.");
 		
-		AdminCommandHandler.getInstance();
-		ChatHandler.getInstance();
-		ItemHandler.getInstance();
-		SkillHandler.getInstance();
-		UserCommandHandler.getInstance();
-		VoicedCommandHandler.getInstance();
-		
 		if (Config.L2JMOD_ALLOW_WEDDING)
 			CoupleManager.getInstance();
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TargetHandler.java

@@ -14,23 +14,17 @@
  */
 package com.l2jserver.gameserver.handler;
 
-import java.io.File;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javolution.util.FastMap;
 
 import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
-import com.l2jserver.gameserver.scripting.L2ScriptEngineManager;
 
 /**
  * @author UnAfraid
  */
 public class TargetHandler
 {
-	private static Logger _log = Logger.getLogger(TargetHandler.class.getName());
-	
 	private final Map<Enum<SkillTargetType>, ISkillTargetTypeHandler> _datatable;
 	
 	public static TargetHandler getInstance()
@@ -45,30 +39,12 @@ public class TargetHandler
 	
 	public void registerSkillTargetType(ISkillTargetTypeHandler handler)
 	{
-		Enum<SkillTargetType> ids = handler.getTargetType();
-		if (_datatable.containsKey(ids))
-			_log.log(Level.FINE, "Target Handler: " + ids.toString() + " is already registered into the map!");
-		_datatable.put(ids, handler);
+		_datatable.put(handler.getTargetType(), handler);
 	}
 	
 	public ISkillTargetTypeHandler getSkillTarget(Enum<SkillTargetType> skillTargetType)
 	{
-		Enum<SkillTargetType> target = skillTargetType;
-		return _datatable.get(target);
-	}
-	
-	public void executeScript()
-	{
-		try
-		{
-			File file = new File(L2ScriptEngineManager.SCRIPT_FOLDER, "handlers/TargetMasterHandler.java");
-			L2ScriptEngineManager.getInstance().executeScript(file);
-		}
-		catch (Exception e)
-		{
-			_log.warning("Problems while running TargetMansterHandler");
-			e.printStackTrace();
-		}
+		return _datatable.get(skillTargetType);
 	}
 	
 	public int size()