diff --git a/pom.xml b/pom.xml index fb64b5a..2cd289a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ me.SuperRonanCraft BetterRTP jar - 3.2.1-3 + 3.2.1-4 1.8 @@ -45,6 +45,7 @@ org.apache.maven.plugins maven-install-plugin + 2.4 hack-binary @@ -106,6 +107,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.1 1.8 1.8 @@ -201,13 +203,13 @@ br.net.fabiozumbi12.RedProtect RedProtect-Core - LATEST + 7.7.3 provided br.net.fabiozumbi12.RedProtect RedProtect-Spigot-1.13 - LATEST + 7.7.3 provided @@ -290,7 +292,7 @@ com.github.SuperRonanCraft Pueblos - 2.0.1 + 97b96c9 provided @@ -303,7 +305,7 @@ org.projectlombok lombok - RELEASE + 1.18.20 provided diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java index 62d0be7..74b55a6 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java @@ -37,7 +37,7 @@ public class DatabaseCooldowns extends SQLite { public boolean removePlayer(UUID uuid) { String sql = "DELETE FROM " + table + " WHERE " + COLUMNS.UUID.name + " = ?"; - List params = new ArrayList<>() {{ + List params = new ArrayList() {{ add(uuid.toString()); }}; return sqlUpdate(sql, params); @@ -74,7 +74,7 @@ public class DatabaseCooldowns extends SQLite { + COLUMNS.COOLDOWN_DATE.name + ", " + COLUMNS.USES.name + " " + ") VALUES(?, ?, ?)"; - List params = new ArrayList<>() {{ + List params = new ArrayList() {{ add(data.getUuid().toString()); add(data.getTime()); add(data.getUses()); @@ -91,7 +91,7 @@ public class DatabaseCooldowns extends SQLite { + COLUMNS.USES.name + " " + ") VALUES(?, ?, ?)"; for (CooldownData data : cooldownData) { - List param = new ArrayList<>() {{ + List param = new ArrayList() {{ add(data.getUuid().toString()); add(data.getTime()); add(data.getUses()); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java index 250acf9..88cf9c7 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java @@ -39,14 +39,23 @@ public class CooldownHandler { } Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), () -> { getDatabase().load(); - OldCooldownConverter.loadOldCooldowns(); - //Load any online players cooldowns (mostly after a reload) - for (Player p : Bukkit.getOnlinePlayers()) - loadPlayer(p); - loaded = true; + checkLater(); }); } + private void checkLater() { + Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), () -> { + if (getDatabase().isLoaded()) { + OldCooldownConverter.loadOldCooldowns(); + //Load any online players cooldowns (mostly after a reload) + for (Player p : Bukkit.getOnlinePlayers()) + loadPlayer(p); + loaded = true; + } else + checkLater(); + }, 10L); + } + public void add(Player player) { if (!enabled) return; CooldownData data = getPInfo().getCooldown().getOrDefault(player,