From 50c4882855daa276028eeea6559140a2e975341a Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Fri, 1 Apr 2016 18:25:32 +0200 Subject: [PATCH] fix config crash when accessing isOpaqueCube() before postInit --- src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt | 2 ++ src/main/kotlin/mods/betterfoliage/client/Hooks.kt | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt b/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt index 2c230d1..f3689b9 100644 --- a/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt +++ b/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt @@ -29,6 +29,7 @@ object BetterFoliageMod { lateinit var log: Logger var config: Configuration? = null + var isAfterPostInit = false @JvmStatic @Mod.InstanceFactory @@ -47,6 +48,7 @@ object BetterFoliageMod { if (FMLCommonHandler.instance().effectiveSide == Side.CLIENT) { Config.attach(config!!) Client.log(INFO, "BetterFoliage initialized") + isAfterPostInit = true } } diff --git a/src/main/kotlin/mods/betterfoliage/client/Hooks.kt b/src/main/kotlin/mods/betterfoliage/client/Hooks.kt index f9ffe29..3cb1c0e 100644 --- a/src/main/kotlin/mods/betterfoliage/client/Hooks.kt +++ b/src/main/kotlin/mods/betterfoliage/client/Hooks.kt @@ -32,8 +32,8 @@ fun doesSideBlockRenderingOverride(original: Boolean, blockAccess: IBlockAccess, } fun isOpaqueCubeOverride(original: Boolean, state: IBlockState): Boolean { - // caution: blocks are initialized and the method called before any mods are loaded - if (BetterFoliageMod.config == null) return original + // caution: blocks are initialized and the method called during startup + if (!BetterFoliageMod.isAfterPostInit) return original return original && !(Config.enabled && Config.roundLogs.enabled && Config.blocks.logs.matchesID(state.block)) }