From 2664bb84be1e60aeec473543ea48d0180e470abb Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 11 Sep 2021 13:30:10 -0400 Subject: [PATCH] Fixed #5974 --- core/src/mindustry/game/Schematics.java | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index 4c4109d6ef..80b378ad53 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -291,11 +291,12 @@ public class Schematics implements Loadable{ /** Checks a schematic for deployment validity and adds it to the cache. */ private void checkLoadout(Schematic s, boolean validate){ Stile core = s.tiles.find(t -> t.block instanceof CoreBlock); + if(core == null) return; int cores = s.tiles.count(t -> t.block instanceof CoreBlock); int maxSize = getMaxLaunchSize(core.block); //make sure a core exists, and that the schematic is small enough. - if(core == null || (validate && (s.width > maxSize || s.height > maxSize + if((validate && (s.width > maxSize || s.height > maxSize || s.tiles.contains(t -> t.block.buildVisibility == BuildVisibility.sandboxOnly || !t.block.unlocked()) || cores > 1))) return; //place in the cache diff --git a/gradle.properties b/gradle.properties index ba07db3e96..912648a4a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=29844ef3821ab99a0212dfb676463cb37d870a1b +archash=72627de9b81e7143af4ebe1d1f9d54099ade8fd3