diff --git a/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/level/AuraSkillsLevelerProvider.java b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/level/AuraSkillsLevelerProvider.java index 141fb3d3..954a830b 100644 --- a/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/level/AuraSkillsLevelerProvider.java +++ b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/level/AuraSkillsLevelerProvider.java @@ -19,6 +19,7 @@ package net.momirealms.customfishing.bukkit.integration.level; import dev.aurelium.auraskills.api.AuraSkillsApi; import dev.aurelium.auraskills.api.registry.NamespacedId; +import net.momirealms.customfishing.api.event.FishingLootSpawnEvent; import net.momirealms.customfishing.api.integration.LevelerProvider; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/core/build.gradle.kts b/core/build.gradle.kts index a1093484..2b49ac0a 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -75,7 +75,6 @@ tasks { relocate ("com.github.benmanes.caffeine", "net.momirealms.customfishing.libraries.caffeine") relocate ("net.momirealms.sparrow.heart", "net.momirealms.customfishing.bukkit.nms") relocate ("com.saicone.rtag", "net.momirealms.customfishing.libraries.rtag") - relocate ("xyz.xenondevs", "net.momirealms.customfishing.libraries") relocate ("net.objecthunter.exp4j", "net.momirealms.customfishing.libraries.exp4j") relocate ("net.jpountz", "net.momirealms.customfishing.libraries.jpountz") //lz4 relocate ("redis.clients.jedis", "net.momirealms.customfishing.libraries.jedis") diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/AbstractSQLDatabase.java b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/AbstractSQLDatabase.java index f706fb58..5fcb75f5 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/AbstractSQLDatabase.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/AbstractSQLDatabase.java @@ -134,7 +134,7 @@ public abstract class AbstractSQLDatabase extends AbstractStorage { data.uuid(uuid); if (lock) { int lockValue = rs.getInt(2); - if (lockValue != 0 && getCurrentSeconds() - ConfigManager.dataSaveInterval() <= lockValue) { + if (lockValue != 0 && getCurrentSeconds() - 30 <= lockValue) { connection.close(); data.locked(true); future.complete(Optional.of(data)); diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/SQLiteProvider.java b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/SQLiteProvider.java index a572747c..c98bdfda 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/SQLiteProvider.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/SQLiteProvider.java @@ -129,7 +129,7 @@ public class SQLiteProvider extends AbstractSQLDatabase { PlayerData data = plugin.getStorageManager().fromBytes(dataByteArray); data.uuid(uuid); int lockValue = rs.getInt(2); - if (lockValue != 0 && getCurrentSeconds() - ConfigManager.dataSaveInterval() <= lockValue) { + if (lockValue != 0 && getCurrentSeconds() - 30 <= lockValue) { connection.close(); data.locked(true); future.complete(Optional.of(data)); diff --git a/core/src/main/resources/translations/en.yml b/core/src/main/resources/translations/en.yml index 5121d779..b52b31bb 100644 --- a/core/src/main/resources/translations/en.yml +++ b/core/src/main/resources/translations/en.yml @@ -1,4 +1,4 @@ -# Don"t change this +# Don't change this config-version: "33" exception.invalid_syntax: "Invalid syntax. Correct syntax: "