Skip to content

Commit d4cdce3

Browse files
committed
Add timeWeekOffSet configuration to off set week reset
1 parent 59a1b8c commit d4cdce3

5 files changed

Lines changed: 694 additions & 541 deletions

File tree

AdvancedCore/src/main/java/com/bencodez/advancedcore/AdvancedCoreConfigOptions.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,11 @@ public class AdvancedCoreConfigOptions {
238238
@Setter
239239
@ConfigDataInt(path = "TimeHourOffSet")
240240
private int timeHourOffSet = 0;
241+
242+
@Getter
243+
@Setter
244+
@ConfigDataInt(path = "TimeWeekOffSet")
245+
private int timeWeekOffSet = 0;
241246

242247
@Getter
243248
@Setter

AdvancedCore/src/main/java/com/bencodez/advancedcore/api/time/TimeChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public boolean hasTimeOffSet() {
149149

150150
public boolean hasWeekChanged(boolean set) {
151151
int prevDate = plugin.getServerDataFile().getPrevWeekDay();
152-
LocalDateTime date = getTime();
152+
LocalDateTime date = getTime().plusDays(plugin.getOptions().getTimeWeekOffSet());
153153
TemporalField woy = WeekFields.of(Locale.getDefault()).weekOfWeekBasedYear();
154154
int weekNumber = date.get(woy);
155155
if (weekNumber == prevDate) {

AdvancedCore/src/main/java/com/bencodez/advancedcore/bungeeapi/time/BungeeTimeChecker.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,16 @@ public abstract class BungeeTimeChecker {
3535
@Getter
3636
private int timeOffSet;
3737

38+
@Getter
39+
private int timeWeekOffSet = 0;
40+
3841
@Getter
3942
private String timeZone;
4043

41-
public BungeeTimeChecker(String timeZone, int timeOffSet) {
44+
public BungeeTimeChecker(String timeZone, int timeOffSet, int weekOffSet) {
4245
this.timeOffSet = timeOffSet;
4346
this.timeZone = timeZone;
47+
this.timeWeekOffSet = weekOffSet;
4448
}
4549

4650
public abstract void debug(String text);
@@ -147,7 +151,7 @@ public boolean hasTimeOffSet() {
147151

148152
public boolean hasWeekChanged(boolean set) {
149153
int prevDate = getPrevWeek();
150-
LocalDateTime date = getTime();
154+
LocalDateTime date = getTime().plusDays(timeWeekOffSet);
151155
TemporalField woy = WeekFields.of(Locale.getDefault()).weekOfWeekBasedYear();
152156
int weekNumber = date.get(woy);
153157
if (weekNumber == prevDate) {
@@ -214,7 +218,7 @@ public void run() {
214218
public abstract void setPrevWeek(int week);
215219

216220
public abstract void timeChanged(TimeType type, boolean fake, boolean pre, boolean post);
217-
221+
218222
public void shutdown() {
219223
timer.shutdownNow();
220224
}

0 commit comments

Comments
 (0)