Merge pull request #57 from coltonk9043/1.21

Moved around module state logic for better reliability. Fixed autofish.
coltonk9043 · Sep 22, 2024 · 7d38e5d · 7d38e5d
2 parents ae5f388 + aee575b
commit 7d38e5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/main/java/net/aoba/module/Module.java b/src/main/java/net/aoba/module/Module.java
@@ -169,15 +169,15 @@ public boolean getState() {
     public void setState(boolean state) {
         if (this.state == state) return;
 
-        this.onToggle();
-
         if (state) {
+        	this.state = true;
             this.onEnable();
-            this.state = true;
         } else {
+        	this.state = false;
             this.onDisable();
-            this.state = false;
         }
+
+        this.onToggle();
     }
 
     /**
@@ -269,12 +269,7 @@ public boolean isKeyPressed(int button) {
      * The state is then updated accordingly.
      */
     public void toggle() {
-        if (this.state) {
-            this.onDisable();
-        } else {
-            this.onEnable();
-        }
-        this.setState(!this.getState());
+    	setState(!state);
     }
 
 

diff --git a/src/main/java/net/aoba/module/modules/misc/AutoFish.java b/src/main/java/net/aoba/module/modules/misc/AutoFish.java
@@ -49,7 +49,7 @@ public class AutoFish extends Module implements ReceivePacketListener {
     		.id("autofish_autotoggle")
     		.displayName("Auto Toggle")
     		.description("Automatically toggles off if no fishing rod is found in the hotbar.")
-    		.defaultValue(true)
+    		.defaultValue(false)
     		.build();
 
     public AutoFish() {