From bdeba22561ae9af4482a1012f8a13831717e3649 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 24 Jun 2021 17:58:26 -0400
Subject: [PATCH] Switched to v7 server list

---
 core/src/mindustry/Vars.java                                | 4 ++--
 core/src/mindustry/world/blocks/payloads/PayloadSource.java | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index 001d5c85d6..65fde466b3 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -73,8 +73,8 @@ public class Vars implements Loadable{
     /** URL to the JSON file containing all the BE servers. Only queried in BE. */
     public static final String serverJsonBeURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_be.json";
     /** URL to the JSON file containing all the stable servers.  */
-    //TODO this uses BE servers until full v7 release, there's no point in displaying v6 at all
-    public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_be.json";
+    //TODO merge with v6 list upon release
+    public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_v7.json";
     /** URL of the github issue report template.*/
     public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?labels=bug&template=bug_report.md";
     /** list of built-in servers.*/
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadSource.java b/core/src/mindustry/world/blocks/payloads/PayloadSource.java
index 52ba318699..f64377ede2 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadSource.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadSource.java
@@ -12,6 +12,7 @@ import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
+import mindustry.world.blocks.storage.*;
 
 import static mindustry.Vars.*;
 
@@ -69,7 +70,7 @@ public class PayloadSource extends PayloadBlock{
     }
 
     public boolean canProduce(Block b){
-        return b.isVisible() && b.size < size;
+        return b.isVisible() && b.size < size && !(b instanceof CoreBlock);
     }
 
     public boolean canProduce(UnitType t){