mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 08:27:37 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed waves not spawning in custom maps

Browse Source
This commit is contained in:
Anuken 2019-02-11 22:44:51 -05:00
parent d218fb926a
commit cb9616a381
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/game/RulePreset.java
View File

@ -9,11 +9,13 @@ public enum RulePreset{
waveTimer = true; waveTimer = true;
waves = true; waves = true;
unitDrops = true; unitDrops = true;
spawns = Waves.getDefaultSpawns();
}}), }}),
sandbox(() -> new Rules(){{ sandbox(() -> new Rules(){{
infiniteResources = true; infiniteResources = true;
waves = true; waves = true;
waveTimer = false; waveTimer = false;
spawns = Waves.getDefaultSpawns();
}}), }}),
attack(() -> new Rules(){{ attack(() -> new Rules(){{
enemyCheat = true; enemyCheat = true;

5
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@ -264,14 +264,13 @@ public class ServerControl implements ApplicationListener{
info("Status:"); info("Status:");
info(" &lyPlaying on map &fi{0}&fb &lb/&ly Wave {1}", Strings.capitalize(world.getMap().name), state.wave); 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()); info("&ly {0} enemies.", unitGroups[Team.red.ordinal()].size());
}else{ }else{
info("&ly {0} seconds until next wave.", (int) (state.wavetime / 60)); info("&ly {0} seconds until next wave.", (int) (state.wavetime / 60));
} }
info(" &ly{0} FPS.", (int) (60f / Time.delta())); info(" &ly{0} FPS, {1} MB used.", (int)(60f/Time.delta()), Core.app.getJavaHeap() / 1024 / 1024);
info(" &ly{0} MB used.", Core.app.getJavaHeap() / 1024 / 1024);
if(playerGroup.size() > 0){ if(playerGroup.size() > 0){
info(" &lyPlayers: {0}", playerGroup.size()); info(" &lyPlayers: {0}", playerGroup.size());