From 95733e5d06f924d2f73934795e35a0d3d65f5720 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Thu, 5 Oct 2023 21:22:07 +0200 Subject: [PATCH] entity event data: allow lenient json --- .../bixilon/minosoft/data/text/events/hover/EntityHoverEvent.kt | 2 +- src/main/java/de/bixilon/minosoft/util/json/Jackson.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/hover/EntityHoverEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/hover/EntityHoverEvent.kt index 5630dc075..7cbd5bc19 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/hover/EntityHoverEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/hover/EntityHoverEvent.kt @@ -41,7 +41,7 @@ data class EntityHoverEvent( } json["text"]?.let { // 1.14.3.... lol - json = Jackson.MAPPER.readValue(it.unsafeCast(), Jackson.JSON_MAP_TYPE) + json = Jackson.MAPPER_LENIENT.readValue(it.unsafeCast(), Jackson.JSON_MAP_TYPE) } var type: ResourceLocation? = null json["type"]?.nullCast()?.let { diff --git a/src/main/java/de/bixilon/minosoft/util/json/Jackson.kt b/src/main/java/de/bixilon/minosoft/util/json/Jackson.kt index 541403bf8..b8da37075 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/Jackson.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/Jackson.kt @@ -56,6 +56,8 @@ object Jackson { propertyNamingStrategy = PropertyNamingStrategies.SNAKE_CASE } + val MAPPER_LENIENT = MAPPER.copy().apply { enable(JsonReadFeature.ALLOW_UNQUOTED_FIELD_NAMES.mappedFeature()) } + val JSON_MAP_TYPE: MapType = MAPPER.typeFactory.constructMapType(HashMap::class.java, Any::class.java, Any::class.java) }