From 0b0ef5846ffeecd469665987cef7944cc91b842f Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 23 Apr 2015 16:40:44 -0400 Subject: [PATCH] #301 crash invalid with marble pillar metadatas --- .../client/render/BlockMarblePillarRenderer.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockMarblePillarRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockMarblePillarRenderer.java index 17fbce21..8898e070 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockMarblePillarRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockMarblePillarRenderer.java @@ -7,7 +7,6 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import com.cricketcraft.chisel.block.BlockCarvablePillar; -import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableHelper.TextureType; import com.cricketcraft.chisel.utils.Drawing; @@ -49,12 +48,10 @@ public class BlockMarblePillarRenderer implements ISimpleBlockRenderingHandler { int metadata = world.getBlockMetadata(x, y, z); - //Probably not the best way to handle this... - if(metadata > block.carverHelper.variations.size()) - { - metadata = block.carverHelper.variations.size() - 1; - } - else { + // Probably not the best way to handle this... + if (metadata >= block.carverHelper.variations.size()) { + metadata = 0; + } else { if (block.carverHelper.variations.get(metadata).type != TextureType.CTMV) { block.sides[0] = block.carverHelper.getIcon(0, metadata); block.sides[1] = block.carverHelper.getIcon(1, metadata);