Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Return dummy string instead of empty optional

This commit is contained in:
Nassim Jahnke 2024-03-25 13:26:01 +01:00
parent b6001403e9
commit 00fd87a10f
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
patches/server/1036-Improve-tag-parser-handling.patch
View File

@ -123,31 +123,32 @@ index 5bec54239a2b185284c10d58854e5a13e33daae5..94cb73e7f60171aa57bd1dbe7e91ef4d
+ } + }
} }
diff --git a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java diff --git a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
index d45e39bc009281c298f3dfae113dc87f2b3b1fbd..084ffde43447f6ff5e45e9fe3fc6a86bde65fd5a 100644 index d45e39bc009281c298f3dfae113dc87f2b3b1fbd..981d34dd4cfbc0932b147688751b98552c8beea8 100644
--- a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java --- a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
+++ b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java +++ b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
@@ -197,6 +197,15 @@ public class TranslatableContents implements ComponentContents { @@ -197,6 +197,15 @@ public class TranslatableContents implements ComponentContents {
@Override @Override
public <T> Optional<T> visit(FormattedText.ContentConsumer<T> visitor) { public <T> Optional<T> visit(FormattedText.ContentConsumer<T> visitor) {
+ // Paper start + // Paper start - Count visited parts
+ try { + try {
+ return this.visit(new TranslatableContentConsumer<>(visitor)); + return this.visit(new TranslatableContentConsumer<>(visitor));
+ } catch (IllegalArgumentException var5) { + } catch (IllegalArgumentException ignored) {
+ return Optional.empty(); + return visitor.accept("...");
+ } + }
+ } + }
+ private <T> Optional<T> visit(TranslatableContentConsumer<T> visitor) { + private <T> Optional<T> visit(TranslatableContentConsumer<T> visitor) {
+ // Paper end + // Paper end - Count visited parts
this.decompose(); this.decompose();
for(FormattedText formattedText : this.decomposedParts) { for(FormattedText formattedText : this.decomposedParts) {
@@ -208,6 +217,24 @@ public class TranslatableContents implements ComponentContents { @@ -208,6 +217,25 @@ public class TranslatableContents implements ComponentContents {
return Optional.empty(); return Optional.empty();
} }
+ // Paper start + // Paper start - Count visited parts
+ private static final class TranslatableContentConsumer<T> implements FormattedText.ContentConsumer<T> { + private static final class TranslatableContentConsumer<T> implements FormattedText.ContentConsumer<T> {
+ private static final IllegalArgumentException EX = new IllegalArgumentException("Too long");
+ private final FormattedText.ContentConsumer<T> visitor; + private final FormattedText.ContentConsumer<T> visitor;
+ private int visited; + private int visited;
+ +
@ -158,12 +159,12 @@ index d45e39bc009281c298f3dfae113dc87f2b3b1fbd..084ffde43447f6ff5e45e9fe3fc6a86b
+ @Override + @Override
+ public Optional<T> accept(final String asString) { + public Optional<T> accept(final String asString) {
+ if (visited++ > 32) { + if (visited++ > 32) {
+ throw new IllegalArgumentException("Too long"); + throw EX;
+ } + }
+ return this.visitor.accept(asString); + return this.visitor.accept(asString);
+ } + }
+ } + }
+ // Paper end + // Paper end - Count visited parts
@Override @Override
public MutableComponent resolve(@Nullable CommandSourceStack source, @Nullable Entity sender, int depth) throws CommandSyntaxException { public MutableComponent resolve(@Nullable CommandSourceStack source, @Nullable Entity sender, int depth) throws CommandSyntaxException {