From 2569b2139d00dffc75117a6cd0beb584c377db57 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 6 Feb 2019 09:04:19 -0500
Subject: [PATCH] Crash fix

---
 core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
index 47579f1de3..6a68f73bab 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
@@ -45,8 +45,8 @@ public class CoreBlock extends StorageBlock{
         CoreEntity entity = tile.entity();
         Effects.effect(Fx.spawn, entity);
         entity.progress = 0;
-        entity.currentUnit.onRespawn(tile);
         entity.currentUnit = player;
+        entity.currentUnit.onRespawn(tile);
         entity.currentUnit.heal();
         entity.currentUnit.rotation = 90f;
         entity.currentUnit.applyImpulse(0, 8f);