fix several bugs related to persist mode

Wudji · Nov 12, 2024 · b3b1d05 · b3b1d05
1 parent 2498e6d
commit b3b1d05
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/troy/autofish/Autofish.java b/src/main/java/troy/autofish/Autofish.java
@@ -48,8 +48,12 @@ public Autofish(FabricModAutofish modAutofish) {
         //Initiate the repeating action for persistent mode casting
         modAutofish.getScheduler().scheduleRepeatingAction(10000, () -> {
             if(!modAutofish.getConfig().isPersistentMode()) return;
+            if(modAutofish.getConfig().isNoBreak() && Objects.requireNonNull(getHeldItem()).getDamage() >= 63) return;
             if(!isHoldingFishingRod()) return;
-            if(hookExists && isBobberInWater()) return;
+            if(hookExists){
+                if(isBobberInWater()) return;
+                else useRod();
+            }
             if(modAutofish.getScheduler().isRecastQueued()) return;
 
             useRod();
@@ -244,7 +248,7 @@ public void switchToFirstRod(ClientPlayerEntity player) {
 
     public boolean isBobberInWater(){
         if(client.player != null && client.world != null && client.player.fishHook != null) {
-            return client.player.fishHook.isTouchingWater();
+            return client.world.getBlockState(client.player.fishHook.getBlockPos()).getBlock() == Blocks.WATER;
         } else{
             return false;
         }