From 79c4e560b90aaa0a351391129f1159b4035d9520 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Mon, 26 Jun 2023 16:30:08 +0700
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D1=81=D1=82=D1=80=D0=B5=D0=BB=20?=
 =?UTF-8?q?=D1=81=D0=B5=D0=B1=D0=B5=20=D0=B2=20=D0=BD=D0=BE=D0=B3=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/dbotthepony/mc/otm/registry/MBlockColors.kt   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockColors.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockColors.kt
index 648c9a94d..85900d227 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockColors.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockColors.kt
@@ -9,19 +9,21 @@ import net.minecraftforge.client.event.RegisterColorHandlersEvent
 import net.minecraftforge.eventbus.api.IEventBus
 
 object MBlockColors {
-	private const val DEFAULT_WATER_TINT: Int = 0x3F76E4;
+	private const val DEFAULT_WATER_TINT: Int = 0x3F76E4
 
 	private fun registerBlockColors(event: RegisterColorHandlersEvent.Block) {
-		event.register({ state: BlockState?, light: BlockAndTintGetter?, pos: BlockPos?, index: Int ->
+		event.register({ state: BlockState, light: BlockAndTintGetter?, pos: BlockPos?, index: Int ->
 			if (index == 0) {
-				if (light == null || pos == null) DEFAULT_WATER_TINT
-				BiomeColors.getAverageWaterColor(light!!, pos!!)
+				if (light == null || pos == null)
+					DEFAULT_WATER_TINT
+				else
+					BiomeColors.getAverageWaterColor(light, pos)
 			} else -1
 		}, MBlocks.COBBLESTONE_GENERATOR)
 	}
 
 	private fun registerItemColors(event: RegisterColorHandlersEvent.Item) {
-		event.register({ stack: ItemStack?, index: Int ->
+		event.register({ stack: ItemStack, index: Int ->
 			if (index == 0) DEFAULT_WATER_TINT else -1
 		}, MBlocks.COBBLESTONE_GENERATOR)
 	}