From 7773a3b17bf7bef4b572acf088bd7ccaa5b1ba2f Mon Sep 17 00:00:00 2001
From: JrTRinny <85090668+JrTRinny@users.noreply.github.com>
Date: Sun, 22 Aug 2021 20:45:05 +0700
Subject: [PATCH 1/2] let payload source/void replace each other (#5835)

---
 core/src/mindustry/content/Blocks.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b783221cbc..97fc58517a 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2083,11 +2083,15 @@ public class Blocks implements ContentList{
         payloadSource = new PayloadSource("payload-source"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
+            alwaysUnlocked = true;
+            group = BlockGroup.units;
         }};
 
         payloadVoid = new PayloadVoid("payload-void"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
+            alwaysUnlocked = true;
+            group = BlockGroup.units;
         }};
 
         //TODO move

From b860b2bbfb81f0f504e55a5b1bffe65187fedce7 Mon Sep 17 00:00:00 2001
From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 22 Aug 2021 06:45:17 -0700
Subject: [PATCH 2/2] Don't show core ghosts (#5834)

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

diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index 24f5b6a652..20c42d8743 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -55,6 +55,7 @@ public class CoreBlock extends StorageBlock{
         envEnabled = Env.any;
         drawDisabled = false;
         replaceable = false;
+        rebuildable = false;
     }
 
     @Remote(called = Loc.server)