Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2025-12-19 15:09:24 +00:00
Code Issues Releases Activity

Reduced lock release time

Browse Source
This commit is contained in:
XiaoMoMi
2024-09-22 23:15:09 +08:00
parent 9a631f0d4a
commit 778837c6e1
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/level/AuraSkillsLevelerProvider.java
View File

@@ -19,6 +19,7 @@ package net.momirealms.customfishing.bukkit.integration.level;
import dev.aurelium.auraskills.api.AuraSkillsApi; import dev.aurelium.auraskills.api.AuraSkillsApi;
import dev.aurelium.auraskills.api.registry.NamespacedId; import dev.aurelium.auraskills.api.registry.NamespacedId;
import net.momirealms.customfishing.api.event.FishingLootSpawnEvent;
import net.momirealms.customfishing.api.integration.LevelerProvider; import net.momirealms.customfishing.api.integration.LevelerProvider;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

1
core/build.gradle.kts
View File

@@ -75,7 +75,6 @@ tasks {
relocate ("com.github.benmanes.caffeine", "net.momirealms.customfishing.libraries.caffeine") relocate ("com.github.benmanes.caffeine", "net.momirealms.customfishing.libraries.caffeine")
relocate ("net.momirealms.sparrow.heart", "net.momirealms.customfishing.bukkit.nms") relocate ("net.momirealms.sparrow.heart", "net.momirealms.customfishing.bukkit.nms")
relocate ("com.saicone.rtag", "net.momirealms.customfishing.libraries.rtag") 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.objecthunter.exp4j", "net.momirealms.customfishing.libraries.exp4j")
relocate ("net.jpountz", "net.momirealms.customfishing.libraries.jpountz") //lz4 relocate ("net.jpountz", "net.momirealms.customfishing.libraries.jpountz") //lz4
relocate ("redis.clients.jedis", "net.momirealms.customfishing.libraries.jedis") relocate ("redis.clients.jedis", "net.momirealms.customfishing.libraries.jedis")

2
core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/AbstractSQLDatabase.java
View File

@@ -134,7 +134,7 @@ public abstract class AbstractSQLDatabase extends AbstractStorage {
data.uuid(uuid); data.uuid(uuid);
if (lock) { if (lock) {
int lockValue = rs.getInt(2); int lockValue = rs.getInt(2);
if (lockValue != 0 && getCurrentSeconds() - ConfigManager.dataSaveInterval() <= lockValue) { if (lockValue != 0 && getCurrentSeconds() - 30 <= lockValue) {
connection.close(); connection.close();
data.locked(true); data.locked(true);
future.complete(Optional.of(data)); future.complete(Optional.of(data));

2
core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/sql/SQLiteProvider.java
View File

@@ -129,7 +129,7 @@ public class SQLiteProvider extends AbstractSQLDatabase {
PlayerData data = plugin.getStorageManager().fromBytes(dataByteArray); PlayerData data = plugin.getStorageManager().fromBytes(dataByteArray);
data.uuid(uuid); data.uuid(uuid);
int lockValue = rs.getInt(2); int lockValue = rs.getInt(2);
if (lockValue != 0 && getCurrentSeconds() - ConfigManager.dataSaveInterval() <= lockValue) { if (lockValue != 0 && getCurrentSeconds() - 30 <= lockValue) {
connection.close(); connection.close();
data.locked(true); data.locked(true);
future.complete(Optional.of(data)); future.complete(Optional.of(data));

2
core/src/main/resources/translations/en.yml
View File

@@ -1,4 +1,4 @@
# Don"t change this # Don't change this
config-version: "33" config-version: "33"
exception.invalid_syntax: "<red>Invalid syntax. Correct syntax: <white><arg:0></white></red>" exception.invalid_syntax: "<red>Invalid syntax. Correct syntax: <white><arg:0></white></red>"