diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java
index 7aafc74eac..a51dd69895 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -25,7 +25,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.StringJoiner;
 
@@ -183,13 +182,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/CommonUtil.java
index 7aafc74eac..a51dd69895 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -25,7 +25,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.StringJoiner;
 
@@ -183,13 +182,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/CommonUtil.java
index 7aafc74eac..a51dd69895 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -25,7 +25,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.StringJoiner;
 
@@ -183,13 +182,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/util/CommonUtil.java
index 86fa98ff10..568f83a73e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -31,7 +31,6 @@ import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -193,13 +192,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java
index 86fa98ff10..568f83a73e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -31,7 +31,6 @@ import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -193,13 +192,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/util/CommonUtil.java
index 86fa98ff10..568f83a73e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -31,7 +31,6 @@ import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -193,13 +192,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/CommonUtil.java
index 86fa98ff10..568f83a73e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -31,7 +31,6 @@ import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -193,13 +192,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java
index ab7837d827..90dc72326c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -27,7 +27,6 @@ import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -187,13 +186,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/util/CommonUtil.java
index 86fa98ff10..568f83a73e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -31,7 +31,6 @@ import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -193,13 +192,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/util/CommonUtil.java
index 86fa98ff10..568f83a73e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -31,7 +31,6 @@ import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -193,13 +192,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/util/CommonUtil.java
index 86fa98ff10..568f83a73e 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -31,7 +31,6 @@ import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -193,13 +192,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/util/CommonUtil.java
index 86fa98ff10..568f83a73e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -31,7 +31,6 @@ import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.StringJoiner;
@@ -193,13 +192,22 @@ public class CommonUtil
 		final LocalDateTime dateNow = LocalDateTime.now();
 		final LocalDateTime dateNowWithDifferentTime = dateNow.withHour(hour).withMinute(min).withSecond(0);
 		
-		// @formatter:off
-		return daysOfWeek.stream()
-			.map(d -> dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(d)))
-			.filter(d -> d.isAfter(dateNow))
-			.min(Comparator.naturalOrder())
-			.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
-		// @formatter:on
+		LocalDateTime minDateTime = null;
+		for (DayOfWeek dayOfWeek : daysOfWeek)
+		{
+			final LocalDateTime dateTime = dateNowWithDifferentTime.with(TemporalAdjusters.nextOrSame(dayOfWeek));
+			if ((minDateTime == null) || (dateTime.isAfter(dateNow) && dateTime.isBefore(minDateTime)))
+			{
+				minDateTime = dateTime;
+			}
+		}
+		
+		if (minDateTime == null)
+		{
+			minDateTime = dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0)));
+		}
+		
+		return minDateTime;
 	}
 	
 	/**