From 92ab01bee1e9489e73598532a1fae8603e1426b0 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Sat, 30 Sep 2023 03:48:22 +0200 Subject: [PATCH] Fix fishing rod being possible to break --- .../java/com/alttd/fishingevent/listeners/CatchFish.java | 6 +++--- .../java/com/alttd/fishingevent/listeners/LavaFishing.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java b/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java index 9b35a66..9793c34 100644 --- a/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java +++ b/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java @@ -134,7 +134,7 @@ public class CatchFish implements Listener { } ItemStack fishingRod = optionalFishingROd.get(); if (fishingRod.getItemMeta() instanceof Damageable damageable) { - return damageable.getDamage() >= Material.FISHING_ROD.getMaxDurability(); + return damageable.getDamage() > Material.FISHING_ROD.getMaxDurability(); } return false; } @@ -166,7 +166,7 @@ public class CatchFish implements Listener { player.updateInventory(); player.getWorld().spawn(player.getLocation(), ExperienceOrb.class).setExperience(10); ScoreboardManager.getInstance().updateScoreboard(player, caughtFishData.length(), caughtFishData.fish()); - player.sendActionBar(MiniMessage.miniMessage().deserialize("You caught a fish cm", //TODO move to config + player.sendActionBar(MiniMessage.miniMessage().deserialize("You caught a cm", //TODO move to config TagResolver.resolver( Placeholder.component("rarity", caughtFishData.fish().getRarity().displayName()), Placeholder.component("name", caughtFishData.fish().fishName()), @@ -195,7 +195,7 @@ public class CatchFish implements Listener { item.setItemStack(caughtFishData.fishItem()); item.setOwner(player.getUniqueId()); ScoreboardManager.getInstance().updateScoreboard(player, caughtFishData.length(), caughtFishData.fish()); - player.sendActionBar(MiniMessage.miniMessage().deserialize("You caught a fish cm", //TODO move to config + player.sendActionBar(MiniMessage.miniMessage().deserialize("You caught a cm", //TODO move to config TagResolver.resolver( Placeholder.component("rarity", caughtFishData.fish().getRarity().displayName()), Placeholder.component("name", caughtFishData.fish().fishName()), diff --git a/src/main/java/com/alttd/fishingevent/listeners/LavaFishing.java b/src/main/java/com/alttd/fishingevent/listeners/LavaFishing.java index d255d92..85f749a 100644 --- a/src/main/java/com/alttd/fishingevent/listeners/LavaFishing.java +++ b/src/main/java/com/alttd/fishingevent/listeners/LavaFishing.java @@ -81,7 +81,7 @@ public class LavaFishing extends BukkitRunnable { } if (item.getItemMeta() instanceof Damageable damageable) { int damage = damageable.getDamage(); - damageable.setDamage(Math.min(++damage, Material.FISHING_ROD.getMaxDurability())); + damageable.setDamage(Math.min(++damage, Material.FISHING_ROD.getMaxDurability() - 1)); item.setItemMeta(damageable); } else { logger.warning("This item can't be damaged");