Rule selection fixes

2020-10-12 15:59:22 -04:00
parent fde1881fd5
commit 06877b457e
3 changed files with 13 additions and 11 deletions
@@ -98,7 +98,9 @@ public class Map implements Comparable<Map>, Publishable{

    public Rules rules(Rules base){
        try{
-            Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}"));
+            //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();
            return result;
        }catch(Exception e){