From a02af0ddf2f6e96bb67c155ec5812aec412dfd37 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 30 Oct 2016 12:51:58 +0100 Subject: [PATCH] Fix #1490 Crash in 1.10.2 when trying to render a Hill Cherry sapling --- .../arboriculture/multiblock/CharcoalPileController.java | 4 ---- src/main/java/forestry/core/models/ModelBlockCached.java | 3 +++ src/main/java/forestry/core/models/ModelBlockDefault.java | 7 +++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java b/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java index aedaa34cf..a225fd17a 100644 --- a/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java +++ b/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java @@ -11,10 +11,7 @@ import forestry.api.core.EnumTemperature; import forestry.api.multiblock.ICharcoalPileComponent; import forestry.api.multiblock.IMultiblockComponent; import forestry.apiculture.network.packets.PacketActiveUpdate; -import forestry.arboriculture.PluginArboriculture; -import forestry.arboriculture.blocks.BlockPile; import forestry.core.multiblock.IMultiblockControllerInternal; -import forestry.core.multiblock.MultiblockRegistry; import forestry.core.multiblock.MultiblockValidationException; import forestry.core.multiblock.RectangularMultiblockControllerBase; import forestry.core.network.DataInputStreamForestry; @@ -22,7 +19,6 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.core.utils.Translator; -import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/forestry/core/models/ModelBlockCached.java b/src/main/java/forestry/core/models/ModelBlockCached.java index 09155d897..8bd1cab29 100644 --- a/src/main/java/forestry/core/models/ModelBlockCached.java +++ b/src/main/java/forestry/core/models/ModelBlockCached.java @@ -37,6 +37,9 @@ public abstract class ModelBlockCached extends ModelBlockDef @Override protected IBakedModel getModel(@Nonnull IBlockState state) { + if(state == null){ + return null; + } K key = getWorldKey(state); if (key == null) { return null; diff --git a/src/main/java/forestry/core/models/ModelBlockDefault.java b/src/main/java/forestry/core/models/ModelBlockDefault.java index 80baad5c9..975e922da 100644 --- a/src/main/java/forestry/core/models/ModelBlockDefault.java +++ b/src/main/java/forestry/core/models/ModelBlockDefault.java @@ -20,6 +20,7 @@ import forestry.api.core.IModelBakerModel; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; import forestry.core.models.baker.ModelBaker; +import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -101,6 +102,9 @@ public abstract class ModelBlockDefault implements IBakedMod } protected IBakedModel getModel(ItemStack stack, World world) { + if(stack == null){ + return null; + } return bakeModel(stack, world, getInventoryKey(stack)); } @@ -187,6 +191,9 @@ public abstract class ModelBlockDefault implements IBakedMod @Override public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { + if(world == null){ + world = Proxies.common.getRenderWorld(); + } return getModel(stack, world); } }