ThreadPool manager rework.

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/GameServer.java

@@ -160,13 +160,15 @@ public final class GameServer
 	{
 		final long serverLoadStart = System.currentTimeMillis();
 		
+		printSection("IdFactory");
 		if (!IdFactory.getInstance().isInitialized())
 		{
 			_log.severe(getClass().getSimpleName() + ": Could not read object IDs from database. Please check your configuration.");
 			throw new Exception("Could not initialize the ID factory!");
 		}
 		
-		ThreadPoolManager.getInstance();
+		printSection("ThreadPool");
+		ThreadPoolManager.init();
 		EventDispatcher.getInstance();
 		
 		new File("log/game").mkdirs();

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/GameTimeController.java

@@ -143,7 +143,7 @@ public final class GameTimeController extends Thread
 		
 		if (isNight)
 		{
-			ThreadPoolManager.getInstance().executeAi(() -> DayNightSpawnManager.getInstance().notifyChangeMode());
+			ThreadPoolManager.execute(() -> DayNightSpawnManager.getInstance().notifyChangeMode());
 		}
 		
 		while (true)
@@ -175,7 +175,7 @@ public final class GameTimeController extends Thread
 			{
 				isNight = !isNight;
 				
-				ThreadPoolManager.getInstance().executeAi(() -> DayNightSpawnManager.getInstance().notifyChangeMode());
+				ThreadPoolManager.execute(() -> DayNightSpawnManager.getInstance().notifyChangeMode());
 			}
 		}
 	}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ItemsAutoDestroy.java

@@ -31,7 +31,7 @@ public final class ItemsAutoDestroy
 	
 	protected ItemsAutoDestroy()
 	{
-		ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this::removeItems, 5000, 5000);
+		ThreadPoolManager.scheduleAtFixedRate(this::removeItems, 5000, 5000);
 	}
 	
 	public static ItemsAutoDestroy getInstance()

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/RecipeController.java

