fix cooldown logic problem; add minus symbol on duration if cooldown …

…passed
DragoniteMC · Jun 26, 2022 · f614b73 · f614b73
1 parent c8d9c54
commit f614b73
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ericlam.mc</groupId>
     <artifactId>MinigamesQuests</artifactId>
-    <version>1.0.7</version>
+    <version>1.0.8</version>
 
     <properties>
         <maven.compiler.source>18</maven.compiler.source>

diff --git a/src/main/java/com/ericlam/mc/mgquests/manager/DurationConvertManager.java b/src/main/java/com/ericlam/mc/mgquests/manager/DurationConvertManager.java
@@ -47,7 +47,8 @@ public String formatDuration(Duration duration) {
         long seconds = duration.getSeconds();
         long absSeconds = Math.abs(seconds);
         return String.format(
-                "%d:%02d:%02d",
+                "%s%d:%02d:%02d",
+                seconds >= 0 ? "" : "-",
                 absSeconds / 3600,
                 (absSeconds % 3600) / 60,
                 absSeconds % 60);

diff --git a/src/main/java/com/ericlam/mc/mgquests/manager/QuestsManager.java b/src/main/java/com/ericlam/mc/mgquests/manager/QuestsManager.java
@@ -2,6 +2,8 @@
 
 import com.ericlam.mc.eld.annotations.InjectPool;
 import com.ericlam.mc.eld.configurations.GroupConfig;
+import com.ericlam.mc.eld.misc.DebugLogger;
+import com.ericlam.mc.eld.services.LoggingService;
 import com.ericlam.mc.mgquests.QuestException;
 import com.ericlam.mc.mgquests.config.QuestMessage;
 import com.ericlam.mc.mgquests.config.QuestObject;
@@ -32,6 +34,12 @@ public class QuestsManager {
     @Inject
     private QuestMessage message;
 
+    private final DebugLogger logger;
+
+    @Inject
+    public QuestsManager(LoggingService loggingService) {
+        this.logger = loggingService.getLogger(QuestsManager.class);
+    }
 
     @InjectPool
     private GroupConfig<QuestObject> questObjects;
@@ -46,9 +54,12 @@ public CompletableFuture<PurchaseResult> acceptQuest(UUID player, String questId
             quest.quest = questId;
         } else if (questObject.coolDown != null && quest.lastFinished != 0){
            var coolDownEnd = durationConvertManager.getCoolDownEndTime(quest, questObject.coolDown);
-            if (coolDownEnd.isBefore(LocalDateTime.now())){
+            if (coolDownEnd.isAfter(LocalDateTime.now())){
+                logger.debugF("player %s is cooling down quest %s, cannot accept", player, questId);
                 var err = message.getLang().get("quest-unavailable", questId);
                 return CompletableFuture.completedFuture(PurchaseResult.failed(err));
+            } else {
+                logger.debugF("player %s is cooled down quest %s, can accept", player, questId);
             }
         }
         final var q = quest;
@@ -116,7 +127,10 @@ public PurchaseResult tryFinishQuest(UUID player, String questId) throws QuestEx
         }
         // check deadline is passed
         var deadline = durationConvertManager.getDeadline(quest, questObject.timeLimit);
-        if (deadline.isBefore(LocalDateTime.now())) return PurchaseResult.failed(message.getLang().get("quest-unavailable", questId));
+        if (deadline.isBefore(LocalDateTime.now())) {
+            logger.debugF("player %s quest %s deadline is passed", player, questId);
+            return PurchaseResult.failed(message.getLang().get("quest-unavailable", questId));
+        }
         // check all stats is passed
         for (String targetStat : questObject.targets.keySet()) {
             var passNum = questObject.targets.get(targetStat);

diff --git a/src/test/java/com/ericlam/mc/questtest/DurationTest.java b/src/test/java/com/ericlam/mc/questtest/DurationTest.java
@@ -0,0 +1,26 @@
+package com.ericlam.mc.questtest;
+
+import java.sql.Timestamp;
+import java.time.Duration;
+
+public class DurationTest {
+
+    public static void main(String[] args) {
+        var oneDay = Duration.ofDays(1);
+        var date = new Timestamp(1654247206150L).toLocalDateTime();
+        System.out.println("last finished: "+date.toString());
+        var cool = date.plus(oneDay);
+        System.out.println("cool: "+cool.toString());
+        System.out.println("diff: "+formatDuration(Duration.between(cool, date)));
+    }
+
+    static String formatDuration(Duration duration) {
+        long seconds = duration.getSeconds();
+        long absSeconds = Math.abs(seconds);
+        return (seconds >= 0 ? "" : "-") + String.format(
+                "%d:%02d:%02d",
+                absSeconds / 3600,
+                (absSeconds % 3600) / 60,
+                absSeconds % 60);
+    }
+}