mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-09-22 05:39:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix schematicannon bedrock breaking with doors, tall flowers and beds

Browse Source
This commit is contained in:
grimmauld 2020-09-06 12:43:41 +02:00
parent fb7b2e64b2
commit 25bce3fc17
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java
View File

@ -688,9 +688,18 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC
}
protected boolean shouldPlace(BlockPos pos, BlockState state) {
if (world == null)
return false;
BlockState toReplace = world.getBlockState(pos);
boolean placingAir = state.getBlock() == Blocks.AIR;
BlockState toReplaceOther = null;
if (state.has(BlockStateProperties.BED_PART) && state.has(BlockStateProperties.HORIZONTAL_FACING) && state.get(BlockStateProperties.BED_PART) == BedPart.FOOT)
toReplaceOther = world.getBlockState(pos.offset(state.get(BlockStateProperties.HORIZONTAL_FACING)));
if (state.has(BlockStateProperties.DOUBLE_BLOCK_HALF)
&& state.get(BlockStateProperties.DOUBLE_BLOCK_HALF) == DoubleBlockHalf.LOWER)
toReplaceOther = world.getBlockState(pos.up());
if (!world.isBlockPresent(pos))
return false;
if (!world.getWorldBorder()
@ -698,11 +707,11 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC
return false;
if (toReplace == state)
return false;
if (toReplace.getBlockHardness(world, pos) == -1)
if (toReplace.getBlockHardness(world, pos) == -1 || (toReplaceOther != null && toReplaceOther.getBlockHardness(world, pos) == -1))
return false;
if (pos.withinDistance(getPos(), 2f))
return false;
if (!replaceTileEntities && toReplace.hasTileEntity())
if (!replaceTileEntities && (toReplace.hasTileEntity() || (toReplaceOther != null && toReplaceOther.hasTileEntity())))
return false;
if (shouldIgnoreBlockState(state))
@ -713,10 +722,10 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC
if (replaceMode == 2 && !placingAir)
return true;
if (replaceMode == 1
&& (state.isNormalCube(blockReader, pos.subtract(schematicAnchor)) || !toReplace.isNormalCube(world, pos))
&& (state.isNormalCube(blockReader, pos.subtract(schematicAnchor)) || (!toReplace.isNormalCube(world, pos) && (toReplaceOther == null || !toReplaceOther.isNormalCube(world, pos))))
&& !placingAir)
return true;
if (replaceMode == 0 && !toReplace.isNormalCube(world, pos) && !placingAir)
if (replaceMode == 0 && !toReplace.isNormalCube(world, pos) && (toReplaceOther == null || !toReplaceOther.isNormalCube(world, pos)) && !placingAir)
return true;
return false;