@@ -109,7 +109,7 @@ public class RecipeController
 			if (Config.ALT_GAME_CREATION)
 			{
 				_activeMakers.put(manufacturer.getObjectId(), maker);
-				ThreadPoolManager.getInstance().scheduleGeneral(maker, 100);
+				ThreadPoolManager.schedule(maker, 100);
 			}
 			else
 			{
@@ -158,7 +158,7 @@ public class RecipeController
 			if (Config.ALT_GAME_CREATION)
 			{
 				_activeMakers.put(player.getObjectId(), maker);
-				ThreadPoolManager.getInstance().scheduleGeneral(maker, 100);
+				ThreadPoolManager.schedule(maker, 100);
 			}
 			else
 			{
@@ -353,7 +353,7 @@ public class RecipeController
 					_player.broadcastPacket(msk);
 					
 					_player.sendPacket(new SetupGauge(0, _delay));
-					ThreadPoolManager.getInstance().scheduleGeneral(this, 100 + _delay);
+					ThreadPoolManager.schedule(this, 100 + _delay);
 				}
 				else
 				{
@@ -536,7 +536,7 @@ public class RecipeController
 						if (Config.ALT_GAME_CREATION && isWait)
 						{
 							_player.sendPacket(new SetupGauge(0, _delay));
-							ThreadPoolManager.getInstance().scheduleGeneral(this, 100 + _delay);
+							ThreadPoolManager.schedule(this, 100 + _delay);
 						}
 						else
 						{
@@ -558,7 +558,7 @@ public class RecipeController
 						if (Config.ALT_GAME_CREATION && isWait)
 						{
 							_player.sendPacket(new SetupGauge(0, _delay));
-							ThreadPoolManager.getInstance().scheduleGeneral(this, 100 + _delay);
+							ThreadPoolManager.schedule(this, 100 + _delay);
 						}
 						else
 						{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java

@@ -186,7 +186,7 @@ public class SevenSigns
 		
 		// Schedule a time for the next period change.
 		final SevenSignsPeriodChange sspc = new SevenSignsPeriodChange();
-		ThreadPoolManager.getInstance().scheduleGeneral(sspc, milliToChange);
+		ThreadPoolManager.schedule(sspc, milliToChange);
 		
 		// Thanks to http://rainbow.arch.scriptmania.com/scripts/timezone_countdown.html for help with this.
 		final double numSecs = (milliToChange / 1000) % 60;
@@ -1538,7 +1538,7 @@ public class SevenSigns
 			setCalendarForNextPeriodChange();
 			
 			final SevenSignsPeriodChange sspc = new SevenSignsPeriodChange();
-			ThreadPoolManager.getInstance().scheduleGeneral(sspc, getMilliToPeriodChange());
+			ThreadPoolManager.schedule(sspc, getMilliToPeriodChange());
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java

@@ -912,7 +912,7 @@ public class SevenSignsFestival implements SpawnListener
 		// at the specified time, then invoke it automatically after every cycle.
 		_managerInstance = new FestivalManager();
 		setNextFestivalStart(Config.ALT_FESTIVAL_MANAGER_START + FESTIVAL_SIGNUP_TIME);
-		_managerScheduledTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(_managerInstance, Config.ALT_FESTIVAL_MANAGER_START, Config.ALT_FESTIVAL_CYCLE_LENGTH);
+		_managerScheduledTask = ThreadPoolManager.scheduleAtFixedRate(_managerInstance, Config.ALT_FESTIVAL_MANAGER_START, Config.ALT_FESTIVAL_CYCLE_LENGTH);
 		
 		_log.info("SevenSignsFestival: The first Festival of Darkness cycle begins in " + (Config.ALT_FESTIVAL_MANAGER_START / 60000) + " minute(s).");
 	}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/Shutdown.java

@@ -213,7 +213,7 @@ public class Shutdown extends Thread
 			// stop all thread pools
 			try
 			{
-				ThreadPoolManager.getInstance().shutdown();
+				ThreadPoolManager.shutdown();
 				_log.info("Thread Pool Manager: Manager has been shut down(" + tc.getEstimatedTimeAndRestartCounter() + "ms).");
 			}
 			catch (Throwable t)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ThreadPoolManager.java

@@ -16,790 +16,284 @@
  */
 package com.l2jmobius.gameserver;
 
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
+ * This class handles thread pooling system. It relies on two ThreadPoolExecutor arrays, which poolers number is generated using config.
  * <p>
- * This class is made to handle all the ThreadPools used in L2J.
+ * Those arrays hold following pools :
  * </p>
- * <p>
- * Scheduled Tasks can either be sent to a {@link #_generalScheduledThreadPool "general"} or {@link #_effectsScheduledThreadPool "effects"} {@link ScheduledThreadPoolExecutor ScheduledThreadPool}: The "effects" one is used for every effects (skills, hp/mp regen ...) while the "general" one is used
- * for everything else that needs to be scheduled.<br>
- * There also is an {@link #_aiScheduledThreadPool "ai"} {@link ScheduledThreadPoolExecutor ScheduledThreadPool} used for AI Tasks.
- * </p>
- * <p>
- * Tasks can be sent to {@link ScheduledThreadPoolExecutor ScheduledThreadPool} either with:
  * <ul>
- * <li>{@link #scheduleEffect(Runnable, long, TimeUnit)} and {@link #scheduleEffect(Runnable, long)} : for effects Tasks that needs to be executed only once.</li>
- * <li>{@link #scheduleGeneral(Runnable, long, TimeUnit)} and {@link #scheduleGeneral(Runnable, long)} : for scheduled Tasks that needs to be executed once.</li>
- * <li>{@link #scheduleAi(Runnable, long, TimeUnit)} and {@link #scheduleAi(Runnable, long)} : for AI Tasks that needs to be executed once</li>
+ * <li>Scheduled pool keeps a track about incoming, future events.</li>
+ * <li>Instant pool handles short-life events.</li>
  * </ul>
- * or
- * <ul>
- * <li>{@link #scheduleEffectAtFixedRate(Runnable, long, long, TimeUnit)} and {@link #scheduleEffectAtFixedRate(Runnable, long, long)} : for effects Tasks that needs to be executed periodically.</li>
- * <li>{@link #scheduleGeneralAtFixedRate(Runnable, long, long, TimeUnit)} and {@link #scheduleGeneralAtFixedRate(Runnable, long, long)} : for scheduled Tasks that needs to be executed periodically.</li>
- * <li>{@link #scheduleAiAtFixedRate(Runnable, long, long, TimeUnit)} and {@link #scheduleAiAtFixedRate(Runnable, long, long)} : for AI Tasks that needs to be executed periodically</li>
- * </ul>
- * </p>
- * <p>
- * For all Tasks that should be executed with no delay asynchronously in a ThreadPool there also are usual {@link ThreadPoolExecutor ThreadPools} that can grow/shrink according to their load.:
- * <ul>
- * <li>{@link #_generalPacketsThreadPool GeneralPackets} where most packets handler are executed.</li>
- * <li>{@link #_ioPacketsThreadPool I/O Packets} where all the i/o packets are executed.</li>
- * <li>There will be an AI ThreadPool where AI events should be executed</li>
- * <li>A general ThreadPool where everything else that needs to run asynchronously with no delay should be executed ({@link com.l2jmobius.gameserver.model.actor.knownlist KnownList} updates, SQL updates/inserts...)?</li>
- * </ul>
- * </p>
- * @author -Wooden-
  */
-public class ThreadPoolManager
+public final class ThreadPoolManager
 {
-	protected static final Logger _log = Logger.getLogger(ThreadPoolManager.class.getName());
+	protected static final Logger LOG = Logger.getLogger(ThreadPoolManager.class.getName());
 	
-	private static final class RunnableWrapper implements Runnable
+	private static final long MAX_DELAY = TimeUnit.NANOSECONDS.toMillis(Long.MAX_VALUE - System.nanoTime()) / 2;
+	
+	private static int _threadPoolRandomizer;
+	
+	protected static ScheduledThreadPoolExecutor[] _scheduledPools;
+	protected static ThreadPoolExecutor[] _instantPools;
+	
+	/**
+	 * Init the different pools, based on Config. It is launched only once, on Gameserver instance.
+	 */
+	public static void init()
 	{
-		private final Runnable _r;
-		
-		public RunnableWrapper(Runnable r)
+		// Feed scheduled pool.
+		int poolCount = Config.SCHEDULED_THREAD_POOL_COUNT;
+		if (poolCount == -1)
 		{
-			_r = r;
+			poolCount = Runtime.getRuntime().availableProcessors();
 		}
 		
-		@Override
-		public final void run()
+		_scheduledPools = new ScheduledThreadPoolExecutor[poolCount];
+		for (int i = 0; i < poolCount; i++)
 		{
-			try
-			{
-				_r.run();
-			}
-			catch (Throwable e)
-			{
-				final Thread t = Thread.currentThread();
-				final UncaughtExceptionHandler h = t.getUncaughtExceptionHandler();
-				if (h != null)
-				{
-					h.uncaughtException(t, e);
-				}
-			}
+			_scheduledPools[i] = new ScheduledThreadPoolExecutor(Config.THREADS_PER_SCHEDULED_THREAD_POOL);
 		}
-	}
-	
-	protected ScheduledThreadPoolExecutor _effectsScheduledThreadPool;
-	protected ScheduledThreadPoolExecutor _generalScheduledThreadPool;
-	protected ScheduledThreadPoolExecutor _aiScheduledThreadPool;
-	protected ScheduledThreadPoolExecutor _eventScheduledThreadPool;
-	private final ThreadPoolExecutor _generalPacketsThreadPool;
-	private final ThreadPoolExecutor _ioPacketsThreadPool;
-	private final ThreadPoolExecutor _generalThreadPool;
-	private final ThreadPoolExecutor _eventThreadPool;
-	
-	private boolean _shutdown;
-	
-	public static ThreadPoolManager getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
-	protected ThreadPoolManager()
-	{
-		_effectsScheduledThreadPool = new ScheduledThreadPoolExecutor(Config.THREAD_P_EFFECTS, new PriorityThreadFactory("EffectsSTPool", Thread.NORM_PRIORITY));
-		_generalScheduledThreadPool = new ScheduledThreadPoolExecutor(Config.THREAD_P_GENERAL, new PriorityThreadFactory("GeneralSTPool", Thread.NORM_PRIORITY));
-		_eventScheduledThreadPool = new ScheduledThreadPoolExecutor(Config.THREAD_E_EVENTS, new PriorityThreadFactory("EventSTPool", Thread.NORM_PRIORITY));
-		_ioPacketsThreadPool = new ThreadPoolExecutor(Config.IO_PACKET_THREAD_CORE_SIZE, Integer.MAX_VALUE, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new PriorityThreadFactory("I/O Packet Pool", Thread.NORM_PRIORITY + 1));
-		_generalPacketsThreadPool = new ThreadPoolExecutor(Config.GENERAL_PACKET_THREAD_CORE_SIZE, Config.GENERAL_PACKET_THREAD_CORE_SIZE + 2, 15L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new PriorityThreadFactory("Normal Packet Pool", Thread.NORM_PRIORITY + 1));
-		_generalThreadPool = new ThreadPoolExecutor(Config.GENERAL_THREAD_CORE_SIZE, Config.GENERAL_THREAD_CORE_SIZE + 2, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new PriorityThreadFactory("General Pool", Thread.NORM_PRIORITY));
-		_aiScheduledThreadPool = new ScheduledThreadPoolExecutor(Config.AI_MAX_THREAD, new PriorityThreadFactory("AISTPool", Thread.NORM_PRIORITY));
-		_eventThreadPool = new ThreadPoolExecutor(Config.EVENT_MAX_THREAD, Config.EVENT_MAX_THREAD + 2, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new PriorityThreadFactory("Event Pool", Thread.NORM_PRIORITY));
 		
-		scheduleGeneralAtFixedRate(new PurgeTask(), 10, 5, TimeUnit.MINUTES);
+		// Feed instant pool.
+		poolCount = Config.INSTANT_THREAD_POOL_COUNT;
+		if (poolCount == -1)
+		{
+			poolCount = Runtime.getRuntime().availableProcessors();
+		}
+		
+		_instantPools = new ThreadPoolExecutor[poolCount];
+		for (int i = 0; i < poolCount; i++)
+		{
+			_instantPools[i] = new ThreadPoolExecutor(Config.THREADS_PER_INSTANT_THREAD_POOL, Config.THREADS_PER_INSTANT_THREAD_POOL, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(100000));
+		}
+		
+		// Prestart core threads.
+		for (ScheduledThreadPoolExecutor threadPool : _scheduledPools)
+		{
+			threadPool.prestartAllCoreThreads();
+		}
+		
+		for (ThreadPoolExecutor threadPool : _instantPools)
+		{
+			threadPool.prestartAllCoreThreads();
+		}
+		
+		// Launch purge task.
+		scheduleAtFixedRate(() ->
+		{
+			purge();
+		}, 600000, 600000);
+		
+		LOG.info("ThreadPoolManager: Initialized " + getPoolSize(_instantPools) + "/" + getMaximumPoolSize(_instantPools) + " instant thread(s).");
+		LOG.info("ThreadPoolManager: Initialized " + getPoolSize(_scheduledPools) + "/" + getMaximumPoolSize(_scheduledPools) + " scheduled thread(s).");
+	}
+	
+	public static void purge()
+	{
+		for (ScheduledThreadPoolExecutor threadPool1 : _scheduledPools)
+		{
+			threadPool1.purge();
+		}
+		for (ThreadPoolExecutor threadPool2 : _instantPools)
+		{
+			threadPool2.purge();
+		}
 	}
 	
 	/**
-	 * Schedules an effect task to be executed after the given delay.
-	 * @param task the task to execute
-	 * @param delay the delay in the given time unit
-	 * @param unit the time unit of the delay parameter
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 * Schedules a one-shot action that becomes enabled after a delay. The pool is chosen based on pools activity.
+	 * @param r : the task to execute.
+	 * @param delay : the time from now to delay execution.
+	 * @return a ScheduledFuture representing pending completion of the task and whose get() method will return null upon completion.
 	 */
-	public ScheduledFuture<?> scheduleEffect(Runnable task, long delay, TimeUnit unit)
+	public static ScheduledFuture<?> schedule(Runnable r, long delay)
 	{
 		try
 		{
-			return _effectsScheduledThreadPool.schedule(new RunnableWrapper(task), delay, unit);
+			return getPool(_scheduledPools).schedule(new TaskWrapper(r), validate(delay), TimeUnit.MILLISECONDS);
 		}
-		catch (RejectedExecutionException e)
+		catch (Exception e)
 		{
 			return null;
 		}
 	}
 	
 	/**
-	 * Schedules an effect task to be executed after the given delay.
-	 * @param task the task to execute
-	 * @param delay the delay in milliseconds
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 * Schedules a periodic action that becomes enabled after a delay. The pool is chosen based on pools activity.
+	 * @param r : the task to execute.
+	 * @param delay : the time from now to delay execution.
+	 * @param period : the period between successive executions.
+	 * @return a ScheduledFuture representing pending completion of the task and whose get() method will throw an exception upon cancellation.
 	 */
-	public ScheduledFuture<?> scheduleEffect(Runnable task, long delay)
-	{
-		return scheduleEffect(task, delay, TimeUnit.MILLISECONDS);
-	}
-	
-	/**
-	 * Schedules an effect task to be executed at fixed rate.
-	 * @param task the task to execute
-	 * @param initialDelay the initial delay in the given time unit
-	 * @param period the period between executions in the given time unit
-	 * @param unit the time unit of the initialDelay and period parameters
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleEffectAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit)
+	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable r, long delay, long period)
 	{
 		try
 		{
-			return _effectsScheduledThreadPool.scheduleAtFixedRate(new RunnableWrapper(task), initialDelay, period, unit);
+			return getPool(_scheduledPools).scheduleAtFixedRate(new TaskWrapper(r), validate(delay), validate(period), TimeUnit.MILLISECONDS);
 		}
-		catch (RejectedExecutionException e)
+		catch (Exception e)
 		{
-			return null; /* shutdown, ignore */
+			return null;
 		}
 	}
 	
 	/**
-	 * Schedules an effect task to be executed at fixed rate.
-	 * @param task the task to execute
-	 * @param initialDelay the initial delay in milliseconds
-	 * @param period the period between executions in milliseconds
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 * Executes the given task sometime in the future.
+	 * @param r : the task to execute.
 	 */
-	public ScheduledFuture<?> scheduleEffectAtFixedRate(Runnable task, long initialDelay, long period)
-	{
-		return scheduleEffectAtFixedRate(task, initialDelay, period, TimeUnit.MILLISECONDS);
-	}
-	
-	/**
-	 * Schedules a general task to be executed after the given delay.
-	 * @param task the task to execute
-	 * @param delay the delay in the given time unit
-	 * @param unit the time unit of the delay parameter
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleGeneral(Runnable task, long delay, TimeUnit unit)
+	public static void execute(Runnable r)
 	{
 		try
 		{
-			return _generalScheduledThreadPool.schedule(new RunnableWrapper(task), delay, unit);
+			getPool(_instantPools).execute(new TaskWrapper(r));
 		}
-		catch (RejectedExecutionException e)
+		catch (Exception e)
 		{
-			return null; /* shutdown, ignore */
 		}
 	}
 	
-	/**
-	 * Schedules a general task to be executed after the given delay.
-	 * @param task the task to execute
-	 * @param delay the delay in milliseconds
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleGeneral(Runnable task, long delay)
+	public static String[] getStats()
 	{
-		return scheduleGeneral(task, delay, TimeUnit.MILLISECONDS);
+		List<String> stats = new ArrayList<>();
+		for (int i = 0; i < _scheduledPools.length; i++)
+		{
+			final ScheduledThreadPoolExecutor threadPool = _scheduledPools[i];
+			stats.add("Scheduled pool #" + i + ":");
+			stats.add(" |- ActiveCount: ...... " + threadPool.getActiveCount());
+			stats.add(" |- CorePoolSize: ..... " + threadPool.getCorePoolSize());
+			stats.add(" |- PoolSize: ......... " + threadPool.getPoolSize());
+			stats.add(" |- LargestPoolSize: .. " + threadPool.getLargestPoolSize());
+			stats.add(" |- MaximumPoolSize: .. " + threadPool.getMaximumPoolSize());
+			stats.add(" |- CompletedTaskCount: " + threadPool.getCompletedTaskCount());
+			stats.add(" |- QueuedTaskCount: .. " + threadPool.getQueue().size());
+			stats.add(" |- TaskCount: ........ " + threadPool.getTaskCount());
+			stats.add(" | -------");
+		}
+		for (int i = 0; i < _instantPools.length; i++)
+		{
+			final ThreadPoolExecutor threadPool = _instantPools[i];
+			stats.add("Scheduled pool #" + i + ":");
+			stats.add(" |- ActiveCount: ...... " + threadPool.getActiveCount());
+			stats.add(" |- CorePoolSize: ..... " + threadPool.getCorePoolSize());
+			stats.add(" |- PoolSize: ......... " + threadPool.getPoolSize());
+			stats.add(" |- LargestPoolSize: .. " + threadPool.getLargestPoolSize());
+			stats.add(" |- MaximumPoolSize: .. " + threadPool.getMaximumPoolSize());
+			stats.add(" |- CompletedTaskCount: " + threadPool.getCompletedTaskCount());
+			stats.add(" |- QueuedTaskCount: .. " + threadPool.getQueue().size());
+			stats.add(" |- TaskCount: ........ " + threadPool.getTaskCount());
+			stats.add(" | -------");
+		}
+		return stats.toArray(new String[stats.size()]);
 	}
 	
 	/**
-	 * Schedules a general task to be executed at fixed rate.
-	 * @param task the task to execute
-	 * @param initialDelay the initial delay in the given time unit
-	 * @param period the period between executions in the given time unit
-	 * @param unit the time unit of the initialDelay and period parameters
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 * Shutdown thread pooling system correctly. Send different informations.
 	 */
-	public ScheduledFuture<?> scheduleGeneralAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit)
+	public static void shutdown()
 	{
 		try
 		{
-			return _generalScheduledThreadPool.scheduleAtFixedRate(new RunnableWrapper(task), initialDelay, period, unit);
-		}
-		catch (RejectedExecutionException e)
-		{
-			return null; /* shutdown, ignore */
-		}
-	}
-	
-	/**
-	 * Schedules a event task to be executed after the given delay.
-	 * @param task the task to execute
-	 * @param delay the delay in the given time unit
-	 * @param unit the time unit of the delay parameter
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleEvent(Runnable task, long delay, TimeUnit unit)
-	{
-		try
-		{
-			return _eventScheduledThreadPool.schedule(new RunnableWrapper(task), delay, unit);
-		}
-		catch (RejectedExecutionException e)
-		{
-			return null; /* shutdown, ignore */
-		}
-	}
-	
-	/**
-	 * Schedules a event task to be executed after the given delay.
-	 * @param task the task to execute
-	 * @param delay the delay in milliseconds
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleEvent(Runnable task, long delay)
-	{
-		return scheduleEvent(task, delay, TimeUnit.MILLISECONDS);
-	}
-	
-	/**
-	 * Schedules a event task to be executed at fixed rate.
-	 * @param task the task to execute
-	 * @param initialDelay the initial delay in the given time unit
-	 * @param period the period between executions in the given time unit
-	 * @param unit the time unit of the initialDelay and period parameters
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleEventAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit)
-	{
-		try
-		{
-			return _eventScheduledThreadPool.scheduleAtFixedRate(new RunnableWrapper(task), initialDelay, period, unit);
-		}
-		catch (RejectedExecutionException e)
-		{
-			return null; /* shutdown, ignore */
-		}
-	}
-	
-	/**
-	 * Schedules a general task to be executed at fixed rate.
-	 * @param task the task to execute
-	 * @param initialDelay the initial delay in milliseconds
-	 * @param period the period between executions in milliseconds
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleGeneralAtFixedRate(Runnable task, long initialDelay, long period)
-	{
-		return scheduleGeneralAtFixedRate(task, initialDelay, period, TimeUnit.MILLISECONDS);
-	}
-	
-	/**
-	 * Schedules an AI task to be executed after the given delay.
-	 * @param task the task to execute
-	 * @param delay the delay in the given time unit
-	 * @param unit the time unit of the delay parameter
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleAi(Runnable task, long delay, TimeUnit unit)
-	{
-		try
-		{
-			return _aiScheduledThreadPool.schedule(new RunnableWrapper(task), delay, unit);
-		}
-		catch (RejectedExecutionException e)
-		{
-			return null; /* shutdown, ignore */
-		}
-	}
-	
-	/**
-	 * Schedules an AI task to be executed after the given delay.
-	 * @param task the task to execute
-	 * @param delay the delay in milliseconds
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleAi(Runnable task, long delay)
-	{
-		return scheduleAi(task, delay, TimeUnit.MILLISECONDS);
-	}
-	
-	/**
-	 * Schedules a general task to be executed at fixed rate.
-	 * @param task the task to execute
-	 * @param initialDelay the initial delay in the given time unit
-	 * @param period the period between executions in the given time unit
-	 * @param unit the time unit of the initialDelay and period parameters
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleAiAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit)
-	{
-		try
-		{
-			return _aiScheduledThreadPool.scheduleAtFixedRate(new RunnableWrapper(task), initialDelay, period, unit);
-		}
-		catch (RejectedExecutionException e)
-		{
-			return null; /* shutdown, ignore */
-		}
-	}
-	
-	/**
-	 * Schedules a general task to be executed at fixed rate.
-	 * @param task the task to execute
-	 * @param initialDelay the initial delay in milliseconds
-	 * @param period the period between executions in milliseconds
-	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
-	 */
-	public ScheduledFuture<?> scheduleAiAtFixedRate(Runnable task, long initialDelay, long period)
-	{
-		return scheduleAiAtFixedRate(task, initialDelay, period, TimeUnit.MILLISECONDS);
-	}
-	
-	/**
-	 * Executes a packet task sometime in future in another thread.
-	 * @param task the task to execute
-	 */
-	public void executePacket(Runnable task)
-	{
-		try
-		{
-			_generalPacketsThreadPool.execute(task);
-		}
-		catch (RejectedExecutionException e)
-		{
-			/* shutdown, ignore */
-		}
-	}
-	
-	/**
-	 * Executes an IO packet task sometime in future in another thread.
-	 * @param task the task to execute
-	 */
-	public void executeIOPacket(Runnable task)
-	{
-		try
-		{
-			_ioPacketsThreadPool.execute(task);
-		}
-		catch (RejectedExecutionException e)
-		{
-			/* shutdown, ignore */
-		}
-	}
-	
-	/**
-	 * Executes a general task sometime in future in another thread.
-	 * @param task the task to execute
-	 */
-	public void executeGeneral(Runnable task)
-	{
-		try
-		{
-			_generalThreadPool.execute(new RunnableWrapper(task));
-		}
-		catch (RejectedExecutionException e)
-		{
-			/* shutdown, ignore */
-		}
-	}
-	
-	/**
-	 * Executes an AI task sometime in future in another thread.
-	 * @param task the task to execute
-	 */
-	public void executeAi(Runnable task)
-	{
-		try
-		{
-			_aiScheduledThreadPool.execute(new RunnableWrapper(task));
-		}
-		catch (RejectedExecutionException e)
-		{
-			/* shutdown, ignore */
-		}
-	}
-	
-	/**
-	 * Executes an Event task sometime in future in another thread.
-	 * @param task the task to execute
-	 */
-	public void executeEvent(Runnable task)
-	{
-		try
-		{
-			_eventThreadPool.execute(new RunnableWrapper(task));
-		}
-		catch (RejectedExecutionException e)
-		{
-			/* shutdown, ignore */
-		}
-	}
-	
-	public StatsSet getStats(String category)
-	{
-		final StatsSet StatsSet = new StatsSet();
-		
-		switch (category)
-		{
-			case "EFFECTS":
-			{
-				StatsSet.set("ActiveThreads", _effectsScheduledThreadPool.getActiveCount());
-				StatsSet.set("getCorePoolSize", _effectsScheduledThreadPool.getCorePoolSize());
-				StatsSet.set("PoolSize", _effectsScheduledThreadPool.getPoolSize());
-				StatsSet.set("MaximumPoolSize", _effectsScheduledThreadPool.getMaximumPoolSize());
-				StatsSet.set("CompletedTasks", (int) _effectsScheduledThreadPool.getCompletedTaskCount());
-				StatsSet.set("ScheduledTasks", _effectsScheduledThreadPool.getQueue().size());
-				break;
-			}
-			case "GENERAL":
-			{
-				StatsSet.set("ActiveThreads", _generalScheduledThreadPool.getActiveCount());
-				StatsSet.set("getCorePoolSizes", _generalScheduledThreadPool.getCorePoolSize());
-				StatsSet.set("PoolSizes", _generalScheduledThreadPool.getPoolSize());
-				StatsSet.set("MaximumPoolSizes", _generalScheduledThreadPool.getMaximumPoolSize());
-				StatsSet.set("CompletedTasks", (int) _generalScheduledThreadPool.getCompletedTaskCount());
-				StatsSet.set("ScheduledTasks", _generalScheduledThreadPool.getQueue().size());
-				break;
-			}
-			case "AI":
-			{
-				StatsSet.set("ActiveThreads", _aiScheduledThreadPool.getActiveCount());
-				StatsSet.set("getCorePoolSize", _aiScheduledThreadPool.getCorePoolSize());
-				StatsSet.set("PoolSize", _aiScheduledThreadPool.getPoolSize());
-				StatsSet.set("MaximumPoolSize", _aiScheduledThreadPool.getMaximumPoolSize());
-				StatsSet.set("CompletedTasks", (int) _aiScheduledThreadPool.getCompletedTaskCount());
-				StatsSet.set("ScheduledTasks", _aiScheduledThreadPool.getQueue().size());
-				break;
-			}
-			case "EVENT":
-			{
-				StatsSet.set("ActiveThreads", _eventScheduledThreadPool.getActiveCount());
-				StatsSet.set("getCorePoolSize", _eventScheduledThreadPool.getCorePoolSize());
-				StatsSet.set("PoolSize", _eventScheduledThreadPool.getPoolSize());
-				StatsSet.set("MaximumPoolSize", _eventScheduledThreadPool.getMaximumPoolSize());
-				StatsSet.set("CompletedTasks", (int) _eventScheduledThreadPool.getCompletedTaskCount());
-				StatsSet.set("ScheduledTasks", _eventScheduledThreadPool.getQueue().size());
-				break;
-			}
-			case "PACKETS":
-			{
-				StatsSet.set("ActiveThreads", _generalPacketsThreadPool.getActiveCount());
-				StatsSet.set("getCorePoolSize", _generalPacketsThreadPool.getCorePoolSize());
-				StatsSet.set("MaximumPoolSize", _generalPacketsThreadPool.getMaximumPoolSize());
-				StatsSet.set("LargestPoolSize", _generalPacketsThreadPool.getLargestPoolSize());
-				StatsSet.set("PoolSize", _generalPacketsThreadPool.getPoolSize());
-				StatsSet.set("CompletedTasks", (int) _generalPacketsThreadPool.getCompletedTaskCount());
-				StatsSet.set("QueuedTasks", _generalPacketsThreadPool.getQueue().size());
-				break;
-			}
-			case "IOPACKETS":
-			{
-				StatsSet.set("ActiveThreads", _ioPacketsThreadPool.getActiveCount());
-				StatsSet.set("getCorePoolSize", _ioPacketsThreadPool.getCorePoolSize());
-				StatsSet.set("MaximumPoolSize", _ioPacketsThreadPool.getMaximumPoolSize());
-				StatsSet.set("LargestPoolSize", _ioPacketsThreadPool.getLargestPoolSize());
-				StatsSet.set("PoolSize", _ioPacketsThreadPool.getPoolSize());
-				StatsSet.set("CompletedTasks", (int) _ioPacketsThreadPool.getCompletedTaskCount());
-				StatsSet.set("QueuedTasks", _ioPacketsThreadPool.getQueue().size());
-				break;
-			}
-			case "GENERAL_TASKS":
-			{
-				StatsSet.set("ActiveThreads", _generalThreadPool.getActiveCount());
-				StatsSet.set("getCorePoolSize", _generalThreadPool.getCorePoolSize());
-				StatsSet.set("MaximumPoolSize", _generalThreadPool.getMaximumPoolSize());
-				StatsSet.set("LargestPoolSize", _generalThreadPool.getLargestPoolSize());
-				StatsSet.set("PoolSize", _generalThreadPool.getPoolSize());
-				StatsSet.set("CompletedTasks", (int) _generalThreadPool.getCompletedTaskCount());
-				StatsSet.set("QueuedTasks", _generalThreadPool.getQueue().size());
-				break;
-			}
-			case "EVENT_TASKS":
-			{
-				StatsSet.set("ActiveThreads", _eventThreadPool.getActiveCount());
-				StatsSet.set("getCorePoolSize", _eventThreadPool.getCorePoolSize());
-				StatsSet.set("MaximumPoolSize", _eventThreadPool.getMaximumPoolSize());
-				StatsSet.set("LargestPoolSize", _eventThreadPool.getLargestPoolSize());
-				StatsSet.set("PoolSize", _eventThreadPool.getPoolSize());
-				StatsSet.set("CompletedTasks", (int) _eventThreadPool.getCompletedTaskCount());
-				StatsSet.set("QueuedTasks", _eventThreadPool.getQueue().size());
-				break;
-			}
-		}
-		return StatsSet;
-	}
-	
-	public String[] getStats()
-	{
-		return new String[]
-		{
-			"STP:",
-			" + Effects:",
-			" |- ActiveThreads:   " + _effectsScheduledThreadPool.getActiveCount(),
-			" |- getCorePoolSize: " + _effectsScheduledThreadPool.getCorePoolSize(),
-			" |- PoolSize:        " + _effectsScheduledThreadPool.getPoolSize(),
-			" |- MaximumPoolSize: " + _effectsScheduledThreadPool.getMaximumPoolSize(),
-			" |- CompletedTasks:  " + _effectsScheduledThreadPool.getCompletedTaskCount(),
-			" |- ScheduledTasks:  " + _effectsScheduledThreadPool.getQueue().size(),
-			" | -------",
-			" + General:",
-			" |- ActiveThreads:   " + _generalScheduledThreadPool.getActiveCount(),
-			" |- getCorePoolSize: " + _generalScheduledThreadPool.getCorePoolSize(),
-			" |- PoolSize:        " + _generalScheduledThreadPool.getPoolSize(),
-			" |- MaximumPoolSize: " + _generalScheduledThreadPool.getMaximumPoolSize(),
-			" |- CompletedTasks:  " + _generalScheduledThreadPool.getCompletedTaskCount(),
-			" |- ScheduledTasks:  " + _generalScheduledThreadPool.getQueue().size(),
-			" | -------",
-			" + AI:",
-			" |- ActiveThreads:   " + _aiScheduledThreadPool.getActiveCount(),
-			" |- getCorePoolSize: " + _aiScheduledThreadPool.getCorePoolSize(),
-			" |- PoolSize:        " + _aiScheduledThreadPool.getPoolSize(),
-			" |- MaximumPoolSize: " + _aiScheduledThreadPool.getMaximumPoolSize(),
-			" |- CompletedTasks:  " + _aiScheduledThreadPool.getCompletedTaskCount(),
-			" |- ScheduledTasks:  " + _aiScheduledThreadPool.getQueue().size(),
-			" | -------",
-			" + Event:",
-			" |- ActiveThreads:   " + _eventScheduledThreadPool.getActiveCount(),
-			" |- getCorePoolSize: " + _eventScheduledThreadPool.getCorePoolSize(),
-			" |- PoolSize:        " + _eventScheduledThreadPool.getPoolSize(),
-			" |- MaximumPoolSize: " + _eventScheduledThreadPool.getMaximumPoolSize(),
-			" |- CompletedTasks:  " + _eventScheduledThreadPool.getCompletedTaskCount(),
-			" |- ScheduledTasks:  " + _eventScheduledThreadPool.getQueue().size(),
-			"TP:",
-			" + Packets:",
-			" |- ActiveThreads:   " + _generalPacketsThreadPool.getActiveCount(),
-			" |- getCorePoolSize: " + _generalPacketsThreadPool.getCorePoolSize(),
-			" |- MaximumPoolSize: " + _generalPacketsThreadPool.getMaximumPoolSize(),
-			" |- LargestPoolSize: " + _generalPacketsThreadPool.getLargestPoolSize(),
-			" |- PoolSize:        " + _generalPacketsThreadPool.getPoolSize(),
-			" |- CompletedTasks:  " + _generalPacketsThreadPool.getCompletedTaskCount(),
-			" |- QueuedTasks:     " + _generalPacketsThreadPool.getQueue().size(),
-			" | -------",
-			" + I/O Packets:",
-			" |- ActiveThreads:   " + _ioPacketsThreadPool.getActiveCount(),
-			" |- getCorePoolSize: " + _ioPacketsThreadPool.getCorePoolSize(),
-			" |- MaximumPoolSize: " + _ioPacketsThreadPool.getMaximumPoolSize(),
-			" |- LargestPoolSize: " + _ioPacketsThreadPool.getLargestPoolSize(),
-			" |- PoolSize:        " + _ioPacketsThreadPool.getPoolSize(),
-			" |- CompletedTasks:  " + _ioPacketsThreadPool.getCompletedTaskCount(),
-			" |- QueuedTasks:     " + _ioPacketsThreadPool.getQueue().size(),
-			" | -------",
-			" + General Tasks:",
-			" |- ActiveThreads:   " + _generalThreadPool.getActiveCount(),
-			" |- getCorePoolSize: " + _generalThreadPool.getCorePoolSize(),
-			" |- MaximumPoolSize: " + _generalThreadPool.getMaximumPoolSize(),
-			" |- LargestPoolSize: " + _generalThreadPool.getLargestPoolSize(),
-			" |- PoolSize:        " + _generalThreadPool.getPoolSize(),
-			" |- CompletedTasks:  " + _generalThreadPool.getCompletedTaskCount(),
-			" |- QueuedTasks:     " + _generalThreadPool.getQueue().size(),
-			" | -------",
-			" + Event Tasks:",
-			" |- ActiveThreads:   " + _eventThreadPool.getActiveCount(),
-			" |- getCorePoolSize: " + _eventThreadPool.getCorePoolSize(),
-			" |- MaximumPoolSize: " + _eventThreadPool.getMaximumPoolSize(),
-			" |- LargestPoolSize: " + _eventThreadPool.getLargestPoolSize(),
-			" |- PoolSize:        " + _eventThreadPool.getPoolSize(),
-			" |- CompletedTasks:  " + _eventThreadPool.getCompletedTaskCount(),
-			" |- QueuedTasks:     " + _eventThreadPool.getQueue().size(),
-			" | -------"
-		};
-	}
-	
-	private static class PriorityThreadFactory implements ThreadFactory
-	{
-		private final int _prio;
-		private final String _name;
-		private final AtomicInteger _threadNumber = new AtomicInteger(1);
-		private final ThreadGroup _group;
-		
-		public PriorityThreadFactory(String name, int prio)
-		{
-			_prio = prio;
-			_name = name;
-			_group = new ThreadGroup(_name);
-		}
-		
-		@Override
-		public Thread newThread(Runnable r)
-		{
-			final Thread t = new Thread(_group, r, _name + "-" + _threadNumber.getAndIncrement());
-			t.setPriority(_prio);
-			return t;
-		}
-		
-		public ThreadGroup getGroup()
-		{
-			return _group;
-		}
-	}
-	
-	public void shutdown()
-	{
-		_shutdown = true;
-		try
-		{
-			_effectsScheduledThreadPool.awaitTermination(1, TimeUnit.SECONDS);
-			_generalScheduledThreadPool.awaitTermination(1, TimeUnit.SECONDS);
-			_generalPacketsThreadPool.awaitTermination(1, TimeUnit.SECONDS);
-			_ioPacketsThreadPool.awaitTermination(1, TimeUnit.SECONDS);
-			_generalThreadPool.awaitTermination(1, TimeUnit.SECONDS);
-			_eventThreadPool.awaitTermination(1, TimeUnit.SECONDS);
-			_effectsScheduledThreadPool.shutdown();
-			_generalScheduledThreadPool.shutdown();
-			_generalPacketsThreadPool.shutdown();
-			_ioPacketsThreadPool.shutdown();
-			_generalThreadPool.shutdown();
-			_eventThreadPool.shutdown();
-			_log.info("All ThreadPools are now stopped");
-		}
-		catch (InterruptedException e)
-		{
-			_log.log(Level.WARNING, "There has been a problem shuting down the thread pool manager!", e);
-		}
-	}
-	
-	public boolean isShutdown()
-	{
-		return _shutdown;
-	}
-	
-	public void purge()
-	{
-		_effectsScheduledThreadPool.purge();
-		_generalScheduledThreadPool.purge();
-		_aiScheduledThreadPool.purge();
-		_eventScheduledThreadPool.purge();
-		_ioPacketsThreadPool.purge();
-		_generalPacketsThreadPool.purge();
-		_generalThreadPool.purge();
-		_eventThreadPool.purge();
-	}
-	
-	public String getPacketStats()
-	{
-		final StringBuilder sb = new StringBuilder(1000);
-		final ThreadFactory tf = _generalPacketsThreadPool.getThreadFactory();
-		if (tf instanceof PriorityThreadFactory)
-		{
-			final PriorityThreadFactory ptf = (PriorityThreadFactory) tf;
-			final int count = ptf.getGroup().activeCount();
-			final Thread[] threads = new Thread[count + 2];
-			ptf.getGroup().enumerate(threads);
-			sb.append("General Packet Thread Pool:" + Config.EOL + "Tasks in the queue: " + _generalPacketsThreadPool.getQueue().size() + Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be " + count + " Threads" + Config.EOL);
-			for (Thread t : threads)
-			{
-				if (t == null)
-				{
-					continue;
-				}
-				
-				sb.append(t.getName());
-				sb.append(Config.EOL);
-				for (StackTraceElement ste : t.getStackTrace())
-				{
-					sb.append(ste);
-					sb.append(Config.EOL);
-				}
-			}
-		}
-		
-		sb.append("Packet Tp stack traces printed.");
-		sb.append(Config.EOL);
-		return sb.toString();
-	}
-	
-	public String getIOPacketStats()
-	{
-		final StringBuilder sb = new StringBuilder(1000);
-		final ThreadFactory tf = _ioPacketsThreadPool.getThreadFactory();
-		
-		if (tf instanceof PriorityThreadFactory)
-		{
-			final PriorityThreadFactory ptf = (PriorityThreadFactory) tf;
-			final int count = ptf.getGroup().activeCount();
-			final Thread[] threads = new Thread[count + 2];
-			ptf.getGroup().enumerate(threads);
-			sb.append("I/O Packet Thread Pool:" + Config.EOL + "Tasks in the queue: " + _ioPacketsThreadPool.getQueue().size() + Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be " + count + " Threads" + Config.EOL);
+			System.out.println("ThreadPoolManager: Shutting down.");
 			
-			for (Thread t : threads)
+			for (ScheduledThreadPoolExecutor threadPool : _scheduledPools)
 			{
-				if (t == null)
-				{
-					continue;
-				}
-				
-				sb.append(t.getName());
-				sb.append(Config.EOL);
-				for (StackTraceElement ste : t.getStackTrace())
-				{
-					sb.append(ste);
-					sb.append(Config.EOL);
-				}
+				threadPool.shutdownNow();
 			}
-		}
-		
-		sb.append("Packet Tp stack traces printed." + Config.EOL);
-		
-		return sb.toString();
-	}
-	
-	public String getGeneralStats()
-	{
-		final StringBuilder sb = new StringBuilder(1000);
-		final ThreadFactory tf = _generalThreadPool.getThreadFactory();
-		
-		if (tf instanceof PriorityThreadFactory)
-		{
-			final PriorityThreadFactory ptf = (PriorityThreadFactory) tf;
-			final int count = ptf.getGroup().activeCount();
-			final Thread[] threads = new Thread[count + 2];
-			ptf.getGroup().enumerate(threads);
-			sb.append("General Thread Pool:" + Config.EOL + "Tasks in the queue: " + _generalThreadPool.getQueue().size() + Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be " + +count + " Threads" + Config.EOL);
 			
-			for (Thread t : threads)
+			for (ThreadPoolExecutor threadPool : _instantPools)
 			{
-				if (t == null)
-				{
-					continue;
-				}
-				
-				sb.append(t.getName());
-				sb.append(Config.EOL);
-				for (StackTraceElement ste : t.getStackTrace())
-				{
-					sb.append(ste);
-					sb.append(Config.EOL);
-				}
+				threadPool.shutdownNow();
 			}
 		}
-		
-		sb.append("Packet Tp stack traces printed." + Config.EOL);
-		
-		return sb.toString();
+		catch (Throwable t)
+		{
+			t.printStackTrace();
+		}
 	}
 	
-	protected class PurgeTask implements Runnable
+	/**
+	 * @param <T> : The pool type.
+	 * @param threadPools : The pool array to check.
+	 * @return the less fed pool.
+	 */
+	private static <T> T getPool(T[] threadPools)
 	{
+		return threadPools[_threadPoolRandomizer++ % threadPools.length];
+	}
+	
+	/**
+	 * @param delay : The delay to validate.
+	 * @return a secured value, from 0 to MAX_DELAY.
+	 */
+	private static long validate(long delay)
+	{
+		return Math.max(0, Math.min(MAX_DELAY, delay));
+	}
+	
+	/**
+	 * @param threadPools : The pool array to check.
+	 * @return the overall actual pools size.
+	 */
+	private static long getPoolSize(ThreadPoolExecutor[] threadPools)
+	{
+		long result = 0;
+		
+		for (ThreadPoolExecutor threadPool : threadPools)
+		{
+			result += threadPool.getPoolSize();
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * @param threadPools : The pool array to check.
+	 * @return the overall maximum pools size.
+	 */
+	private static long getMaximumPoolSize(ThreadPoolExecutor[] threadPools)
+	{
+		long result = 0;
+		
+		for (ThreadPoolExecutor threadPool : threadPools)
+		{
+			result += threadPool.getMaximumPoolSize();
+		}
+		
+		return result;
+	}
+	
+	public static final class TaskWrapper implements Runnable
+	{
+		private final Runnable _runnable;
+		
+		public TaskWrapper(Runnable runnable)
+		{
+			_runnable = runnable;
+		}
+		
 		@Override
 		public void run()
 		{
-			_effectsScheduledThreadPool.purge();
-			_generalScheduledThreadPool.purge();
-			_aiScheduledThreadPool.purge();
-			_eventScheduledThreadPool.purge();
+			try
+			{
+				_runnable.run();
+			}
+			catch (RuntimeException e)
+			{
+				LOG.warning("Exception in a Runnable execution:" + e);
+			}
 		}
 	}
-	
-	private static class SingletonHolder
-	{
-		protected static final ThreadPoolManager _instance = new ThreadPoolManager();
-	}
 }

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java

@@ -836,7 +836,7 @@ public abstract class AbstractAI implements Ctrl
 		
 		// Create and Launch an AI Follow Task to execute every 1s
 		_followTarget = target;
-		_followTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new FollowTask(), 5, FOLLOW_INTERVAL);
+		_followTask = ThreadPoolManager.scheduleAtFixedRate(new FollowTask(), 5, FOLLOW_INTERVAL);
 	}
 	
 	/**
@@ -853,7 +853,7 @@ public abstract class AbstractAI implements Ctrl
 		}
 		
 		_followTarget = target;
-		_followTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new FollowTask(range), 5, ATTACK_FOLLOW_INTERVAL);
+		_followTask = ThreadPoolManager.scheduleAtFixedRate(new FollowTask(range), 5, ATTACK_FOLLOW_INTERVAL);
 	}
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java

@@ -24,7 +24,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.GameTimeController;
@@ -301,7 +300,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 		// If not idle - create an AI task (schedule onEvtThink repeatedly)
 		if (_aiTask == null)
 		{
-			_aiTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(this, 1000, 1000);
+			_aiTask = ThreadPoolManager.scheduleAtFixedRate(this, 1000, 1000);
 		}
 	}
 	
@@ -400,7 +399,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 	{
 		if ((_fearTime > 0) && (_fearTask == null))
 		{
-			_fearTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new FearTask(this, effector, start), 0, FEAR_TICKS, TimeUnit.SECONDS);
+			_fearTask = ThreadPoolManager.scheduleAtFixedRate(new FearTask(this, effector, start), 0, FEAR_TICKS * 1000); // seconds
 			_actor.startAbnormalVisualEffect(true, AbnormalVisualEffect.TURN_FLEE);
 		}
 		else

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java

@@ -311,7 +311,7 @@ public class L2CharacterAI extends AbstractAI
 		
 		if (_actor.getBowAttackEndTime() > GameTimeController.getInstance().getGameTicks())
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new CastTask(_actor, skill, target), (_actor.getBowAttackEndTime() - GameTimeController.getInstance().getGameTicks()) * GameTimeController.MILLIS_IN_TICK);
+			ThreadPoolManager.schedule(new CastTask(_actor, skill, target), (_actor.getBowAttackEndTime() - GameTimeController.getInstance().getGameTicks()) * GameTimeController.MILLIS_IN_TICK);
 		}
 		else
 		{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2DoorAI.java

@@ -87,7 +87,7 @@ public class L2DoorAI extends L2CharacterAI
 	@Override
 	protected void onEvtAttacked(L2Character attacker)
 	{
-		ThreadPoolManager.getInstance().executeGeneral(new onEventAttackedDoorTask((L2DoorInstance) _actor, attacker));
+		ThreadPoolManager.execute(new onEventAttackedDoorTask((L2DoorInstance) _actor, attacker));
 	}
 	
 	@Override

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java

@@ -205,7 +205,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 		// If not idle - create an AI task (schedule onEvtThink repeatedly)
 		if (_aiTask == null)
 		{
-			_aiTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(this, 1000, 1000);
+			_aiTask = ThreadPoolManager.scheduleAtFixedRate(this, 1000, 1000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java

@@ -203,7 +203,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 		// If not idle - create an AI task (schedule onEvtThink repeatedly)
 		if (_aiTask == null)
 		{
-			_aiTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(this, 1000, 1000);
+			_aiTask = ThreadPoolManager.scheduleAtFixedRate(this, 1000, 1000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SummonAI.java

@@ -295,7 +295,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable
 	{
 		if (_avoidTask == null)
 		{
-			_avoidTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(this, 100, 100);
+			_avoidTask = ThreadPoolManager.scheduleAtFixedRate(this, 100, 100);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/cache/WarehouseCacheManager.java

@@ -33,7 +33,7 @@ public class WarehouseCacheManager
 	
 	protected WarehouseCacheManager()
 	{
-		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new CacheScheduler(), 120000, 60000);
+		ThreadPoolManager.scheduleAtFixedRate(new CacheScheduler(), 120000, 60000);
 	}
 	
 	public void addCacheTask(L2PcInstance pc)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java

@@ -345,7 +345,7 @@ public class ClanTable
 	
 	public void scheduleRemoveClan(int clanId)
 	{
-		ThreadPoolManager.getInstance().scheduleGeneral(() ->
+		ThreadPoolManager.schedule(() ->
 		{
 			if (getClan(clanId) == null)
 			{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/datatables/BotReportTable.java

@@ -422,11 +422,11 @@ public final class BotReportTable
 				c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1);
 			}
 			
-			ThreadPoolManager.getInstance().scheduleGeneral(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
+			ThreadPoolManager.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
 		}
 		catch (Exception e)
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new ResetPointTask(), 24 * 3600 * 1000);
+			ThreadPoolManager.schedule(new ResetPointTask(), 24 * 3600 * 1000);
 			LOGGER.log(Level.WARNING, "BotReportTable: Could not properly schedule bot report points reset task. Scheduled in 24 hours.", e);
 		}
 	}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/datatables/ItemTable.java

@@ -220,14 +220,14 @@ public class ItemTable
 				if ((raid.getFirstCommandChannelAttacked() != null) && !Config.AUTO_LOOT_RAIDS)
 				{
 					item.setOwnerId(raid.getFirstCommandChannelAttacked().getLeaderObjectId());
-					itemLootShedule = ThreadPoolManager.getInstance().scheduleGeneral(new ResetOwner(item), Config.LOOT_RAIDS_PRIVILEGE_INTERVAL);
+					itemLootShedule = ThreadPoolManager.schedule(new ResetOwner(item), Config.LOOT_RAIDS_PRIVILEGE_INTERVAL);
 					item.setItemLootShedule(itemLootShedule);
 				}
 			}
 			else if (!Config.AUTO_LOOT || ((reference instanceof L2EventMonsterInstance) && ((L2EventMonsterInstance) reference).eventDropOnGround()))
 			{
 				item.setOwnerId(actor.getObjectId());
-				itemLootShedule = ThreadPoolManager.getInstance().scheduleGeneral(new ResetOwner(item), 15000);
+				itemLootShedule = ThreadPoolManager.schedule(new ResetOwner(item), 15000);
 				item.setItemLootShedule(itemLootShedule);
 			}
 		}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java

@@ -53,7 +53,7 @@ public class BitSetIDFactory extends IdFactory
 		
 		synchronized (BitSetIDFactory.class)
 		{
-			ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new BitSetCapacityCheck(), 30000, 30000);
+			ThreadPoolManager.scheduleAtFixedRate(new BitSetCapacityCheck(), 30000, 30000);
 			initialize();
 		}
 		_log.info(getClass().getSimpleName() + ": " + _freeIds.size() + " id's available.");

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java

@@ -28,7 +28,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
@@ -102,7 +101,7 @@ public final class CastleManorManager implements IXmlReader, IStorable
 			// Schedule autosave
 			if (!Config.ALT_MANOR_SAVE_ALL_ACTIONS)
 			{
-				ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this::storeMe, Config.ALT_MANOR_SAVE_PERIOD_RATE, Config.ALT_MANOR_SAVE_PERIOD_RATE, TimeUnit.HOURS);
+				ThreadPoolManager.scheduleAtFixedRate(this::storeMe, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000);
 			}
 			
 			// Send debug message
@@ -279,7 +278,7 @@ public final class CastleManorManager implements IXmlReader, IStorable
 			}
 		}
 		// Schedule mode change
-		ThreadPoolManager.getInstance().scheduleGeneral(this::changeMode, _nextModeChange.getTimeInMillis() - System.currentTimeMillis());
+		ThreadPoolManager.schedule(this::changeMode, _nextModeChange.getTimeInMillis() - System.currentTimeMillis());
 	}
 	
 	public final void changeMode()

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java

@@ -79,7 +79,7 @@ public class FishingChampionshipManager
 		}
 		else
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new finishChamp(), _enddate - System.currentTimeMillis());
+			ThreadPoolManager.schedule(new finishChamp(), _enddate - System.currentTimeMillis());
 		}
 	}
 	
@@ -305,7 +305,7 @@ public class FishingChampionshipManager
 			pl.sendPacket(html);
 			
 			refreshResult();
-			ThreadPoolManager.getInstance().scheduleGeneral(new needRefresh(), 60000);
+			ThreadPoolManager.schedule(new needRefresh(), 60000);
 			return;
 		}
 		
@@ -471,7 +471,7 @@ public class FishingChampionshipManager
 			shutdown();
 			
 			_log.info("FishingChampionshipManager : new event period start.");
-			ThreadPoolManager.getInstance().scheduleGeneral(new finishChamp(), _enddate - System.currentTimeMillis());
+			ThreadPoolManager.schedule(new finishChamp(), _enddate - System.currentTimeMillis());
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java

@@ -204,25 +204,25 @@ public final class FourSepulchersManager
 		if ((currentTime >= _coolDownTimeEnd) && (currentTime < _entryTimeEnd)) // entry time check
 		{
 			clean();
-			_changeEntryTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeEntryTimeTask(), 0);
+			_changeEntryTimeTask = ThreadPoolManager.schedule(new FourSepulchersChangeEntryTimeTask(), 0);
 			_log.info(getClass().getSimpleName() + ": Beginning in Entry time");
 		}
 		else if ((currentTime >= _entryTimeEnd) && (currentTime < _warmUpTimeEnd)) // warmup time check
 		{
 			clean();
-			_changeWarmUpTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeWarmUpTimeTask(), 0);
+			_changeWarmUpTimeTask = ThreadPoolManager.schedule(new FourSepulchersChangeWarmUpTimeTask(), 0);
 			_log.info(getClass().getSimpleName() + ": Beginning in WarmUp time");
 		}
 		else if ((currentTime >= _warmUpTimeEnd) && (currentTime < _attackTimeEnd)) // attack time check
 		{
 			clean();
-			_changeAttackTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeAttackTimeTask(), 0);
+			_changeAttackTimeTask = ThreadPoolManager.schedule(new FourSepulchersChangeAttackTimeTask(), 0);
 			_log.info(getClass().getSimpleName() + ": Beginning in Attack time");
 		}
 		else
 		// else cooldown time and without cleanup because it's already implemented
 		{
-			_changeCoolDownTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeCoolDownTimeTask(), 0);
+			_changeCoolDownTimeTask = ThreadPoolManager.schedule(new FourSepulchersChangeCoolDownTimeTask(), 0);
 			_log.info(getClass().getSimpleName() + ": Beginning in Cooldown time");
 		}
 	}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java

@@ -109,7 +109,7 @@ public final class GrandBossManager implements IStorable
 		{
 			_log.log(Level.WARNING, "Error while initializing GrandBossManager: " + e.getMessage(), e);
 		}
-		ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
+		ThreadPoolManager.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java

@@ -86,7 +86,7 @@ public final class HandysBlockCheckerManager
 			{
 				holder.checkAndShuffle();
 			}
-			ThreadPoolManager.getInstance().executeGeneral(holder.getEvent().new StartEvent());
+			ThreadPoolManager.execute(holder.getEvent().new StartEvent());
 		}
 		else
 		{
@@ -345,7 +345,7 @@ public final class HandysBlockCheckerManager
 	
 	private void schedulePenaltyRemoval(int objId)
 	{
-		ThreadPoolManager.getInstance().scheduleGeneral(new PenaltyRemoveTask(objId), 10000);
+		ThreadPoolManager.schedule(new PenaltyRemoveTask(objId), 10000);
 	}
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java

@@ -47,7 +47,7 @@ public final class ItemsOnGroundManager implements Runnable
 	{
 		if (Config.SAVE_DROPPED_ITEM_INTERVAL > 0)
 		{
-			ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this, Config.SAVE_DROPPED_ITEM_INTERVAL, Config.SAVE_DROPPED_ITEM_INTERVAL);
+			ThreadPoolManager.scheduleAtFixedRate(this, Config.SAVE_DROPPED_ITEM_INTERVAL, Config.SAVE_DROPPED_ITEM_INTERVAL);
 		}
 		load();
 	}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/MailManager.java

@@ -72,11 +72,11 @@ public final class MailManager
 				
 				if (expiration < System.currentTimeMillis())
 				{
-					ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msgId), 10000);
+					ThreadPoolManager.schedule(new MessageDeletionTask(msgId), 10000);
 				}
 				else
 				{
-					ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msgId), expiration - System.currentTimeMillis());
+					ThreadPoolManager.schedule(new MessageDeletionTask(msgId), expiration - System.currentTimeMillis());
 				}
 			}
 		}
@@ -181,7 +181,7 @@ public final class MailManager
 			receiver.sendPacket(ExNoticePostArrived.valueOf(true));
 		}
 		
-		ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msg.getId()), msg.getExpiration() - System.currentTimeMillis());
+		ThreadPoolManager.schedule(new MessageDeletionTask(msg.getId()), msg.getExpiration() - System.currentTimeMillis());
 	}
 	
 	public final void markAsReadInDb(int msgId)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/PremiumManager.java

@@ -110,7 +110,7 @@ public class PremiumManager
 	 */
 	private void startExpireTask(L2PcInstance player, long delay)
 	{
-		ScheduledFuture<?> task = ThreadPoolManager.getInstance().scheduleEvent(new PremiumExpireTask(player), delay);
+		ScheduledFuture<?> task = ThreadPoolManager.schedule(new PremiumExpireTask(player), delay);
 		expiretasks.put(player.getAccountName(), task);
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java

@@ -186,7 +186,7 @@ public class RaidBossSpawnManager
 				time.setTimeInMillis(respawnTime);
 				_log.info(getClass().getSimpleName() + ": Updated " + boss.getName() + " respawn time to " + time.getTime());
 				
-				_schedules.put(boss.getId(), ThreadPoolManager.getInstance().scheduleGeneral(new SpawnSchedule(boss.getId()), respawnDelay));
+				_schedules.put(boss.getId(), ThreadPoolManager.schedule(new SpawnSchedule(boss.getId()), respawnDelay));
 				updateDb();
 			}
 		}
@@ -242,7 +242,7 @@ public class RaidBossSpawnManager
 		}
 		else
 		{
-			_schedules.put(bossId, ThreadPoolManager.getInstance().scheduleGeneral(new SpawnSchedule(bossId), respawnTime - Calendar.getInstance().getTimeInMillis()));
+			_schedules.put(bossId, ThreadPoolManager.schedule(new SpawnSchedule(bossId), respawnTime - Calendar.getInstance().getTimeInMillis()));
 		}
 		
 		_spawns.put(bossId, spawnDat);

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java

@@ -71,7 +71,7 @@ public class ServerRestartManager
 			if (lastRestart != null)
 			{
 				nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime());
-				ThreadPoolManager.getInstance().scheduleGeneral(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000));
+				ThreadPoolManager.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000));
 				_log.info("Scheduled server restart at " + lastRestart.getTime().toString() + ".");
 			}
 		}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java

