= Dirt Check - Another fixes for stupid melon farm

JellyLabScripts · Jan 13, 2024 · fc05d63 · fc05d63
1 parent 488b4c5
commit fc05d63
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
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.4.1-pre12
+version=2.4.1-pre13
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/failsafe/impl/DirtFailsafe.java b/src/main/java/com/jelly/farmhelperv2/failsafe/impl/DirtFailsafe.java
@@ -67,8 +67,8 @@ public void onBlockChange(BlockChangeEvent event) {
         if ((event.old.getBlock().equals(Blocks.air) || CropUtils.isCrop(event.old.getBlock()) || event.old.getBlock().equals(Blocks.water) || event.old.getBlock().equals(Blocks.flowing_water)) &&
                 event.update.getBlock() != null && !event.update.getBlock().equals(Blocks.air) &&
                 !CropUtils.isCrop(event.update.getBlock()) && event.update.getBlock().isCollidable() &&
-                !event.update.getBlock().equals(Blocks.trapdoor) && !event.update.getBlock().equals(Blocks.water) &&
-                !event.update.getBlock().equals(Blocks.flowing_water)) { // If old block was air or crop and new block is not air, crop, trapdoor, water or flowing water
+                !event.update.getBlock().equals(Blocks.trapdoor) && !event.update.getBlock().equals(Blocks.ladder) &&
+                !event.update.getBlock().equals(Blocks.water) && !event.update.getBlock().equals(Blocks.flowing_water)) { // If old block was air or crop and new block is not air, crop, trapdoor, water or flowing water
             LogUtils.sendWarning("[Failsafe] Someone put a block on your garden! Block pos: " + event.pos);
             dirtBlocks.add(new Tuple<>(event.pos, System.currentTimeMillis()));
         }

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/VisitorsMacro.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/VisitorsMacro.java
@@ -202,7 +202,7 @@ public boolean isToggled() {
 
     @Override
     public boolean shouldCheckForFailsafes() {
-        return travelState != TravelState.WAIT_FOR_TP && mainState != MainState.DISABLING && mainState != MainState.END;
+        return travelState != TravelState.WAIT_FOR_TP && mainState != MainState.DISABLING && mainState != MainState.END && compactorState != CompactorState.NONE;
     }
 
     @SubscribeEvent