ThreadPool revert and path change.

L2J_Mobius_01.0_Ertheia/dist/game/config/Server.ini

@@ -126,16 +126,20 @@ ServerListBrackets = False
 # Thread Configuration
 # ---------------------------------------------------------------------------
 
-# Specifies how many threads will be in the scheduled pool.
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
-# Default: 160
+ScheduledThreadPoolCount = -1
-ScheduledThreadPoolCount = 160
 
-# Specifies how many threads will be in the single instant pool.
+# Specifies how many threads will be in a single scheduled pool.
-# Default: 120
+ThreadsPerScheduledThreadPool = 4
-InstantThreadPoolCount = 120
 
-# Default: 40
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
-UrgentPacketThreadCoreSize = 40
+InstantThreadPoolCount = -1
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 2
+
+# Urgent packet thread core size.
+UrgentPacketThreadCoreSize = -1
 
 # Use threads to decrease startup time.
 # Default: False

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DenOfEvil/DenOfEvil.java

@@ -16,7 +16,7 @@
  */
 package ai.areas.DenOfEvil;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java

@@ -21,7 +21,7 @@ import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.Location;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java

@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.ai.CtrlIntention;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java

@@ -16,7 +16,7 @@
  */
 package ai.areas.Rune.AltarOfSacrifice;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java

@@ -20,7 +20,7 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.data.xml.SkillTreeData;
 import org.l2jmobius.gameserver.enums.CategoryType;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java

@@ -22,7 +22,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
 import org.l2jmobius.gameserver.model.actor.Npc;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java

@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.concurrent.ScheduledFuture;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.ai.CtrlIntention;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java

@@ -20,7 +20,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.SpawnTable;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/EnergySeeds.java

@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.DoorData;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferAI.java

@@ -18,7 +18,7 @@ package ai.others.NpcBuffers;
 
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffers.java

@@ -16,7 +16,7 @@
  */
 package ai.others.NpcBuffers;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java

@@ -19,7 +19,7 @@ package ai.others;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java

@@ -19,7 +19,7 @@ package custom.events.Elpies;
 import java.util.concurrent.ScheduledFuture;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.actor.Npc;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java

@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.SkillFinishType;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/SavingSanta/SavingSanta.java

@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.ItemTable;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java

@@ -18,7 +18,7 @@ package handlers.admincommandhandlers;
 
 import java.util.StringTokenizer;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/HomeBoard.java

@@ -29,8 +29,8 @@ import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.cache.HtmCache;
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.data.xml.BuyListData;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java

@@ -16,7 +16,7 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java

@@ -16,7 +16,7 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java

@@ -16,7 +16,7 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java

@@ -16,7 +16,7 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.handler.TargetHandler;
 import org.l2jmobius.gameserver.model.StatSet;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/SocialAction.java

@@ -16,7 +16,7 @@
  */
 package handlers.playeractions;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.ai.NextAction;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java

@@ -16,7 +16,7 @@
  */
 package handlers.punishmenthandlers;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.LoginServerThread;
 import org.l2jmobius.gameserver.cache.HtmCache;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java

@@ -34,7 +34,7 @@ import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.GameServer;
 import org.l2jmobius.gameserver.LoginServerThread;
 import org.l2jmobius.gameserver.data.xml.AdminData;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Performance.java

@@ -17,7 +17,7 @@
 package handlers.telnethandlers.server;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.network.telnet.ITelnetCommand;
 
 import io.netty.channel.ChannelHandlerContext;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Purge.java

@@ -17,7 +17,7 @@
 package handlers.telnethandlers.server;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.network.telnet.ITelnetCommand;
 
 import io.netty.channel.ChannelHandlerContext;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java

@@ -19,7 +19,7 @@ package handlers.voicedcommandhandlers;
 import java.util.StringTokenizer;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData;
 import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
 import org.l2jmobius.gameserver.model.World;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java

@@ -22,7 +22,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.Location;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.enums.QuestSound;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java