@@ -102,7 +102,7 @@ public final class SoDManager
 				}
 				else
 				{
-					ThreadPoolManager.getInstance().scheduleEffect(new UpdateSoDStateTask(), Config.SOD_STAGE_2_LENGTH - timePast);
+					ThreadPoolManager.schedule(new UpdateSoDStateTask(), Config.SOD_STAGE_2_LENGTH - timePast);
 				}
 				break;
 			case 3:

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java

@@ -116,7 +116,7 @@ public class SoIManager
 		spawnOpenedSeed();
 		DoorData.getInstance().getDoor(14240102).openMe();
 		
-		ThreadPoolManager.getInstance().scheduleGeneral(() ->
+		ThreadPoolManager.schedule(() ->
 		{
 			closeSeed();
 			setCurrentStage(4);

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java

@@ -275,7 +275,7 @@ public final class TerritoryWarManager implements Siegable
 			{
 				_scheduledEndTWTask.cancel(false);
 			}
-			_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), 1000);
+			_scheduledEndTWTask = ThreadPoolManager.schedule(new ScheduleEndTWTask(), 1000);
 		}
 		else
 		{
@@ -283,7 +283,7 @@ public final class TerritoryWarManager implements Siegable
 			{
 				_scheduledStartTWTask.cancel(false);
 			}
-			_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), 1000);
+			_scheduledStartTWTask = ThreadPoolManager.schedule(new ScheduleStartTWTask(), 1000);
 		}
 	}
 	
