chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.5.6

.github/workflows/maven.yml

@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: "Set up JDK"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '8'
           distribution: 'adopt'
@@ -38,7 +38,7 @@ jobs:
           cp -vrf .asset/*.jar artifacts
 
       - name: "Upload artifact"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Artifact
           path: artifacts

.github/workflows/release.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Set up JDK"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '8'
           distribution: 'adopt'

README.md

@@ -72,10 +72,13 @@
 变量如下:
 
 ```text
-# %TimeReward_time_<时间类型>%
+# %TimeReward_<单位>_<时间类型>%
-- 得到玩家的在线时长(秒)。
+- 得到玩家的在线时长。
+- 单位可选 seconds, minutes, hours, days.
 - 时间类型可选 TOTAL, DAILY, WEEKLY, MONTHLY 。
 
+
+
 # %TimeReward_reward_<奖励ID>%
 - 得到某个奖励配置的名称。
 
@@ -107,7 +110,7 @@
 
 若您觉得本插件做的不错，您可以捐赠支持我，感谢您成为开源项目的支持者！
 
-万分感谢 [egg_拿]() 赞助本项目的开发与维护！
+万分感谢 [egg_拿]() 与 [ayoiz](https://github.com/ayoi2) 赞助本项目的开发与维护！
 
 Many thanks to Jetbrains for kindly providing a license for me to work on this and other open-source projects.  
 [![](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/?from=https://github.com/CarmJos/UserPrefix)

pom.xml

@@ -11,14 +11,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
-        <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
+        <deps.easyplugin.version>1.5.14</deps.easyplugin.version>
         <deps.easysql.version>0.4.7</deps.easysql.version>
-        <deps.mineconfig.version>3.1.1</deps.mineconfig.version>
+        <deps.mineconfig.version>3.1.3</deps.mineconfig.version>
     </properties>
 
     <groupId>cc.carm.plugin</groupId>
     <artifactId>timereward</artifactId>
-    <version>3.1.2</version>
+    <version>3.1.6</version>
 
     <name>TimeReward</name>
     <description>在线时长自动领奖插件，通过指令发放奖励，基于EasyPlugin实现。</description>
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
@@ -153,14 +153,14 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <version>1.19-R0.1-20220725.090125-47</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.6</version>
+            <version>2.12.2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -174,7 +174,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>26.0.2</version>
+            <version>26.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -187,7 +187,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -211,7 +211,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.14.0</version>
+                <version>3.15.0</version>
                 <configuration>
                     <source>${project.jdk.version}</source>
                     <target>${project.jdk.version}</target>
@@ -223,13 +223,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
+                <version>3.5.0</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -243,7 +243,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -289,7 +289,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.5.6</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>

src/main/java/cc/carm/plugin/timereward/Main.java

@@ -14,9 +14,11 @@ import cc.carm.plugin.timereward.listener.UserListener;
 import cc.carm.plugin.timereward.manager.RewardManager;
 import cc.carm.plugin.timereward.manager.UserManager;
 import cc.carm.plugin.timereward.storage.database.MySQLStorage;
+import cc.carm.plugin.timereward.util.DateTimeUtils;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
+import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.File;
 
@@ -31,6 +33,8 @@ public class Main extends EasyPlugin {
     protected UserManager userManager;
     protected RewardManager rewardManager;
 
+    protected BukkitRunnable autoSaveTask;
+
     public Main() {
         instance = this;
     }
@@ -46,6 +50,8 @@ public class Main extends EasyPlugin {
 
         this.rewardProvider = BukkitConfigFactory.from(new File(getDataFolder(), "rewards.yml")).build();
         this.rewardProvider.initialize(RewardsConfig.class);
+
+        DateTimeUtils.WEEK_START_DAY = PluginConfig.WEEK_FIRST_DAY::resolve;
     }
 
     @Override
@@ -96,11 +102,32 @@ public class Main extends EasyPlugin {
             info("已禁用检查更新，跳过。");
         }
 
+        if (PluginConfig.AUTO_SAVE.resolve() > 0) {
+            long period = PluginConfig.AUTO_SAVE.resolve() * 20L;
+            this.autoSaveTask = new BukkitRunnable() {
+                int i = 0;
+
+                @Override
+                public void run() {
+                    i = i == Integer.MAX_VALUE ? 0 : i + 1;
+                    debugging("第" + i + "次自动保存用户在线数据...");
+                    userManager.saveAll();
+                }
+            };
+            this.autoSaveTask.runTaskTimerAsynchronously(this, period, period);
+        }
+
         return true;
     }
 
     @Override
     protected void shutdown() {
+
+        if (this.autoSaveTask != null && !this.autoSaveTask.isCancelled()) {
+            this.autoSaveTask.cancel();
+            this.autoSaveTask = null;
+        }
+
         info("终止奖励发放进程...");
         this.rewardManager.shutdown();
 

src/main/java/cc/carm/plugin/timereward/command/sub/ClaimCommand.java

@@ -30,6 +30,11 @@ public class ClaimCommand extends SubCommand<MainCommand> {
         Player player = (Player) sender;
         RewardManager manager = TimeRewardAPI.getRewardManager();
 
+        if(manager.isClaiming(player.getUniqueId())){
+            PluginMessages.ALREADY_CLAIMING.sendTo(sender);
+            return null;
+        }
+
         @Nullable String rewardID = args.length > 0 ? args[0] : null;
         if (rewardID == null) {
 

src/main/java/cc/carm/plugin/timereward/command/sub/ListCommand.java

@@ -29,7 +29,7 @@ public class ListCommand extends SubCommand<MainCommand> {
                         reward.getTime(), reward.getPermission()
                 ).to(sender);
             } else {
-                PluginMessages.LIST.OBJECT_PERM.prepare(
+                PluginMessages.LIST.OBJECT.prepare(
                         reward.getRewardID(), reward.getDisplayName(),
                         reward.getType().name(), reward.getTime()
                 ).to(sender);

src/main/java/cc/carm/plugin/timereward/command/sub/UserCommand.java

@@ -33,6 +33,11 @@ public class UserCommand extends SubCommand<MainCommand> {
         }
 
         UserRewardData user = TimeRewardAPI.getUserManager().get(player);
+        if (user == null) {
+            PluginMessages.LOADING.sendTo(sender, args[0]);
+            return null;
+        }
+
         PluginMessages.USER_INFO.prepare(
                 player.getName(),
                 user.getOnlineDuration(IntervalType.DAILY).getSeconds(),

src/main/java/cc/carm/plugin/timereward/conf/PluginConfig.java

@@ -26,6 +26,20 @@ public interface PluginConfig extends Configuration {
     })
     ConfiguredValue<Boolean> CHECK_UPDATE = ConfiguredValue.of(Boolean.class, true);
 
+    @HeaderComments({
+            "自动保存设定，用于设置自动保存的时间间隔，单位为秒（小于等于0则关闭）。",
+            "一般来说，玩家会在退出游戏时进行保存。",
+            "但如果您希望额外的定期保存数据以避免数据丢失，可以选择开启。",
+    })
+    ConfiguredValue<Long> AUTO_SAVE = ConfiguredValue.of(Long.class, 60L);
+
+    @HeaderComments({
+            "是否在保存时优先使用数据库中的数据。",
+            "若启用，则会在保存数据时在数据库中重新读取数据计算时间，以确利用最新数据；",
+            "若关闭，则保存时会直接采用进入服务器时所加载的数据进行计算。"
+    })
+    ConfiguredValue<Boolean> USE_STORAGE_DATA = ConfiguredValue.of(Boolean.class, true);
+
     @HeaderComments("周起始日，用于判断周度奖励的结算日期。")
     ConfiguredValue<DayOfWeek> WEEK_FIRST_DAY = ConfiguredValue.builderOf(DayOfWeek.class)
             .from(Integer.class)

src/main/java/cc/carm/plugin/timereward/conf/PluginMessages.java

@@ -79,6 +79,10 @@ public interface PluginMessages extends Configuration {
             "&f玩家 &e%(player) &f并不在线。"
     ).params("player").build();
 
+    ConfiguredMessage<BaseComponent[]> LOADING = list().defaults(
+            "&e&l请稍候... &f您的在线数据正在加载中。"
+    ).params("player").build();
+
     ConfiguredMessage<BaseComponent[]> NOT_EXISTS = list().defaults(
             "&f奖励 &e%(award) &f并不存在。"
     ).params("award").build();
@@ -87,6 +91,10 @@ public interface PluginMessages extends Configuration {
             "&c&l抱歉！&f但您暂时未满足领取奖励 &e%(award) &f的条件。"
     ).params("award").build();
 
+    ConfiguredMessage<BaseComponent[]> ALREADY_CLAIMING = list().defaults(
+            "&e&l请稍候...&f您当前有正在领取的奖励任务，单次只可领取一份奖励。"
+    ).build();
+    
     ConfiguredMessage<BaseComponent[]> NO_UNCLAIMED_REWARD = list().defaults(
             "&f您暂时没有未领取的奖励。"
     ).build();

src/main/java/cc/carm/plugin/timereward/data/IntervalType.java

@@ -1,8 +1,11 @@
 package cc.carm.plugin.timereward.data;
 
+import cc.carm.plugin.timereward.Main;
+import cc.carm.plugin.timereward.util.DateTimeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.function.BiFunction;
@@ -11,62 +14,77 @@ import java.util.function.Predicate;
 public enum IntervalType {
 
     TOTAL(
-            0, time -> false,
+            0, Duration.ofSeconds(4294967295L), time -> false,
             (timeRecord, join) -> Duration.between(join, LocalDateTime.now()).plus(timeRecord.getTotalTime())
     ),
 
     DAILY(
-            1, time -> time.isBefore(TimeRecord.getTodayStart()),
+            1, Duration.ofDays(1), time -> !DateTimeUtils.sameDay(time.toLocalDate()),
-            (timeRecord, join) -> {
+            (record, join) -> {
                 LocalDateTime now = LocalDateTime.now();
-                if (now.toLocalDate().isEqual(timeRecord.getDate())) {
+                LocalDate today = LocalDate.now();
-                    // 和记录还在同一天
+                if (DateTimeUtils.sameDay(join.toLocalDate(), today)) {
-                    return Duration.between(join, now).plus(timeRecord.getDailyTime());
+                    // 如果加入的时间和今天的日期相同
-                } else if (now.toLocalDate().isEqual(join.toLocalDate())) {
+                    if (DateTimeUtils.sameDay(record.getDate(), today)) {
-                    // 加入的时间和现在的时间在同一天
+                        // 如果上一次记录的日期和今天的日期相同
-                    return Duration.between(join, now);
+                        // 则从加入的时间开始计算到现在的时间，并加上当天的游玩时间
+                        return Duration.between(join, now).plus(record.getDailyTime());
+                    } else {
+                        // 如果上一次记录的日期和今天的日期不同
+                        // 则从加入的时间开始计算到现在的时间
+                        return Duration.between(join, now);
+                    }
                 } else {
-                    // 加入的时间和现在的时间不在同一天
+                    // 如果加入的时间和今天的日期不同
-                    return Duration.between(TimeRecord.getTodayStart(), now);
+                    // 则从今天的0点开始计算到现在的时间
+                    return Duration.between(today.atTime(0, 0, 0), now);
                 }
             }
     ),
     WEEKLY(
-            2, time -> time.isBefore(TimeRecord.getThisWeekStart()),
+            2, Duration.ofDays(7),
-            (timeRecord, join) -> {
+            time -> !DateTimeUtils.sameWeek(time),
+            (r, join) -> {
                 LocalDateTime now = LocalDateTime.now();
-                if (TimeRecord.isSameWeek(timeRecord.getDate(), now)) {
+                if (DateTimeUtils.sameWeek(join.toLocalDate(), now)) {
-                    return Duration.between(join, now).plus(timeRecord.getWeeklyTime());
+                    if (DateTimeUtils.sameWeek(r.getDate(), now.toLocalDate())) {
-                } else if (TimeRecord.isSameWeek(join, now)) {
+                        return Duration.between(join, now).plus(r.getWeeklyTime());
-                    return Duration.between(join, now);
+                    } else {
+                        return Duration.between(join, now);
+                    }
                 } else {
-                    return Duration.between(TimeRecord.getThisWeekStart(), now);
+                    return Duration.between(DateTimeUtils.currentWeekStartTime(), now);
                 }
             }
     ),
 
     MONTHLY(
-            3, time -> time.isBefore(TimeRecord.getThisMonthStart()),
+            3, Duration.ofDays(31),
-            (timeRecord, join) -> {
+            time -> !DateTimeUtils.sameMonth(time.toLocalDate()),
+            (r, join) -> {
                 LocalDateTime now = LocalDateTime.now();
-                if (TimeRecord.isSameMonth(timeRecord.getDate(), now.toLocalDate())) {
+                if (DateTimeUtils.sameMonth(join.toLocalDate(), now.toLocalDate())) {
-                    return Duration.between(join, now).plus(timeRecord.getMonthlyTime());
+                    if (DateTimeUtils.sameMonth(r.getDate(), now.toLocalDate())) {
-                } else if (TimeRecord.isSameMonth(join.toLocalDate(), now.toLocalDate())) {
+                        return Duration.between(join, now).plus(r.getMonthlyTime());
-                    return Duration.between(join, now);
+                    } else {
+                        return Duration.between(join, now);
+                    }
                 } else {
-                    return Duration.between(TimeRecord.getThisMonthStart(), now);
+                    return Duration.between(DateTimeUtils.currentMonthStartTime(), now);
                 }
             }
     );
 
     private final int id;
+    private final @NotNull Duration maxDuration;
     private final @NotNull Predicate<LocalDateTime> periodChangePredicate;
     private final @NotNull BiFunction<TimeRecord, LocalDateTime, Duration> calculator;
 
-    IntervalType(int id,
+    IntervalType(int id, @NotNull Duration maxDuration,
                  @NotNull Predicate<LocalDateTime> periodChangePredicate,
                  @NotNull BiFunction<TimeRecord, LocalDateTime, Duration> calculator) {
         this.id = id;
+        this.maxDuration = maxDuration;
         this.periodChangePredicate = periodChangePredicate;
         this.calculator = calculator;
     }
@@ -75,16 +93,19 @@ public enum IntervalType {
         return id;
     }
 
-    public @NotNull BiFunction<TimeRecord, LocalDateTime, Duration> getCalculator() {
+    public @NotNull Duration getMaxDuration() {
-        return calculator;
+        return maxDuration;
     }
 
-    public @NotNull Predicate<LocalDateTime> getPreiodChangePredicate() {
-        return periodChangePredicate;
-    }
 
     public Duration calculate(@NotNull TimeRecord timeRecord, @NotNull LocalDateTime joinTime) {
-        return calculator.apply(timeRecord, joinTime);
+        Duration result = calculator.apply(timeRecord, joinTime);
+        // 如果超过最大值，则返回最大值
+        if (result.compareTo(maxDuration) > 0) {
+            Main.debugging("在线时间超过最大值，类型: " + this.name() + ", 计算结果: " + result + " 加入时间 " + joinTime + " 时间记录" + timeRecord);
+            return maxDuration;
+        }
+        return result;
     }
 
     public boolean isPeriodChanged(@NotNull LocalDateTime claimedDate) {

src/main/java/cc/carm/plugin/timereward/data/TimeRecord.java

@@ -1,14 +1,10 @@
 package cc.carm.plugin.timereward.data;
 
-import cc.carm.plugin.timereward.conf.PluginConfig;
+import cc.carm.plugin.timereward.util.DateTimeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.temporal.Temporal;
-import java.time.temporal.TemporalField;
-import java.time.temporal.WeekFields;
 
 public class TimeRecord {
 
@@ -16,7 +12,6 @@ public class TimeRecord {
         return new TimeRecord(LocalDate.now(), 0, 0, 0, 0);
     }
 
-
     protected final @NotNull LocalDate date;
 
     protected final @NotNull Duration daily;
@@ -68,37 +63,14 @@ public class TimeRecord {
 
     public boolean isWeekUpdated() {
         if (!isDayUpdated()) return false; // Same day always same week
-        return !isSameWeek(LocalDate.now(), getDate());
+        return !DateTimeUtils.sameWeek(LocalDate.now(), getDate());
     }
 
     public boolean isMonthUpdated() {
         if (!isDayUpdated()) return false; // Same day always same month
-
+        return !DateTimeUtils.sameMonth(LocalDate.now(), getDate());
-        // Predicate current month is after the month of the date
-        return LocalDate.now().getMonth().compareTo(getDate().getMonth()) > 0;
     }
 
-    public static boolean isSameWeek(Temporal a, Temporal b) {
-        TemporalField woy = WeekFields.of(PluginConfig.WEEK_FIRST_DAY.getNotNull(), 4).weekOfWeekBasedYear();
-        return a.get(woy) == b.get(woy);
-    }
-
-    public static boolean isSameMonth(LocalDate a, LocalDate b) {
-        return a.getMonth().equals(b.getMonth());
-    }
-
-    public static LocalDateTime getTodayStart() {
-        return LocalDate.now().atTime(0, 0);
-    }
-
-    public static LocalDateTime getThisWeekStart() {
-        TemporalField woy = WeekFields.of(PluginConfig.WEEK_FIRST_DAY.getNotNull(), 4).weekOfWeekBasedYear();
-        return LocalDate.now().with(woy, 1).atTime(0, 0);
-    }
-
-    public static LocalDateTime getThisMonthStart() {
-        return LocalDate.now().withDayOfMonth(1).atTime(0, 0);
-    }
 
     @Override
     public String toString() {

src/main/java/cc/carm/plugin/timereward/hooker/PAPIExpansion.java

@@ -10,50 +10,21 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.time.Duration;
 import java.util.Collections;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.ToLongFunction;
 
 public class PAPIExpansion extends EasyPlaceholder {
 
     public PAPIExpansion(@NotNull JavaPlugin plugin, @NotNull String rootIdentifier) {
         super(plugin, rootIdentifier);
 
-        handle("seconds", userHandler((user, args) -> {
+        handle("seconds", timeHandler(Duration::getSeconds), Collections.singletonList("<时间类型>"), "time");
-            if (args.length < 1) return "请填写时间类型";
+        handle("minutes", timeHandler(Duration::toMinutes), Collections.singletonList("<时间类型>"));
-            IntervalType type = IntervalType.parse(args[0]);
+        handle("hours", timeHandler(Duration::toHours), Collections.singletonList("<时间类型>"));
-
+        handle("days", timeHandler(Duration::toDays), Collections.singletonList("<时间类型>"));
-            if (type == null) return "时间类型不存在";
-
-            return user.getOnlineDuration(type).getSeconds();
-        }), Collections.singletonList("<时间类型>"), "time");
-
-        handle("minutes", userHandler((user, args) -> {
-            if (args.length < 1) return "请填写时间类型";
-            IntervalType type = IntervalType.parse(args[0]);
-
-            if (type == null) return "时间类型不存在";
-
-            return user.getOnlineDuration(type).toMinutes();
-        }), Collections.singletonList("<时间类型>"));
-
-        handle("hours", userHandler((user, args) -> {
-            if (args.length < 1) return "请填写时间类型";
-            IntervalType type = IntervalType.parse(args[0]);
-
-            if (type == null) return "时间类型不存在";
-
-            return user.getOnlineDuration(type).toHours();
-        }), Collections.singletonList("<时间类型>"));
-
-        handle("days", userHandler((user, args) -> {
-            if (args.length < 1) return "请填写时间类型";
-            IntervalType type = IntervalType.parse(args[0]);
-
-            if (type == null) return "时间类型不存在";
-
-            return user.getOnlineDuration(type).toDays();
-        }), Collections.singletonList("<时间类型>"));
 
         handle("reward",
                 rewardHandler(RewardContents::getDisplayName),
@@ -89,10 +60,21 @@ public class PAPIExpansion extends EasyPlaceholder {
     protected <R> PlaceholderHandler userHandler(BiFunction<UserRewardData, String[], R> userFunction) {
         return (player, args) -> {
             if (player == null || !player.isOnline()) return "加载中...";
-            return userFunction.apply(TimeRewardAPI.getUserManager().get((Player) player), args);
+            UserRewardData data = TimeRewardAPI.getUserManager().get((Player) player);
+            if (data == null) return "加载中...";
+            return userFunction.apply(data, args);
         };
     }
 
+    protected PlaceholderHandler timeHandler(ToLongFunction<Duration> timeFunction) {
+        return userHandler((user, args) -> {
+            if (args.length < 1) return "请填写时间类型";
+            IntervalType type = IntervalType.parse(args[0]);
+            if (type == null) return "时间类型不存在";
+            return timeFunction.applyAsLong(user.getOnlineDuration(type));
+        });
+    }
+
     protected <R> PlaceholderHandler rewardHandler(Function<RewardContents, R> function) {
         return (player, args) -> {
             if (args.length < 1) return "请填写奖励ID";

src/main/java/cc/carm/plugin/timereward/listener/UserListener.java

@@ -2,26 +2,32 @@ package cc.carm.plugin.timereward.listener;
 
 import cc.carm.plugin.timereward.Main;
 import cc.carm.plugin.timereward.TimeRewardAPI;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.jetbrains.annotations.Nullable;
 
 public class UserListener implements Listener {
 
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
-        TimeRewardAPI.getUserManager().load(event.getPlayer().getUniqueId(), true).thenAccept(data -> {
+        @Nullable Player player = event.getPlayer();
-            Player player = Bukkit.getPlayer(data.getUserUUID());
+        // Delayed load to avoid async error
-            if (player == null || !player.isOnline()) {
+        Main.getInstance().getScheduler().runLater(20L, () -> {
-                TimeRewardAPI.getUserManager().unload(data.getUserUUID());
+            if (player == null || !player.isOnline()) return;
-            } // 不在线自动卸载
+            TimeRewardAPI.getUserManager()
-        }).exceptionally(ex -> {
+                    .load(event.getPlayer().getUniqueId(), true)
-            Main.severe("加载用户在线时长数据失败: " + event.getPlayer().getName());
+                    .thenAccept(data -> {
-            ex.printStackTrace();
+                        if (!player.isOnline()) {  // 不在线自动卸载
-            return null;
+                            TimeRewardAPI.getUserManager().unload(data.getUserUUID(), false);
+                        }
+                    }).exceptionally(ex -> {
+                        Main.severe("加载用户在线时长数据失败: " + event.getPlayer().getName());
+                        ex.printStackTrace();
+                        return null;
+                    });
         });
     }
 

src/main/java/cc/carm/plugin/timereward/manager/RewardManager.java

@@ -18,12 +18,15 @@ import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 public class RewardManager {
 
     protected BukkitRunnable runnable;
 
+    protected Map<UUID, CompletableFuture<Boolean>> claiming = new ConcurrentHashMap<>();
+
     public RewardManager(Main main) {
         this.runnable = new BukkitRunnable() {
             @Override
@@ -31,6 +34,8 @@ public class RewardManager {
                 if (Bukkit.getOnlinePlayers().isEmpty()) return;
 
                 for (Player player : Bukkit.getOnlinePlayers()) {
+                    if (isClaiming(player.getUniqueId())) continue; // 如果正在领取奖励，则跳过
+
                     List<RewardContents> rewards = getUnclaimedRewards(player).stream()
                             .filter(RewardContents::isAutoClaimed)
                             .collect(Collectors.toList());
@@ -61,6 +66,14 @@ public class RewardManager {
         return Collections.unmodifiableMap(RewardsConfig.getContents());
     }
 
+    public boolean isClaiming(@NotNull UUID uuid) {
+        return claiming.containsKey(uuid) && !claiming.get(uuid).isDone();
+    }
+
+    public CompletableFuture<Boolean> getClaiming(@NotNull UUID uuid) {
+        return claiming.get(uuid);
+    }
+
     @Unmodifiable
     public @NotNull List<RewardContents> getUnclaimedRewards(@NotNull Player player) {
         return listRewards().values().stream()
@@ -72,6 +85,8 @@ public class RewardManager {
         if (!reward.checkPermission(player)) return false; // 满足权限
 
         UserRewardData user = TimeRewardAPI.getUserManager().get(player);
+        if (user == null) return false; // 玩家数据加载中
+
         IntervalType intervalType = reward.getType();
         LocalDateTime lastClaimed = user.getClaimedDate(reward);
 
@@ -95,20 +110,27 @@ public class RewardManager {
     }
 
     public CompletableFuture<Boolean> claimRewards(Player player, Collection<RewardContents> rewards, boolean check) {
+        CompletableFuture<Boolean> exists = claiming.get(player.getUniqueId());
+        if (exists != null) return CompletableFuture.completedFuture(false); // 如果玩家正在领取奖励，则直接返回false
+
         Set<RewardContents> contents = rewards.stream()
                 .filter(r -> !check || isClaimable(player, r))
                 .collect(Collectors.toSet());
 
+        if (contents.isEmpty()) {
+            return CompletableFuture.completedFuture(true); // 没有可领取的奖励，直接返回true。
+        }
+
         Map<String, LocalDateTime> map = new LinkedHashMap<>();
         contents.forEach(reward -> map.put(reward.getRewardID(), LocalDateTime.now()));
 
-        return Main.getInstance().supplyAsync(() -> {
+        UserRewardData user = TimeRewardAPI.getUserManager().get(player);
-            try {
+        if (user == null) return CompletableFuture.completedFuture(false); // 玩家数据加载中
 
-                UserRewardData user = TimeRewardAPI.getUserManager().get(player);
+        CompletableFuture<Boolean> task = Main.getInstance().supplyAsync(() -> {
+            try {
                 Main.getStorage().addClaimedData(player.getUniqueId(), map);
                 contents.forEach(user::updateClaimed);
-
                 return true;
             } catch (Exception ex) {
                 Main.severe("为玩家 " + player.getName() + " 领取奖励时发生错误。");
@@ -125,6 +147,12 @@ public class RewardManager {
                 return CompletableFuture.completedFuture(false);
             }
         });
+
+        claiming.put(player.getUniqueId(), task);
+
+        return task.whenComplete((b, t) -> {
+            claiming.remove(player.getUniqueId());
+        });
     }
 
     public void executeCommand(Player player, RewardContents reward) {

src/main/java/cc/carm/plugin/timereward/manager/UserManager.java

@@ -23,8 +23,8 @@ public class UserManager extends UserDataManager<UUID, UserRewardData> {
         super(plugin);
     }
 
-    public @NotNull UserRewardData get(Player player) {
+    public @Nullable UserRewardData get(Player player) {
-        return get(player.getUniqueId());
+        return getNullable(player.getUniqueId());
     }
 
     @Override
@@ -38,15 +38,18 @@ public class UserManager extends UserDataManager<UUID, UserRewardData> {
 
         MySQLStorage storage = Main.getStorage();
 
-        @Nullable UserRewardData current = loadData(data.getUserUUID()); // 考虑读取时间差，优先利用数据库的当前数据计算
+        // 考虑读取时间差，优先利用数据库的当前数据计算
-        TimeRecord oldRecord = current == null ? data.getTimeRecord() : current.getTimeRecord();
+        @Nullable TimeRecord inDatabase = storage.loadTimeRecord(data.getUserUUID());
+        TimeRecord oldRecord = inDatabase == null ? data.getTimeRecord() : inDatabase;
 
+        Main.debugging("用户 " + data.getUserUUID() + " 的旧记录: " + oldRecord);
         // 只需要保存游玩时间数据，领取数据已经实时保存了
         Duration daily = IntervalType.DAILY.calculate(oldRecord, data.getJoinTime());
         Duration weekly = IntervalType.WEEKLY.calculate(oldRecord, data.getJoinTime());
         Duration monthly = IntervalType.MONTHLY.calculate(oldRecord, data.getJoinTime());
         Duration total = IntervalType.TOTAL.calculate(oldRecord, data.getJoinTime());
         TimeRecord newRecord = new TimeRecord(LocalDate.now(), daily, weekly, monthly, total);
+        Main.debugging("用户 " + data.getUserUUID() + " 的新记录: " + newRecord);
 
         storage.savePlayTime(data.getUserUUID(), newRecord);
     }

src/main/java/cc/carm/plugin/timereward/storage/database/DatabaseTables.java

@@ -22,7 +22,7 @@ public enum DatabaseTables implements SQLTable {
 
         table.addColumn("daily_time", "MEDIUMINT UNSIGNED NOT NULL DEFAULT 0"); // 用户日在线时间(秒)
         table.addColumn("weekly_time", "MEDIUMINT UNSIGNED NOT NULL DEFAULT 0"); // 用户周在线时间(秒)
-        table.addColumn("monthly_time", "INT UNSIGNED NOT NULL DEFAULT 0"); // 用户月在线时间(秒)
+        table.addColumn("monthly_time", "MEDIUMINT UNSIGNED NOT NULL DEFAULT 0"); // 用户月在线时间(秒)
         table.addColumn("total_time", "INT UNSIGNED NOT NULL DEFAULT 0"); // 用户总在线时间(秒)
 
         table.addColumn("update",

src/main/java/cc/carm/plugin/timereward/storage/database/MySQLStorage.java

@@ -76,6 +76,13 @@ public class MySQLStorage {
                     long monthly = rs.getLong("monthly_time");
                     long total = rs.getLong("total_time");
 
+                    Main.debugging("成功从数据库中加载用户在线时间记录: " + uuid + " -> {",
+                            " - DAILY = " + daily,
+                            " - WEEKLY = " + weekly,
+                            " - MONTHLY = " + monthly,
+                            " - TOTAL = " + total,
+                            "}");
+
                     return new TimeRecord(date, daily, weekly, monthly, total);
                 }, TimeRecord.empty());
     }

src/main/java/cc/carm/plugin/timereward/user/UserRewardData.java

@@ -1,6 +1,6 @@
 package cc.carm.plugin.timereward.user;
 
-import cc.carm.lib.easyplugin.user.UserData;
+import cc.carm.lib.easyplugin.user.AbstractUserData;
 import cc.carm.plugin.timereward.data.IntervalType;
 import cc.carm.plugin.timereward.data.RewardContents;
 import cc.carm.plugin.timereward.data.TimeRecord;
@@ -15,7 +15,7 @@ import java.util.UUID;
 /**
  * 用户奖励数据，用于存储用户的奖励的领取情况。
  */
