Merge branch 'kotlin-1.11.2' into kotlin-1.12

2017-07-10 17:29:06 +02:00
parent 55095e7252 f145ff221e
commit dec1f6ff03
11 changed files with 43 additions and 22 deletions
@@ -27,13 +27,9 @@ class RenderConnectedGrassLog : AbstractBlockRenderingHandler(BetterFoliageMod.M
    override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean {
        val grassDir = grassCheckDirs.find {
            Config.blocks.grassClasses.matchesClass(ctx.block(it.offset))
-        }
+        } ?: return renderWorldBlockBase(ctx, dispatcher, renderer, layer)

-        return if (grassDir != null) {
-            ctx.withOffset(Int3.zero, grassDir.offset) {
-                renderWorldBlockBase(ctx, dispatcher, renderer, layer)
-            }
-        } else {
+        return ctx.withOffset(Int3.zero, grassDir.offset) {
            renderWorldBlockBase(ctx, dispatcher, renderer, layer)
        }
    }