From 55dac73d103def2a8d758d9d93513be3c35b7b1c Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 13 May 2013 21:04:55 -0700 Subject: [PATCH] Fix NPE when rendering EntityItems that are not blocks but int he block range. --- client/net/minecraftforge/client/ForgeHooksClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/net/minecraftforge/client/ForgeHooksClient.java b/client/net/minecraftforge/client/ForgeHooksClient.java index c359b978a..8acb7cb84 100644 --- a/client/net/minecraftforge/client/ForgeHooksClient.java +++ b/client/net/minecraftforge/client/ForgeHooksClient.java @@ -85,7 +85,8 @@ public class ForgeHooksClient boolean is3D = customRenderer.shouldUseRenderHelper(ENTITY, item, BLOCK_3D); engine.bindTexture(item.getItemSpriteNumber() == 0 ? "/terrain.png" : "/gui/items.png"); - if (is3D || (item.itemID < Block.blocksList.length && RenderBlocks.renderItemIn3d(Block.blocksList[item.itemID].getRenderType()))) + Block block = (item.itemID < Block.blocksList.length ? Block.blocksList[item.itemID] : null); + if (is3D || (block != null && RenderBlocks.renderItemIn3d(block.getRenderType()))) { int renderType = (item.itemID < Block.blocksList.length ? Block.blocksList[item.itemID].getRenderType() : 1); float scale = (renderType == 1 || renderType == 19 || renderType == 12 || renderType == 2 ? 0.5F : 0.25F);