StateMc/BetterFoliage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

defend against CME in Forestry leaf support module

Browse Source 
fixes #106
This commit is contained in:
octarine-noise
2016-12-04 18:54:25 +01:00
parent 468d0f34b6
commit c356c3ef57
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/mods/betterfoliage/client/integration/ForestryIntegration.kt
View File

@@ -18,6 +18,7 @@ import mods.octarinecore.metaprog.ClassRef
import mods.octarinecore.metaprog.FieldRef import mods.octarinecore.metaprog.FieldRef
import mods.octarinecore.metaprog.MethodRef import mods.octarinecore.metaprog.MethodRef
import mods.octarinecore.metaprog.allAvailable import mods.octarinecore.metaprog.allAvailable
import mods.octarinecore.tryDefault
import net.minecraft.block.state.IBlockState import net.minecraft.block.state.IBlockState
import net.minecraft.client.Minecraft import net.minecraft.client.Minecraft
import net.minecraft.client.renderer.block.model.ModelResourceLocation import net.minecraft.client.renderer.block.model.ModelResourceLocation
@@ -118,7 +119,7 @@ object ForestryLeavesSupport : ILeafRegistry {
} }
// extract leaf texture information from TileEntity // 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 if (!ForestryIntegration.TileLeaves.isInstance(tile)) return null
val textureLoc = ForestryIntegration.TiLgetLeaveSprite.invoke(tile, Minecraft.isFancyGraphicsEnabled()) ?: return null val textureLoc = ForestryIntegration.TiLgetLeaveSprite.invoke(tile, Minecraft.isFancyGraphicsEnabled()) ?: return null
return textureToValue[textureLoc] return textureToValue[textureLoc]