Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-22 10:05:12 +01:00
Code Issues Projects Releases Wiki Activity

Fix conversion of mixed json arrays

Browse Source
This commit is contained in:
Nassim Jahnke 2023-12-09 15:19:05 +01:00
parent 9387b86e4a
commit cf5f5ed4bb
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
View File

@ -361,7 +361,7 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
// Use the hash to write a pack uuid // Use the hash to write a pack uuid
final String url = wrapper.read(Type.STRING); final String url = wrapper.read(Type.STRING);
final String hash = wrapper.read(Type.STRING); final String hash = wrapper.read(Type.STRING);
wrapper.write(Type.UUID, UUID.nameUUIDFromBytes(hash.getBytes(StandardCharsets.UTF_8))); wrapper.write(Type.UUID, UUID.nameUUIDFromBytes(url.getBytes(StandardCharsets.UTF_8)));
wrapper.write(Type.STRING, url); wrapper.write(Type.STRING, url);
wrapper.write(Type.STRING, hash); wrapper.write(Type.STRING, hash);
wrapper.passthrough(Type.BOOLEAN); // Required wrapper.passthrough(Type.BOOLEAN); // Required
@ -485,15 +485,20 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
for (final JsonElement entry : element.getAsJsonArray()) { for (final JsonElement entry : element.getAsJsonArray()) {
final Tag convertedTag = convertToTag(entry); final Tag convertedTag = convertToTag(entry);
if (convertedTag instanceof CompoundTag) { if (convertedTag instanceof CompoundTag) {
processedListTag.add(listTag); processedListTag.add(convertedTag);
continue; continue;
} }
// Wrap all entries in compound tags as lists can only consist of one type of tag // Wrap all entries in compound tags, as lists can only consist of one type of tag
final CompoundTag compoundTag = new CompoundTag(); final CompoundTag compoundTag = new CompoundTag();
compoundTag.put("type", new StringTag("text")); compoundTag.put("type", new StringTag("text"));
if (convertedTag instanceof ListTag) {
compoundTag.put("text", new StringTag()); compoundTag.put("text", new StringTag());
compoundTag.put("extra", convertedTag); compoundTag.put("extra", convertedTag);
} else {
compoundTag.put("text", new StringTag(convertedTag.toString()));
}
processedListTag.add(compoundTag);
} }
return processedListTag; return processedListTag;
} }