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

Use sector preset name for maps if possible

Browse Source
This commit is contained in:
Anuken
2020-12-27 16:20:06 -05:00
parent f174d1b2b4
commit 990562dd71
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/World.java
View File

@@ -268,7 +268,7 @@ public class World{
}
private void setSectorRules(Sector sector){
state.map = new Map(StringMap.of("name", sector.planet.localizedName + "; Sector " + sector.id));
state.map = new Map(StringMap.of("name", sector.preset == null ? sector.planet.localizedName + "; Sector " + sector.id : sector.preset.localizedName));
state.rules.sector = sector;
state.rules.weather.clear();

11
core/src/mindustry/world/blocks/power/PowerGraph.java
View File

@@ -12,17 +12,6 @@ public class PowerGraph{
private static final Seq<Building> outArray1 = new Seq<>();
private static final Seq<Building> outArray2 = new Seq<>();
private static final IntSet closedSet = new IntSet();
private static final PowerGraph nullGraph = new PowerGraph(){
@Override
public void add(Building build){
throw new RuntimeException("cannot add to null graph");
}
@Override
public void addGraph(PowerGraph graph){
throw new RuntimeException("cannot add to null graph");
}
};
private final Seq<Building> producers = new Seq<>(false);
private final Seq<Building> consumers = new Seq<>(false);