diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index ff4bdf0356..2d26a96fc5 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -887,7 +887,7 @@ public class Block extends UnlockableContent{
         }
 
         //generate paletted team regions
-        if(teamRegion.found()){
+        if(teamRegion != null && teamRegion.found()){
             for(Team team : Team.all){
                 //if there's an override, don't generate anything
                 if(team.hasPalette && !Core.atlas.has(name + "-team-" + team.name)){
diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index f5c8b690dd..24f5b6a652 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -302,7 +302,13 @@ public class CoreBlock extends StorageBlock{
         @Override
         public void afterDestroyed(){
             if(state.rules.coreCapture){
-                tile.setNet(block, lastDamage, 0);
+                if(!net.client()){
+                    tile.setBlock(block, lastDamage);
+                }
+
+                //delay so clients don't destroy it afterwards
+                Core.app.post(() -> tile.setNet(block, lastDamage, 0));
+
                 //building does not exist on client yet
                 if(!net.client()){
                     //core is invincible for several seconds to prevent recapture
diff --git a/gradle.properties b/gradle.properties
index ccad41c21d..8595a5a09d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=fd433d5d1b3406a6f1c1fd7dad7e3591634ceeab
+archash=68277c42b4883e5fcb01dfa20fd27a5434ace891