@@ -1261,14 +1261,14 @@ public final class TerritoryWarManager implements Siegable
 				if (timeRemaining > 7200000)
 				{
 					_isRegistrationOver = false;
-					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 7200000); // Prepare task for 2h before TW start to end registration
+					_scheduledStartTWTask = ThreadPoolManager.schedule(new ScheduleStartTWTask(), timeRemaining - 7200000); // Prepare task for 2h before TW start to end registration
 				}
 				else if ((timeRemaining <= 7200000) && (timeRemaining > 1200000))
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_REQUEST_PERIOD_HAS_ENDED);
 					Broadcast.toAllOnlinePlayers(sm);
 					_isRegistrationOver = true;
-					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 1200000); // Prepare task for 20 mins left before TW start.
+					_scheduledStartTWTask = ThreadPoolManager.schedule(new ScheduleStartTWTask(), timeRemaining - 1200000); // Prepare task for 20 mins left before TW start.
 				}
 				else if ((timeRemaining <= 1200000) && (timeRemaining > 600000))
 				{
@@ -1277,7 +1277,7 @@ public final class TerritoryWarManager implements Siegable
 					_isTWChannelOpen = true;
 					_isRegistrationOver = true;
 					updatePlayerTWStateFlags(false);
-					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 600000); // Prepare task for 10 mins left before TW start.
+					_scheduledStartTWTask = ThreadPoolManager.schedule(new ScheduleStartTWTask(), timeRemaining - 600000); // Prepare task for 10 mins left before TW start.
 				}
 				else if ((timeRemaining <= 600000) && (timeRemaining > 300000))
 				{
@@ -1286,7 +1286,7 @@ public final class TerritoryWarManager implements Siegable
 					_isTWChannelOpen = true;
 					_isRegistrationOver = true;
 					updatePlayerTWStateFlags(false);
-					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 300000); // Prepare task for 5 mins left before TW start.
+					_scheduledStartTWTask = ThreadPoolManager.schedule(new ScheduleStartTWTask(), timeRemaining - 300000); // Prepare task for 5 mins left before TW start.
 				}
 				else if ((timeRemaining <= 300000) && (timeRemaining > 60000))
 				{
@@ -1295,7 +1295,7 @@ public final class TerritoryWarManager implements Siegable
 					_isTWChannelOpen = true;
 					_isRegistrationOver = true;
 					updatePlayerTWStateFlags(false);
-					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 60000); // Prepare task for 1 min left before TW start.
+					_scheduledStartTWTask = ThreadPoolManager.schedule(new ScheduleStartTWTask(), timeRemaining - 60000); // Prepare task for 1 min left before TW start.
 				}
 				else if ((timeRemaining <= 60000) && (timeRemaining > 0))
 				{
@@ -1304,15 +1304,15 @@ public final class TerritoryWarManager implements Siegable
 					_isTWChannelOpen = true;
 					_isRegistrationOver = true;
 					updatePlayerTWStateFlags(false);
-					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining); // Prepare task for TW start.
+					_scheduledStartTWTask = ThreadPoolManager.schedule(new ScheduleStartTWTask(), timeRemaining); // Prepare task for TW start.
 				}
 				else if ((timeRemaining + WARLENGTH) > 0)
 				{
 					_isTWChannelOpen = true;
 					_isRegistrationOver = true;
 					startTerritoryWar();
-					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), 1000); // Prepare task for TW end.
-					_scheduledRewardOnlineTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RewardOnlineParticipants(), 60000, 60000);
+					_scheduledEndTWTask = ThreadPoolManager.schedule(new ScheduleEndTWTask(), 1000); // Prepare task for TW end.
+					_scheduledRewardOnlineTask = ThreadPoolManager.scheduleAtFixedRate(new RewardOnlineParticipants(), 60000, 60000);
 				}
 			}
 			catch (Exception e)
@@ -1342,41 +1342,41 @@ public final class TerritoryWarManager implements Siegable
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_HOUR_S);
 					sm.addInt(2);
 					announceToParticipants(sm, 0, 0);
-					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 3600000); // Prepare task for 1 hr left.
+					_scheduledEndTWTask = ThreadPoolManager.schedule(new ScheduleEndTWTask(), timeRemaining - 3600000); // Prepare task for 1 hr left.
 				}
 				else if ((timeRemaining <= 3600000) && (timeRemaining > 600000))
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTE_S);
 					sm.addInt((int) (timeRemaining / 60000));
 					announceToParticipants(sm, 0, 0);
-					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 600000); // Prepare task for 10 minute left.
+					_scheduledEndTWTask = ThreadPoolManager.schedule(new ScheduleEndTWTask(), timeRemaining - 600000); // Prepare task for 10 minute left.
 				}
 				else if ((timeRemaining <= 600000) && (timeRemaining > 300000))
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTE_S);
 					sm.addInt((int) (timeRemaining / 60000));
 					announceToParticipants(sm, 0, 0);
-					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 300000); // Prepare task for 5 minute left.
+					_scheduledEndTWTask = ThreadPoolManager.schedule(new ScheduleEndTWTask(), timeRemaining - 300000); // Prepare task for 5 minute left.
 				}
 				else if ((timeRemaining <= 300000) && (timeRemaining > 10000))
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTE_S);
 					sm.addInt((int) (timeRemaining / 60000));
 					announceToParticipants(sm, 0, 0);
-					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 10000); // Prepare task for 10 seconds count down
+					_scheduledEndTWTask = ThreadPoolManager.schedule(new ScheduleEndTWTask(), timeRemaining - 10000); // Prepare task for 10 seconds count down
 				}
 				else if ((timeRemaining <= 10000) && (timeRemaining > 0))
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECOND_S_TO_THE_END_OF_TERRITORY_WAR);
 					sm.addInt((int) (timeRemaining / 1000));
 					announceToParticipants(sm, 0, 0);
-					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining); // Prepare task for second count down
+					_scheduledEndTWTask = ThreadPoolManager.schedule(new ScheduleEndTWTask(), timeRemaining); // Prepare task for second count down
 				}
 				else
 				{
 					endTerritoryWar();
-					// _scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), 1000);
-					ThreadPoolManager.getInstance().scheduleGeneral(new closeTerritoryChannelTask(), 600000);
+					// _scheduledStartTWTask = ThreadPoolManager.schedule(new ScheduleStartTWTask(), 1000);
+					ThreadPoolManager.schedule(new closeTerritoryChannelTask(), 600000);
 				}
 			}
 			catch (Exception e)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -271,7 +271,7 @@ public final class WalkingManager implements IXmlReader
 					npc.sendDebugMessage("Starting to move at route '" + routeName + "'");
 					npc.setIsRunning(node.runToLocation());
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node);
-					walk.setWalkCheckTask(ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight
+					walk.setWalkCheckTask(ThreadPoolManager.scheduleAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight
 					
 					npc.getKnownList().startTrackingTask();
 					
@@ -280,7 +280,7 @@ public final class WalkingManager implements IXmlReader
 				else
 				{
 					npc.sendDebugMessage("Failed to start moving along route '" + routeName + "', scheduled");
-					ThreadPoolManager.getInstance().scheduleGeneral(new StartMovingTask(npc, routeName), 60000);
+					ThreadPoolManager.schedule(new StartMovingTask(npc, routeName), 60000);
 				}
 			}
 			// walk was stopped due to some reason (arrived to node, script action, fight or something else), resume it
@@ -422,7 +422,7 @@ public final class WalkingManager implements IXmlReader
 		{
 			walk.setLastAction(System.currentTimeMillis());
 		}
-		ThreadPoolManager.getInstance().scheduleGeneral(new ArrivedTask(npc, walk), 100 + (node.getDelay() * 1000L));
+		ThreadPoolManager.schedule(new ArrivedTask(npc, walk), 100 + (node.getDelay() * 1000L));
 	}
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java

@@ -152,12 +152,12 @@ public class Lottery
 						if (_enddate > System.currentTimeMillis())
 						{
 							_isStarted = true;
-							ThreadPoolManager.getInstance().scheduleGeneral(new finishLottery(), _enddate - System.currentTimeMillis());
+							ThreadPoolManager.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
 							
 							if (_enddate > (System.currentTimeMillis() + (12 * MINUTE)))
 							{
 								_isSellingTickets = true;
-								ThreadPoolManager.getInstance().scheduleGeneral(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
+								ThreadPoolManager.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
 							}
 							return;
 						}
@@ -195,8 +195,8 @@ public class Lottery
 				_enddate = finishtime.getTimeInMillis();
 			}
 			
-			ThreadPoolManager.getInstance().scheduleGeneral(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
-			ThreadPoolManager.getInstance().scheduleGeneral(new finishLottery(), _enddate - System.currentTimeMillis());
+			ThreadPoolManager.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
+			ThreadPoolManager.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
 			
 			try (Connection con = DatabaseFactory.getInstance().getConnection();
 				PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY))
@@ -436,7 +436,7 @@ public class Lottery
 				_log.log(Level.WARNING, "Lottery: Could not store finished lottery data: " + e.getMessage(), e);
 			}
 			
-			ThreadPoolManager.getInstance().scheduleGeneral(new startLottery(), MINUTE);
+			ThreadPoolManager.schedule(new startLottery(), MINUTE);
 			_number++;
 			
 			_isStarted = false;

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeAttackTimeTask.java

@@ -61,14 +61,14 @@ public final class FourSepulchersChangeAttackTimeTask implements Runnable
 				{
 					final Calendar inter = Calendar.getInstance();
 					inter.set(Calendar.MINUTE, (int) min);
-					ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersManagerSayTask(), inter.getTimeInMillis() - Calendar.getInstance().getTimeInMillis());
+					ThreadPoolManager.schedule(new FourSepulchersManagerSayTask(), inter.getTimeInMillis() - Calendar.getInstance().getTimeInMillis());
 					break;
 				}
 			}
 		}
 		else
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersManagerSayTask(), 5 * 60400);
+			ThreadPoolManager.schedule(new FourSepulchersManagerSayTask(), 5 * 60400);
 		}
 		// searching time when attack time will be ended:
 		// counting difference between time when attack time ends and
@@ -83,7 +83,7 @@ public final class FourSepulchersChangeAttackTimeTask implements Runnable
 			interval = Config.FS_TIME_ATTACK * 60000L;
 		}
 		
-		manager.setChangeCoolDownTimeTask(ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeCoolDownTimeTask(), interval));
+		manager.setChangeCoolDownTimeTask(ThreadPoolManager.schedule(new FourSepulchersChangeCoolDownTimeTask(), interval));
 		final ScheduledFuture<?> changeAttackTimeTask = manager.getChangeAttackTimeTask();
 		
 		if (changeAttackTimeTask != null)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java

@@ -54,7 +54,7 @@ public final class FourSepulchersChangeCoolDownTimeTask implements Runnable
 		
 		final long interval = time.getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
 		
-		manager.setChangeEntryTimeTask(ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeEntryTimeTask(), interval));
+		manager.setChangeEntryTimeTask(ThreadPoolManager.schedule(new FourSepulchersChangeEntryTimeTask(), interval));
 		final ScheduledFuture<?> changeCoolDownTimeTask = manager.getChangeCoolDownTimeTask();
 		
 		if (changeCoolDownTimeTask != null)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeEntryTimeTask.java

@@ -40,8 +40,8 @@ public final class FourSepulchersChangeEntryTimeTask implements Runnable
 		
 		final long interval = manager.isFirstTimeRun() ? manager.getEntrytTimeEnd() - Calendar.getInstance().getTimeInMillis() : Config.FS_TIME_ENTRY * 60000L;
 		// launching saying process...
-		ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersManagerSayTask(), 0);
-		manager.setChangeWarmUpTimeTask(ThreadPoolManager.getInstance().scheduleEffect(new FourSepulchersChangeWarmUpTimeTask(), interval));
+		ThreadPoolManager.schedule(new FourSepulchersManagerSayTask(), 0);
+		manager.setChangeWarmUpTimeTask(ThreadPoolManager.schedule(new FourSepulchersChangeWarmUpTimeTask(), interval));
 		final ScheduledFuture<?> changeEntryTimeTask = manager.getChangeEntryTimeTask();
 		
 		if (changeEntryTimeTask != null)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeWarmUpTimeTask.java

@@ -39,7 +39,7 @@ public final class FourSepulchersChangeWarmUpTimeTask implements Runnable
 		manager.setIsCoolDownTime(false);
 		
 		final long interval = manager.isFirstTimeRun() ? manager.getWarmUpTimeEnd() - Calendar.getInstance().getTimeInMillis() : Config.FS_TIME_WARMUP * 60000L;
-		manager.setChangeAttackTimeTask(ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeAttackTimeTask(), interval));
+		manager.setChangeAttackTimeTask(ThreadPoolManager.schedule(new FourSepulchersChangeAttackTimeTask(), interval));
 		final ScheduledFuture<?> changeWarmUpTimeTask = manager.getChangeWarmUpTimeTask();
 		
 		if (changeWarmUpTimeTask != null)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersManagerSayTask.java

@@ -43,7 +43,7 @@ public final class FourSepulchersManagerSayTask implements Runnable
 				// cannot be
 				// more than
 				// 59
-				ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersManagerSayTask(), 5 * 60000);
+				ThreadPoolManager.schedule(new FourSepulchersManagerSayTask(), 5 * 60000);
 			}
 			// attack time ending chat
 			else if ((tmp.get(Calendar.MINUTE) + 5) >= Config.FS_TIME_ATTACK)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java

@@ -274,7 +274,7 @@ public class AutoSpawnHandler
 		if (isActive)
 		{
 			final AutoSpawner rs = new AutoSpawner(objectId);
-			spawnTask = spawnInst._desDelay > 0 ? ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(rs, spawnInst._initDelay, spawnInst._resDelay) : ThreadPoolManager.getInstance().scheduleEffect(rs, spawnInst._initDelay);
+			spawnTask = spawnInst._desDelay > 0 ? ThreadPoolManager.scheduleAtFixedRate(rs, spawnInst._initDelay, spawnInst._resDelay) : ThreadPoolManager.schedule(rs, spawnInst._initDelay);
 			_runningSpawns.put(objectId, spawnTask);
 		}
 		else
@@ -285,7 +285,7 @@ public class AutoSpawnHandler
 			{
 				spawnTask.cancel(false);
 			}
-			ThreadPoolManager.getInstance().scheduleEffect(rd, 0);
+			ThreadPoolManager.schedule(rd, 0);
 		}
 		spawnInst.setSpawnActive(isActive);
 	}
@@ -489,7 +489,7 @@ public class AutoSpawnHandler
 				// If there is no despawn time, do not create a despawn task.
 				if (spawnInst.getDespawnDelay() > 0)
 				{
-					ThreadPoolManager.getInstance().scheduleAi(new AutoDespawner(_objectId), spawnInst.getDespawnDelay() - 1000);
+					ThreadPoolManager.schedule(new AutoDespawner(_objectId), spawnInst.getDespawnDelay() - 1000);
 				}
 			}
 			catch (Exception e)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -1308,7 +1308,7 @@ public final class CharEffectList
 			return;
 		}
 		// Schedule the icon update packets 500miliseconds ahead, so it can gather-up most of the changes.
-		_effectIconsUpdate = ThreadPoolManager.getInstance().scheduleGeneral(() ->
+		_effectIconsUpdate = ThreadPoolManager.schedule(() ->
 		{
 			AbnormalStatusUpdate asu = null;
 			PartySpelled ps = null;

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java

@@ -352,7 +352,7 @@ public class CursedWeapon implements INamable
 		{
 			_player.stopTransformation(true);
 			
-			ThreadPoolManager.getInstance().scheduleGeneral(() -> TransformData.getInstance().transformPlayer(transformationId, _player), 500);
+			ThreadPoolManager.schedule(() -> TransformData.getInstance().transformPlayer(transformationId, _player), 500);
 		}
 		else
 		{
@@ -378,7 +378,7 @@ public class CursedWeapon implements INamable
 		}
 		else
 		{
-			_removeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RemoveTask(), _durationLost * 12000L, _durationLost * 12000L);
+			_removeTask = ThreadPoolManager.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000L, _durationLost * 12000L);
 		}
 	}
 	
@@ -391,7 +391,7 @@ public class CursedWeapon implements INamable
 			
 			// Start the Life Task
 			_endTime = System.currentTimeMillis() + (_duration * 60000L);
-			_removeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RemoveTask(), _durationLost * 12000L, _durationLost * 12000L);
+			_removeTask = ThreadPoolManager.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000L, _durationLost * 12000L);
 			
 			return true;
 		}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/DropProtection.java

@@ -84,6 +84,6 @@ public class DropProtection implements Runnable
 			throw new NullPointerException("Trying to protect dropped item to null owner");
 		}
 		
-		_task = ThreadPoolManager.getInstance().scheduleGeneral(this, PROTECTED_MILLIS_TIME);
+		_task = ThreadPoolManager.schedule(this, PROTECTED_MILLIS_TIME);
 	}
 }

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java

