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

???

Browse Source
This commit is contained in:
Anuken
2020-05-18 11:10:56 -04:00
parent 3784251108
commit dcbe4072dc
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/TechTree.java
View File

@@ -345,7 +345,7 @@ public class TechTree implements ContentList{
return new TechNode(content, requirements, children); return new TechNode(content, requirements, children);
} }
private static TechNode node(Block block){ private static TechNode node(UnlockableContent block){
return node(block, () -> {}); return node(block, () -> {});
} }

4
core/src/mindustry/maps/generators/FileMapGenerator.java
View File

@@ -17,11 +17,13 @@ public class FileMapGenerator implements WorldGenerator{
public final Map map; public final Map map;
public FileMapGenerator(String mapName){ public FileMapGenerator(String mapName){
this.map = maps.loadInternalMap(mapName); this.map = maps != null ? maps.loadInternalMap(mapName) : null;
} }
@Override @Override
public void generate(Tiles tiles){ public void generate(Tiles tiles){
if(map == null) throw new RuntimeException("Generator has null map, cannot be used.");
SaveIO.load(map.file); SaveIO.load(map.file);
world.beginMapLoad(); world.beginMapLoad();

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=41fc7758d3853b18fdeb2e4c657a99895f44e721 archash=