???

core/src/mindustry/content/TechTree.java

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

core/src/mindustry/maps/generators/FileMapGenerator.java

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