Merge branch 'refs/heads/main' into new_ui

TKaxv-7S · Jul 16, 2024 · e3990db · e3990db
2 parents b65247d + 9b2f8a9
commit e3990db
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/app/src/main/java/tkaxv7s/xposed/sesame/model/task/antFarm/AntFarm.java b/app/src/main/java/tkaxv7s/xposed/sesame/model/task/antFarm/AntFarm.java
@@ -377,9 +377,6 @@ public void run() {
     }
 
     private void animalSleepAndWake() {
-        if (!Status.canAnimalSleep()) {
-            return;
-        }
         String sleepTime = this.sleepTime.getValue();
         if ("-1".equals(sleepTime)) {
             return;
@@ -402,14 +399,17 @@ private void animalSleepAndWake() {
         boolean afterWakeUpTime = now.compareTo(animalWakeUpTimeCalendar) > 0;
         if (afterSleepTime && afterWakeUpTime) {
             //睡觉时间后
+            if (!Status.canAnimalSleep()) {
+                return;
+            }
             Status.animalSleep();
             Log.record("已错过小鸡今日睡觉时间");
             return;
         }
         if (afterSleepTime) {
             //睡觉时间内
-            if (!animalSleepNow()) {
-                return;
+            if (Status.canAnimalSleep()) {
+                animalSleepNow();
             }
             animalWakeUpTime(animalWakeUpTime);
             return;
@@ -497,7 +497,7 @@ private Boolean animalSleepNow() {
                         return true;
                     }
                 } else {
-                    Log.farm("小鸡无法睡觉🛌");
+                    Log.farm("小鸡无需睡觉🛌");
                 }
             }
         } catch (Throwable t) {