Merge branch 'master' into crater

2020-03-15 22:00:51 +01:00
parent 4b08cfd2b7 ec34e27102
commit 4f195b72d1
21 changed files with 42 additions and 13 deletions
--- a/core/src/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/mindustry/world/blocks/BuildBlock.java
@@ -252,7 +252,7 @@ public class BuildBlock extends Block{
        }

        public void deconstruct(Unit builder, @Nullable TileEntity core, float amount){
-            float deconstructMultiplier = 0.5f;
+            float deconstructMultiplier = state.rules.deconstructRefundMultiplier;

            if(cblock != null){
                ItemStack[] requirements = cblock.requirements;