@@ -359,7 +359,7 @@ public class L2Party extends AbstractPlayerGroup
 		
 		if (_positionBroadcastTask == null)
 		{
-			_positionBroadcastTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() ->
+			_positionBroadcastTask = ThreadPoolManager.scheduleAtFixedRate(() ->
 			{
 				if (_positionPacket == null)
 				{
@@ -993,7 +993,7 @@ public class L2Party extends AbstractPlayerGroup
 		}
 		_changeRequestDistributionType = partyDistributionType;
 		_changeDistributionTypeAnswers = new HashSet<>();
-		_changeDistributionTypeRequestTask = ThreadPoolManager.getInstance().scheduleGeneral(() -> finishLootRequest(false), PARTY_DISTRIBUTION_TYPE_REQUEST_TIMEOUT.toMillis());
+		_changeDistributionTypeRequestTask = ThreadPoolManager.schedule(() -> finishLootRequest(false), PARTY_DISTRIBUTION_TYPE_REQUEST_TIMEOUT.toMillis());
 		
 		broadcastToPartyMembers(getLeader(), new ExAskModifyPartyLooting(getLeader().getName(), partyDistributionType));
 		

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Request.java

@@ -123,7 +123,7 @@ public class L2Request
 	{
 		_isRequestor = isRequestor;
 		_isAnswerer = !isRequestor;
-		ThreadPoolManager.getInstance().scheduleGeneral(() -> clear(), REQUEST_TIMEOUT * 1000);
+		ThreadPoolManager.schedule(() -> clear(), REQUEST_TIMEOUT * 1000);
 	}
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -446,7 +446,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			
 			// Create a new SpawnTask to launch after the respawn Delay
 			// ClientScheduler.getInstance().scheduleLow(new SpawnTask(npcId), _respawnDelay);
-			ThreadPoolManager.getInstance().scheduleGeneral(new SpawnTask(oldNpc), hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay);
+			ThreadPoolManager.schedule(new SpawnTask(oldNpc), hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2WorldRegion.java

@@ -330,7 +330,7 @@ public final class L2WorldRegion
 			}
 			
 			// then, set a timer to activate the neighbors
-			_neighborsTask = ThreadPoolManager.getInstance().scheduleGeneral(new NeighborsTask(true), 1000 * Config.GRID_NEIGHBOR_TURNON_TIME);
+			_neighborsTask = ThreadPoolManager.schedule(new NeighborsTask(true), 1000 * Config.GRID_NEIGHBOR_TURNON_TIME);
 		}
 	}
 	
@@ -350,7 +350,7 @@ public final class L2WorldRegion
 			
 			// start a timer to "suggest" a deactivate to self and neighbors.
 			// suggest means: first check if a neighbor has L2PcInstances in it. If not, deactivate.
-			_neighborsTask = ThreadPoolManager.getInstance().scheduleGeneral(new NeighborsTask(false), 1000 * Config.GRID_NEIGHBOR_TURNOFF_TIME);
+			_neighborsTask = ThreadPoolManager.schedule(new NeighborsTask(false), 1000 * Config.GRID_NEIGHBOR_TURNOFF_TIME);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java

@@ -257,7 +257,7 @@ public class L2Attackable extends L2Npc
 						{
 							_commandChannelTimer = new CommandChannelTimer(this);
 							_commandChannelLastAttack = System.currentTimeMillis();
-							ThreadPoolManager.getInstance().scheduleGeneral(_commandChannelTimer, 10000); // check for last attack
+							ThreadPoolManager.schedule(_commandChannelTimer, 10000); // check for last attack
 							_firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg
 						}
 					}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -845,7 +845,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				if (getCurrentMp() < mpConsume)
 				{
 					// If L2PcInstance doesn't have enough MP, stop the attack
-					ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
+					ThreadPoolManager.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 					sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return false;
@@ -863,7 +863,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			else
 			{
 				// Cancel the action because the bow can't be re-use at this moment
-				ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
+				ThreadPoolManager.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
@@ -1127,7 +1127,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			}
 			
 			// Notify AI with EVT_READY_TO_ACT
-			ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), timeAtk + reuse);
+			ThreadPoolManager.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), timeAtk + reuse);
 		}
 		finally
 		{
@@ -1193,7 +1193,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		}
 		
 		// Create a new hit task with Medium priority
-		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk);
+		ThreadPoolManager.schedule(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk);
 		
 		// Calculate and set the disable delay of the bow in function of the Attack Speed
 		_disableBowAttackEndTime = ((sAtk + reuse) / GameTimeController.MILLIS_IN_TICK) + GameTimeController.getInstance().getGameTicks();
@@ -1263,7 +1263,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		}
 		
 		// Create a new hit task with Medium priority
-		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk);
+		ThreadPoolManager.schedule(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk);
 		
 		// Calculate and set the disable delay of the bow in function of the Attack Speed
 		_disableBowAttackEndTime = ((sAtk + reuse) / GameTimeController.MILLIS_IN_TICK) + GameTimeController.getInstance().getGameTicks();
@@ -1333,10 +1333,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		}
 		
 		// Create a new hit task with Medium priority for hit 1
-		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk / 2);
+		ThreadPoolManager.schedule(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk / 2);
 		
 		// Create a new hit task with Medium priority for hit 2 with a higher delay
-		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage2, crit2, miss2, attack.hasSoulshot(), shld2), sAtk);
+		ThreadPoolManager.schedule(new HitTask(this, target, damage2, crit2, miss2, attack.hasSoulshot(), shld2), sAtk);
 		
 		// Add those hits to the Server-Client packet Attack
 		attack.addHit(target, damage1, miss1, crit1, shld1);
@@ -1513,7 +1513,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		}
 		
 		// Create a new hit task with Medium priority
-		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk);
+		ThreadPoolManager.schedule(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk);
 		
 		// Add this hit to the Server-Client packet Attack
 		attack.addHit(target, damage1, miss1, crit1, shld1);
@@ -1775,7 +1775,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		// queue herbs and potions
 		if (isCastingSimultaneouslyNow() && simultaneously)
 		{
-			ThreadPoolManager.getInstance().scheduleAi(() -> beginCast(skill, simultaneously, target, targets), 100);
+			ThreadPoolManager.schedule(() -> beginCast(skill, simultaneously, target, targets), 100);
 			return;
 		}
 		
@@ -1929,7 +1929,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		// Before start AI Cast Broadcast Fly Effect is Need
 		if (skill.getFlyType() != null)
 		{
-			ThreadPoolManager.getInstance().scheduleEffect(new FlyToLocationTask(this, target, skill), 50);
+			ThreadPoolManager.schedule(new FlyToLocationTask(this, target, skill), 50);
 		}
 		
 		final MagicUseTask mut = new MagicUseTask(this, targets, skill, skillTime, simultaneously);
@@ -1959,7 +1959,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				
 				// Create a task MagicUseTask to launch the MagicSkill at the end of the casting time (skillTime)
 				// For client animation reasons (party buffs especially) 400 ms before!
-				_skillCast2 = ThreadPoolManager.getInstance().scheduleEffect(mut, skillTime - 400);
+				_skillCast2 = ThreadPoolManager.schedule(mut, skillTime - 400);
 			}
 			else
 			{
@@ -1972,7 +1972,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				
 				// Create a task MagicUseTask to launch the MagicSkill at the end of the casting time (skillTime)
 				// For client animation reasons (party buffs especially) 400 ms before!
-				_skillCast = ThreadPoolManager.getInstance().scheduleEffect(mut, skillTime - 400);
+				_skillCast = ThreadPoolManager.schedule(mut, skillTime - 400);
 			}
 		}
 		else
@@ -4093,7 +4093,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		
 		if (distFraction > 1)
 		{
-			ThreadPoolManager.getInstance().executeAi(() ->
+			ThreadPoolManager.execute(() ->
 			{
 				try
 				{
@@ -4555,7 +4555,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		// Create a task to notify the AI that L2Character arrives at a check point of the movement
 		if ((ticksToMove * GameTimeController.MILLIS_IN_TICK) > 3000)
 		{
-			ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_ARRIVED_REVALIDATE), 2000);
+			ThreadPoolManager.schedule(new NotifyAITask(this, CtrlEvent.EVT_ARRIVED_REVALIDATE), 2000);
 		}
 		
 		// the CtrlEvent.EVT_ARRIVED will be sent when the character will actually arrive
@@ -4636,7 +4636,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		// Create a task to notify the AI that L2Character arrives at a check point of the movement
 		if ((ticksToMove * GameTimeController.MILLIS_IN_TICK) > 3000)
 		{
-			ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_ARRIVED_REVALIDATE), 2000);
+			ThreadPoolManager.schedule(new NotifyAITask(this, CtrlEvent.EVT_ARRIVED_REVALIDATE), 2000);
 		}
 		
 		// the CtrlEvent.EVT_ARRIVED will be sent when the character will actually arrive
@@ -5474,7 +5474,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		}
 		else
 		{
-			_skillCast = ThreadPoolManager.getInstance().scheduleEffect(mut, 400);
+			_skillCast = ThreadPoolManager.schedule(mut, 400);
 		}
 	}
 	
@@ -5603,11 +5603,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		{
 			if (mut.isSimultaneous())
 			{
-				_skillCast2 = ThreadPoolManager.getInstance().scheduleEffect(mut, 0);
+				_skillCast2 = ThreadPoolManager.schedule(mut, 0);
 			}
 			else
 			{
-				_skillCast = ThreadPoolManager.getInstance().scheduleEffect(mut, 0);
+				_skillCast = ThreadPoolManager.schedule(mut, 0);
 			}
 		}
 	}
@@ -5674,7 +5674,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				
 				// DON'T USE : Recursive call to useMagic() method
 				// currPlayer.useMagic(queuedSkill.getSkill(), queuedSkill.isCtrlPressed(), queuedSkill.isShiftPressed());
-				ThreadPoolManager.getInstance().executeGeneral(new QueuedMagicUseTask(currPlayer, queuedSkill.getSkill(), queuedSkill.isCtrlPressed(), queuedSkill.isShiftPressed()));
+				ThreadPoolManager.execute(new QueuedMagicUseTask(currPlayer, queuedSkill.getSkill(), queuedSkill.isCtrlPressed(), queuedSkill.isShiftPressed()));
 			}
 		}
 		

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java

@@ -314,7 +314,7 @@ public class L2Npc extends L2Character
 		
 		// Create a RandomAnimation Task that will be launched after the calculated delay
 		_rAniTask = new RandomAnimationTask(this);
