Merge branch '1.21' into 1.21.3

senseiwells · Oct 24, 2024 · f411878 · f411878
2 parents 1e3c31c + 99f8399
commit f411878
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ repositories {
     maven("https://jitpack.io")
 }
 
-val modVersion = "2.0.0-beta.1"
+val modVersion = "2.0.0-beta.2"
 val releaseVersion = "${modVersion}+${libs.versions.minecraft.get()}"
 version = releaseVersion
 group = "me.senseiwells"

diff --git a/src/main/kotlin/me/senseiwells/essential_client/utils/CarpetUtils.kt b/src/main/kotlin/me/senseiwells/essential_client/utils/CarpetUtils.kt
@@ -9,7 +9,7 @@ import me.senseiwells.essential_client.features.carpet_client.database.CarpetRul
 object CarpetUtils {
     fun rules(): List<CarpetRule<*>> {
         val managers = arrayListOf<SettingsManager>(CarpetServer.settingsManager)
-        CarpetServer.extensions.mapTo(managers, CarpetExtension::extensionSettingsManager)
+        CarpetServer.extensions.mapNotNullTo(managers, CarpetExtension::extensionSettingsManager)
         return managers.flatMap { it.carpetRules }
     }