Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-25 19:45:21 +01:00
Code Issues Projects Releases Wiki Activity

Only remove id field if it actually is a uuid

Browse Source
This commit is contained in:
Nassim Jahnke 2023-10-19 12:13:44 +10:00
parent 7d1b0d83ce
commit 08f6b3ce36
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 8 additions and 3 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

@ -400,9 +400,11 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
if ((key.equals("contents")) && element.isJsonObject()) { if ((key.equals("contents")) && element.isJsonObject()) {
// Store show_entity id as int array instead of uuid string // Store show_entity id as int array instead of uuid string
final JsonObject hoverEvent = element.getAsJsonObject(); final JsonObject hoverEvent = element.getAsJsonObject();
final JsonElement id = hoverEvent.remove("id"); final JsonElement id = hoverEvent.get("id");
final UUID uuid; final UUID uuid;
if (id != null && id.isJsonPrimitive() && (uuid = parseUUID(id.getAsString())) != null) { if (id != null && id.isJsonPrimitive() && (uuid = parseUUID(id.getAsString())) != null) {
hoverEvent.remove("id");
final CompoundTag convertedTag = (CompoundTag) convertToTag(element); final CompoundTag convertedTag = (CompoundTag) convertToTag(element);
convertedTag.put("id", new IntArrayTag(UUIDIntArrayType.uuidToIntArray(uuid))); convertedTag.put("id", new IntArrayTag(UUIDIntArrayType.uuidToIntArray(uuid)));
tag.put(key, convertedTag); tag.put(key, convertedTag);
@ -475,8 +477,10 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
if ((key.equals("contents")) && tag instanceof CompoundTag) { if ((key.equals("contents")) && tag instanceof CompoundTag) {
// Back to a UUID string // Back to a UUID string
final CompoundTag showEntity = (CompoundTag) tag; final CompoundTag showEntity = (CompoundTag) tag;
final Tag idTag = showEntity.remove("id"); final Tag idTag = showEntity.get("id");
if (idTag instanceof IntArrayTag) { if (idTag instanceof IntArrayTag) {
showEntity.remove("id");
final JsonObject convertedElement = (JsonObject) convertToJson(key, tag); final JsonObject convertedElement = (JsonObject) convertToJson(key, tag);
convertedElement.addProperty("id", uuidIntsToString(((IntArrayTag) idTag).getValue())); convertedElement.addProperty("id", uuidIntsToString(((IntArrayTag) idTag).getValue()));
object.add(key, convertedElement); object.add(key, convertedElement);
@ -484,7 +488,8 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
} }
} }
object.add(key, convertToJson(key, tag)); // "":1 is a valid tag, but not a valid json component
object.add(key.isEmpty() ? "text" : key, convertToJson(key, tag));
} }
private static String uuidIntsToString(final int[] parts) { private static String uuidIntsToString(final int[] parts) {