Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Fixed ExtendedPersistentDataContainerFactory on 1.20.4

Browse Source
This commit is contained in:
Will FP
2024-03-10 17:03:51 +00:00
parent 1908d9a5c2
commit 446e7a9534
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eco-core/core-nms/v1_20_R3/build.gradle.kts
View File

@@ -7,7 +7,7 @@ version = rootProject.version
dependencies { dependencies {
implementation(project(":eco-core:core-nms:nms-common")) implementation(project(":eco-core:core-nms:nms-common"))
paperweight.paperDevBundle("1.20.3-R0.1-SNAPSHOT") paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT")
implementation("net.kyori:adventure-text-minimessage:4.11.0") { implementation("net.kyori:adventure-text-minimessage:4.11.0") {
version { version {

6
eco-core/core-nms/v1_20_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R3/ExtendedPersistentDataContainerFactory.kt
View File

@@ -46,17 +46,17 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
override fun <T : Any, Z : Any> set(key: String, dataType: PersistentDataType<T, Z>, value: Z) { override fun <T : Any, Z : Any> set(key: String, dataType: PersistentDataType<T, Z>, value: Z) {
customDataTags[key] = customDataTags[key] =
registry.wrap(dataType.primitiveType, dataType.toPrimitive(value, handle.adapterContext)) registry.wrap(dataType, dataType.toPrimitive(value, handle.adapterContext))
} }
override fun <T : Any, Z : Any> has(key: String, dataType: PersistentDataType<T, Z>): Boolean { override fun <T : Any, Z : Any> has(key: String, dataType: PersistentDataType<T, Z>): Boolean {
val value = customDataTags[key] ?: return false val value = customDataTags[key] ?: return false
return registry.isInstanceOf(dataType.primitiveType, value) return registry.isInstanceOf(dataType, value)
} }
override fun <T : Any, Z : Any> get(key: String, dataType: PersistentDataType<T, Z>): Z? { override fun <T : Any, Z : Any> get(key: String, dataType: PersistentDataType<T, Z>): Z? {
val value = customDataTags[key] ?: return null val value = customDataTags[key] ?: return null
return dataType.fromPrimitive(registry.extract(dataType.primitiveType, value), handle.adapterContext) return dataType.fromPrimitive(registry.extract<T, Tag>(dataType, value), handle.adapterContext)
} }
override fun <T : Any, Z : Any> getOrDefault( override fun <T : Any, Z : Any> getOrDefault(