🚑 修复无法正常铲除荒废作物的BUG

farm/farm.py

@@ -552,14 +552,14 @@ class CFarmManager:
             harvestCount = 0  # 成功收获数量
 
             for i in range(1, soilNumber + 1):
-                # 如果没有种植
-                if not await g_pDBService.userSoil.isSoilPlanted(uid, i):
-                    continue
-
                 soilInfo = await g_pDBService.userSoil.getUserSoil(uid, i)
                 if not soilInfo:
                     continue
 
+                # 如果没有种植
+                if soilInfo.get("isSoilPlanted", 0):
+                    continue
+
                 level = soilInfo.get("soilLevel", 0)
 
                 # 如果是枯萎状态
@@ -676,14 +676,14 @@ class CFarmManager:
 
         experience = 0
         for i in range(1, soilNumber + 1):
-            # 如果没有种植
-            if not await g_pDBService.userSoil.isSoilPlanted(uid, i):
-                continue
-
             soilInfo = await g_pDBService.userSoil.getUserSoil(uid, i)
             if not soilInfo:
                 continue
 
+            # 如果没有种植
+            if soilInfo.get("isSoilPlanted", 0):
+                continue
+
             # 如果不是枯萎状态
             if soilInfo.get("wiltStatus", 0) == 0:
                 continue
@@ -704,6 +704,7 @@ class CFarmManager:
                     "plantTime": 0,
                     "matureTime": 0,
                     "wiltStatus": 0,
+                    "isSoilPlanted": 0,
                 },
             )
 
@@ -810,14 +811,14 @@ class CFarmManager:
         isStealingPlant = 0
 
         for i in range(1, soilNumber + 1):
-            # 如果没有种植
-            if not await g_pDBService.userSoil.isSoilPlanted(target, i):
-                continue
-
             soilInfo = await g_pDBService.userSoil.getUserSoil(target, i)
             if not soilInfo:
                 continue
 
+            # 如果没有种植
+            if soilInfo.get("isSoilPlanted", 0):
+                continue
+
             # 如果是枯萎状态
             if soilInfo.get("wiltStatus", 1) == 1:
                 continue