Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wave versions

Browse Source
This commit is contained in:
Anuken
2020-10-28 18:51:42 -04:00
parent 68ab48a1d3
commit 44286cee59
12 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/maps/Map.java
View File

@@ -101,7 +101,7 @@ public class Map implements Comparable<Map>, Publishable{
//this replacement is a MASSIVE hack but it fixes some incorrect overwriting of team-specific rules.
//may need to be tweaked later
Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}").replace("teams:{2:{infiniteAmmo:true}},", ""));
if(result.spawns.isEmpty()) result.spawns = Vars.defaultWaves.get();
if(result.spawns.isEmpty()) result.spawns = Vars.waves.get();
return result;
}catch(Exception e){
//error reading rules. ignore?