Fix: #11 (theoretically)

Wudji · May 15, 2024 · 57d188e · 57d188e
1 parent e9a4b5b
commit 57d188e
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/main/java/troy/autofish/Autofish.java b/src/main/java/troy/autofish/Autofish.java
@@ -23,6 +23,7 @@
 import troy.autofish.monitor.FishMonitorMPSound;
 import troy.autofish.scheduler.ActionType;
 
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -135,7 +136,9 @@ public void handleChat(GameMessageS2CPacket packet) {
 
     public void catchFish() {
         if(!modAutofish.getScheduler().isRecastQueued()) { //prevents double reels
-            detectOpenWater(client.player.fishHook);
+            if (client.player != null) {
+                detectOpenWater(client.player.fishHook);
+            }
             //queue actions
             queueRodSwitch();
             queueRecast();
@@ -190,15 +193,15 @@ private void detectOpenWater(FishingBobberEntity bobber){
             )))){
                 // didn't pass the check
                 if(!alreadyAlertOP){
-                    bobber.getPlayerOwner().sendMessage(Text.translatable("info.autofish.open_water_detection.fail"),true);
+                    Objects.requireNonNull(bobber.getPlayerOwner()).sendMessage(Text.translatable("info.autofish.open_water_detection.fail"),true);
                     alreadyAlertOP = true;
                     alreadyPassOP = false;
                 }
                 flag = false;
             }
         }
         if(flag && !alreadyPassOP) {
-            bobber.getPlayerOwner().sendMessage(Text.translatable("info.autofish.open_water_detection.success"),true);
+            Objects.requireNonNull(bobber.getPlayerOwner()).sendMessage(Text.translatable("info.autofish.open_water_detection.success"),true);
             alreadyPassOP = true;
             alreadyAlertOP = false;
         }
@@ -242,8 +245,11 @@ public void switchToFirstRod(ClientPlayerEntity player) {
     public void useRod() {
         if(client.player != null && client.world != null) {
             Hand hand = getCorrectHand();
-            ActionResult actionResult = client.interactionManager.interactItem(client.player, hand);
-            if (actionResult.isAccepted()) {
+            ActionResult actionResult = null;
+            if (client.interactionManager != null) {
+                actionResult = client.interactionManager.interactItem(client.player, hand);
+            }
+            if (actionResult != null && actionResult.isAccepted()) {
                 if (actionResult.shouldSwingHand()) {
                     client.player.swingHand(hand);
                 }
@@ -258,12 +264,15 @@ public boolean isHoldingFishingRod() {
 
     private Hand getCorrectHand() {
         if (!modAutofish.getConfig().isMultiRod()) {
-            if (isItemFishingRod(client.player.getOffHandStack().getItem())) return Hand.OFF_HAND;
+            if (client.player != null && isItemFishingRod(client.player.getOffHandStack().getItem()))
+                return Hand.OFF_HAND;
         }
         return Hand.MAIN_HAND;
     }
 
     private ItemStack getHeldItem() {
+        if (client.player == null) return ItemStack.EMPTY;
+
         if (!modAutofish.getConfig().isMultiRod()) {
             if (isItemFishingRod(client.player.getOffHandStack().getItem()))
                 return client.player.getOffHandStack();