From 8c01246ef292316be5779f096af4946569131cf9 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Sun, 28 Jul 2024 14:21:23 -0500 Subject: [PATCH] feat: update CustomFishing integration --- build.gradle.kts | 2 +- .../hibiscuscommons/hooks/misc/HookCustomFishing.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4d24eac..1bf7242 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -81,7 +81,7 @@ allprojects { compileOnly("LibsDisguises:LibsDisguises:10.0.21") { exclude("org.spigotmc", "spigot") } - compileOnly("com.github.Xiao-MoMi:Custom-Fishing:2.1.2") + compileOnly("com.github.Xiao-MoMi:Custom-Fishing:2.2.5") compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.2") // Lombok <3 diff --git a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookCustomFishing.java b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookCustomFishing.java index 359e682..824437a 100644 --- a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookCustomFishing.java +++ b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookCustomFishing.java @@ -4,6 +4,7 @@ import me.lojosho.hibiscuscommons.api.events.HibiscusPluginFishEvent; import me.lojosho.hibiscuscommons.hooks.Hook; import net.momirealms.customfishing.api.event.FishingLootSpawnEvent; import org.bukkit.Bukkit; +import org.bukkit.entity.Item; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -15,8 +16,8 @@ public class HookCustomFishing extends Hook { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerFish(FishingLootSpawnEvent event) { - if (event.getItem() == null) return; - HibiscusPluginFishEvent newEvent = new HibiscusPluginFishEvent(this, event.getPlayer(), event.getItem().getItemStack()); + if (!(event.getEntity() instanceof Item item)) return; + HibiscusPluginFishEvent newEvent = new HibiscusPluginFishEvent(this, event.getPlayer(), item.getItemStack()); Bukkit.getPluginManager().callEvent(newEvent); } }