From 5251668d2f2cdfd0d775cb70034a655b69f6d526 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 20 May 2019 00:30:56 +0000
Subject: [PATCH] Changed daily reset time for attendance rewards. Contributed
 by facab.

---
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 .../model/actor/instance/PlayerInstance.java        | 13 +++++++++++--
 11 files changed, 121 insertions(+), 22 deletions(-)

diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index f769a2309b..16b3e2c2a1 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14151,14 +14151,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index f98b0f1e46..8bb8778180 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14201,14 +14201,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 5223953305..62facf8d0c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14215,14 +14215,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 6945a914d0..cc09569e7a 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14204,14 +14204,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 3b33960dc8..1cba581e9f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14204,14 +14204,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index aa423995c8..c814ddea00 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14210,14 +14210,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 33d82a1e25..d69d0fa782 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -13976,14 +13976,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index d3bcc5b0d2..3a04bde009 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -13983,14 +13983,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index fad8cbc94d..82f3b67031 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -13967,14 +13967,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 5224fd8d48..490ff1e4e0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -13967,14 +13967,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index a4f0baf0e9..1eae49244e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -13967,14 +13967,23 @@ public final class PlayerInstance extends Playable
 	
 	public void setAttendanceInfo(int rewardIndex)
 	{
+		// At 6:30 next day, another reward may be taken.
+		final Calendar nextReward = Calendar.getInstance();
+		nextReward.set(Calendar.MINUTE, 30);
+		if (nextReward.get(Calendar.HOUR_OF_DAY) >= 6)
+		{
+			nextReward.add(Calendar.DATE, 1);
+		}
+		nextReward.set(Calendar.HOUR_OF_DAY, 6);
+		
 		if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
 		{
-			getAccountVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 		else
 		{
-			getVariables().set(ATTENDANCE_DATE_VAR, System.currentTimeMillis() + 86400000); // Now + 24 hours.
+			getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis());
 			getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex);
 		}
 	}