From 16d0c7a8e39a22156246302df3d7fe26b8c15196 Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft Date: Sat, 12 Sep 2026 21:20:43 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A7=20chore:=20bump=20version=20to?= =?UTF-8?q?=203.43.2=20and=20update=20weight=20retrieval=20logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update version in gradle.properties from 3.43.1 to 3.43.2 - modify weight retrieval in LuckPermsAccess.kt to use getOrNull() for safety --- gradle.properties | 2 +- .../dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 760f18851..02e3b01d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled javaVersion=25 mcVersion=26.2 group=dev.slne.surf.api -version=3.43.1 +version=3.43.2 relocationPrefix=dev.slne.surf.api.libs snapshot=false diff --git a/surf-api-core/surf-api-core/src/main/kotlin/dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt b/surf-api-core/surf-api-core/src/main/kotlin/dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt index 260ad924e..467169dd0 100644 --- a/surf-api-core/surf-api-core/src/main/kotlin/dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt +++ b/surf-api-core/surf-api-core/src/main/kotlin/dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt @@ -21,7 +21,8 @@ val User.suffix: String get() = this.cachedData.metaData.suffix ?: "" val User.weight - get() = LuckPermsAccess.luckperms.groupManager.getGroup(this.primaryGroup)?.weight ?: 0 + get() = LuckPermsAccess.luckperms.groupManager.getGroup(this.primaryGroup)?.weight?.getOrNull() + ?: 0 inline fun User.getMeta(key: String): T? { val value = this.resolveInheritedNodes(NodeType.META, this.queryOptions) @@ -40,7 +41,11 @@ inline fun User.getMeta(key: String, default: T): T { } +fun OptionalInt.getOrNull() = if (this.isPresent) this.asInt else null + + fun Audience.getLuckPermsUser(): User = this.getLuckPermsUserOrNull() ?: error("Audience does not have a valid UUID or LuckPerms user could not be found.") -fun Audience.getLuckPermsUserOrNull(): User? = this.uuidOrNull()?.let { LuckPermsAccess.getUser(it) } \ No newline at end of file +fun Audience.getLuckPermsUserOrNull(): User? = + this.uuidOrNull()?.let { LuckPermsAccess.getUser(it) } \ No newline at end of file From f9599bb95032d2c8d1f6ce408a7ca104627e46f5 Mon Sep 17 00:00:00 2001 From: Simon <32338899+ammodev@users.noreply.github.com> Date: Tue, 15 Sep 2026 13:21:17 +0200 Subject: [PATCH 2/3] Change getOrNull function to private visibility Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../kotlin/dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/surf-api-core/surf-api-core/src/main/kotlin/dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt b/surf-api-core/surf-api-core/src/main/kotlin/dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt index 467169dd0..20988b371 100644 --- a/surf-api-core/surf-api-core/src/main/kotlin/dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt +++ b/surf-api-core/surf-api-core/src/main/kotlin/dev/slne/surf/api/core/luckperms/LuckPermsAccess.kt @@ -41,7 +41,7 @@ inline fun User.getMeta(key: String, default: T): T { } -fun OptionalInt.getOrNull() = if (this.isPresent) this.asInt else null +private fun OptionalInt.getOrNull(): Int? = if (isPresent) asInt else null fun Audience.getLuckPermsUser(): User = this.getLuckPermsUserOrNull() From d2b4910fe8d5a68895b2afc9f8d14bc720f55d01 Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft Date: Tue, 15 Sep 2026 15:53:26 +0200 Subject: [PATCH 3/3] Update ABI reference --- surf-api-core/surf-api-core/api/surf-api-core.api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/surf-api-core/surf-api-core/api/surf-api-core.api b/surf-api-core/surf-api-core/api/surf-api-core.api index cbd84ba23..c81310562 100644 --- a/surf-api-core/surf-api-core/api/surf-api-core.api +++ b/surf-api-core/surf-api-core/api/surf-api-core.api @@ -7376,7 +7376,7 @@ public final class dev/slne/surf/api/core/luckperms/LuckPermsAccessKt { public static final fun getLuckPermsUserOrNull (Lnet/kyori/adventure/audience/Audience;)Lnet/luckperms/api/model/user/User; public static final fun getPrefix (Lnet/luckperms/api/model/user/User;)Ljava/lang/String; public static final fun getSuffix (Lnet/luckperms/api/model/user/User;)Ljava/lang/String; - public static final fun getWeight (Lnet/luckperms/api/model/user/User;)Ljava/lang/Object; + public static final fun getWeight (Lnet/luckperms/api/model/user/User;)I } public final class dev/slne/surf/api/core/math/VoxelLineTracer {