From 8d28976b0d54dcc9c1114ef3fe6bed5982d2ac4f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 5 Dec 2018 19:00:10 -0500
Subject: [PATCH] Misc cleanup

---
 build.gradle                                                    | 2 +-
 core/src/io/anuke/mindustry/ai/WaveSpawner.java                 | 2 +-
 .../io/anuke/mindustry/entities/effect/GroundEffectEntity.java  | 2 +-
 core/src/io/anuke/mindustry/game/EventType.java                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index ba398346bf..2a4f828ef1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.9'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '3dfb820142a0fc583ad19413a24fc5038aa29d89'
+        uCoreVersion = '5871d2d0385370bc937fed3e5e301d6962a50476'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/ai/WaveSpawner.java b/core/src/io/anuke/mindustry/ai/WaveSpawner.java
index 7a7d58fc14..897cdcda3f 100644
--- a/core/src/io/anuke/mindustry/ai/WaveSpawner.java
+++ b/core/src/io/anuke/mindustry/ai/WaveSpawner.java
@@ -164,7 +164,7 @@ public class WaveSpawner{
             for(int y = quady * quadsize; y < world.height() && y < (quady + 1) * quadsize; y++){
                 Tile tile = world.tile(x, y);
 
-                if(tile == null || tile.solid() || world.pathfinder.getValueforTeam(Team.red, x, y) == Float.MAX_VALUE || tile.floor().isLiquid){
+                if(tile == null || tile.solid() || tile.getTeam() == defaultTeam || world.pathfinder.getValueforTeam(Team.red, x, y) == Float.MAX_VALUE || tile.floor().isLiquid){
                     setQuad(quadx, quady, false);
                     break outer;
                 }
diff --git a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java b/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
index 889c04a7ce..ceaceb8ba7 100644
--- a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
+++ b/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
@@ -6,7 +6,7 @@ import io.anuke.ucore.core.Effects;
 import io.anuke.ucore.core.Effects.Effect;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.entities.impl.EffectEntity;
-import io.anuke.ucore.function.EffectRenderer;
+import io.anuke.ucore.core.Effects.EffectRenderer;
 import io.anuke.ucore.util.Mathf;
 
 /**
diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java
index f2e91965f9..0724be398a 100644
--- a/core/src/io/anuke/mindustry/game/EventType.java
+++ b/core/src/io/anuke/mindustry/game/EventType.java
@@ -3,7 +3,7 @@ package io.anuke.mindustry.game;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.traits.BuilderTrait;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.ucore.function.Event;
+import io.anuke.ucore.core.Events.Event;
 
 public class EventType{