From a2b20f1d678cb7b28960af295d7a950f639d9dd6 Mon Sep 17 00:00:00 2001 From: yueh Date: Thu, 8 Dec 2016 21:29:46 +0100 Subject: [PATCH] Fixes #2689: Do not pass our own blockstate to the adjacent block. --- .../java/appeng/decorative/solid/BlockQuartzGlass.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java index abaf837a7..f86376364 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java @@ -95,15 +95,17 @@ public class BlockQuartzGlass extends AEBaseBlock { BlockPos adjacentPos = pos.offset( side ); - final Material mat = w.getBlockState( adjacentPos ).getBlock().getMaterial( state ); + final Material mat = w.getBlockState( adjacentPos ).getMaterial(); + if( mat == Material.GLASS || mat == AEGlassMaterial.INSTANCE ) { - if( w.getBlockState( adjacentPos ).getBlock().getRenderType( state ) == this.getRenderType( state ) ) + if( w.getBlockState( adjacentPos ).getRenderType() == this.getRenderType( state ) ) { return false; } } - return super.shouldSideBeRendered( state, w, pos, side ); + + return w.getBlockState( pos ).shouldSideBeRendered( w, adjacentPos, side ); } @Override