From cb9616a3814e77cde841b8ece585537f67a021cf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 11 Feb 2019 22:44:51 -0500
Subject: [PATCH] Fixed waves not spawning in custom maps

---
 core/src/io/anuke/mindustry/game/RulePreset.java        | 2 ++
 server/src/io/anuke/mindustry/server/ServerControl.java | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/io/anuke/mindustry/game/RulePreset.java b/core/src/io/anuke/mindustry/game/RulePreset.java
index ae76a97430..566c632159 100644
--- a/core/src/io/anuke/mindustry/game/RulePreset.java
+++ b/core/src/io/anuke/mindustry/game/RulePreset.java
@@ -9,11 +9,13 @@ public enum RulePreset{
         waveTimer = true;
         waves = true;
         unitDrops = true;
+        spawns = Waves.getDefaultSpawns();
     }}),
     sandbox(() -> new Rules(){{
         infiniteResources = true;
         waves = true;
         waveTimer = false;
+        spawns = Waves.getDefaultSpawns();
     }}),
     attack(() -> new Rules(){{
         enemyCheat = true;
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index b62fec2cf6..047ee35155 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -264,14 +264,13 @@ public class ServerControl implements ApplicationListener{
                 info("Status:");
                 info("  &lyPlaying on map &fi{0}&fb &lb/&ly Wave {1}", Strings.capitalize(world.getMap().name), state.wave);
 
-                if(!state.rules.waves){
+                if(state.rules.waves){
                     info("&ly  {0} enemies.", unitGroups[Team.red.ordinal()].size());
                 }else{
                     info("&ly  {0} seconds until next wave.", (int) (state.wavetime / 60));
                 }
 
-                info("  &ly{0} FPS.", (int) (60f / Time.delta()));
-                info("  &ly{0} MB used.", Core.app.getJavaHeap() / 1024 / 1024);
+                info("  &ly{0} FPS, {1} MB used.", (int)(60f/Time.delta()), Core.app.getJavaHeap() / 1024 / 1024);
 
                 if(playerGroup.size() > 0){
                     info("  &lyPlayers: {0}", playerGroup.size());