-		ThreadPoolManager.getInstance().scheduleGeneral(_rAniTask, interval);
+		ThreadPoolManager.schedule(_rAniTask, interval);
 	}
 	
 	/**
@@ -1498,7 +1498,7 @@ public class L2Npc extends L2Character
 	
 	public L2Npc scheduleDespawn(long delay)
 	{
-		ThreadPoolManager.getInstance().scheduleGeneral(() ->
+		ThreadPoolManager.schedule(() ->
 		{
 			if (!isDecayed())
 			{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java

@@ -92,7 +92,7 @@ public abstract class L2Vehicle extends L2Character
 	{
 		if (_engine != null)
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(_engine, delay);
+			ThreadPoolManager.schedule(_engine, delay);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BabyPetInstance.java

@@ -187,7 +187,7 @@ public final class L2BabyPetInstance extends L2PetInstance
 	{
 		if ((_majorHeal != null) || (_buffs != null) || ((_recharge != null) && (_castTask == null) && !isDead()))
 		{
-			_castTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new CastTask(this), 3000, 2000);
+			_castTask = ThreadPoolManager.scheduleAtFixedRate(new CastTask(this), 3000, 2000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableAirShipInstance.java

@@ -257,8 +257,8 @@ public class L2ControllableAirShipInstance extends L2AirShipInstance
 	public void onSpawn()
 	{
 		super.onSpawn();
-		_checkTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new CheckTask(), 60000, 10000);
-		_consumeFuelTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ConsumeFuelTask(), 60000, 60000);
+		_checkTask = ThreadPoolManager.scheduleAtFixedRate(new CheckTask(), 60000, 10000);
+		_consumeFuelTask = ThreadPoolManager.scheduleAtFixedRate(new ConsumeFuelTask(), 60000, 60000);
 	}
 	
 	@Override
@@ -330,7 +330,7 @@ public class L2ControllableAirShipInstance extends L2AirShipInstance
 			if (isVisible() && isEmpty() && !isInDock())
 			{
 				// deleteMe() can't be called from CheckTask because task should not cancel itself
-				ThreadPoolManager.getInstance().executeGeneral(new DecayTask());
+				ThreadPoolManager.execute(new DecayTask());
 			}
 		}
 	}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java

@@ -154,7 +154,7 @@ public final class L2CubicInstance implements IIdentifiable
 				_skills.add(SkillData.getInstance().getSkill(5115, 4));
 				break;
 		}
-		_disappearTask = ThreadPoolManager.getInstance().scheduleGeneral(new CubicDisappear(this), cubicDuration * 1000); // disappear
+		_disappearTask = ThreadPoolManager.schedule(new CubicDisappear(this), cubicDuration * 1000); // disappear
 	}
 	
 	public synchronized void doAction()
@@ -180,10 +180,10 @@ public final class L2CubicInstance implements IIdentifiable
 			case SMART_CUBIC_SPECTRALMASTER:
 			case SMART_CUBIC_EVATEMPLAR:
 			case SMART_CUBIC_SHILLIENTEMPLAR:
-				_actionTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new CubicAction(this, _cubicSkillChance), 0, _cubicDelay);
+				_actionTask = ThreadPoolManager.scheduleAtFixedRate(new CubicAction(this, _cubicSkillChance), 0, _cubicDelay);
 				break;
 			case LIFE_CUBIC:
-				_actionTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new CubicHeal(this), 0, _cubicDelay);
+				_actionTask = ThreadPoolManager.scheduleAtFixedRate(new CubicHeal(this), 0, _cubicDelay);
 				break;
 		}
 	}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java

@@ -49,8 +49,8 @@ public class L2DecoyInstance extends L2Decoy
 		_totalLifeTime = totalLifeTime;
 		_timeRemaining = _totalLifeTime;
 		final int skilllevel = getTemplate().getDisplayId() - 13070;
-		_DecoyLifeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000);
-		_HateSpam = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000);
+		_DecoyLifeTask = ThreadPoolManager.scheduleAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000);
+		_HateSpam = ThreadPoolManager.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000);
 	}
 	
 	@Override

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java

@@ -127,7 +127,7 @@ public class L2DoorInstance extends L2Character
 		{
 			delay += Rnd.get(getTemplate().getRandomTime());
 		}
-		ThreadPoolManager.getInstance().scheduleGeneral(new TimerOpen(), delay * 1000);
+		ThreadPoolManager.schedule(new TimerOpen(), delay * 1000);
 	}
 	
 	@Override
@@ -751,7 +751,7 @@ public class L2DoorInstance extends L2Character
 			_autoCloseTask = null;
 			oldTask.cancel(false);
 		}
-		_autoCloseTask = ThreadPoolManager.getInstance().scheduleGeneral(new AutoClose(), getTemplate().getCloseTime() * 1000);
+		_autoCloseTask = ThreadPoolManager.schedule(new AutoClose(), getTemplate().getCloseTime() * 1000);
 	}
 	
 	class AutoClose implements Runnable
@@ -786,7 +786,7 @@ public class L2DoorInstance extends L2Character
 			{
 				delay += Rnd.get(getTemplate().getRandomTime());
 			}
-			ThreadPoolManager.getInstance().scheduleGeneral(this, delay * 1000);
+			ThreadPoolManager.schedule(this, delay * 1000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java

@@ -157,7 +157,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance
 						
 						broadcastPacket(ns);
 						setCanTalk(false);
-						ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleTalkTask(), 10000);
+						ThreadPoolManager.schedule(new ScheduleTalkTask(), 10000);
 					}
 				}
 			}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -890,7 +890,7 @@ public final class L2PcInstance extends L2Playable
 		
 		if (_PvPRegTask == null)
 		{
-			_PvPRegTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new PvPFlagTask(this), 1000, 1000);
+			_PvPRegTask = ThreadPoolManager.scheduleAtFixedRate(new PvPFlagTask(this), 1000, 1000);
 		}
 	}
 	
@@ -2842,7 +2842,7 @@ public final class L2PcInstance extends L2Playable
 		getAI().setIntention(CtrlIntention.AI_INTENTION_REST);
 		broadcastPacket(new ChangeWaitType(this, ChangeWaitType.WT_SITTING));
 		// Schedule a sit down task to wait for the animation to finish
-		ThreadPoolManager.getInstance().scheduleGeneral(new SitDownTask(this), 2500);
+		ThreadPoolManager.schedule(new SitDownTask(this), 2500);
 		setIsParalyzed(true);
 	}
 	
@@ -2864,7 +2864,7 @@ public final class L2PcInstance extends L2Playable
 			
 			broadcastPacket(new ChangeWaitType(this, ChangeWaitType.WT_STANDING));
 			// Schedule a stand up task to wait for the animation to finish
-			ThreadPoolManager.getInstance().scheduleGeneral(new StandUpTask(this), 2500);
+			ThreadPoolManager.schedule(new StandUpTask(this), 2500);
 		}
 	}
 	
@@ -4257,7 +4257,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		if (Config.GAMEGUARD_ENFORCE)
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new GameGuardCheckTask(this), 30 * 1000);
+			ThreadPoolManager.schedule(new GameGuardCheckTask(this), 30 * 1000);
 		}
 	}
 	
@@ -9088,7 +9088,7 @@ public final class L2PcInstance extends L2Playable
 		_inventoryDisable = val;
 		if (val)
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new InventoryEnableTask(this), 1500);
+			ThreadPoolManager.schedule(new InventoryEnableTask(this), 1500);
 		}
 	}
 	
@@ -10308,7 +10308,7 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (_taskWarnUserTakeBreak == null)
 		{
-			_taskWarnUserTakeBreak = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new WarnUserTakeBreakTask(this), 7200000, 7200000);
+			_taskWarnUserTakeBreak = ThreadPoolManager.scheduleAtFixedRate(new WarnUserTakeBreakTask(this), 7200000, 7200000);
 		}
 	}
 	
@@ -10334,7 +10334,7 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (_taskRentPet == null)
 		{
-			_taskRentPet = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RentPetTask(this), seconds * 1000L, seconds * 1000L);
+			_taskRentPet = ThreadPoolManager.scheduleAtFixedRate(new RentPetTask(this), seconds * 1000L, seconds * 1000L);
 		}
 	}
 	
@@ -10362,7 +10362,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		final int timeinwater = (int) calcStat(Stats.BREATH, 60000, this, null);
 		sendPacket(new SetupGauge(2, timeinwater));
-		_taskWater = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new WaterTask(this), timeinwater, 1000);
+		_taskWater = ThreadPoolManager.scheduleAtFixedRate(new WaterTask(this), timeinwater, 1000);
 	}
 	
 	public boolean isInWater()
@@ -10723,7 +10723,7 @@ public final class L2PcInstance extends L2Playable
 			{
 				synchronized (this)
 				{
-					_teleportWatchdog = ThreadPoolManager.getInstance().scheduleGeneral(new TeleportWatchdogTask(this), Config.TELEPORT_WATCHDOG_TIMEOUT * 1000);
+					_teleportWatchdog = ThreadPoolManager.schedule(new TeleportWatchdogTask(this), Config.TELEPORT_WATCHDOG_TIMEOUT * 1000);
 				}
 			}
 		}
@@ -11532,7 +11532,7 @@ public final class L2PcInstance extends L2Playable
 					checkDelay = _fish.getGutsCheckTime() * 66;
 				}
 			}
-			_taskforfish = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new LookingForFishTask(this, _fish.getStartCombatTime(), _fish.getFishGuts(), _fish.getFishGroup(), isNoob, isUpperGrade), 10000, checkDelay);
+			_taskforfish = ThreadPoolManager.scheduleAtFixedRate(new LookingForFishTask(this, _fish.getStartCombatTime(), _fish.getFishGuts(), _fish.getFishGroup(), isNoob, isUpperGrade), 10000, checkDelay);
 		}
 	}
 	
@@ -12067,7 +12067,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		if (_fameTask == null)
 		{
-			_fameTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FameTask(this, fameFixRate), delay, delay);
+			_fameTask = ThreadPoolManager.scheduleAtFixedRate(new FameTask(this, fameFixRate), delay, delay);
 		}
 	}
 	
@@ -12085,7 +12085,7 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (Config.ENABLE_VITALITY && (_vitalityTask == null))
 		{
-			_vitalityTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new VitalityTask(this), 1000, 60000);
+			_vitalityTask = ThreadPoolManager.scheduleAtFixedRate(new VitalityTask(this), 1000, 60000);
 		}
 	}
 	
@@ -12205,7 +12205,7 @@ public final class L2PcInstance extends L2Playable
 			_soulTask.cancel(false);
 			_soulTask = null;
 		}
-		_soulTask = ThreadPoolManager.getInstance().scheduleGeneral(new ResetSoulsTask(this), 600000);
+		_soulTask = ThreadPoolManager.schedule(new ResetSoulsTask(this), 600000);
 	}
 	
 	/**
@@ -12505,7 +12505,7 @@ public final class L2PcInstance extends L2Playable
 			sendPacket(new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
 			if (!isDead())
 			{
-				_mountFeedTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new PetFeedTask(this), 10000, 10000);
+				_mountFeedTask = ThreadPoolManager.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
 			}
 		}
 		else if (_canFeed)
@@ -12515,7 +12515,7 @@ public final class L2PcInstance extends L2Playable
 			sendPacket(sg);
 			if (!isDead())
 			{
-				_mountFeedTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new PetFeedTask(this), 10000, 10000);
+				_mountFeedTask = ThreadPoolManager.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
 			}
 		}
 	}
@@ -12579,7 +12579,7 @@ public final class L2PcInstance extends L2Playable
 	
 	public void enteredNoLanding(int delay)
 	{
-		_dismountTask = ThreadPoolManager.getInstance().scheduleGeneral(new DismountTask(this), delay * 1000);
+		_dismountTask = ThreadPoolManager.schedule(new DismountTask(this), delay * 1000);
 	}
 	
 	public void exitedNoLanding()
@@ -12723,7 +12723,7 @@ public final class L2PcInstance extends L2Playable
 				_chargeTask.cancel(false);
 			}
 		}
-		_chargeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ResetChargesTask(this), 600000);
+		_chargeTask = ThreadPoolManager.schedule(new ResetChargesTask(this), 600000);
 	}
 	
 	/**
@@ -13836,7 +13836,7 @@ public final class L2PcInstance extends L2Playable
 		startNevitHourglassTask();
 		
 		// Create task to give new recommendations
-		_recoGiveTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RecoGiveTask(this), 7200000, 3600000);
+		_recoGiveTask = ThreadPoolManager.scheduleAtFixedRate(new RecoGiveTask(this), 7200000, 3600000);
 		
 		// Store new data
 		storeRecommendations(false);
@@ -13852,7 +13852,7 @@ public final class L2PcInstance extends L2Playable
 			if (taskTime > 0)
 			{
 				// If player have some timeleft, start bonus task
-				_nevitHourglassTask = ThreadPoolManager.getInstance().scheduleGeneral(new RecoBonusTaskEnd(this), taskTime);
+				_nevitHourglassTask = ThreadPoolManager.schedule(new RecoBonusTaskEnd(this), taskTime);
 			}
 			sendPacket(new ExVoteSystemInfo(this));
 		}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java

@@ -1100,7 +1100,7 @@ public class L2PetInstance extends L2Summon
 		stopFeed();
 		if (!isDead() && (getOwner().getSummon() == this))
 		{
-			_feedTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FeedTask(), 10000, 10000);
+			_feedTask = ThreadPoolManager.scheduleAtFixedRate(new FeedTask(), 10000, 10000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java

@@ -103,27 +103,26 @@ public class L2RaceManagerInstance extends L2Npc
 			
 			_managers = new ArrayList<>();
 			
-			final ThreadPoolManager s = ThreadPoolManager.getInstance();
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1), 0, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.NOW_SELLING_TICKETS_FOR_MONSTER_RACE_S1), 30 * SECOND, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1), MINUTE, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.NOW_SELLING_TICKETS_FOR_MONSTER_RACE_S1), MINUTE + (30 * SECOND), 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 2 * MINUTE, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 3 * MINUTE, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 4 * MINUTE, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 5 * MINUTE, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 6 * MINUTE, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.TICKETS_SALES_ARE_CLOSED_FOR_MONSTER_RACE_S1_ODDS_ARE_POSTED), 7 * MINUTE, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_S1_MINUTE_S), 7 * MINUTE, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_S1_MINUTE_S), 8 * MINUTE, 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S1_WILL_BEGIN_IN_30_SECONDS), (8 * MINUTE) + (30 * SECOND), 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S1_IS_ABOUT_TO_BEGIN_COUNTDOWN_IN_FIVE_SECONDS), (8 * MINUTE) + (50 * SECOND), 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (55 * SECOND), 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (56 * SECOND), 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (57 * SECOND), 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (58 * SECOND), 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (59 * SECOND), 10 * MINUTE);
-			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.THEY_RE_OFF), 9 * MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1), 0, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.NOW_SELLING_TICKETS_FOR_MONSTER_RACE_S1), 30 * SECOND, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1), MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.NOW_SELLING_TICKETS_FOR_MONSTER_RACE_S1), MINUTE + (30 * SECOND), 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 2 * MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 3 * MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 4 * MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 5 * MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 6 * MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKETS_SALES_ARE_CLOSED_FOR_MONSTER_RACE_S1_ODDS_ARE_POSTED), 7 * MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_S1_MINUTE_S), 7 * MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_S1_MINUTE_S), 8 * MINUTE, 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S1_WILL_BEGIN_IN_30_SECONDS), (8 * MINUTE) + (30 * SECOND), 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S1_IS_ABOUT_TO_BEGIN_COUNTDOWN_IN_FIVE_SECONDS), (8 * MINUTE) + (50 * SECOND), 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (55 * SECOND), 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (56 * SECOND), 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (57 * SECOND), 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (58 * SECOND), 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (59 * SECOND), 10 * MINUTE);
+			ThreadPoolManager.scheduleAtFixedRate(new Announcement(SystemMessageId.THEY_RE_OFF), 9 * MINUTE, 10 * MINUTE);
 		}
 		_managers.add(this);
 	}
@@ -242,7 +241,7 @@ public class L2RaceManagerInstance extends L2Npc
 			_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
 			sendMonsterInfo();
 			
-			ThreadPoolManager.getInstance().scheduleGeneral(new RunRace(), 5000);
+			ThreadPoolManager.schedule(new RunRace(), 5000);
 		}
 		else
 		{
@@ -519,7 +518,7 @@ public class L2RaceManagerInstance extends L2Npc
 		{
 			_packet = new MonRaceInfo(_codes[2][0], _codes[2][1], MonsterRace.getInstance().getMonsters(), MonsterRace.getInstance().getSpeeds());
 			sendMonsterInfo();
-			ThreadPoolManager.getInstance().scheduleGeneral(new RunEnd(), 30000);
+			ThreadPoolManager.schedule(new RunEnd(), 30000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java

@@ -108,7 +108,7 @@ public class L2RaidBossInstance extends L2MonsterInstance
 	@Override
 	protected void startMaintenanceTask()
 	{
-		_maintenanceTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() -> checkAndReturnToSpawn(), 60000, getMaintenanceInterval() + Rnd.get(5000));
+		_maintenanceTask = ThreadPoolManager.scheduleAtFixedRate(() -> checkAndReturnToSpawn(), 60000, getMaintenanceInterval() + Rnd.get(5000));
 	}
 	
 	protected void checkAndReturnToSpawn()

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java

@@ -78,12 +78,12 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 				{
 					_victimSpawnKeyBoxTask.cancel(true);
 				}
-				_victimSpawnKeyBoxTask = ThreadPoolManager.getInstance().scheduleEffect(new VictimSpawnKeyBox(this), 300000);
+				_victimSpawnKeyBoxTask = ThreadPoolManager.schedule(new VictimSpawnKeyBox(this), 300000);
 				if (_victimShout != null)
 				{
 					_victimShout.cancel(true);
 				}
-				_victimShout = ThreadPoolManager.getInstance().scheduleEffect(new VictimShout(this), 5000);
+				_victimShout = ThreadPoolManager.schedule(new VictimShout(this), 5000);
 				break;
 			case 18196:
 			case 18197:
@@ -120,7 +120,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 				{
 					_changeImmortalTask.cancel(true);
 				}
-				_changeImmortalTask = ThreadPoolManager.getInstance().scheduleEffect(new ChangeImmortal(this), 1600);
+				_changeImmortalTask = ThreadPoolManager.schedule(new ChangeImmortal(this), 1600);
 				
 				break;
 			case 18256:
@@ -180,7 +180,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 				{
 					_onDeadEventTask.cancel(true);
 				}
-				_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 3500);
+				_onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 3500);
 				break;
 			
 			case 18150:
@@ -205,7 +205,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 				{
 					_onDeadEventTask.cancel(true);
 				}
-				_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 3500);
+				_onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 3500);
 				break;
 			
 			case 18141:
@@ -222,7 +222,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 					{
 						_onDeadEventTask.cancel(true);
 					}
-					_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 3500);
+					_onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 3500);
 				}
 				break;
 			
@@ -253,7 +253,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 					{
 						_onDeadEventTask.cancel(true);
 					}
-					_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 3500);
+					_onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 3500);
 				}
 				break;
 			
@@ -266,7 +266,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 				{
 					_onDeadEventTask.cancel(true);
 				}
-				_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 8500);
+				_onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 8500);
 				break;
 		}
 		return true;

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

@@ -212,7 +212,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 				{
 					_spawnMonsterTask.cancel(true);
 				}
-				_spawnMonsterTask = ThreadPoolManager.getInstance().scheduleEffect(new SpawnMonster(getId()), 3500);
+				_spawnMonsterTask = ThreadPoolManager.schedule(new SpawnMonster(getId()), 3500);
 				break;
 			}
 			case 31455:
@@ -367,12 +367,12 @@ public class L2SepulcherNpcInstance extends L2Npc
 		{
 			_closeTask.cancel(true);
 		}
-		_closeTask = ThreadPoolManager.getInstance().scheduleEffect(new CloseNextDoor(doorId), 10000);
+		_closeTask = ThreadPoolManager.schedule(new CloseNextDoor(doorId), 10000);
 		if (_spawnNextMysteriousBoxTask != null)
 		{
 			_spawnNextMysteriousBoxTask.cancel(true);
 		}
-		_spawnNextMysteriousBoxTask = ThreadPoolManager.getInstance().scheduleEffect(new SpawnNextMysteriousBox(npcId), 0);
+		_spawnNextMysteriousBoxTask = ThreadPoolManager.schedule(new SpawnNextMysteriousBox(npcId), 0);
 	}
 	
 	private static class CloseNextDoor implements Runnable

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java

@@ -79,7 +79,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable
 		super.onSpawn();
 		if (_summonLifeTask == null)
 		{
-			_summonLifeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this, 0, 5000);
+			_summonLifeTask = ThreadPoolManager.scheduleAtFixedRate(this, 0, 5000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SiegeFlagInstance.java

@@ -201,7 +201,7 @@ public class L2SiegeFlagInstance extends L2Npc
 					// send warning to owners of headquarters that theirs base is under attack
 					_clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.YOUR_BASE_IS_BEING_ATTACKED));
 					setCanTalk(false);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleTalkTask(), 20000);
+					ThreadPoolManager.schedule(new ScheduleTalkTask(), 20000);
 				}
 			}
 		}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java

@@ -152,7 +152,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
 			{
 				_durationCheckTask.cancel(true);
 			}
-			_durationCheckTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new CheckDuration(this), DURATION_CHECK_INTERVAL, DURATION_CHECK_INTERVAL);
+			_durationCheckTask = ThreadPoolManager.scheduleAtFixedRate(new CheckDuration(this), DURATION_CHECK_INTERVAL, DURATION_CHECK_INTERVAL);
 		}
 	}
 	
@@ -216,10 +216,10 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
 		int delay = 100;
 		for (Skill skill : _beastSkills)
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new buffCast(skill), delay);
+			ThreadPoolManager.schedule(new buffCast(skill), delay);
 			delay += (100 + skill.getHitTime());
 		}
-		ThreadPoolManager.getInstance().scheduleGeneral(new buffCast(null), delay);
+		ThreadPoolManager.schedule(new buffCast(null), delay);
 	}
 	
 	private class buffCast implements Runnable
@@ -283,7 +283,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
 				{
 					_buffTask.cancel(true);
 				}
-				_buffTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new CheckOwnerBuffs(this, totalBuffsAvailable), BUFF_INTERVAL, BUFF_INTERVAL);
+				_buffTask = ThreadPoolManager.scheduleAtFixedRate(new CheckOwnerBuffs(this, totalBuffsAvailable), BUFF_INTERVAL, BUFF_INTERVAL);
 			}
 		}
 		else

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java

@@ -84,7 +84,7 @@ public final class L2TrapInstance extends L2Npc
 		_remainingTime = _lifeTime;
 		if (_skill != null)
 		{
-			_trapTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new TrapTask(this), TICK, TICK);
+			_trapTask = ThreadPoolManager.scheduleAtFixedRate(new TrapTask(this), TICK, TICK);
 		}
 	}
 	
@@ -409,7 +409,7 @@ public final class L2TrapInstance extends L2Npc
 		
 		EventDispatcher.getInstance().notifyEventAsync(new OnTrapAction(this, target, TrapAction.TRAP_TRIGGERED), this);
 		
-		ThreadPoolManager.getInstance().scheduleGeneral(new TrapTriggerTask(this), 500);
+		ThreadPoolManager.schedule(new TrapTriggerTask(this), 500);
 	}
 	
 	public void unSummon()

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/knownlist/NpcKnownList.java

@@ -101,7 +101,7 @@ public class NpcKnownList extends CharKnownList
 	{
 		if ((_trackingTask == null) && (getActiveChar().getAggroRange() > 0))
 		{
-			_trackingTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new TrackingTask(), 2000, 2000);
+			_trackingTask = ThreadPoolManager.scheduleAtFixedRate(new TrackingTask(), 2000, 2000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java

@@ -206,7 +206,7 @@ public class CharStatus
 			final int period = Formulas.getRegeneratePeriod(getActiveChar());
 			
 			// Create the HP/MP/CP Regeneration task
-			_regTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new RegenTask(), period, period);
+			_regTask = ThreadPoolManager.scheduleAtFixedRate(new RegenTask(), period, period);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java

@@ -48,7 +48,7 @@ public final class CommandChannelTimer implements Runnable
 		}
 		else
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(this, 10000); // 10sec
+			ThreadPoolManager.schedule(this, 10000); // 10sec
 		}
 	}
 }

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTriggerTask.java

@@ -38,7 +38,7 @@ public class TrapTriggerTask implements Runnable
 		try
 		{
 			_trap.doCast(_trap.getSkill());
-			ThreadPoolManager.getInstance().scheduleGeneral(new TrapUnsummonTask(_trap), _trap.getSkill().getHitTime() + 300);
+			ThreadPoolManager.schedule(new TrapUnsummonTask(_trap), _trap.getSkill().getHitTime() + 300);
 		}
 		catch (Exception e)
 		{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java

@@ -160,7 +160,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable
 			_task.cancel(false);
 		}
 		_currentState = _repeat;
-		_task = ThreadPoolManager.getInstance().scheduleGeneral(this, _initial);
+		_task = ThreadPoolManager.schedule(this, _initial);
 	}
 	
 	@Override
@@ -178,6 +178,6 @@ public final class AutoAnnouncement extends Announcement implements Runnable
 		{
 			_currentState--;
 		}
-		_task = ThreadPoolManager.getInstance().scheduleGeneral(this, _delay);
+		_task = ThreadPoolManager.schedule(this, _delay);
 	}
 }

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/buylist/Product.java

@@ -113,7 +113,7 @@ public final class Product
 		}
 		if ((_restockTask == null) || _restockTask.isDone())
 		{
-			_restockTask = ThreadPoolManager.getInstance().scheduleGeneral(new RestockTask(), getRestockDelay());
+			_restockTask = ThreadPoolManager.schedule(new RestockTask(), getRestockDelay());
 		}
 		final boolean result = _count.addAndGet(-val) >= 0;
 		save();
@@ -130,7 +130,7 @@ public final class Product
 		final long remainTime = nextRestockTime - System.currentTimeMillis();
 		if (remainTime > 0)
 		{
-			_restockTask = ThreadPoolManager.getInstance().scheduleGeneral(new RestockTask(), remainTime);
+			_restockTask = ThreadPoolManager.schedule(new RestockTask(), remainTime);
 		}
 		else
 		{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/Auction.java

@@ -235,7 +235,7 @@ public class Auction
 		{
 			taskDelay = _endDate - currentTime;
 		}
-		ThreadPoolManager.getInstance().scheduleGeneral(new AutoEndTask(), taskDelay);
+		ThreadPoolManager.schedule(new AutoEndTask(), taskDelay);
 	}
 	
 	public static String getItemTypeName(AuctionItemType value)
@@ -470,7 +470,7 @@ public class Auction
 		else
 		{
 			/** Task waiting ClanHallManager is loaded every 3s */
-			ThreadPoolManager.getInstance().scheduleGeneral(new AutoEndTask(), 3000);
+			ThreadPoolManager.schedule(new AutoEndTask(), 3000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java

@@ -304,7 +304,7 @@ public final class BlockCheckerEngine
 				
 				_abnormalEnd = true;
 				
-				ThreadPoolManager.getInstance().executeGeneral(new EndEvent());
+				ThreadPoolManager.execute(new EndEvent());
 				
 				if (Config.DEBUG)
 				{
@@ -426,7 +426,7 @@ public final class BlockCheckerEngine
 			}
 			_isStarted = true;
 			// Spawn the blocks
-			ThreadPoolManager.getInstance().executeGeneral(new SpawnRound(16, 1));
+			ThreadPoolManager.execute(new SpawnRound(16, 1));
 			// Start up player parameters
 			setUpPlayers();
 			// Set the started time
@@ -460,17 +460,17 @@ public final class BlockCheckerEngine
 			{
 				case 1: // Schedule second spawn round
 				{
-					_task = ThreadPoolManager.getInstance().scheduleGeneral(new SpawnRound(20, 2), 60000);
+					_task = ThreadPoolManager.schedule(new SpawnRound(20, 2), 60000);
 					break;
 				}
 				case 2: // Schedule third spawn round
 				{
-					_task = ThreadPoolManager.getInstance().scheduleGeneral(new SpawnRound(14, 3), 60000);
+					_task = ThreadPoolManager.schedule(new SpawnRound(14, 3), 60000);
 					break;
 				}
 				case 3: // Schedule Event End Count Down
 				{
-					_task = ThreadPoolManager.getInstance().scheduleGeneral(new EndEvent(), 180000);
+					_task = ThreadPoolManager.schedule(new EndEvent(), 180000);
 					break;
 				}
 			}
@@ -521,7 +521,7 @@ public final class BlockCheckerEngine
 					SpawnTable.getInstance().addNewSpawn(girlSpawn, false);
 					girlSpawn.init();
 					// Schedule his deletion after 9 secs of spawn
-					ThreadPoolManager.getInstance().scheduleGeneral(new CarryingGirlUnspawn(girlSpawn), 9000);
+					ThreadPoolManager.schedule(new CarryingGirlUnspawn(girlSpawn), 9000);
 				}
 				catch (Exception e)
 				{
@@ -562,7 +562,7 @@ public final class BlockCheckerEngine
 	
 	/*
 	 * private class CountDown implements Runnable {
-	 * @Override public void run() { _holder.broadCastPacketToTeam(SystemMessage.getSystemMessage(SystemMessageId.BLOCK_CHECKER_ENDS_5)); ThreadPoolManager.getInstance().scheduleGeneral(new EndEvent(), 5000); } }
+	 * @Override public void run() { _holder.broadCastPacketToTeam(SystemMessage.getSystemMessage(SystemMessageId.BLOCK_CHECKER_ENDS_5)); ThreadPoolManager.schedule(new EndEvent(), 5000); } }
 	 */
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -158,11 +158,11 @@ public final class Castle extends AbstractResidence
 			final long currentTime = System.currentTimeMillis();
 			if (_endDate > currentTime)
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), _endDate - currentTime);
+				ThreadPoolManager.schedule(new FunctionTask(cwh), _endDate - currentTime);
 			}
 			else
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), 0);
+				ThreadPoolManager.schedule(new FunctionTask(cwh), 0);
 			}
 		}
 		
@@ -196,7 +196,7 @@ public final class Castle extends AbstractResidence
 						{
 							ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null);
 						}
-						ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(true), getRate());
+						ThreadPoolManager.schedule(new FunctionTask(true), getRate());
 					}
 					else
 					{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/ClanHall.java

@@ -131,11 +131,11 @@ public abstract class ClanHall
 			final long currentTime = System.currentTimeMillis();
 			if (_endDate > currentTime)
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), _endDate - currentTime);
+				ThreadPoolManager.schedule(new FunctionTask(cwh), _endDate - currentTime);
 			}
 			else
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), 0);
+				ThreadPoolManager.schedule(new FunctionTask(cwh), 0);
 			}
 		}
 		
@@ -164,7 +164,7 @@ public abstract class ClanHall
 						{
 							ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_function_fee", Inventory.ADENA_ID, fee, null, null);
 						}
