fix bot forget remove finished current building

Author: vinaghost

TbsCore/Helpers/BuildingHelper.cs

@@ -232,26 +232,26 @@ private static bool BuildingIsOnLevel(BuildingEnum building, int lvl, Village vi
         /// </summary>
         /// <param name="vill"></param>
         /// <returns>Whether there were some tasks removed</returns>
-        //public static bool RemoveFinishedCB(Village vill)
-        //{
-        //    var tasksDone = vill.Build
-        //        .CurrentlyBuilding
-        //        .Where(x => x.Duration < DateTime.Now)
-        //        .ToList();
-
-        //    if (tasksDone.Count == 0) return false;
-
-        //    foreach (var taskDone in tasksDone)
-        //    {
-        //        var building = vill.Build.Buildings.FirstOrDefault(x => x.Id == taskDone.Location);
-        //        if (building == null) building = vill.Build.Buildings.FirstOrDefault(x => x.Type == taskDone.Building);
-        //        if (building == null || building.Type != taskDone.Building) continue;
-
-        //        if (building.Level < taskDone.Level) building.Level = taskDone.Level;
-        //        vill.Build.CurrentlyBuilding.Remove(taskDone);
-        //    }
-        //    return true;
-        //}
+        public static bool RemoveFinishedCB(Village vill)
+        {
+            var tasksDone = vill.Build
+                .CurrentlyBuilding
+                .Where(x => x.Duration < DateTime.Now)
+                .ToList();
+
+            if (tasksDone.Count == 0) return false;
+
+            foreach (var taskDone in tasksDone)
+            {
+                //var building = vill.Build.Buildings.FirstOrDefault(x => x.Id == taskDone.Location);
+                //if (building == null) building = vill.Build.Buildings.FirstOrDefault(x => x.Type == taskDone.Building);
+                //if (building == null || building.Type != taskDone.Building) continue;
+
+                //if (building.Level < taskDone.Level) building.Level = taskDone.Level;
+                vill.Build.CurrentlyBuilding.Remove(taskDone);
+            }
+            return true;
+        }
 
         /// <summary>
         /// Used by building task to get the url for navigation
@@ -440,10 +440,14 @@ internal static bool UpgradeBuildingForOneLvl(Account acc, Village vill, Buildin
                 }, bottom);
             }
 
+            // Current lvl in bot's data
             var currentLvl = (int)upgrade.Level;
 
-            // RemoveFinishedCB(vill);
-            currentLvl += vill.Build.CurrentlyBuilding.Count(x => x.Building == building);
+            RemoveFinishedCB(vill);
+
+            // Current lvl in current building list
+            var currentBuilding = vill.Build.CurrentlyBuilding.FirstOrDefault(x => x.Building == building);
+            if (currentBuilding != null) currentLvl = currentBuilding.Level;
 
             if (BuildingsData.MaxBuildingLevel(acc, building) == currentLvl)
             {
@@ -479,7 +483,7 @@ internal static bool UpgradeBuildingForOneLvl(Account acc, Village vill, Buildin
         /// <returns>Whether we have all prerequisite buildings</returns>
         public static bool AddBuildingPrerequisites(Account acc, Village vill, BuildingEnum building, bool bottom = true)
         {
-            // RemoveFinishedCB(vill);
+            RemoveFinishedCB(vill);
 
             (var tribe, var prereqs) = BuildingsData.GetBuildingPrerequisites(building);
             if (acc.AccInfo.Tribe != tribe && tribe != TribeEnum.Any) return false;

TbsCore/Tasks/LowLevel/UpgradeBuilding.cs

@@ -347,6 +347,8 @@ public async Task<bool> TTWarsTryFastUpgrade(Account acc, string url)
         /// <param name="acc">Account</param>
         public void ConfigNextExecute(Account acc, bool restart = true)
         {
+            RemoveFinishedCB(Vill);
+
             if (Vill.Build.AutoBuildResourceBonusBuildings) CheckResourceBonus(acc, Vill, restart);
 
             // Checks if we have enough FreeCrop (above 0)