diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java
index b6d9989e47..c0216bd642 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java
index b6d9989e47..c0216bd642 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java
index b6d9989e47..c0216bd642 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java
index e9e60d2dd4..dd4d2ff44b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java
index d6eacb32e3..622962cc28 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java
index e9e60d2dd4..dd4d2ff44b 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java
index e9e60d2dd4..dd4d2ff44b 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java
index e9e60d2dd4..dd4d2ff44b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java
index e9e60d2dd4..dd4d2ff44b 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java
index e9e60d2dd4..dd4d2ff44b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 756e6a7258..bcbb036fd4 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 0ce8650831..fd9db617aa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 0ce8650831..fd9db617aa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/BotReportTable.java
index b6d9989e47..c0216bd642 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 233d75e76b..fd3eb013fe 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 233d75e76b..fd3eb013fe 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 233d75e76b..fd3eb013fe 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 233d75e76b..fd3eb013fe 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 233d75e76b..fd3eb013fe 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 01123e1169..b4eec6159a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 233d75e76b..fd3eb013fe 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 233d75e76b..fd3eb013fe 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 233d75e76b..fd3eb013fe 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 93d8d07471..3144605280 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 93d8d07471..3144605280 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java
index 93d8d07471..3144605280 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java
@@ -126,11 +126,11 @@ public class BotReportTable
 				final Calendar calendar = Calendar.getInstance();
 				calendar.set(Calendar.HOUR_OF_DAY, hour);
 				calendar.set(Calendar.MINUTE, minute);
-				if (calendar.getTimeInMillis() < currentTime)
+				if (currentTime < calendar.getTimeInMillis())
 				{
-					calendar.add(Calendar.DAY_OF_YEAR, 1);
+					calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 1);
 				}
-				lastResetTime = currentTime;
+				lastResetTime = calendar.getTimeInMillis();
 			}
 			catch (Exception e)
 			{