43 lines
2.3 KiB
Diff
43 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Telesphoreo <me@telesphoreo.me>
|
|
Date: Sat, 10 Dec 2022 22:25:38 -0600
|
|
Subject: [PATCH] Return null when a show_entity hover event's UUID isn't valid
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
|
index 3ad05bbab726c59e7b67d9614af4b208d4520cb3..c0633f9553fb5aa52e8ffc863159521d09cb3bd5 100644
|
|
--- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
|
+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
|
@@ -174,7 +174,14 @@ public class HoverEvent {
|
|
} else {
|
|
JsonObject jsonObject = json.getAsJsonObject();
|
|
EntityType<?> entityType = BuiltInRegistries.ENTITY_TYPE.get(new ResourceLocation(GsonHelper.getAsString(jsonObject, "type")));
|
|
- UUID uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id"));
|
|
+ // Scissors start
|
|
+ UUID uUID;
|
|
+ try {
|
|
+ uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id"));
|
|
+ } catch (Exception ex) {
|
|
+ return null;
|
|
+ }
|
|
+ // Scissors end
|
|
Component component = Component.Serializer.fromJson(jsonObject.get("name"));
|
|
return new HoverEvent.EntityTooltipInfo(entityType, uUID, component);
|
|
}
|
|
@@ -186,7 +193,14 @@ public class HoverEvent {
|
|
CompoundTag compoundTag = TagParser.parseTag(text.getString());
|
|
Component component = Component.Serializer.fromJson(compoundTag.getString("name"));
|
|
EntityType<?> entityType = BuiltInRegistries.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type")));
|
|
- UUID uUID = UUID.fromString(compoundTag.getString("id"));
|
|
+ // Scissors start
|
|
+ UUID uUID;
|
|
+ try {
|
|
+ uUID = UUID.fromString(compoundTag.getString("id"));
|
|
+ } catch (Exception ex) {
|
|
+ return null;
|
|
+ }
|
|
+ // Scissors end
|
|
return new HoverEvent.EntityTooltipInfo(entityType, uUID, component);
|
|
} catch (Exception var5) {
|
|
return null;
|