From cd26609b68053cdd48b0ebd0fdd833926d16ea9f Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Tue, 13 Feb 2024 12:17:15 +0800 Subject: [PATCH] fix on ground --- build.gradle.kts | 2 +- plugin/build.gradle.kts | 6 +++--- .../customfishing/CustomFishingPluginImpl.java | 12 ++++++------ .../mechanic/action/ActionManagerImpl.java | 2 ++ .../mechanic/fishing/HookCheckTimerTask.java | 4 +++- .../method/database/sql/AbstractHikariDatabase.java | 2 +- plugin/src/main/resources/database.yml | 2 +- plugin/src/main/resources/loot-conditions.yml | 2 ++ 8 files changed, 19 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1bc173dc..2e2317d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { allprojects { - version = "2.0.12.1" + version = "2.0.12.2" apply() apply(plugin = "java") diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 894ddeca..51899ca4 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { compileOnly("com.willfp:libreforge:4.48.1") // database - compileOnly("org.xerial:sqlite-jdbc:3.43.2.2") + compileOnly("org.xerial:sqlite-jdbc:3.45.1.0") compileOnly("com.h2database:h2:2.2.224") compileOnly("org.mongodb:mongodb-driver-sync:4.11.1") compileOnly("com.zaxxer:HikariCP:5.0.1") @@ -39,12 +39,12 @@ dependencies { // others compileOnly("com.github.LoneDev6:api-itemsadder:3.5.0c-r5") compileOnly("io.th0rgal:oraxen:1.165.0") - compileOnly("pers.neige.neigeitems:NeigeItems:1.15.95") + compileOnly("pers.neige.neigeitems:NeigeItems:1.16.24") compileOnly("com.github.Zrips:Jobs:4.17.2") compileOnly("com.github.Archy-X:AureliumSkills:Beta1.3.21") compileOnly("com.github.MilkBowl:VaultAPI:1.7") compileOnly("org.betonquest:betonquest:2.0.0") - compileOnly("xyz.xenondevs.invui:invui:1.24") + compileOnly("xyz.xenondevs.invui:invui:1.25") compileOnly("com.github.Xiao-MoMi:Custom-Crops:3.3.1.10") // local jars diff --git a/plugin/src/main/java/net/momirealms/customfishing/CustomFishingPluginImpl.java b/plugin/src/main/java/net/momirealms/customfishing/CustomFishingPluginImpl.java index f95f7ee6..090e9c61 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/CustomFishingPluginImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/CustomFishingPluginImpl.java @@ -210,15 +210,15 @@ public class CustomFishingPluginImpl extends CustomFishingPlugin { "dev.dejvokep:boosted-yaml:1.3.1", mavenRepo, "com.zaxxer:HikariCP:5.0.1", mavenRepo, "net.objecthunter:exp4j:0.4.8", mavenRepo, - "org.mariadb.jdbc:mariadb-java-client:3.3.0", mavenRepo, - "com.mysql:mysql-connector-j:8.2.0", mavenRepo, + "org.mariadb.jdbc:mariadb-java-client:3.3.2", mavenRepo, + "com.mysql:mysql-connector-j:8.3.0", mavenRepo, "commons-io:commons-io:2.14.0", mavenRepo, "com.google.code.gson:gson:2.10.1", mavenRepo, "com.h2database:h2:2.2.224", mavenRepo, "org.mongodb:mongodb-driver-sync:4.11.1", mavenRepo, "org.mongodb:mongodb-driver-core:4.11.1", mavenRepo, "org.mongodb:bson:4.11.1", mavenRepo, - "org.xerial:sqlite-jdbc:3.43.2.2", mavenRepo, + "org.xerial:sqlite-jdbc:3.45.1.0", mavenRepo, "dev.jorel:commandapi-bukkit-shade:9.3.0", mavenRepo ); @@ -236,9 +236,9 @@ public class CustomFishingPluginImpl extends CustomFishingPlugin { case "v1_20_R3" -> artifact = "r18"; } LibraryLoader.loadDependencies( - "xyz.xenondevs.invui:invui-core:1.24", "https://repo.xenondevs.xyz/releases/", - "xyz.xenondevs.invui:inventory-access:1.24", "https://repo.xenondevs.xyz/releases/", - String.format("xyz.xenondevs.invui:inventory-access-%s:1.24", artifact), "https://repo.xenondevs.xyz/releases/" + "xyz.xenondevs.invui:invui-core:1.25", "https://repo.xenondevs.xyz/releases/", + "xyz.xenondevs.invui:inventory-access:1.25", "https://repo.xenondevs.xyz/releases/", + String.format("xyz.xenondevs.invui:inventory-access-%s:1.25", artifact), "https://repo.xenondevs.xyz/releases/" ); } diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java index feec5f40..bf132b0e 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java @@ -45,6 +45,8 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.Player; import org.bukkit.inventory.EquipmentSlot; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/HookCheckTimerTask.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/HookCheckTimerTask.java index 469ec20e..fd963696 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/HookCheckTimerTask.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/HookCheckTimerTask.java @@ -92,7 +92,6 @@ public class HookCheckTimerTask implements Runnable { public void run() { if ( !fishHook.isValid() - || fishHook.isOnGround() || (fishHook.getHookedEntity() != null && fishHook.getHookedEntity().getType() != EntityType.ARMOR_STAND) ) { // This task would be cancelled when hook is not at a proper place @@ -100,6 +99,9 @@ public class HookCheckTimerTask implements Runnable { this.destroy(); return; } + if (fishHook.isOnGround()) { + return; + } if (fishHook.getLocation().getBlock().getType() == Material.LAVA) { // if player can fish in lava if (firstTime) { diff --git a/plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/AbstractHikariDatabase.java b/plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/AbstractHikariDatabase.java index cc2541e6..50ec2d75 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/AbstractHikariDatabase.java +++ b/plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/AbstractHikariDatabase.java @@ -19,6 +19,7 @@ package net.momirealms.customfishing.storage.method.database.sql; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; +import me.clip.placeholderapi.PlaceholderAPI; import net.momirealms.customfishing.api.CustomFishingPlugin; import net.momirealms.customfishing.api.data.*; import net.momirealms.customfishing.api.util.LogUtils; @@ -54,7 +55,6 @@ public abstract class AbstractHikariDatabase extends AbstractSQLDatabase impleme } else if (getStorageType() == StorageType.MySQL) { try { Class.forName("com.mysql.jdbc.Driver"); - LogUtils.warn("It seems that you are not using MySQL 8.0+. It's recommended to update."); } catch (ClassNotFoundException e2) { LogUtils.warn("No MySQL driver is found"); } diff --git a/plugin/src/main/resources/database.yml b/plugin/src/main/resources/database.yml index d5a94fb7..af8f3715 100644 --- a/plugin/src/main/resources/database.yml +++ b/plugin/src/main/resources/database.yml @@ -67,7 +67,7 @@ MongoDB: Redis: enable: false host: localhost - #password: 123456 + #password: "123456" port: 6379 use-ssl: false MaxTotal: 10 diff --git a/plugin/src/main/resources/loot-conditions.yml b/plugin/src/main/resources/loot-conditions.yml index 3935c6cf..0aa90ddc 100644 --- a/plugin/src/main/resources/loot-conditions.yml +++ b/plugin/src/main/resources/loot-conditions.yml @@ -1,3 +1,5 @@ + + # global group global-group: list: []