Support servers with broken getFirstJoin implementation - Release 1.2.4

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>xyz.alicedtrh</groupId>
     <artifactId>safetyblanket</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Safetyblanket</name>

src/main/java/xyz/alicedtrh/safetyblanket/SafetyBlanketConfig.java

@@ -43,4 +43,9 @@ public class SafetyBlanketConfig {
 
     @Comment("Should this plugin check for updates on server start? (Default: True)")
     public static boolean CHECK_FOR_UPDATES = true;
+
+    @Comment("Use manual method to store player age data (Only use this if your users are marked as new on every join)")
+    @Comment("If you use this, all users will be marked as new once and after that the plugin will keep track of player age")
+    @Comment("(Default: false)")
+    public static boolean MANUAL_PLAYER_AGE_STORAGE = false;
 }

src/main/java/xyz/alicedtrh/safetyblanket/Safetyblanket.java

@@ -23,6 +23,7 @@ public final class Safetyblanket extends JavaPlugin {
     static int blankets = 0;
 
     public static final @NotNull NamespacedKey HAS_NEW_PLAYER_EFFECTS = NamespacedKey.minecraft("xyz.alicedtrh.safetyblanket.newplayer");
+    public static final @NotNull NamespacedKey PLAYER_AGE = NamespacedKey.minecraft("xyz.alicedtrh.safetyblanket.playerage");
 
     public static Logger log() {
         return Safetyblanket.getPlugin(Safetyblanket.class).getLogger();
@@ -73,4 +74,9 @@ public void onCommandEnableSafetyBlanket(CommandSender sender, Player player, In
         sender.sendMessage(String.format("%s has been given test blanket.", player.getName()));
     }
 
+    @CommandHook("timeuntilregular")
+    public void onCommandTimeUntilRegular(CommandSender sender, Player player) {
+        sender.sendMessage(String.valueOf(new SafetyblanketEvents().timeUntilRegular(player, TimeUnit.TICKS, 0)));
+    }
+
 }

src/main/java/xyz/alicedtrh/safetyblanket/SafetyblanketEvents.java

@@ -151,8 +151,12 @@ public void onPlayerJoinEvent(@NotNull PlayerJoinEvent event) {
             return;
         }
 
+        if (!event.getPlayer().getPersistentDataContainer().has(Safetyblanket.PLAYER_AGE)) {
+            event.getPlayer().getPersistentDataContainer().set(Safetyblanket.PLAYER_AGE, PersistentDataType.LONG, event.getPlayer().getLastLogin());
+        }
+
         if (!isPlayerNew(event.getPlayer())) {
-            if(event.getPlayer().getPersistentDataContainer().has(Safetyblanket.HAS_NEW_PLAYER_EFFECTS)) {
+            if (event.getPlayer().getPersistentDataContainer().has(Safetyblanket.HAS_NEW_PLAYER_EFFECTS)) {
                 new ExpireSafetyBlanketTask(event.getPlayer()).runTask(plugin);
             }
             return;
@@ -208,7 +212,7 @@ protected void addSafetyBlanket(@NotNull Player player, int override) {
      * Returns whether the player is still considered new to the server.
      */
     private static boolean isPlayerNew(@NotNull Player player) {
-        return (System.currentTimeMillis() - player.getFirstPlayed()) < NEW_PLAYER_DURATION;
+        return (System.currentTimeMillis() - getFirstPlayed(player)) < NEW_PLAYER_DURATION;
     }
 
     /**
@@ -218,7 +222,7 @@ protected int timeUntilRegular(@NotNull Player player, @NotNull TimeUnit timeUni
         int time_in_millis;
         try {
             time_in_millis = Math.toIntExact(
-                    NEW_PLAYER_DURATION - (System.currentTimeMillis() - player.getFirstPlayed())
+                    NEW_PLAYER_DURATION - (System.currentTimeMillis() - getFirstPlayed(player))
             );
         } catch (ArithmeticException e) {
             time_in_millis = 0;
@@ -249,5 +253,12 @@ protected int timeUntilRegular(@NotNull Player player, @NotNull TimeUnit timeUni
 
     }
 
+    protected static long getFirstPlayed(Player player) {
+        if (MANUAL_PLAYER_AGE_STORAGE) {
+            return player.getPersistentDataContainer().getOrDefault(Safetyblanket.PLAYER_AGE, PersistentDataType.LONG, player.getLastLogin());
+        }
+        return player.getFirstPlayed();
+    }
+
 
 }

src/main/resources/command.rdcml

@@ -8,4 +8,10 @@ enableuserblanket player:player int:ticks {
         permission safetyblanket.admin
         help Give user a temporary test blanket.
         hook enableuserblanket
+}
+
+timeuntilregular player:player {
+        permission safetyblanket.user
+        help Check how many ticks the player has left until they are no longer a new player
+        hook timeuntilregular
 }