-						ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(true), getRate());
+						ThreadPoolManager.schedule(new FunctionTask(true), getRate());
 					}
 					else
 					{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/DimensionalRift.java

@@ -173,7 +173,7 @@ public class DimensionalRift
 			final long jumpTime = calcTimeToNextJump();
 			teleporterTimer.schedule(teleporterTimerTask, jumpTime); // Teleporter task, 8-10 minutes
 			
-			earthQuakeTask = ThreadPoolManager.getInstance().scheduleGeneral(() ->
+			earthQuakeTask = ThreadPoolManager.schedule(() ->
 			{
 				for (L2PcInstance p : _party.getMembers())
 				{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java

@@ -98,7 +98,7 @@ public class Duel
 			broadcastToTeam2(sm);
 		}
 		// Schedule duel start
-		ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartDuelTask(this), 3000);
+		ThreadPoolManager.schedule(new ScheduleStartDuelTask(this), 3000);
 	}
 	
 	public static class PlayerCondition
@@ -206,14 +206,14 @@ public class Duel
 					}
 					case Continue:
 					{
-						ThreadPoolManager.getInstance().scheduleGeneral(this, 1000);
+						ThreadPoolManager.schedule(this, 1000);
 						break;
 					}
 					default:
 					{
 						setFinished(true);
 						playKneelAnimation();
-						ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000);
+						ThreadPoolManager.schedule(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000);
 						InstanceManager.getInstance().destroyInstance(_duel.getDueldInstanceId());
 						break;
 					}
@@ -251,11 +251,11 @@ public class Duel
 					_duel.teleportPlayers();
 					
 					// give players 20 seconds to complete teleport and get ready (its ought to be 30 on official..)
-					ThreadPoolManager.getInstance().scheduleGeneral(this, _duel.isPartyDuel() ? 20000 : 1);
+					ThreadPoolManager.schedule(this, _duel.isPartyDuel() ? 20000 : 1);
 				}
 				else if (count > 0) // duel not started yet - continue countdown
 				{
-					ThreadPoolManager.getInstance().scheduleGeneral(this, 1000);
+					ThreadPoolManager.schedule(this, 1000);
 				}
 				else
 				{
@@ -462,7 +462,7 @@ public class Duel
 		broadcastToTeam2(B04_S01);
 		
 		// start dueling task
-		ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleDuelTask(this), 1000);
+		ThreadPoolManager.schedule(new ScheduleDuelTask(this), 1000);
 	}
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java

@@ -166,11 +166,11 @@ public final class Fort extends AbstractResidence
 			final long currentTime = System.currentTimeMillis();
 			if (_endDate > currentTime)
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), _endDate - currentTime);
+				ThreadPoolManager.schedule(new FunctionTask(cwh), _endDate - currentTime);
 			}
 			else
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), 0);
+				ThreadPoolManager.schedule(new FunctionTask(cwh), 0);
 			}
 		}
 		
@@ -199,7 +199,7 @@ public final class Fort extends AbstractResidence
 						{
 							getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null);
 						}
-						ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(true), getRate());
+						ThreadPoolManager.schedule(new FunctionTask(true), getRate());
 					}
 					else
 					{
@@ -268,7 +268,7 @@ public final class Fort extends AbstractResidence
 	
 	public void endOfSiege(L2Clan clan)
 	{
-		ThreadPoolManager.getInstance().executeAi(new endFortressSiege(this, clan));
+		ThreadPoolManager.execute(new endFortressSiege(this, clan));
 	}
 	
 	/**
@@ -587,15 +587,15 @@ public final class Fort extends AbstractResidence
 				initial = (Config.FS_UPDATE_FRQ * 60000L) - initial;
 				if ((Config.FS_MAX_OWN_TIME <= 0) || (getOwnedTime() < (Config.FS_MAX_OWN_TIME * 3600)))
 				{
-					_FortUpdater[0] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.PERIODIC_UPDATE), initial, Config.FS_UPDATE_FRQ * 60000L); // Schedule owner tasks to start running
+					_FortUpdater[0] = ThreadPoolManager.scheduleAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.PERIODIC_UPDATE), initial, Config.FS_UPDATE_FRQ * 60000L); // Schedule owner tasks to start running
 					if (Config.FS_MAX_OWN_TIME > 0)
 					{
-						_FortUpdater[1] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owener
+						_FortUpdater[1] = ThreadPoolManager.scheduleAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owener
 					}
 				}
 				else
 				{
-					_FortUpdater[1] = ThreadPoolManager.getInstance().scheduleGeneral(new FortUpdater(this, clan, 0, UpdaterType.MAX_OWN_TIME), 60000); // Schedule owner tasks to remove owner
+					_FortUpdater[1] = ThreadPoolManager.schedule(new FortUpdater(this, clan, 0, UpdaterType.MAX_OWN_TIME), 60000); // Schedule owner tasks to remove owner
 				}
 			}
 			else
@@ -820,10 +820,10 @@ public final class Fort extends AbstractResidence
 				{
 					_FortUpdater[1].cancel(false);
 				}
-				_FortUpdater[0] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.PERIODIC_UPDATE), Config.FS_UPDATE_FRQ * 60000L, Config.FS_UPDATE_FRQ * 60000L); // Schedule owner tasks to start running
+				_FortUpdater[0] = ThreadPoolManager.scheduleAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.PERIODIC_UPDATE), Config.FS_UPDATE_FRQ * 60000L, Config.FS_UPDATE_FRQ * 60000L); // Schedule owner tasks to start running
 				if (Config.FS_MAX_OWN_TIME > 0)
 				{
-					_FortUpdater[1] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owener
+					_FortUpdater[1] = ThreadPoolManager.scheduleAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owener
 				}
 			}
 			else

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java

@@ -112,7 +112,7 @@ public class FortSiege implements Siegable
 				final SystemMessage sm;
 				if (_time == 3600) // 1hr remains
 				{
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(600), 3000000); // Prepare task for 10 minutes left.
+					ThreadPoolManager.schedule(new ScheduleStartSiegeTask(600), 3000000); // Prepare task for 10 minutes left.
 				}
 				else if (_time == 600) // 10min remains
 				{
@@ -120,49 +120,49 @@ public class FortSiege implements Siegable
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
 					sm.addInt(10);
 					announceToPlayer(sm);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(300), 300000); // Prepare task for 5 minutes left.
+					ThreadPoolManager.schedule(new ScheduleStartSiegeTask(300), 300000); // Prepare task for 5 minutes left.
 				}
 				else if (_time == 300) // 5min remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
 					sm.addInt(5);
 					announceToPlayer(sm);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(60), 240000); // Prepare task for 1 minute left.
+					ThreadPoolManager.schedule(new ScheduleStartSiegeTask(60), 240000); // Prepare task for 1 minute left.
 				}
 				else if (_time == 60) // 1min remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
 					sm.addInt(1);
 					announceToPlayer(sm);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(30), 30000); // Prepare task for 30 seconds left.
+					ThreadPoolManager.schedule(new ScheduleStartSiegeTask(30), 30000); // Prepare task for 30 seconds left.
 				}
 				else if (_time == 30) // 30seconds remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
 					sm.addInt(30);
 					announceToPlayer(sm);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(10), 20000); // Prepare task for 10 seconds left.
+					ThreadPoolManager.schedule(new ScheduleStartSiegeTask(10), 20000); // Prepare task for 10 seconds left.
 				}
 				else if (_time == 10) // 10seconds remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
 					sm.addInt(10);
 					announceToPlayer(sm);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(5), 5000); // Prepare task for 5 seconds left.
+					ThreadPoolManager.schedule(new ScheduleStartSiegeTask(5), 5000); // Prepare task for 5 seconds left.
 				}
 				else if (_time == 5) // 5seconds remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
 					sm.addInt(5);
 					announceToPlayer(sm);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(1), 4000); // Prepare task for 1 seconds left.
+					ThreadPoolManager.schedule(new ScheduleStartSiegeTask(1), 4000); // Prepare task for 1 seconds left.
 				}
 				else if (_time == 1) // 1seconds remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
 					sm.addInt(1);
 					announceToPlayer(sm);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(0), 1000); // Prepare task start siege.
+					ThreadPoolManager.schedule(new ScheduleStartSiegeTask(0), 1000); // Prepare task start siege.
 				}
 				else if (_time == 0)// start siege
 				{
@@ -274,7 +274,7 @@ public class FortSiege implements Siegable
 		getSiegeGuardManager().unspawnSiegeGuard(); // Remove all spawned siege guard from this fort
 		getFort().resetDoors(); // Respawn door to fort
 		
-		ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000L); // Prepare 3hr task for suspicious merchant respawn
+		ThreadPoolManager.schedule(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000L); // Prepare 3hr task for suspicious merchant respawn
 		setSiegeDateTime(true); // store suspicious merchant spawn in DB
 		
 		if (_siegeEnd != null)
@@ -338,7 +338,7 @@ public class FortSiege implements Siegable
 		getFort().getZone().updateZoneStatusForCharactersInside();
 		
 		// Schedule a task to prepare auto siege end
-		_siegeEnd = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000L); // Prepare auto end task
+		_siegeEnd = ThreadPoolManager.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000L); // Prepare auto end task
 		
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN);
 		sm.addCastleId(getFort().getResidenceId());
@@ -664,7 +664,7 @@ public class FortSiege implements Siegable
 				getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED));
 				if (_siegeRestore == null)
 				{
-					_siegeRestore = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000L);
+					_siegeRestore = ThreadPoolManager.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000L);
 				}
 			}
 		}
@@ -828,7 +828,7 @@ public class FortSiege implements Siegable
 			saveFortSiege();
 			clearSiegeClan(); // remove all clans
 			// spawn suspicious merchant immediately
-			ThreadPoolManager.getInstance().executeGeneral(new ScheduleSuspiciousMerchantSpawn());
+			ThreadPoolManager.execute(new ScheduleSuspiciousMerchantSpawn());
 		}
 		else
 		{
@@ -836,33 +836,33 @@ public class FortSiege implements Siegable
 			if (getAttackerClans().isEmpty())
 			{
 				// no attackers - waiting for suspicious merchant spawn
-				ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSuspiciousMerchantSpawn(), delay);
+				ThreadPoolManager.schedule(new ScheduleSuspiciousMerchantSpawn(), delay);
 			}
 			else
 			{
 				// preparing start siege task
 				if (delay > 3600000) // more than hour, how this can happens ? spawn suspicious merchant
 				{
-					ThreadPoolManager.getInstance().executeGeneral(new ScheduleSuspiciousMerchantSpawn());
-					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(3600), delay - 3600000);
+					ThreadPoolManager.execute(new ScheduleSuspiciousMerchantSpawn());
+					_siegeStartTask = ThreadPoolManager.schedule(new FortSiege.ScheduleStartSiegeTask(3600), delay - 3600000);
 				}
 				if (delay > 600000) // more than 10 min, spawn suspicious merchant
 				{
-					ThreadPoolManager.getInstance().executeGeneral(new ScheduleSuspiciousMerchantSpawn());
-					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(600), delay - 600000);
+					ThreadPoolManager.execute(new ScheduleSuspiciousMerchantSpawn());
+					_siegeStartTask = ThreadPoolManager.schedule(new FortSiege.ScheduleStartSiegeTask(600), delay - 600000);
 				}
 				else if (delay > 300000)
 				{
-					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(300), delay - 300000);
+					_siegeStartTask = ThreadPoolManager.schedule(new FortSiege.ScheduleStartSiegeTask(300), delay - 300000);
 				}
 				else if (delay > 60000)
 				{
-					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(60), delay - 60000);
+					_siegeStartTask = ThreadPoolManager.schedule(new FortSiege.ScheduleStartSiegeTask(60), delay - 60000);
 				}
 				else
 				{
 					// lower than 1 min, set to 1 min
-					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(60), 0);
+					_siegeStartTask = ThreadPoolManager.schedule(new FortSiege.ScheduleStartSiegeTask(60), 0);
 				}
 				
 				_log.info("Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime());
@@ -892,7 +892,7 @@ public class FortSiege implements Siegable
 		}
 		
 		// Execute siege auto start
-		_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(3600), 0);
+		_siegeStartTask = ThreadPoolManager.schedule(new FortSiege.ScheduleStartSiegeTask(3600), 0);
 	}
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/Instance.java

@@ -197,7 +197,7 @@ public final class Instance
 			_checkTimeUpTask.cancel(true);
 		}
 		
-		_checkTimeUpTask = ThreadPoolManager.getInstance().scheduleGeneral(new CheckTimeUp(duration), 500);
+		_checkTimeUpTask = ThreadPoolManager.schedule(new CheckTimeUp(duration), 500);
 		_instanceEndTime = System.currentTimeMillis() + duration + 500;
 	}
 	
@@ -494,7 +494,7 @@ public final class Instance
 					a = n.getAttributes().getNamedItem("val");
 					if (a != null)
 					{
-						_checkTimeUpTask = ThreadPoolManager.getInstance().scheduleGeneral(new CheckTimeUp(Integer.parseInt(a.getNodeValue()) * 60000), 15000);
+						_checkTimeUpTask = ThreadPoolManager.schedule(new CheckTimeUp(Integer.parseInt(a.getNodeValue()) * 60000), 15000);
 						_instanceEndTime = System.currentTimeMillis() + (Long.parseLong(a.getNodeValue()) * 60000) + 15000;
 					}
 					break;
@@ -845,11 +845,11 @@ public final class Instance
 		cancelTimer();
 		if (remaining >= 10000)
 		{
-			_checkTimeUpTask = ThreadPoolManager.getInstance().scheduleGeneral(new CheckTimeUp(remaining), interval);
+			_checkTimeUpTask = ThreadPoolManager.schedule(new CheckTimeUp(remaining), interval);
 		}
 		else
 		{
-			_checkTimeUpTask = ThreadPoolManager.getInstance().scheduleGeneral(new TimeUp(), interval);
+			_checkTimeUpTask = ThreadPoolManager.schedule(new TimeUp(), interval);
 		}
 	}
 	
@@ -874,7 +874,7 @@ public final class Instance
 	{
 		if (player != null)
 		{
-			_ejectDeadTasks.put(player.getObjectId(), ThreadPoolManager.getInstance().scheduleGeneral(() ->
+			_ejectDeadTasks.put(player.getObjectId(), ThreadPoolManager.schedule(() ->
 			{
 				if (player.isDead() && (player.getInstanceId() == getId()))
 				{

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/Message.java

@@ -145,7 +145,7 @@ public class Message
 		_attachments = msg.getAttachments();
 		msg.removeAttachments();
 		_attachments.setNewMessageId(_messageId);
-		_unloadTask = ThreadPoolManager.getInstance().scheduleGeneral(new AttachmentsUnloadTask(this), UNLOAD_ATTACHMENTS_INTERVAL + Rnd.get(UNLOAD_ATTACHMENTS_INTERVAL));
+		_unloadTask = ThreadPoolManager.schedule(new AttachmentsUnloadTask(this), UNLOAD_ATTACHMENTS_INTERVAL + Rnd.get(UNLOAD_ATTACHMENTS_INTERVAL));
 	}
 	
 	public static PreparedStatement getStatement(Message msg, Connection con) throws SQLException
@@ -330,7 +330,7 @@ public class Message
 		{
 			_attachments = new Mail(_senderId, _messageId);
 			_attachments.restore();
-			_unloadTask = ThreadPoolManager.getInstance().scheduleGeneral(new AttachmentsUnloadTask(this), UNLOAD_ATTACHMENTS_INTERVAL + Rnd.get(UNLOAD_ATTACHMENTS_INTERVAL));
+			_unloadTask = ThreadPoolManager.schedule(new AttachmentsUnloadTask(this), UNLOAD_ATTACHMENTS_INTERVAL + Rnd.get(UNLOAD_ATTACHMENTS_INTERVAL));
 		}
 		return _attachments;
 	}
@@ -364,7 +364,7 @@ public class Message
 		
 		_attachments = new Mail(_senderId, _messageId);
 		_hasAttachments = true;
-		_unloadTask = ThreadPoolManager.getInstance().scheduleGeneral(new AttachmentsUnloadTask(this), UNLOAD_ATTACHMENTS_INTERVAL + Rnd.get(UNLOAD_ATTACHMENTS_INTERVAL));
+		_unloadTask = ThreadPoolManager.schedule(new AttachmentsUnloadTask(this), UNLOAD_ATTACHMENTS_INTERVAL + Rnd.get(UNLOAD_ATTACHMENTS_INTERVAL));
 		return _attachments;
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/NevitSystem.java

@@ -147,7 +147,7 @@ public class NevitSystem implements IUniqueId
 			{
 				if ((_adventTask == null) && (getAdventTime() < Config.NEVIT_ADVENT_TIME))
 				{
-					_adventTask = ThreadPoolManager.getInstance().scheduleGeneral(new AdventTask(), 30000);
+					_adventTask = ThreadPoolManager.schedule(new AdventTask(), 30000);
 					getPlayer().sendPacket(new ExNevitAdventTimeChange(getAdventTime(), false));
 				}
 			}
@@ -203,7 +203,7 @@ public class NevitSystem implements IUniqueId
 			getPlayer().sendPacket(new ExNevitAdventEffect(time));
 			getPlayer().sendPacket(SystemMessageId.NEVIT_HAS_BLESSED_YOU_FROM_ABOVE);
 			getPlayer().startAbnormalVisualEffect(true, AbnormalVisualEffect.NAVIT_ADVENT);
-			_nevitEffectTask = ThreadPoolManager.getInstance().scheduleGeneral(new NevitEffectEnd(), time * 1000L);
+			_nevitEffectTask = ThreadPoolManager.schedule(new NevitEffectEnd(), time * 1000L);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/Siege.java

@@ -101,35 +101,35 @@ public class Siege implements Siegable
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HOUR_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
 					sm.addInt(2);
 					announceToPlayer(sm, true);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 3600000); // Prepare task for 1 hr left.
+					ThreadPoolManager.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 3600000); // Prepare task for 1 hr left.
 				}
 				else if ((timeRemaining <= 3600000) && (timeRemaining > 600000))
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
 					sm.addInt((int) timeRemaining / 60000);
 					announceToPlayer(sm, true);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left.
+					ThreadPoolManager.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left.
 				}
 				else if ((timeRemaining <= 600000) && (timeRemaining > 300000))
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
 					sm.addInt((int) timeRemaining / 60000);
 					announceToPlayer(sm, true);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left.
+					ThreadPoolManager.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left.
 				}
 				else if ((timeRemaining <= 300000) && (timeRemaining > 10000))
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
 					sm.addInt((int) timeRemaining / 60000);
 					announceToPlayer(sm, true);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down
+					ThreadPoolManager.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down
 				}
 				else if ((timeRemaining <= 10000) && (timeRemaining > 0))
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_CASTLE_SIEGE_WILL_END_IN_S1_SECOND_S);
 					sm.addInt((int) timeRemaining / 1000);
 					announceToPlayer(sm, true);
-					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down
+					ThreadPoolManager.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down
 				}
 				else
 				{
@@ -168,7 +168,7 @@ public class Siege implements Siegable
 					final long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
 					if (regTimeRemaining > 0)
 					{
-						_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), regTimeRemaining);
+						_scheduledStartSiegeTask = ThreadPoolManager.schedule(new ScheduleStartSiegeTask(_castleInst), regTimeRemaining);
 						return;
 					}
 					endTimeRegistration(true);
@@ -177,7 +177,7 @@ public class Siege implements Siegable
 				final long timeRemaining = getSiegeDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
 				if (timeRemaining > 86400000)
 				{
-					_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 86400000); // Prepare task for 24 before siege start to end registration
+					_scheduledStartSiegeTask = ThreadPoolManager.schedule(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 86400000); // Prepare task for 24 before siege start to end registration
 				}
 				else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000))
 				{
@@ -186,23 +186,23 @@ public class Siege implements Siegable
 					Broadcast.toAllOnlinePlayers(sm);
 					_isRegistrationOver = true;
 					clearSiegeWaitingClan();
-					_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 13600000); // Prepare task for 1 hr left before siege start.
+					_scheduledStartSiegeTask = ThreadPoolManager.schedule(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 13600000); // Prepare task for 1 hr left before siege start.
 				}
 				else if ((timeRemaining <= 13600000) && (timeRemaining > 600000))
 				{
-					_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left.
+					_scheduledStartSiegeTask = ThreadPoolManager.schedule(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left.
 				}
 				else if ((timeRemaining <= 600000) && (timeRemaining > 300000))
 				{
-					_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left.
+					_scheduledStartSiegeTask = ThreadPoolManager.schedule(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left.
 				}
 				else if ((timeRemaining <= 300000) && (timeRemaining > 10000))
 				{
-					_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down
+					_scheduledStartSiegeTask = ThreadPoolManager.schedule(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down
 				}
 				else if ((timeRemaining <= 10000) && (timeRemaining > 0))
 				{
-					_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down
+					_scheduledStartSiegeTask = ThreadPoolManager.schedule(new ScheduleStartSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down
 				}
 				else
 				{
@@ -513,7 +513,7 @@ public class Siege implements Siegable
 			// Schedule a task to prepare auto siege end
 			_siegeEndDate = Calendar.getInstance();
 			_siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength());
-			ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task
+			ThreadPoolManager.schedule(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task
 			
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED);
 			sm.addCastleId(getCastle().getResidenceId());
@@ -1026,7 +1026,7 @@ public class Siege implements Siegable
 		{
 			_scheduledStartSiegeTask.cancel(false);
 		}
-		_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new Siege.ScheduleStartSiegeTask(getCastle()), 1000);
+		_scheduledStartSiegeTask = ThreadPoolManager.schedule(new Siege.ScheduleStartSiegeTask(getCastle()), 1000);
 	}
 	
 	/**
@@ -1341,7 +1341,7 @@ public class Siege implements Siegable
 		if (_scheduledStartSiegeTask != null)
 		{
 			_scheduledStartSiegeTask.cancel(true);
-			_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new Siege.ScheduleStartSiegeTask(getCastle()), 1000);
+			_scheduledStartSiegeTask = ThreadPoolManager.schedule(new Siege.ScheduleStartSiegeTask(getCastle()), 1000);
 		}
 		
 		try (Connection con = DatabaseFactory.getInstance().getConnection();

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventTeleporter.java

@@ -45,7 +45,7 @@ public class TvTEventTeleporter implements Runnable
 		_coordinates = coordinates;
 		_adminRemove = adminRemove;
 		
-		ThreadPoolManager.getInstance().scheduleGeneral(this, fastSchedule ? 0 : (TvTEvent.isStarted() ? Config.TVT_EVENT_RESPAWN_TELEPORT_DELAY : Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY) * 1000);
+		ThreadPoolManager.schedule(this, fastSchedule ? 0 : (TvTEvent.isStarted() ? Config.TVT_EVENT_RESPAWN_TELEPORT_DELAY : Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY) * 1000);
 	}
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTManager.java

@@ -96,7 +96,7 @@ public class TvTManager
 			if (nextStartTime != null)
 			{
 				_task = new TvTStartTask(nextStartTime.getTimeInMillis());
-				ThreadPoolManager.getInstance().executeGeneral(_task);
+				ThreadPoolManager.execute(_task);
 			}
 		}
 		catch (Exception e)
@@ -123,7 +123,7 @@ public class TvTManager
 			
 			// schedule registration end
 			_task.setStartTime(System.currentTimeMillis() + (60000L * Config.TVT_EVENT_PARTICIPATION_TIME));
-			ThreadPoolManager.getInstance().executeGeneral(_task);
+			ThreadPoolManager.execute(_task);
 		}
 	}
 	
@@ -143,7 +143,7 @@ public class TvTManager
 		{
 			TvTEvent.sysMsgToAllParticipants("TvT Event: Teleporting participants to an arena in " + Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY + " second(s).");
 			_task.setStartTime(System.currentTimeMillis() + (60000L * Config.TVT_EVENT_RUNNING_TIME));
-			ThreadPoolManager.getInstance().executeGeneral(_task);
+			ThreadPoolManager.execute(_task);
 		}
 	}
 	
@@ -164,7 +164,7 @@ public class TvTManager
 		if (_task.nextRun.cancel(false))
 		{
 			_task.setStartTime(System.currentTimeMillis());
-			ThreadPoolManager.getInstance().executeGeneral(_task);
+			ThreadPoolManager.execute(_task);
 		}
 	}
 	
@@ -245,7 +245,7 @@ public class TvTManager
 			
 			if (delay > 0)
 			{
-				nextRun = ThreadPoolManager.getInstance().scheduleGeneral(this, nextMsg * 1000);
+				nextRun = ThreadPoolManager.schedule(this, nextMsg * 1000);
 			}
 		}
 		

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java

@@ -111,22 +111,22 @@ public final class AuctionableHall extends ClanHall
 		final long currentTime = System.currentTimeMillis();
 		if (_paidUntil > currentTime)
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _paidUntil - currentTime);
+			ThreadPoolManager.schedule(new FeeTask(), _paidUntil - currentTime);
 		}
 		else if (!_paid && !forced)
 		{
 			if ((System.currentTimeMillis() + (3600000 * 24)) <= (_paidUntil + _chRate))
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), System.currentTimeMillis() + (3600000 * 24));
+				ThreadPoolManager.schedule(new FeeTask(), System.currentTimeMillis() + (3600000 * 24));
 			}
 			else
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), (_paidUntil + _chRate) - System.currentTimeMillis());
+				ThreadPoolManager.schedule(new FeeTask(), (_paidUntil + _chRate) - System.currentTimeMillis());
 			}
 		}
 		else
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), 0);
+			ThreadPoolManager.schedule(new FeeTask(), 0);
 		}
 	}
 	
@@ -149,7 +149,7 @@ public final class AuctionableHall extends ClanHall
 				
 				if (_paidUntil > _time)
 				{
-					ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _paidUntil - _time);
+					ThreadPoolManager.schedule(new FeeTask(), _paidUntil - _time);
 					return;
 				}
 				
@@ -168,7 +168,7 @@ public final class AuctionableHall extends ClanHall
 						_paidUntil = _time + _chRate;
 					}
 					ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_rental_fee", Inventory.ADENA_ID, getLease(), null, null);
-					ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _paidUntil - _time);
+					ThreadPoolManager.schedule(new FeeTask(), _paidUntil - _time);
 					_paid = true;
 					updateDb();
 				}
@@ -185,7 +185,7 @@ public final class AuctionableHall extends ClanHall
 						}
 						else
 						{
-							ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), 3000);
+							ThreadPoolManager.schedule(new FeeTask(), 3000);
 						}
 					}
 					else
@@ -196,11 +196,11 @@ public final class AuctionableHall extends ClanHall
 						Clan.broadcastToOnlineMembers(sm);
 						if ((_time + (3600000 * 24)) <= (_paidUntil + _chRate))
 						{
-							ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _time + (3600000 * 24));
+							ThreadPoolManager.schedule(new FeeTask(), _time + (3600000 * 24));
 						}
 						else
 						{
-							ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), (_paidUntil + _chRate) - _time);
+							ThreadPoolManager.schedule(new FeeTask(), (_paidUntil + _chRate) - _time);
 						}
 					}
 				}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

@@ -86,7 +86,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		_hall = CHSiegeManager.getInstance().getSiegableHall(hallId);
 		_hall.setSiege(this);
 		
-		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000);
+		_siegeTask = ThreadPoolManager.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000);
 		_log.config(_hall.getName() + " siege scheduled for " + getSiegeDate().getTime() + ".");
 		loadAttackers();
 	}
@@ -294,7 +294,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		Broadcast.toAllOnlinePlayers(msg);
 		_hall.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
 		
-		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), 3600000);
+		_siegeTask = ThreadPoolManager.schedule(new SiegeStarts(), 3600000);
 	}
 	
 	@Override
@@ -305,7 +305,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 			onSiegeEnds();
 			_attackers.clear();
 			_hall.updateNextSiege();
-			_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getSiegeDate().getTimeInMillis());
+			_siegeTask = ThreadPoolManager.schedule(new PrepareOwner(), _hall.getSiegeDate().getTimeInMillis());
 			_hall.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_BEEN_CANCELED_DUE_TO_LACK_OF_INTEREST);
 			sm.addString(_hall.getName());
@@ -337,7 +337,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		
 		_hall.updateSiegeStatus(SiegeStatus.RUNNING);
 		onSiegeStarts();
-		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeEnds(), _hall.getSiegeLenght());
+		_siegeTask = ThreadPoolManager.schedule(new SiegeEnds(), _hall.getSiegeLenght());
 	}
 	
 	@Override
@@ -399,7 +399,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		
 		onSiegeEnds();
 		
-		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000);
+		_siegeTask = ThreadPoolManager.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000);
 		_log.config("Siege of " + _hall.getName() + " scheduled for " + _hall.getSiegeDate().getTime() + ".");
 		
 		_hall.updateSiegeStatus(SiegeStatus.REGISTERING);
@@ -410,7 +410,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 	public void updateSiege()
 	{
 		cancelSiegeTask();
-		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getNextSiegeTime() - 3600000);
+		_siegeTask = ThreadPoolManager.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - 3600000);
 		_log.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime().toString() + ".");
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/event/LongTimeEvent.java

@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
 			else if (_eventPeriod.getStartDate().after(new Date()))
 			{
 				final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
-				ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStart(), delay);
+				ThreadPoolManager.schedule(new ScheduleStart(), delay);
 				_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate());
 			}
 			else
@@ -283,7 +283,7 @@ public class LongTimeEvent extends Quest
 		AnnouncementsTable.getInstance().addAnnouncement(new EventAnnouncement(_eventPeriod, _onEnterMsg));
 		
 		// Schedule event end (now only for message sending)
-		ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEnd(), millisToEventEnd);
+		ThreadPoolManager.schedule(new ScheduleEnd(), millisToEventEnd);
 	}
 	
 	/**

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java

@@ -17,7 +17,6 @@
 package com.l2jmobius.gameserver.model.events;
 
 import java.util.Queue;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -116,7 +115,7 @@ public final class EventDispatcher
 		
 		if (hasListeners)
 		{
-			ThreadPoolManager.getInstance().executeEvent(() -> notifyEventToMultipleContainers(event, containers, null));
+			ThreadPoolManager.execute(() -> notifyEventToMultipleContainers(event, containers, null));
 		}
 	}
 	
@@ -130,22 +129,7 @@ public final class EventDispatcher
 	{
 		if (Containers.Global().hasListener(event.getType()) || container.hasListener(event.getType()))
 		{
-			ThreadPoolManager.getInstance().scheduleEvent(() -> notifyEvent(event, container, null), delay);
-		}
-	}
-	
-	/**
-	 * Scheduling current listener notification asynchronously after specified delay.
-	 * @param event
-	 * @param container
-	 * @param delay
-	 * @param unit
-	 */
-	public void notifyEventAsyncDelayed(IBaseEvent event, ListenersContainer container, long delay, TimeUnit unit)
-	{
-		if (Containers.Global().hasListener(event.getType()) || container.hasListener(event.getType()))
-		{
-			ThreadPoolManager.getInstance().scheduleEvent(() -> notifyEvent(event, container, null), delay, unit);
+			ThreadPoolManager.schedule(() -> notifyEvent(event, container, null), delay);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/fishing/L2Fishing.java

@@ -106,7 +106,7 @@ public class L2Fishing implements Runnable
 		
 		if (_fishAiTask == null)
 		{
-			_fishAiTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(this, 1000, 1000);
+			_fishAiTask = ThreadPoolManager.scheduleAtFixedRate(this, 1000, 1000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java

@@ -393,7 +393,7 @@ public final class ItemAuction
 	
 	public final void broadcastToAllBidders(L2GameServerPacket packet)
 	{
-		ThreadPoolManager.getInstance().executeGeneral(() -> broadcastToAllBiddersInternal(packet));
+		ThreadPoolManager.execute(() -> broadcastToAllBiddersInternal(packet));
 	}
 	
 	public final void broadcastToAllBiddersInternal(L2GameServerPacket packet)

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java

@@ -323,17 +323,17 @@ public final class ItemAuctionInstance
 		{
 			if (currentAuction.getAuctionState() == ItemAuctionState.STARTED)
 			{
-				setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0L)));
+				setStateTask(ThreadPoolManager.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0L)));
 			}
 			else
 			{
-				setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0L)));
+				setStateTask(ThreadPoolManager.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0L)));
 			}
 			_log.log(Level.INFO, getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId);
 		}
 		else
 		{
-			setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0L)));
+			setStateTask(ThreadPoolManager.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0L)));
 			_log.log(Level.INFO, getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId);
 		}
 	}
