fix(tutorial): Align saved times (utc)

Author: Zoriot

build.gradle.kts

@@ -77,10 +77,8 @@ tasks.withType<Javadoc> {
 
 tasks.shadowJar {
     archiveClassifier = ""
-    val relocationPrefix = "alpsplotsystem.libs"
-    relocate("com.alpsbte.alpslib", "$relocationPrefix.com.alpsbte.alpslib")
-    relocate("org.mariadb.jdbc", "$relocationPrefix.org.mariadb.jdbc")
-    relocate("com.zaxxer.hikari", "$relocationPrefix.com.zaxxer.hikari")
+    relocationPrefix = "com.alpsbte.plotsystem.shaded"
+    enableAutoRelocation = true
 }
 
 tasks.assemble {

gradle/libs.versions.toml

@@ -2,8 +2,8 @@
 
 [versions]
 # Dependencies
-com-alpsbte-alpslib-alpslib-hologram = "1.1.1" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-hologram/
-com-alpsbte-alpslib-alpslib-io = "1.2.2" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-io/
+com-alpsbte-alpslib-alpslib-hologram = "1.1.2" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-hologram/
+com-alpsbte-alpslib-alpslib-io = "1.2.3" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-io/
 com-alpsbte-alpslib-alpslib-utils = "1.4.1" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-utils/
 com-alpsbte-canvas = "1.3" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/canvas/
 com-arcaniax-headdatabase-api = "1.3.2" # https://github.com/Arcaniax-Development/HeadDatabase-API/releases

src/main/java/com/alpsbte/plotsystem/PlotSystem.java

@@ -189,8 +189,10 @@ public static PlotSystem getPlugin() {
         return plugin;
     }
 
-    public void initDatabase() throws IOException, SQLException, ClassNotFoundException {
-        DatabaseConnection.initializeDatabase(DatabaseConfigPaths.getConfig(getConfig()), true);
+    public void initDatabase() throws IOException, SQLException, RuntimeException {
+        // We currently want to save everything in UTC to have no mismatch, because CURRENT_TIMESTAMP uses UTC + DateTime doesn't support timezones (we would have to use TIMESTAMP)
+        // These url parameters align behaviour (at least on linux)
+        DatabaseConnection.initializeDatabase(DatabaseConfigPaths.getConfig(getConfig()), true, "serverTimezone=UTC&forceConnectionTimeZoneToSession=true");
         var initScript = CharStreams.toString(Objects.requireNonNull(getTextResource("DATABASE.sql")));
         try (var con = DatabaseConnection.getConnection(); var s = con.createStatement()) {
             s.execute(initScript);

src/main/java/com/alpsbte/plotsystem/core/EventListener.java

@@ -75,7 +75,7 @@
 
 public class EventListener implements Listener {
     @EventHandler
-    public void onPlayerJoinEvent(PlayerJoinEvent event) {
+    public void onPlayerJoinEvent(@NotNull PlayerJoinEvent event) {
         Player player = event.getPlayer();
 
         // Add Items
@@ -141,8 +141,10 @@ public void onPlayerQuitEvent(@NotNull PlayerQuitEvent event) {
                 plotWorld.unloadWorld(false);
         }, 60L);
 
-        PlotUtils.plotReminder.get(event.getPlayer().getUniqueId()).cancel();
-        PlotUtils.plotReminder.remove(event.getPlayer().getUniqueId());
+        if (PlotUtils.plotReminder.containsKey(event.getPlayer().getUniqueId())) {
+            PlotUtils.plotReminder.get(event.getPlayer().getUniqueId()).cancel();
+            PlotUtils.plotReminder.remove(event.getPlayer().getUniqueId());
+        }
     }
 
     @EventHandler

src/main/java/com/alpsbte/plotsystem/core/database/providers/TutorialPlotProvider.java

@@ -7,7 +7,7 @@
 import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -64,7 +64,7 @@ public boolean setStageId(int tutorialId, String playerUUID, int stageId) {
         String qSetStage = "UPDATE tutorial SET stage_id = ?, last_stage_complete_date = ? WHERE tutorial_id = ? AND uuid = ?;";
         return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetStage, ps -> {
             ps.setInt(1, stageId);
-            ps.setTimestamp(2, Timestamp.valueOf(LocalDateTime.now()));
+            ps.setTimestamp(2, Timestamp.from(Instant.now()));
             ps.setInt(3, tutorialId);
             ps.setString(4, playerUUID);
             return ps.executeUpdate() > 0;
@@ -75,7 +75,8 @@ public boolean setComplete(int tutorialId, String playerUUID) {
         String qSetComplete = "UPDATE tutorial SET is_complete = ?, last_stage_complete_date = ? WHERE tutorial_id = ? AND uuid = ?;";
         return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetComplete, ps -> {
             ps.setBoolean(1, true);
-            ps.setTimestamp(2, Timestamp.valueOf(LocalDateTime.now()));
+
+            ps.setTimestamp(2, Timestamp.from(Instant.now()));
             ps.setInt(3, tutorialId);
             ps.setString(4, playerUUID);
             return ps.executeUpdate() > 0;