From c356c3ef576f3191d59a81699b39ccc1f12e88c4 Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Sun, 4 Dec 2016 18:54:25 +0100 Subject: [PATCH] defend against CME in Forestry leaf support module fixes #106 --- .../betterfoliage/client/integration/ForestryIntegration.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/mods/betterfoliage/client/integration/ForestryIntegration.kt b/src/main/kotlin/mods/betterfoliage/client/integration/ForestryIntegration.kt index 05be50d..e7c7324 100644 --- a/src/main/kotlin/mods/betterfoliage/client/integration/ForestryIntegration.kt +++ b/src/main/kotlin/mods/betterfoliage/client/integration/ForestryIntegration.kt @@ -18,6 +18,7 @@ import mods.octarinecore.metaprog.ClassRef import mods.octarinecore.metaprog.FieldRef import mods.octarinecore.metaprog.MethodRef import mods.octarinecore.metaprog.allAvailable +import mods.octarinecore.tryDefault import net.minecraft.block.state.IBlockState import net.minecraft.client.Minecraft import net.minecraft.client.renderer.block.model.ModelResourceLocation @@ -118,7 +119,7 @@ object ForestryLeavesSupport : ILeafRegistry { } // extract leaf texture information from TileEntity - val tile = world.getTileEntity(pos) ?: return null + val tile = tryDefault(null) { world.getTileEntity(pos) } ?: return null if (!ForestryIntegration.TileLeaves.isInstance(tile)) return null val textureLoc = ForestryIntegration.TiLgetLeaveSprite.invoke(tile, Minecraft.isFancyGraphicsEnabled()) ?: return null return textureToValue[textureLoc]