More fixes for cooldown events

BenCodez · Mar 20, 2024 · 0a74e33 · 0a74e33
1 parent d1dc8b3
commit 0a74e33
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/VotingPlugin/src/com/bencodez/votingplugin/cooldown/CoolDownCheck.java b/VotingPlugin/src/com/bencodez/votingplugin/cooldown/CoolDownCheck.java
@@ -81,13 +81,15 @@ public void vote(VotingPluginUser user, VoteSite site) {
 
 	public synchronized void check(VotingPluginUser user) {
 		boolean coolDownCheck = user.getCoolDownCheck();
-		if (user.canVoteAll() && coolDownCheck) {
-			user.setCoolDownCheck(false);
-			PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(user);
-			plugin.getServer().getPluginManager().callEvent(event);
-			allSiteTasks.remove(user.getJavaUUID());
-		} else if (!coolDownCheck) {
-			schedule(user, false);
+		if (coolDownCheck) {
+			if (user.canVoteAll()) {
+				user.setCoolDownCheck(false);
+				PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(user);
+				plugin.getServer().getPluginManager().callEvent(event);
+				allSiteTasks.remove(user.getJavaUUID());
+			} else {
+				schedulePerSite(user, false);
+			}
 		}
 	}
 
@@ -133,8 +135,10 @@ public void run() {
 							checkPerSite(uuid);
 						}
 					}
-				}, time + 2, TimeUnit.SECONDS);
+				}, time / +2, TimeUnit.SECONDS);
 				perSiteTasks.put(uuid, scheduledFuture);
+			} else {
+				plugin.extraDebug(user.getUUID() + "/" + user.getPlayerName() + " not scheduling cooldown check");
 			}
 		}
 	}
@@ -159,6 +163,8 @@ public void run() {
 					}
 				}, time + 2, TimeUnit.SECONDS);
 				allSiteTasks.put(uuid, scheduledFuture);
+			} else {
+				plugin.extraDebug(user.getUUID() + "/" + user.getPlayerName() + " not scheduling cooldown check");
 			}
 		}
 

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/user/VotingPluginUser.java b/VotingPlugin/src/com/bencodez/votingplugin/user/VotingPluginUser.java
@@ -5,7 +5,6 @@
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -282,7 +281,8 @@ public boolean canVoteSite(VoteSite voteSite) {
 						.withSecond(0);
 				LocalDateTime resetTimeTomorrow = resetTime.plusHours(24);
 
-				if (ChronoUnit.HOURS.between(lastVote, resetTime) > 24) {
+				// if (ChronoUnit.HOURS.between(lastVote, resetTime) > 24) {
+				if (lastVote.isBefore(resetTime)) {
 					if (now.isAfter(resetTime)) {
 						return true;
 					}
@@ -1316,10 +1316,9 @@ public long voteNextDurationTime(VoteSite voteSite, long time) {
 				}
 			}
 		} else {
-			LocalDateTime resetTime = plugin.getTimeChecker().getTime().withHour(voteSite.getVoteDelayDailyHour())
-					.withMinute(0).withSecond(0);
+			LocalDateTime resetTime = lastVote.withHour(voteSite.getVoteDelayDailyHour()).withMinute(0).withSecond(0);
 			LocalDateTime resetTimeTomorrow = resetTime.plusHours(24);
-			if (lastVote.isBefore(resetTime)) {
+			if (lastVote.isBefore(resetTime) && now.isBefore(resetTime)) {
 				if (now.isBefore(resetTime)) {
 					Duration dur = Duration.between(now, resetTime);
 					return dur.getSeconds();