From 5edf70103fb9c0693c3e9376d097d9f5ae4ea36c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 25 Sep 2019 12:17:08 -0400
Subject: [PATCH] Crash fix

---
 core/src/io/anuke/mindustry/ai/BlockIndexer.java    | 7 +++++--
 core/src/io/anuke/mindustry/editor/MapRenderer.java | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java
index a9e575f35d..b57e364d91 100644
--- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java
+++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java
@@ -143,8 +143,11 @@ public class BlockIndexer{
         returnArray.clear();
         for(Team enemy : state.teams.enemiesOf(team)){
             if(state.teams.isActive(enemy)){
-                for(Tile tile : getFlagged(enemy)[type.ordinal()]){
-                    returnArray.add(tile);
+                ObjectSet<Tile> set = getFlagged(enemy)[type.ordinal()];
+                if(set != null){
+                    for(Tile tile : set){
+                        returnArray.add(tile);
+                    }
                 }
             }
         }
diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java
index 619b03567a..8c88cba145 100644
--- a/core/src/io/anuke/mindustry/editor/MapRenderer.java
+++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java
@@ -68,6 +68,11 @@ public class MapRenderer implements Disposable{
         updates.addAll(delayedUpdates);
         delayedUpdates.clear();
 
+        //????
+        if(chunks == null){
+            return;
+        }
+
         for(int x = 0; x < chunks.length; x++){
             for(int y = 0; y < chunks[0].length; y++){
                 IndexedRenderer mesh = chunks[x][y];