mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-11-16 18:46:12 +00:00
871cc5653c
* Clean up command block event patch * Merge resource location patches * Merge map decoration patches * Merge Video's resource location patches * Merge large tag reset patches
36 lines
1.9 KiB
Diff
36 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Telesphoreo <me@telesphoreo.me>
|
|
Date: Fri, 25 Nov 2022 22:25:24 -0600
|
|
Subject: [PATCH] Reject oversized components from updating
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/chat/ComponentUtils.java b/src/main/java/net/minecraft/network/chat/ComponentUtils.java
|
|
index 584a58659fae6ba3d8b53858890bc6ec509ffb0e..0dcee5b53740126e0886058dacc43e447836b8d8 100644
|
|
--- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java
|
|
+++ b/src/main/java/net/minecraft/network/chat/ComponentUtils.java
|
|
@@ -39,8 +39,10 @@ public class ComponentUtils {
|
|
}
|
|
|
|
public static MutableComponent updateForEntity(@Nullable CommandSourceStack source, Component text, @Nullable Entity sender, int depth) throws CommandSyntaxException {
|
|
+ // Scissors start - Reject oversized components
|
|
+ MutableComponent result;
|
|
if (depth > 100) {
|
|
- return text.copy();
|
|
+ result = text.copy();
|
|
} else {
|
|
// Paper start
|
|
if (text instanceof io.papermc.paper.adventure.AdventureComponent adventureComponent) {
|
|
@@ -53,8 +55,11 @@ public class ComponentUtils {
|
|
mutableComponent.append(updateForEntity(source, component, sender, depth + 1));
|
|
}
|
|
|
|
- return mutableComponent.withStyle(resolveStyle(source, text.getStyle(), sender, depth));
|
|
+ result = mutableComponent.withStyle(resolveStyle(source, text.getStyle(), sender, depth));
|
|
}
|
|
+ // Would the resulting component exceed 65535 bytes when encoded as a string?
|
|
+ return Component.Serializer.toJson(result).length() > 65535 ? Component.empty() : result;
|
|
+ // Scissors end
|
|
}
|
|
|
|
private static Style resolveStyle(@Nullable CommandSourceStack source, Style style, @Nullable Entity sender, int depth) throws CommandSyntaxException {
|