From 55903576b6c5de1a1a510d695e37145e80ff4b21 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 4 Aug 2020 17:18:19 -0400
Subject: [PATCH] Fixed #2312

---
 core/src/mindustry/ai/WaveSpawner.java | 2 ++
 gradle.properties                      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java
index 7f75b594af..9f2039284b 100644
--- a/core/src/mindustry/ai/WaveSpawner.java
+++ b/core/src/mindustry/ai/WaveSpawner.java
@@ -41,6 +41,8 @@ public class WaveSpawner{
         spawning = true;
 
         for(SpawnGroup group : state.rules.spawns){
+            if(group.type == null) continue;
+
             int spawned = group.getUnitsSpawned(state.wave - 1);
 
             if(group.type.flying){
diff --git a/gradle.properties b/gradle.properties
index 1da478fdec..d6ffc7de48 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=37a42909cbc4b857437ca29a132edbe05db76989
+archash=419b6760c2c7e1a1053f707f64db32380424fe4f