Run damage before spawn points activate

2020-12-06 10:23:24 -05:00
parent 18b19e964a
commit cf91bcbd49
2 changed files with 16 additions and 6 deletions
--- a/core/src/mindustry/ai/WaveSpawner.java
+++ b/core/src/mindustry/ai/WaveSpawner.java
@@ -55,6 +55,12 @@ public class WaveSpawner{
    public void spawnEnemies(){
        spawning = true;

+        eachGroundSpawn((spawnX, spawnY, doShockwave) -> {
+            if(doShockwave){
+                doShockwave(spawnX, spawnY);
+            }
+        });
+
        for(SpawnGroup group : state.rules.spawns){
            if(group.type == null) continue;

@@ -86,12 +92,6 @@ public class WaveSpawner{
            }
        }

-        eachGroundSpawn((spawnX, spawnY, doShockwave) -> {
-            if(doShockwave){
-                doShockwave(spawnX, spawnY);
-            }
-        });
-
        Time.runTask(121f, () -> spawning = false);
    }