@@ -416,7 +416,7 @@ public final class ItemAuctionInstance
 							if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL)
 							{
 								_auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN);
-								setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
+								setStateTask(ThreadPoolManager.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
 								return;
 							}
 							break;
@@ -426,7 +426,7 @@ public final class ItemAuctionInstance
 							if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN)
 							{
 								_auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN);
-								setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
+								setStateTask(ThreadPoolManager.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
 								return;
 							}
 							break;
@@ -436,7 +436,7 @@ public final class ItemAuctionInstance
 							if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B)
 							{
 								_auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B);
-								setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
+								setStateTask(ThreadPoolManager.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
 								return;
 							}
 							break;
@@ -446,7 +446,7 @@ public final class ItemAuctionInstance
 							if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A)
 							{
 								_auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A);
-								setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
+								setStateTask(ThreadPoolManager.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
 								return;
 							}
 						}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java

@@ -1371,7 +1371,7 @@ public final class L2ItemInstance extends L2Object
 			return;
 		}
 		_consumingMana = true;
-		ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleConsumeManaTask(this), MANA_CONSUMPTION_RATE);
+		ThreadPoolManager.schedule(new ScheduleConsumeManaTask(this), MANA_CONSUMPTION_RATE);
 	}
 	
 	/**
@@ -1583,7 +1583,7 @@ public final class L2ItemInstance extends L2Object
 	
 	public final void dropMe(L2Character dropper, int x, int y, int z)
 	{
-		ThreadPoolManager.getInstance().executeGeneral(new ItemDropTask(this, dropper, x, y, z));
+		ThreadPoolManager.execute(new ItemDropTask(this, dropper, x, y, z));
 		if ((dropper != null) && dropper.isPlayer())
 		{
 			// Notify to scripts
@@ -1864,7 +1864,7 @@ public final class L2ItemInstance extends L2Object
 			{
 				_lifeTimeTask.cancel(false);
 			}
-			_lifeTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleLifeTimeTask(this), getRemainingTime());
+			_lifeTimeTask = ThreadPoolManager.schedule(new ScheduleLifeTimeTask(this), getRemainingTime());
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -236,7 +236,7 @@ public class Olympiad extends ListenersContainer
 				if (_validationEnd > Calendar.getInstance().getTimeInMillis())
 				{
 					loadNoblesRank();
-					_scheduledValdationTask = ThreadPoolManager.getInstance().scheduleGeneral(new ValidationEndTask(), getMillisToValidationEnd());
+					_scheduledValdationTask = ThreadPoolManager.schedule(new ValidationEndTask(), getMillisToValidationEnd());
 				}
 				else
 				{
@@ -390,7 +390,7 @@ public class Olympiad extends ListenersContainer
 			_scheduledOlympiadEnd.cancel(true);
 		}
 		
-		_scheduledOlympiadEnd = ThreadPoolManager.getInstance().scheduleGeneral(new OlympiadEndTask(HEROS_TO_BE), getMillisToOlympiadEnd());
+		_scheduledOlympiadEnd = ThreadPoolManager.schedule(new OlympiadEndTask(HEROS_TO_BE), getMillisToOlympiadEnd());
 		
 		updateCompStatus();
 	}
@@ -432,7 +432,7 @@ public class Olympiad extends ListenersContainer
 			_validationEnd = validationEnd.getTimeInMillis() + VALIDATION_PERIOD;
 			
 			loadNoblesRank();
-			_scheduledValdationTask = ThreadPoolManager.getInstance().scheduleGeneral(new ValidationEndTask(), getMillisToValidationEnd());
+			_scheduledValdationTask = ThreadPoolManager.schedule(new ValidationEndTask(), getMillisToValidationEnd());
 		}
 	}
 	
@@ -480,7 +480,7 @@ public class Olympiad extends ListenersContainer
 			_log.info("Olympiad System: Event starts/started : " + _compStart.getTime());
 		}
 		
-		_scheduledCompStart = ThreadPoolManager.getInstance().scheduleGeneral(() ->
+		_scheduledCompStart = ThreadPoolManager.schedule(() ->
 		{
 			if (isOlympiadEnd())
 			{
@@ -493,19 +493,19 @@ public class Olympiad extends ListenersContainer
 			_log.info("Olympiad System: Olympiad Game Started");
 			_logResults.info("Result,Player1,Player2,Player1 HP,Player2 HP,Player1 Damage,Player2 Damage,Points,Classed");
 			
-			_gameManager = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(OlympiadGameManager.getInstance(), 30000, 30000);
+			_gameManager = ThreadPoolManager.scheduleAtFixedRate(OlympiadGameManager.getInstance(), 30000, 30000);
 			if (Config.ALT_OLY_ANNOUNCE_GAMES)
 			{
-				_gameAnnouncer = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new OlympiadAnnouncer(), 30000, 500);
+				_gameAnnouncer = ThreadPoolManager.scheduleAtFixedRate(new OlympiadAnnouncer(), 30000, 500);
 			}
 			
 			final long regEnd = getMillisToCompEnd() - 600000;
 			if (regEnd > 0)
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(() -> Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.THE_GRAND_OLYMPIAD_REGISTRATION_PERIOD_HAS_ENDED)), regEnd);
+				ThreadPoolManager.schedule(() -> Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.THE_GRAND_OLYMPIAD_REGISTRATION_PERIOD_HAS_ENDED)), regEnd);
 			}
 			
-			_scheduledCompEnd = ThreadPoolManager.getInstance().scheduleGeneral(() ->
+			_scheduledCompEnd = ThreadPoolManager.schedule(() ->
 			{
 				if (isOlympiadEnd())
 				{
@@ -560,7 +560,7 @@ public class Olympiad extends ListenersContainer
 			_scheduledOlympiadEnd.cancel(true);
 		}
 		
-		_scheduledOlympiadEnd = ThreadPoolManager.getInstance().scheduleGeneral(new OlympiadEndTask(HEROS_TO_BE), 0);
+		_scheduledOlympiadEnd = ThreadPoolManager.schedule(new OlympiadEndTask(HEROS_TO_BE), 0);
 	}
 	
 	protected long getMillisToValidationEnd()
@@ -649,7 +649,7 @@ public class Olympiad extends ListenersContainer
 	
 	private void scheduleWeeklyChange()
 	{
-		_scheduledWeeklyTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() ->
+		_scheduledWeeklyTask = ThreadPoolManager.scheduleAtFixedRate(() ->
 		{
 			addWeeklyPoints();
 			_log.info("Olympiad System: Added weekly points to nobles");

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java

@@ -160,7 +160,7 @@ public final class OlympiadGameTask implements Runnable
 		_game = game;
 		_state = GameState.BEGIN;
 		_needAnnounce = false;
-		ThreadPoolManager.getInstance().executeGeneral(this);
+		ThreadPoolManager.execute(this);
 	}
 	
 	@Override
@@ -315,7 +315,7 @@ public final class OlympiadGameTask implements Runnable
 					return;
 				}
 			}
-			ThreadPoolManager.getInstance().scheduleGeneral(this, delay * 1000);
+			ThreadPoolManager.schedule(this, delay * 1000);
 		}
 		catch (Exception e)
 		{
@@ -335,7 +335,7 @@ public final class OlympiadGameTask implements Runnable
 			
 			_log.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e);
 			_state = GameState.GAME_STOPPED;
-			ThreadPoolManager.getInstance().scheduleGeneral(this, 1000);
+			ThreadPoolManager.schedule(this, 1000);
 		}
 	}
 	

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadManager.java

@@ -405,7 +405,7 @@ public class OlympiadManager
 			if ((team != null) && team.contains(objId))
 			{
 				_teamsBasedRegisters.remove(team);
-				ThreadPoolManager.getInstance().executeGeneral(new AnnounceUnregToTeam(team));
+				ThreadPoolManager.execute(new AnnounceUnregToTeam(team));
 				return true;
 			}
 		}
@@ -437,7 +437,7 @@ public class OlympiadManager
 			if ((team != null) && team.contains(objId))
 			{
 				_teamsBasedRegisters.remove(team);
-				ThreadPoolManager.getInstance().executeGeneral(new AnnounceUnregToTeam(team));
+				ThreadPoolManager.execute(new AnnounceUnregToTeam(team));
 				return;
 			}
 		}

L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java

@@ -147,7 +147,7 @@ public class PunishmentTask implements Runnable
 		onStart();
 		if (_expirationTime > 0) // Has expiration?
 		{
-			_task = ThreadPoolManager.getInstance().scheduleGeneral(this, _expirationTime - System.currentTimeMillis());
+			_task = ThreadPoolManager.schedule(this, _expirationTime - System.currentTimeMillis());
 		}
 	}