From dcbe4072dc01bc0cab90c5f8d66516347baa1a21 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 18 May 2020 11:10:56 -0400
Subject: [PATCH] ???

---
 core/src/mindustry/content/TechTree.java                 | 2 +-
 core/src/mindustry/maps/generators/FileMapGenerator.java | 4 +++-
 gradle.properties                                        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index d10ff747de..ad9205cc3f 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/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, () -> {});
     }
 
diff --git a/core/src/mindustry/maps/generators/FileMapGenerator.java b/core/src/mindustry/maps/generators/FileMapGenerator.java
index b8fa0ae4f2..702e73d38f 100644
--- a/core/src/mindustry/maps/generators/FileMapGenerator.java
+++ b/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();
 
diff --git a/gradle.properties b/gradle.properties
index 69581981c7..cd20e76ae5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=41fc7758d3853b18fdeb2e4c657a99895f44e721
+archash=