Skip to content

Commit

Permalink
Fixes AppliedEnergistics#2689: Do not pass our own blockstate to the …
Browse files Browse the repository at this point in the history
…adjacent block.
  • Loading branch information
yueh authored and phit committed Dec 19, 2016
1 parent 92dacf4 commit 9be4acd
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/main/java/appeng/decorative/solid/BlockQuartzGlass.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,17 @@ public boolean shouldSideBeRendered( final IBlockState state, final IBlockAccess
{
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
Expand Down

0 comments on commit 9be4acd

Please sign in to comment.