safety for text interaction stripping

sisby-folk · Oct 16, 2024 · 2d81b0a · 2d81b0a
1 parent 142390e
commit 2d81b0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ authors=Sisby folk
 contributors=Ampflower, falkreon, jaskarth, Garden System
 license=LGPL-3.0-or-later
 # Mod Version
-baseVersion=0.6.24
+baseVersion=0.6.25
 # Branch Metadata
 branch=1.20
 tagBranch=1.20

diff --git a/src/main/java/folk/sisby/surveyor/util/TextUtil.java b/src/main/java/folk/sisby/surveyor/util/TextUtil.java
@@ -16,9 +16,13 @@
 
 public class TextUtil {
 	public static Text stripInteraction(Text text) {
-		NbtCompound nbt = (NbtCompound) Codecs.TEXT.encodeStart(NbtOps.INSTANCE, text).getOrThrow(false, null);
-		NbtUtil.removeRecursive(nbt, List.of("hoverEvent", "clickEvent", "insertion"));
-		return Codecs.TEXT.decode(NbtOps.INSTANCE, nbt).getOrThrow(false, null).getFirst();
+		try {
+			NbtCompound nbt = (NbtCompound) Codecs.TEXT.encodeStart(NbtOps.INSTANCE, text).getOrThrow(true, null);
+			NbtUtil.removeRecursive(nbt, List.of("hoverEvent", "clickEvent", "insertion"));
+			return Codecs.TEXT.decode(NbtOps.INSTANCE, nbt).getOrThrow(true, null).getFirst();
+		} catch (Exception e) {
+			return Text.literal(text.getString());
+		}
 	}
 
 	public static MutableText highlightStrings(Collection<String> list, Function<String, Formatting> highlighter) {