From 8d086c4c3f4a7351f077999ab05e3bac2df0f63a Mon Sep 17 00:00:00 2001 From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com> Date: Wed, 26 May 2021 20:56:13 -0300 Subject: [PATCH] fix building --- build.gradle.kts | 2 +- .../protocol/id47toid5/metadata/MetadataRewriter.kt | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 40ffc41..0bd0b05 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,12 +46,12 @@ version = "0.4.0-SNAPSHOT+" + try { extra.set("archivesBaseName", "VIAaaS") repositories { - mavenLocal() mavenCentral() maven("https://oss.sonatype.org/content/repositories/snapshots") maven("https://repo.viaversion.com/") maven("https://repo.aikar.co/content/groups/aikar/") maven("https://jitpack.io") + mavenLocal() } dependencies { diff --git a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/metadata/MetadataRewriter.kt b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/metadata/MetadataRewriter.kt index 73e27e6..4bb13f6 100644 --- a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/metadata/MetadataRewriter.kt +++ b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/metadata/MetadataRewriter.kt @@ -9,20 +9,21 @@ import de.gerrygames.viarewind.protocol.protocol1_8to1_7_6_10.metadata.MetaIndex object MetadataRewriter { fun transform(type: Entity1_10Types.EntityType?, list: MutableList) { for (entry in ArrayList(list)) { - val metaIndex = MetaIndex1_8to1_7_6_10.searchIndex(type, entry.id) + val metaIndex = MetaIndex1_8to1_7_6_10.searchIndex(type, entry.id()) try { if (metaIndex == null) throw Exception("Could not find valid metadata") - if (metaIndex.newType == MetaType1_8.NonExistent) { + if (metaIndex.newType == MetaType1_8.NonExistent || metaIndex.newType == null) { list.remove(entry) return } val value = entry.value - if (!value.javaClass.isAssignableFrom(metaIndex.oldType.type.outputClass)) { + if (value == null + || !value.javaClass.isAssignableFrom(metaIndex.oldType.type().outputClass)) { list.remove(entry) return } - entry.metaType = metaIndex.newType - entry.id = metaIndex.newIndex + entry.setMetaType(metaIndex.newType) + entry.setId(metaIndex.newIndex) when (metaIndex.newType) { MetaType1_8.Int -> entry.value = (value as Number).toInt() MetaType1_8.Byte -> {