-public class UserRewardData extends UserData<UUID> {
+public class UserRewardData extends AbstractUserData<UUID> {
 
     private final @NotNull Map<String, LocalDateTime> claimedRewards; // 记录已领取的奖励ID
 
@@ -35,7 +35,7 @@ public class UserRewardData extends UserData<UUID> {
     }
 
     public @NotNull UUID getUserUUID() {
-        return getKey();
+        return key();
     }
 
     /**

src/main/java/cc/carm/plugin/timereward/util/DateTimeUtils.java

@@ -0,0 +1,75 @@
+package cc.carm.plugin.timereward.util;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAdjusters;
+import java.time.temporal.TemporalField;
+import java.time.temporal.WeekFields;
+import java.util.function.Supplier;
+
+public class DateTimeUtils {
+
+    public static Supplier<DayOfWeek> WEEK_START_DAY = () -> DayOfWeek.MONDAY;
+
+    public static boolean sameDay(LocalDate a) {
+        return sameDay(a, LocalDate.now());
+    }
+
+    public static boolean sameDay(LocalDate a, LocalDate b) {
+        return a.getYear() == b.getYear() &&
+                a.getMonth() == b.getMonth() &&
+                a.getDayOfMonth() == b.getDayOfMonth();
+    }
+
+    public static boolean sameWeek(Temporal a) {
+        return sameWeek(WEEK_START_DAY.get(), a, LocalDate.now());
+    }
+
+    public static boolean sameWeek(DayOfWeek weekStart, Temporal a) {
+        return sameWeek(weekStart, a, LocalDate.now());
+    }
+
+    public static boolean sameWeek(Temporal a, Temporal b) {
+        return sameWeek(WEEK_START_DAY.get(), a, b);
+    }
+
+    public static boolean sameWeek(DayOfWeek weekStart, Temporal a, Temporal b) {
+        TemporalField woy = WeekFields.of(weekStart, 4).weekOfWeekBasedYear();
+        return a.get(woy) == b.get(woy);
+    }
+
+    public static boolean sameMonth(LocalDate a) {
+        return sameMonth(a, LocalDate.now());
+    }
+
+    public static boolean sameMonth(LocalDate a, LocalDate b) {
+        return a.getMonth().equals(b.getMonth());
+    }
+
+    public static LocalDateTime todayStartTime() {
+        return LocalDate.now().atTime(0, 0);
+    }
+
+    public static LocalDate currentWeekStartDay(DayOfWeek weekStart) {
+        return LocalDate.now().with(TemporalAdjusters.previousOrSame(weekStart));
+    }
+
+    public static LocalDate currentWeekStartDay() {
+        return currentWeekStartDay(WEEK_START_DAY.get());
+    }
+
+    public static LocalDateTime currentWeekStartTime(DayOfWeek weekStart) {
+        return currentWeekStartDay(weekStart).atTime(0, 0);
+    }
+
+    public static LocalDateTime currentWeekStartTime() {
+        return currentWeekStartTime(WEEK_START_DAY.get());
+    }
+
+    public static LocalDateTime currentMonthStartTime() {
+        return LocalDate.now().withDayOfMonth(1).atTime(0, 0);
+    }
+
+}

src/test/java/TimeTest.java

@@ -1,57 +0,0 @@
-import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
-
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.temporal.TemporalField;
-import java.time.temporal.WeekFields;
-
-public class TimeTest {
-
-    LocalDate date = LocalDate.of(2023, 8, 30);
-
-    @Test
-    public void test() {
-
-        LocalDate date1 = LocalDate.of(2023, 9, 2);
-        LocalDate date2 = LocalDate.of(2023, 8, 28);
-        LocalDate date3 = LocalDate.of(2023, 8, 27);
-
-        System.out.println(isDayUpdated(date1));
-        System.out.println(isWeekUpdated(date1));
-        System.out.println(isMonthUpdated(date1));
-
-        System.out.println(isDayUpdated(date2));
-        System.out.println(isWeekUpdated(date2));
-        System.out.println(isMonthUpdated(date2));
-
-        System.out.println(isDayUpdated(date3));
-        System.out.println(isWeekUpdated(date3));
-        System.out.println(isMonthUpdated(date3));
-
-        System.out.println(isDayUpdated(date));
-
-    }
-
-    public @NotNull LocalDate getDate() {
-        return date;
-    }
-
-    public boolean isDayUpdated(LocalDate d) {
-        return !d.equals(getDate());
-    }
-
-    public boolean isWeekUpdated(LocalDate d) {
-        if (!isDayUpdated(d)) return false; // Same day always same week
-
-        TemporalField woy = WeekFields.of(DayOfWeek.MONDAY, 4).weekOfWeekBasedYear();
-        return getDate().get(woy) != d.get(woy);
-    }
-
-    public boolean isMonthUpdated(LocalDate d) {
-        if (!isDayUpdated(d)) return false; // Same day always same month
-
-        // Predicate current month is after the month of the date
-        return d.getMonth().compareTo(getDate().getMonth()) > 0;
-    }
-}

src/test/java/cc/carm/plugin/tests/DataTest.java

@@ -0,0 +1,52 @@
+package cc.carm.plugin.tests;
+
+import cc.carm.plugin.timereward.data.IntervalType;
+import cc.carm.plugin.timereward.data.TimeRecord;
+import cc.carm.plugin.timereward.user.UserRewardData;
+import cc.carm.plugin.timereward.util.DateTimeUtils;
+import org.junit.Test;
+
+import java.time.DayOfWeek;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.UUID;
+
+public class DataTest {
+
+    DateTimeFormatter DATETIME = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    @Test
+    public void test() {
+
+        LocalDate date = LocalDate.of(2025, 5, 1);
+        LocalDateTime dateTime = LocalDateTime.now().minusHours(10).minusSeconds(600);
+
+        System.out.println("-----------------------------------------");
+        System.out.println("   DURATION: " + Duration.between(dateTime, LocalDateTime.now()).getSeconds());
+        System.out.println("TODAY START: " + DATETIME.format(DateTimeUtils.todayStartTime()));
+        System.out.println("WEEK  START: " + DATETIME.format(DateTimeUtils.currentWeekStartTime()));
+        System.out.println("MONTH START: " + DATETIME.format(DateTimeUtils.currentMonthStartTime()));
+        System.out.println("-----------------------------------------");
+        System.out.println("RECORD DATE: " + DateTimeFormatter.ofPattern("yyyy-MM-dd").format(date));
+        System.out.println("  JOIN TIME: " + DATETIME.format(dateTime));
+        System.out.println("-----------------------------------------");
+
+        UserRewardData data = createData(date, dateTime);
+        for (IntervalType value : IntervalType.values()) {
+            System.out.println(value.name() + " = " + data.getOnlineDuration(value).getSeconds());
+        }
+
+    }
+
+    static UserRewardData createData(LocalDate date, LocalDateTime join) {
+        return new UserRewardData(
+                UUID.randomUUID(), new HashMap<>(),
+                new TimeRecord(date, 0, 0, 0, 0),
+                join
+        );
+    }
+
+}

src/test/java/cc/carm/plugin/tests/IntervalTest.java

@@ -0,0 +1,22 @@
+package cc.carm.plugin.tests;
+
+import cc.carm.plugin.timereward.data.IntervalType;
+import cc.carm.plugin.timereward.data.TimeRecord;
+import org.junit.Test;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+public class IntervalTest {
+
+    @Test
+    public void test() {
+
+        System.out.println(IntervalType.DAILY.calculate(
+                new TimeRecord(LocalDate.now(), 100, 200, 300, 400),
+                LocalDateTime.now()
+        ).getSeconds());
+
+    }
+
+}

src/test/java/cc/carm/plugin/tests/TimeTest.java

@@ -0,0 +1,41 @@
+package cc.carm.plugin.tests;
+
+import cc.carm.plugin.timereward.data.IntervalType;
+import cc.carm.plugin.timereward.data.TimeRecord;
+import org.junit.Test;
+
+import java.time.LocalDate;
+
+public class TimeTest {
+
+    LocalDate date = LocalDate.of(2023, 8, 30);
+
+    @Test
+    public void test() {
+
+        TimeRecord record1 = new TimeRecord(LocalDate.now().minusMonths(1), 0, 0, 0, 0);
+        TimeRecord record2 = new TimeRecord(LocalDate.now().minusWeeks(1), 0, 0, 0, 0);
+        TimeRecord record3 = new TimeRecord(LocalDate.now().minusDays(1), 0, 0, 0, 0);
+
+        System.out.println(record1.isDayUpdated());
+        System.out.println(record1.isWeekUpdated());
+        System.out.println(record1.isMonthUpdated());
+
+        System.out.println(record2.isDayUpdated());
+        System.out.println(record2.isWeekUpdated());
+        System.out.println(record2.isMonthUpdated());
+
+        System.out.println(record3.isDayUpdated());
+        System.out.println(record3.isWeekUpdated());
+        System.out.println(record3.isMonthUpdated());
+
+    }
+
+    @Test
+    public void durationTest() {
+        for (IntervalType value : IntervalType.values()) {
+            System.out.println(value.name() + " = <MAX> = " + value.getMaxDuration().getSeconds());
+        }
+    }
+
+}