From 4851af4561fe077540d201893a0e13938f56774f Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 2 Jun 2019 21:17:19 +0000
Subject: [PATCH] Synchronized threadpool arrays.

---
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 .../commons/concurrent/ThreadPool.java        | 43 +++++++++++--------
 14 files changed, 364 insertions(+), 238 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index 1eae3538ad..f99c5dc75a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index 1eae3538ad..f99c5dc75a 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index 1eae3538ad..f99c5dc75a 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index 1eae3538ad..f99c5dc75a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index 1eae3538ad..f99c5dc75a 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index 1eae3538ad..f99c5dc75a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index 1eae3538ad..f99c5dc75a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index 1eae3538ad..f99c5dc75a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index c70afed3a1..aa3a604581 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index 1eae3538ad..f99c5dc75a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index c70afed3a1..aa3a604581 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index c70afed3a1..aa3a604581 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index c70afed3a1..aa3a604581 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/concurrent/ThreadPool.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/concurrent/ThreadPool.java
index c70afed3a1..aa3a604581 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/concurrent/ThreadPool.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/concurrent/ThreadPool.java
@@ -102,13 +102,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> schedule(Runnable runnable, long delay)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].schedule(new RunnableWrapper(runnable), delay, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -121,13 +124,16 @@ public final class ThreadPool
 	 */
 	public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period)
 	{
-		try
+		synchronized (SCHEDULED_POOLS)
 		{
-			return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
-		}
-		catch (Exception e)
-		{
-			return null;
+			try
+			{
+				return SCHEDULED_POOLS[SCHEDULED_THREAD_RANDOMIZER++ % Config.SCHEDULED_THREAD_POOL_COUNT].scheduleAtFixedRate(new RunnableWrapper(runnable), initialDelay, period, TimeUnit.MILLISECONDS);
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
 	}
 	
@@ -137,12 +143,15 @@ public final class ThreadPool
 	 */
 	public static void execute(Runnable runnable)
 	{
-		try
-		{
-			INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
-		}
-		catch (Exception e)
+		synchronized (INSTANT_POOLS)
 		{
+			try
+			{
+				INSTANT_POOLS[INSTANT_THREAD_RANDOMIZER++ % Config.INSTANT_THREAD_POOL_COUNT].execute(new RunnableWrapper(runnable));
+			}
+			catch (Exception e)
+			{
+			}
 		}
 	}