fix: remove non-hero units after round ends

README.md

@@ -52,3 +52,4 @@ All other information should be explored by reading the source code!
 
 - [2023/3/21 21:13] fix: remove shop and spawn heros as a circle.([#20](https://github.com/Escapingbug/dotaxctf/pull/20))
 - [2023/3/21 22:00] feat: support getting hero's candidate id.([#21](https://github.com/Escapingbug/dotaxctf/pull/21))
+- [2023/3/22 13:30] fix: remove non-hero units after round ends.([#23](https://github.com/Escapingbug/dotaxctf/pull/23), reporter: AAA剑圣)

commands.lua

@@ -29,7 +29,6 @@ end
 function Commands:FullRestart()
     Timers:RemoveTimer("round_periodic_timer")
     Timers:RemoveTimer("round_limit_timer")
-    Rounds:CleanupLivingHeros()
     Rounds.restarting = true
     Rounds:InitFromServerAndBeginGame()
 end

rounds.lua

@@ -209,12 +209,28 @@ function Rounds:InitFromServerAndBeginGame()
     end
 end
 
-function Rounds:CleanupLivingHeros()
+function Rounds:CleanupLivingHerosAndClearUnits()
     for _, hero in pairs(self.heros) do
         hero:RemoveSelf()
     end
-
     self.heros = {}
+
+    for _, team in pairs(AVAILABLE_TEAMS) do
+        local team_units = FindUnitsInRadius(
+            team,
+            Vector(0, 0),
+            nil, -- cacheUnit
+            1e6,
+            DOTA_UNIT_TARGET_TEAM_BOTH,
+            DOTA_UNIT_TARGET_ALL,
+            DOTA_UNIT_TARGET_FLAG_NONE,
+            FIND_ANY_ORDER,
+            false -- canGrowCache
+        )
+        for _, unit in pairs(team_units) do
+            unit:RemoveSelf()
+        end
+    end
 end
 
 --[[
@@ -282,7 +298,7 @@ function Rounds:NextRound(scripts)
         table.insert(self.history.scores, last_scores)
     end
 
-    Rounds:CleanupLivingHeros()
+    Rounds:CleanupLivingHerosAndClearUnits()
     Rounds:ChooseHeros(scripts["chooser_scripts"], scripts["attributes"])
     Timers:CreateTimer(
         Config.round_begin_delay,