diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 840e2f4623..da58c45a0d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1530,7 +1530,7 @@ liquid.slag.description = Refined in separators into constituent metals. Consume liquid.oil.description = Used in advanced material production and as incendiary ammunition. liquid.cryofluid.description = Used as coolant in reactors, turrets and factories. -block.derelict =  [lightgray]Derelict +block.derelict = \uf77e [lightgray]Derelict block.armored-conveyor.description = Moves items forward. Does not accept non-conveyor inputs from the sides. block.illuminator.description = Emits light. block.message.description = Stores a message for communication between allies. diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index e1e251d0cb..afcfb74d2e 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -131,15 +131,16 @@ public class CoreBlock extends StorageBlock{ 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)){ + if(!tempTiles.contains(o -> !o.floor().allowCorePlacement || o.block() instanceof CoreBlock)){ return true; } + //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; }