@@ -25,7 +25,7 @@ import java.util.logging.Level;
 import java.util.stream.IntStream;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Location;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.enums.QuestSound;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java

@@ -16,7 +16,7 @@
  */
 package quests.Q10292_SevenSignsGirlOfDoubt;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.enums.QuestSound;
 import org.l2jmobius.gameserver.model.actor.Npc;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java

@@ -17,7 +17,7 @@
 package quests.Q10369_NoblesseSoulTesting;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.enums.Movie;
 import org.l2jmobius.gameserver.enums.QuestSound;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java

@@ -16,7 +16,7 @@
  */
 package quests.Q10742_AFurryFriend;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java

@@ -19,7 +19,7 @@ package vehicles;
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.Movie;
 import org.l2jmobius.gameserver.instancemanager.AirShipManager;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -16,7 +16,7 @@
  */
 package vehicles.AirShipGludioGracia;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.instancemanager.AirShipManager;
 import org.l2jmobius.gameserver.model.Location;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/BoatGludinRune.java

@@ -18,7 +18,7 @@ package vehicles;
 
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.instancemanager.BoatManager;
 import org.l2jmobius.gameserver.model.VehiclePathPoint;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/BoatInnadrilTour.java

@@ -18,7 +18,7 @@ package vehicles;
 
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.instancemanager.BoatManager;
 import org.l2jmobius.gameserver.model.VehiclePathPoint;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/BoatRunePrimeval.java

@@ -18,7 +18,7 @@ package vehicles;
 
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.instancemanager.BoatManager;
 import org.l2jmobius.gameserver.model.VehiclePathPoint;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java

@@ -442,7 +442,9 @@ public class Config
 	public static boolean ALT_DEV_SHOW_QUESTS_LOAD_IN_LOGS;
 	public static boolean ALT_DEV_SHOW_SCRIPTS_LOAD_IN_LOGS;
 	public static int SCHEDULED_THREAD_POOL_COUNT;
+	public static int THREADS_PER_SCHEDULED_THREAD_POOL;
 	public static int INSTANT_THREAD_POOL_COUNT;
+	public static int THREADS_PER_INSTANT_THREAD_POOL;
 	public static int IO_PACKET_THREAD_CORE_SIZE;
 	public static boolean THREADS_FOR_LOADING;
 	public static boolean DEADLOCK_DETECTOR;
@@ -1429,9 +1431,23 @@ public class Config
 			SERVER_LIST_TYPE = getServerTypeId(serverSettings.getString("ServerListType", "Free").split(","));
 			SERVER_LIST_AGE = serverSettings.getInt("ServerListAge", 0);
 			SERVER_LIST_BRACKET = serverSettings.getBoolean("ServerListBrackets", false);
-			SCHEDULED_THREAD_POOL_COUNT = serverSettings.getInt("ScheduledThreadPoolCount", 40);
+			SCHEDULED_THREAD_POOL_COUNT = serverSettings.getInt("ScheduledThreadPoolCount", -1);
-			INSTANT_THREAD_POOL_COUNT = serverSettings.getInt("InstantThreadPoolCount", 20);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
-			IO_PACKET_THREAD_CORE_SIZE = serverSettings.getInt("UrgentPacketThreadCoreSize", 20);
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Runtime.getRuntime().availableProcessors();
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = serverSettings.getInt("ThreadsPerScheduledThreadPool", 4);
+			INSTANT_THREAD_POOL_COUNT = serverSettings.getInt("InstantThreadPoolCount", -1);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Runtime.getRuntime().availableProcessors();
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = serverSettings.getInt("ThreadsPerInstantThreadPool", 2);
+			IO_PACKET_THREAD_CORE_SIZE = serverSettings.getInt("UrgentPacketThreadCoreSize", -1);
+			if (IO_PACKET_THREAD_CORE_SIZE == -1)
+			{
+				IO_PACKET_THREAD_CORE_SIZE = Runtime.getRuntime().availableProcessors();
+			}
 			THREADS_FOR_LOADING = serverSettings.getBoolean("ThreadsForLoading", false);
 			DEADLOCK_DETECTOR = serverSettings.getBoolean("DeadLockDetector", true);
 			DEADLOCK_CHECK_INTERVAL = serverSettings.getInt("DeadLockCheckInterval", 20);

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/concurrent/ThreadPool.java

