Merge pull request #314 from mqtze/fix/pest-farmer

onixiya1337 · web-flow · commit 083bceced84f · 2025-07-02T22:56:40.000+02:00
Pest Farmer:
= Fixed fales triggering failsafe
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.9.7-pre1
+version=2.9.7-pre2
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/PestFarmer.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/PestFarmer.java
@@ -88,7 +88,7 @@ public boolean isToggled() {
 
     @Override
     public boolean shouldCheckForFailsafes() {
-        return (mainState != MainState.RETURN || returnState.ordinal() > 9) && (state != State.WAITING_FOR_WARP || state != State.ENDING);
+        return (mainState != MainState.RETURN || returnState.ordinal() > 9) && (state != State.WAITING_FOR_WARP && state != State.ENDING);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public boolean isToggled() {`
`88`	`88`
`89`	`89`	`@Override`
`90`	`90`	`public boolean shouldCheckForFailsafes() {`
`91`		`- return (mainState != MainState.RETURN \|\| returnState.ordinal() > 9) && (state != State.WAITING_FOR_WARP \|\| state != State.ENDING);`
	`91`	`+ return (mainState != MainState.RETURN \|\| returnState.ordinal() > 9) && (state != State.WAITING_FOR_WARP && state != State.ENDING);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`