Better built-in shuffle

2020-06-14 14:50:04 -04:00
parent 5370874686
commit 126b54b981
24 changed files with 41 additions and 57 deletions
--- a/core/src/mindustry/game/Gamemode.java
+++ b/core/src/mindustry/game/Gamemode.java
@@ -21,7 +21,7 @@ public enum Gamemode{
        rules.attackMode = true;
        rules.waves = true;
        rules.waveTimer = true;
-    }, map -> map.teams.contains(state.rules.waveTeam.id)),
+    }, map -> map.teams.contains(state.rules.waveTeam.id) && !map.rules().pvp),
    pvp(rules -> {
        rules.pvp = true;
        rules.enemyCoreBuildRadius = 600f;