Fixed #316

- Moved camouflage logic in `getBlockFaceShape` method from `StargateAbstractMemberBlock` to `StargateClassicMemberBlock` - `BlockFaceShape.SOLID` will be returned if member block isn't merged
MrJake222 · Jun 8, 2021 · 1aec430 · 1aec430
1 parent 4b796bc
commit 1aec430
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/main/java/mrjake/aunis/block/stargate/StargateAbstractMemberBlock.java b/src/main/java/mrjake/aunis/block/stargate/StargateAbstractMemberBlock.java
@@ -106,14 +106,6 @@ public boolean isFullBlock(IBlockState state) {
 
     @Override
     public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing facing) {
-    	if (state.getValue(AunisProps.RENDER_BLOCK)) {
-    		// Rendering some block
-    		StargateClassicMemberTile memberTile = (StargateClassicMemberTile) world.getTileEntity(pos);
-			if (memberTile != null && memberTile.getCamoState() != null) {
-				return memberTile.getCamoState().getBlockFaceShape(world, pos, facing);
-			}
-    	}
-
-    	return BlockFaceShape.UNDEFINED;
+        return state.getValue(AunisProps.RENDER_BLOCK) ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED;
     }
 }
diff --git a/src/main/java/mrjake/aunis/block/stargate/StargateClassicMemberBlock.java b/src/main/java/mrjake/aunis/block/stargate/StargateClassicMemberBlock.java
@@ -13,6 +13,7 @@
 import net.minecraft.block.BlockSlab;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -379,4 +380,16 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess access, Bloc
 	public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess access, BlockPos pos) {
 		return CamoPropertiesHelper.getStargateBlockBoundingBox(state, access, pos, true);
 	}
+
+	@Override
+	public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing facing) {
+		if (state.getValue(AunisProps.RENDER_BLOCK)) {
+			// Rendering camouflage block
+			StargateClassicMemberTile memberTile = (StargateClassicMemberTile) world.getTileEntity(pos);
+			if (memberTile != null && memberTile.getCamoState() != null) {
+				return memberTile.getCamoState().getBlockFaceShape(world, pos, facing);
+			}
+		}
+		return super.getBlockFaceShape(world, state, pos, facing);
+	}
 }