diff --git a/build.gradle b/build.gradle index 67242f51..c1412c43 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '1.2.9' +version = '1.2.10' repositories { mavenCentral() @@ -55,7 +55,7 @@ dependencies { compileOnly('com.github.TechFortress:GriefPrevention:16.18') compileOnly('com.palmergames.bukkit.towny:towny:0.98.2.0') compileOnly('com.comphenix.protocol:ProtocolLib:4.8.0') - compileOnly('redis.clients:jedis:4.3.0') + compileOnly('redis.clients:jedis:4.3.1') compileOnly('me.clip:placeholderapi:2.11.1') compileOnly('com.sk89q.worldguard:worldguard-bukkit:7.0.7') compileOnly('io.lumine:Mythic-Dist:5.0.3-SNAPSHOT') @@ -66,10 +66,10 @@ dependencies { compileOnly('com.github.LoneDev6:api-itemsadder:3.2.3c') compileOnly('net.objecthunter:exp4j:0.4.8') compileOnly('org.mariadb.jdbc:mariadb-java-client:3.0.6') - implementation('net.kyori:adventure-api:4.11.0') + implementation('net.kyori:adventure-api:4.12.0') implementation('net.kyori:adventure-platform-bukkit:4.1.2') - implementation('net.kyori:adventure-text-minimessage:4.11.0') - implementation('net.kyori:adventure-text-serializer-legacy:4.11.0') + implementation('net.kyori:adventure-text-minimessage:4.12.0') + implementation('net.kyori:adventure-text-serializer-legacy:4.12.0') implementation('de.tr7zw:item-nbt-api:2.10.0') implementation("org.bstats:bstats-bukkit:3.0.0") } diff --git a/src/main/java/net/momirealms/customfishing/CustomFishing.java b/src/main/java/net/momirealms/customfishing/CustomFishing.java index 6951259d..c788710f 100644 --- a/src/main/java/net/momirealms/customfishing/CustomFishing.java +++ b/src/main/java/net/momirealms/customfishing/CustomFishing.java @@ -69,7 +69,7 @@ public final class CustomFishing extends JavaPlugin { @Override public void onLoad() { plugin = this; - LibraryLoader.load("redis.clients","jedis","4.3.0","https://repo.maven.apache.org/maven2/"); + LibraryLoader.load("redis.clients","jedis","4.3.1","https://repo.maven.apache.org/maven2/"); LibraryLoader.load("org.apache.commons","commons-pool2","2.11.1","https://repo.maven.apache.org/maven2/"); LibraryLoader.load("dev.dejvokep","boosted-yaml","1.3","https://repo.maven.apache.org/maven2/"); LibraryLoader.load("com.zaxxer","HikariCP","5.0.1","https://repo.maven.apache.org/maven2/"); diff --git a/src/main/java/net/momirealms/customfishing/manager/FishingManager.java b/src/main/java/net/momirealms/customfishing/manager/FishingManager.java index 6ea8ef48..c8eea8f5 100644 --- a/src/main/java/net/momirealms/customfishing/manager/FishingManager.java +++ b/src/main/java/net/momirealms/customfishing/manager/FishingManager.java @@ -887,7 +887,7 @@ public class FishingManager extends Function { Location bottomLoc = coreLoc.clone().subtract(0, totem.getOriginalModel().getCorePos().getY(), 0); ActivatedTotem activatedTotem = new ActivatedTotem(bottomLoc, totem, this); activatedTotem.runTaskTimer(CustomFishing.plugin, 10, 20); - totemCache.put(coreLoc, activatedTotem); + totemCache.put(bottomLoc, activatedTotem); } private void useFinder(Player player) { @@ -1004,8 +1004,8 @@ public class FishingManager extends Function { else return GsonComponentSerializer.gson().deserialize("{\"translate\":\"item.minecraft." + type + "\"}"); } - public void removeTotem(ActivatedTotem activatedTotem) { - totemCache.remove(activatedTotem); + public void removeTotem(Location location) { + totemCache.remove(location); } public void addPlayerToLavaFishing(Player player, BobberCheckTask task) { diff --git a/src/main/java/net/momirealms/customfishing/object/totem/ActivatedTotem.java b/src/main/java/net/momirealms/customfishing/object/totem/ActivatedTotem.java index 6d5457c8..ffa6f37e 100644 --- a/src/main/java/net/momirealms/customfishing/object/totem/ActivatedTotem.java +++ b/src/main/java/net/momirealms/customfishing/object/totem/ActivatedTotem.java @@ -132,7 +132,7 @@ public class ActivatedTotem extends BukkitRunnable { public void stop() { this.particleTimerTask.cancel(); cancel(); - fishingManager.removeTotem(this); + fishingManager.removeTotem(location); if (hasHolo) { for (Player player : nearbyPlayerSet) {