@@ -1,168 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.commons.concurrent;
-
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-
-/**
- * This class handles thread pooling system.<br>
- * It relies on two threadpool executors, which pool size is set using config.<br>
- * Those arrays hold following pools:<br>
- * <ul>
- * <li>Scheduled pool keeps a track about incoming, future events.</li>
- * <li>Instant pool handles short-life events.</li>
- * </ul>
- */
-public class ThreadPool
-{
-	private static final Logger LOGGER = Logger.getLogger(ThreadPool.class.getName());
-	
-	private static final ScheduledThreadPoolExecutor SCHEDULED_POOL = new ScheduledThreadPoolExecutor(Config.SCHEDULED_THREAD_POOL_COUNT);
-	private static final ThreadPoolExecutor INSTANT_POOL = new ThreadPoolExecutor(Config.INSTANT_THREAD_POOL_COUNT, Config.INSTANT_THREAD_POOL_COUNT, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(100000));
-	
-	public static void init()
-	{
-		// Set pool options.
-		SCHEDULED_POOL.setRejectedExecutionHandler(new RejectedExecutionHandlerImpl());
-		SCHEDULED_POOL.setRemoveOnCancelPolicy(true);
-		SCHEDULED_POOL.prestartAllCoreThreads();
-		INSTANT_POOL.setRejectedExecutionHandler(new RejectedExecutionHandlerImpl());
-		INSTANT_POOL.prestartAllCoreThreads();
-		
-		// Launch purge task.
-		scheduleAtFixedRate(ThreadPool::purge, 60000, 60000);
-		
-		LOGGER.info("ThreadPool: Initialized");
-		LOGGER.info("...scheduled pool executor with " + Config.SCHEDULED_THREAD_POOL_COUNT + " total threads.");
-		LOGGER.info("...instant pool executor with " + Config.INSTANT_THREAD_POOL_COUNT + " total threads.");
-	}
-	
-	public static void purge()
-	{
-		SCHEDULED_POOL.purge();
-		INSTANT_POOL.purge();
-	}
-	
-	/**
-	 * Creates and executes a one-shot action that becomes enabled after the given delay.
-	 * @param runnable : 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 static ScheduledFuture<?> schedule(Runnable runnable, long delay)
-	{
-		try
-		{
-			return SCHEDULED_POOL.schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage() + Config.EOL + e.getStackTrace());
-			return null;
-		}
-	}
-	
-	/**
-	 * Creates and executes a periodic action that becomes enabled first after the given initial delay.
-	 * @param runnable : the task to execute.
-	 * @param initialDelay : the time to delay first 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 static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
-	{
-		try
-		{
-			return SCHEDULED_POOL.scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage() + Config.EOL + e.getStackTrace());
-			return null;
-		}
-	}
-	
-	/**
-	 * Executes the given task sometime in the future.
-	 * @param runnable : the task to execute.
-	 */
-	public static void execute(Runnable runnable)
-	{
-		try
-		{
-			INSTANT_POOL.execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage() + Config.EOL + e.getStackTrace());
-		}
-	}
-	
-	public static String[] getStats()
-	{
-		final String[] stats = new String[20];
-		int pos = 0;
-		
-		stats[pos++] = "Scheduled pool:";
-		stats[pos++] = " |- ActiveCount: ...... " + SCHEDULED_POOL.getActiveCount();
-		stats[pos++] = " |- CorePoolSize: ..... " + SCHEDULED_POOL.getCorePoolSize();
-		stats[pos++] = " |- PoolSize: ......... " + SCHEDULED_POOL.getPoolSize();
-		stats[pos++] = " |- LargestPoolSize: .. " + SCHEDULED_POOL.getLargestPoolSize();
-		stats[pos++] = " |- MaximumPoolSize: .. " + SCHEDULED_POOL.getMaximumPoolSize();
-		stats[pos++] = " |- CompletedTaskCount: " + SCHEDULED_POOL.getCompletedTaskCount();
-		stats[pos++] = " |- QueuedTaskCount: .. " + SCHEDULED_POOL.getQueue().size();
-		stats[pos++] = " |- TaskCount: ........ " + SCHEDULED_POOL.getTaskCount();
-		stats[pos++] = " | -------";
-		
-		stats[pos++] = "Instant pool:";
-		stats[pos++] = " |- ActiveCount: ...... " + INSTANT_POOL.getActiveCount();
-		stats[pos++] = " |- CorePoolSize: ..... " + INSTANT_POOL.getCorePoolSize();
-		stats[pos++] = " |- PoolSize: ......... " + INSTANT_POOL.getPoolSize();
-		stats[pos++] = " |- LargestPoolSize: .. " + INSTANT_POOL.getLargestPoolSize();
-		stats[pos++] = " |- MaximumPoolSize: .. " + INSTANT_POOL.getMaximumPoolSize();
-		stats[pos++] = " |- CompletedTaskCount: " + INSTANT_POOL.getCompletedTaskCount();
-		stats[pos++] = " |- QueuedTaskCount: .. " + INSTANT_POOL.getQueue().size();
-		stats[pos++] = " |- TaskCount: ........ " + INSTANT_POOL.getTaskCount();
-		stats[pos++] = " | -------";
-		
-		return stats;
-	}
-	
-	/**
-	 * Shutdown thread pooling system correctly. Send different informations.
-	 */
-	public static void shutdown()
-	{
-		try
-		{
-			LOGGER.info("ThreadPool: Shutting down.");
-			SCHEDULED_POOL.shutdownNow();
-			INSTANT_POOL.shutdownNow();
-		}
-		catch (Throwable t)
-		{
-			LOGGER.info("ThreadPool: Problem at Shutting down. " + t.getMessage());
-		}
-	}
-}

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/threads/RejectedExecutionHandlerImpl.java

