Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2022-02-05 19:22:02 -05:00
parent 87726fc89b 6a053f2f45
commit f02c1f6964
4 changed files with 8 additions and 3 deletions
@@ -116,7 +116,7 @@ public class CoreBlock extends StorageBlock{
    @Override
    public boolean canReplace(Block other){
        //coreblocks can upgrade smaller cores
-        return super.canReplace(other) || (other instanceof CoreBlock && size > other.size);
+        return super.canReplace(other) || (other instanceof CoreBlock && size >= other.size && other != this);
    }

    @Override