Fixed Java Requirements

This commit is contained in:
RonanCraft 2021-10-04 15:58:00 -04:00
parent 8daabe9b93
commit 9576a25af2
3 changed files with 24 additions and 13 deletions

12
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId> <groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTP</artifactId> <artifactId>BetterRTP</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>3.2.1-3</version> <version>3.2.1-4</version>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
@ -45,6 +45,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<version>2.4</version>
<executions> <executions>
<execution> <execution>
<id>hack-binary</id> <id>hack-binary</id>
@ -106,6 +107,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
@ -201,13 +203,13 @@
<dependency> <dependency>
<groupId>br.net.fabiozumbi12.RedProtect</groupId> <groupId>br.net.fabiozumbi12.RedProtect</groupId>
<artifactId>RedProtect-Core</artifactId> <artifactId>RedProtect-Core</artifactId>
<version>LATEST</version> <version>7.7.3</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>br.net.fabiozumbi12.RedProtect</groupId> <groupId>br.net.fabiozumbi12.RedProtect</groupId>
<artifactId>RedProtect-Spigot-1.13</artifactId> <artifactId>RedProtect-Spigot-1.13</artifactId>
<version>LATEST</version> <version>7.7.3</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- FactionsUUID (https://www.spigotmc.org/resources/factionsuuid.1035/) --> <!-- FactionsUUID (https://www.spigotmc.org/resources/factionsuuid.1035/) -->
@ -290,7 +292,7 @@
<dependency> <dependency>
<groupId>com.github.SuperRonanCraft</groupId> <groupId>com.github.SuperRonanCraft</groupId>
<artifactId>Pueblos</artifactId> <artifactId>Pueblos</artifactId>
<version>2.0.1</version> <version>97b96c9</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Particles Library --> <!-- Particles Library -->
@ -303,7 +305,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>RELEASE</version> <version>1.18.20</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -37,7 +37,7 @@ public class DatabaseCooldowns extends SQLite {
public boolean removePlayer(UUID uuid) { public boolean removePlayer(UUID uuid) {
String sql = "DELETE FROM " + table + " WHERE " String sql = "DELETE FROM " + table + " WHERE "
+ COLUMNS.UUID.name + " = ?"; + COLUMNS.UUID.name + " = ?";
List<Object> params = new ArrayList<>() {{ List<Object> params = new ArrayList<Object>() {{
add(uuid.toString()); add(uuid.toString());
}}; }};
return sqlUpdate(sql, params); return sqlUpdate(sql, params);
@ -74,7 +74,7 @@ public class DatabaseCooldowns extends SQLite {
+ COLUMNS.COOLDOWN_DATE.name + ", " + COLUMNS.COOLDOWN_DATE.name + ", "
+ COLUMNS.USES.name + " " + COLUMNS.USES.name + " "
+ ") VALUES(?, ?, ?)"; + ") VALUES(?, ?, ?)";
List<Object> params = new ArrayList<>() {{ List<Object> params = new ArrayList<Object>() {{
add(data.getUuid().toString()); add(data.getUuid().toString());
add(data.getTime()); add(data.getTime());
add(data.getUses()); add(data.getUses());
@ -91,7 +91,7 @@ public class DatabaseCooldowns extends SQLite {
+ COLUMNS.USES.name + " " + COLUMNS.USES.name + " "
+ ") VALUES(?, ?, ?)"; + ") VALUES(?, ?, ?)";
for (CooldownData data : cooldownData) { for (CooldownData data : cooldownData) {
List<Object> param = new ArrayList<>() {{ List<Object> param = new ArrayList<Object>() {{
add(data.getUuid().toString()); add(data.getUuid().toString());
add(data.getTime()); add(data.getTime());
add(data.getUses()); add(data.getUses());

View File

@ -39,14 +39,23 @@ public class CooldownHandler {
} }
Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), () -> { Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), () -> {
getDatabase().load(); getDatabase().load();
OldCooldownConverter.loadOldCooldowns(); checkLater();
//Load any online players cooldowns (mostly after a reload)
for (Player p : Bukkit.getOnlinePlayers())
loadPlayer(p);
loaded = true;
}); });
} }
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) { public void add(Player player) {
if (!enabled) return; if (!enabled) return;
CooldownData data = getPInfo().getCooldown().getOrDefault(player, CooldownData data = getPInfo().getCooldown().getOrDefault(player,