@@ -14,13 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.commons.concurrent;
+package org.l2jmobius.commons.threads;
 
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
+
 /**
  * @author NB4L1
  */
@@ -29,22 +31,22 @@ public class RejectedExecutionHandlerImpl implements RejectedExecutionHandler
 	private static final Logger LOGGER = Logger.getLogger(RejectedExecutionHandlerImpl.class.getName());
 	
 	@Override
-	public void rejectedExecution(Runnable r, ThreadPoolExecutor executor)
+	public void rejectedExecution(Runnable runnable, ThreadPoolExecutor executor)
 	{
 		if (executor.isShutdown())
 		{
 			return;
 		}
 		
-		LOGGER.warning(r + " from " + executor + " " + new RejectedExecutionException());
+		LOGGER.warning(runnable.getClass().getSimpleName() + Config.EOL + runnable + " from " + executor + " " + new RejectedExecutionException());
 		
 		if (Thread.currentThread().getPriority() > Thread.NORM_PRIORITY)
 		{
-			new Thread(r).start();
+			new Thread(runnable).start();
 		}
 		else
 		{
-			r.run();
+			runnable.run();
 		}
 	}
 }

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/threads/RunnableWrapper.java

@@ -14,13 +14,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.commons.concurrent;
+package org.l2jmobius.commons.threads;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 
-/**
- * @author Mobius
- */
 public class RunnableWrapper implements Runnable
 {
 	private final Runnable _runnable;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/threads/ThreadPool.java

@@ -0,0 +1,214 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.commons.threads;
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+import org.l2jmobius.Config;
+
+/**
+ * This class handles thread pooling system.<br>
+ * It relies on two ThreadPoolExecutor arrays, which pool size is set using config.<br>
+ * Those arrays hold following pools:<br>
+ * <ul>
+ * <li>Scheduled pool keeps a track about incoming, future events.</li>
+ * <li>Instant pool handles short-life events.</li>
+ * </ul>
+ */
+public class ThreadPool
+{
+	private static final Logger LOGGER = Logger.getLogger(ThreadPool.class.getName());
+	
+	private static final ScheduledThreadPoolExecutor[] SCHEDULED_POOLS = new ScheduledThreadPoolExecutor[Config.SCHEDULED_THREAD_POOL_COUNT];
+	private static final ThreadPoolExecutor[] INSTANT_POOLS = new ThreadPoolExecutor[Config.INSTANT_THREAD_POOL_COUNT];
+	private static int SCHEDULED_THREAD_RANDOMIZER = 0;
+	private static int INSTANT_THREAD_RANDOMIZER = 0;
+	
+	public static void init()
+	{
+		LOGGER.info("ThreadPool: Initialized");
+		
+		// Feed scheduled pool.
+		for (int i = 0; i < Config.SCHEDULED_THREAD_POOL_COUNT; i++)
+		{
+			SCHEDULED_POOLS[i] = new ScheduledThreadPoolExecutor(Config.THREADS_PER_SCHEDULED_THREAD_POOL);
+		}
+		
+		LOGGER.info("..." + Config.SCHEDULED_THREAD_POOL_COUNT + " scheduled pool executors with " + (Config.SCHEDULED_THREAD_POOL_COUNT * Config.THREADS_PER_SCHEDULED_THREAD_POOL) + " total threads.");
+		
+		// Feed instant pool.
+		for (int i = 0; i < Config.INSTANT_THREAD_POOL_COUNT; i++)
+		{
+			INSTANT_POOLS[i] = new ThreadPoolExecutor(Config.THREADS_PER_INSTANT_THREAD_POOL, Config.THREADS_PER_INSTANT_THREAD_POOL, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<>(100000));
+		}
+		
+		LOGGER.info("..." + Config.INSTANT_THREAD_POOL_COUNT + " instant pool executors with " + (Config.INSTANT_THREAD_POOL_COUNT * Config.THREADS_PER_INSTANT_THREAD_POOL) + " total threads.");
+		
+		// Prestart core threads.
+		for (ScheduledThreadPoolExecutor threadPool : SCHEDULED_POOLS)
+		{
+			threadPool.setRejectedExecutionHandler(new RejectedExecutionHandlerImpl());
+			threadPool.setRemoveOnCancelPolicy(true);
+			threadPool.prestartAllCoreThreads();
+		}
+		
+		for (ThreadPoolExecutor threadPool : INSTANT_POOLS)
+		{
+			threadPool.setRejectedExecutionHandler(new RejectedExecutionHandlerImpl());
+			threadPool.prestartAllCoreThreads();
+		}
+		
+		// Launch purge task.
+		scheduleAtFixedRate(ThreadPool::purge, 60000, 60000);
+	}
+	
+	public static void purge()
+	{
+		for (ScheduledThreadPoolExecutor threadPool : SCHEDULED_POOLS)
+		{
+			threadPool.purge();
+		}
+		
+		for (ThreadPoolExecutor threadPool : INSTANT_POOLS)
+		{
+			threadPool.purge();
+		}
+	}
+	
+	/**
+	 * Creates and executes a one-shot action that becomes enabled after the given delay.
+	 * @param runnable : 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 static ScheduledFuture<?> schedule(Runnable runnable, long delay)
+	{
+		try
+		{
+			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning(e.getMessage() + Config.EOL + e.getStackTrace());
+			return null;
+		}
+	}
+	
+	/**
+	 * Creates and executes a periodic action that becomes enabled first after the given initial delay.
+	 * @param runnable : the task to execute.
+	 * @param initialDelay : the time to delay first 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 static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
+	{
+		try
+		{
+			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning(e.getMessage() + Config.EOL + e.getStackTrace());
+			return null;
+		}
+	}
+	
+	/**
+	 * Executes the given task sometime in the future.
+	 * @param runnable : the task to execute.
+	 */
+	public static void execute(Runnable runnable)
+	{
+		try
+		{
+			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning(e.getMessage() + Config.EOL + e.getStackTrace());
+		}
+	}
+	
+	public static String[] getStats()
+	{
+		final String[] stats = new String[(SCHEDULED_POOLS.length + INSTANT_POOLS.length) * 10];
+		int pos = 0;
+		
+		for (int i = 0; i < SCHEDULED_POOLS.length; i++)
+		{
+			final ScheduledThreadPoolExecutor threadPool = SCHEDULED_POOLS[i];
+			stats[pos++] = "Scheduled pool #" + i + ":";
+			stats[pos++] = " |- ActiveCount: ...... " + threadPool.getActiveCount();
+			stats[pos++] = " |- CorePoolSize: ..... " + threadPool.getCorePoolSize();
+			stats[pos++] = " |- PoolSize: ......... " + threadPool.getPoolSize();
+			stats[pos++] = " |- LargestPoolSize: .. " + threadPool.getLargestPoolSize();
+			stats[pos++] = " |- MaximumPoolSize: .. " + threadPool.getMaximumPoolSize();
+			stats[pos++] = " |- CompletedTaskCount: " + threadPool.getCompletedTaskCount();
+			stats[pos++] = " |- QueuedTaskCount: .. " + threadPool.getQueue().size();
+			stats[pos++] = " |- TaskCount: ........ " + threadPool.getTaskCount();
+			stats[pos++] = " | -------";
+		}
+		
+		for (int i = 0; i < INSTANT_POOLS.length; i++)
+		{
+			final ThreadPoolExecutor threadPool = INSTANT_POOLS[i];
+			stats[pos++] = "Instant pool #" + i + ":";
+			stats[pos++] = " |- ActiveCount: ...... " + threadPool.getActiveCount();
+			stats[pos++] = " |- CorePoolSize: ..... " + threadPool.getCorePoolSize();
+			stats[pos++] = " |- PoolSize: ......... " + threadPool.getPoolSize();
+			stats[pos++] = " |- LargestPoolSize: .. " + threadPool.getLargestPoolSize();
+			stats[pos++] = " |- MaximumPoolSize: .. " + threadPool.getMaximumPoolSize();
+			stats[pos++] = " |- CompletedTaskCount: " + threadPool.getCompletedTaskCount();
+			stats[pos++] = " |- QueuedTaskCount: .. " + threadPool.getQueue().size();
+			stats[pos++] = " |- TaskCount: ........ " + threadPool.getTaskCount();
+			stats[pos++] = " | -------";
+		}
+		
+		return stats;
+	}
+	
+	/**
+	 * Shutdown thread pooling system correctly. Send different informations.
+	 */
+	public static void shutdown()
+	{
+		try
+		{
+			LOGGER.info("ThreadPool: Shutting down.");
+			
+			for (ScheduledThreadPoolExecutor threadPool : SCHEDULED_POOLS)
+			{
+				threadPool.shutdownNow();
+			}
+			
+			for (ThreadPoolExecutor threadPool : INSTANT_POOLS)
+			{
+				threadPool.shutdownNow();
+			}
+		}
+		catch (Throwable t)
+		{
+			LOGGER.info("ThreadPool: Problem at Shutting down. " + t.getMessage());
+		}
+	}
+}

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/util/IXmlReader.java

@@ -42,7 +42,7 @@ import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.file.filter.XMLFilter;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.holders.MinionHolder;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java

@@ -31,9 +31,9 @@ import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.DeadLockDetector;
 import org.l2jmobius.commons.util.PropertiesParser;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java

@@ -20,9 +20,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.data.BotReportTable;
 import org.l2jmobius.gameserver.data.sql.ClanTable;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java

@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.enums.ItemLocation;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoorAI.java

@@ -16,7 +16,7 @@
  */
 package org.l2jmobius.gameserver.ai;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -22,7 +22,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
 
 import java.util.concurrent.Future;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java

@@ -21,7 +21,7 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java

@@ -37,8 +37,8 @@ import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.WorldObject;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -33,8 +33,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.file.filter.XMLFilter;
 import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData;
 import org.l2jmobius.gameserver.enums.ItemLocation;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java

@@ -29,8 +29,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -33,7 +33,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.ChanceLocation;
 import org.l2jmobius.gameserver.model.StatSet;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java

@@ -22,7 +22,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.data.xml.AdminData;
 import org.l2jmobius.gameserver.enums.PlayerAction;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java

@@ -40,8 +40,8 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.commons.util.Rnd;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java

@@ -34,8 +34,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java

@@ -34,8 +34,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.ItemLocation;
 import org.l2jmobius.gameserver.enums.MailType;
 import org.l2jmobius.gameserver.model.Message;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java

@@ -27,8 +27,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.MailType;
 import org.l2jmobius.gameserver.model.Message;
 import org.l2jmobius.gameserver.model.World;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -30,8 +30,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.SpawnTable;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java

@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.SpawnTable;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java

@@ -20,7 +20,7 @@ import java.util.Calendar;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask;
 import org.l2jmobius.gameserver.model.quest.Quest;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java

@@ -29,8 +29,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask;
 import org.l2jmobius.gameserver.model.StatSet;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.tasks.PenaltyRemoveTask;
 import org.l2jmobius.gameserver.model.ArenaParticipantsHolder;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/IdManager.java

@@ -28,8 +28,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.util.PrimeFinder;
 

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java

@@ -27,8 +27,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java

@@ -25,7 +25,7 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.Shutdown;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java

@@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java

@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.RecipeData;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ServerRestartManager.java

@@ -22,7 +22,7 @@ import java.util.Locale;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.Shutdown;
 
 /**

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.NpcData;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java

@@ -24,7 +24,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.SpawnTable;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/MonsterRace.java

@@ -30,8 +30,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.model.actor.Npc;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java

@@ -24,8 +24,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/DropProtection.java

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model;
 
 import java.util.concurrent.ScheduledFuture;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Duel.java

@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.DuelResult;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/MpRewardTask.java

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model;
 import java.util.concurrent.ScheduledFuture;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java

@@ -30,7 +30,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.enums.PartyDistributionType;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Request.java

@@ -16,7 +16,7 @@
  */
 package org.l2jmobius.gameserver.model;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldRegion.java

@@ -22,7 +22,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.ai.AttackableAI;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -40,7 +40,7 @@ import java.util.function.Predicate;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.EmptyQueue;
 import org.l2jmobius.commons.util.Rnd;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.cache.HtmCache;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -21,7 +21,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/ControllableAirShipInstance.java

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.actor.instance;
 
 import java.util.concurrent.Future;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.model.actor.stat.ControllableAirShipStat;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DecoyInstance.java

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.instance;
 import java.util.concurrent.Future;
 import java.util.logging.Level;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java

@@ -20,7 +20,7 @@ import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.Future;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.ai.CreatureAI;
 import org.l2jmobius.gameserver.ai.DoorAI;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.actor.instance;
 
 import java.util.List;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.InstanceType;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -30,8 +30,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.ItemTable;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -45,8 +45,8 @@ import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.commons.util.Rnd;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/ServitorInstance.java

@@ -29,8 +29,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.sql.CharSummonTable;
 import org.l2jmobius.gameserver.data.sql.SummonEffectTable;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java

@@ -16,7 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.instance;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java

@@ -22,7 +22,7 @@ import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.NpcData;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java

@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ScheduledFuture;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.TrapAction;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/AbstractRequest.java

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.request;
 import java.util.Objects;
 import java.util.concurrent.ScheduledFuture;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java

@@ -21,7 +21,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java

@@ -17,7 +17,7 @@
 package org.l2jmobius.gameserver.model.actor.tasks.attackable;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTriggerTask.java

@@ -16,7 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
 
-import org.l2jmobius.commons.concurrent.ThreadPool;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
 
 /**