From 5bf7401139ec8ccc01ff100fec9a043ca054c1ac Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 26 Aug 2020 14:50:43 -0400 Subject: [PATCH] Fixed a crash --- core/src/mindustry/ai/BaseAI.java | 5 ++++- gradle.properties | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/ai/BaseAI.java b/core/src/mindustry/ai/BaseAI.java index 70a0c43b31..83f393cc83 100644 --- a/core/src/mindustry/ai/BaseAI.java +++ b/core/src/mindustry/ai/BaseAI.java @@ -160,7 +160,10 @@ public class BaseAI{ private void tryWalls(){ Block wall = Blocks.copperWall; - Tile spawn = state.rules.defaultTeam.core() != null ? state.rules.defaultTeam.core().tile : data.team.core().tile; + Building spawnt = state.rules.defaultTeam.core() != null ? state.rules.defaultTeam.core() : data.team.core(); + Tile spawn = spawnt == null ? null : spawnt.tile; + + if(spawn == null) return; for(int wx = lastX; wx <= lastX + lastW; wx++){ for(int wy = lastY; wy <= lastY + lastH; wy++){ diff --git a/gradle.properties b/gradle.properties index 3c17a1d7f1..d6f1b99a58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=2ac66690875edbfa17847a3ef61b13a3e2006fe2 +archash=c899ca692e409237ff08631845cf0ea8b9392bb5