From d6acfadab974cdcb0498d3b29a0de84dd5cb16a7 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Wed, 8 Jun 2022 08:24:22 -0400 Subject: [PATCH] No more free core upgrades (#6936) --- core/src/mindustry/world/blocks/storage/CoreBlock.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 1446851c04..e1e251d0cb 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -130,15 +130,16 @@ public class CoreBlock extends StorageBlock{ //in the editor, you can place them anywhere for convenience if(state.isEditor()) return true; + CoreBuild core = team.core(); + //must have all requirements + if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements, state.rules.buildCostMultiplier))) return false; + //special floor upon which cores can be placed tile.getLinkedTilesAs(this, tempTiles); if(!tempTiles.contains(o -> !o.floor().allowCorePlacement)){ return true; } - CoreBuild core = team.core(); - //must have all requirements - if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements, state.rules.buildCostMultiplier))) return false; return tile.block() instanceof CoreBlock && size > tile.block().size; }