geforkt von Mirrors/Paper
3e90a19183
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 304e83eb PR-1002: Improve documentation and implementation of getMaxStackSize e8215ea2 SPIGOT-7638: Library loader does not seem to resolve every dependency 79c595c0 SPIGOT-7637: Bad logic in checking nullability of AttributeModifier slots CraftBukkit Changes: 91b1fc3f1 SPIGOT-7644: Fix ItemMeta#getAsString 4e77a81e1 SPIGOT-7615: PlayerLeashEntityEvent cancelled eats lead 996f660f3 Do not remove leash knot if leasing to an existing leash knot gets cancelled f70367d42 SPIGOT-7643: Fix inverted leash event cancelled usage and remove leash knot if no entity gets leashed 7ddb48294 SPIGOT-7640: Abnormal jumping height of wind charge 080c8711e SPIGOT-7639: Incoming plugin channels not working ad549847e Open a direct connection instead of pinging mojang server to check if it is reachable 38e2926c5 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime
57 Zeilen
3.1 KiB
Diff
57 Zeilen
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 27 Feb 2019 22:18:40 -0500
|
|
Subject: [PATCH] Limit Client Sign length more
|
|
|
|
modified clients can send more data from the client
|
|
to the server and it would get stored on the sign as sent.
|
|
|
|
Mojang has a limit of 384 which is much higher than reasonable.
|
|
|
|
the client can barely render around 16 characters as-is, but formatting
|
|
codes can get it to be more than 16 actual length.
|
|
|
|
Set a limit of 80 which should give an average of 16 characters 2
|
|
sets of legacy formatting codes which should be plenty for all uses.
|
|
|
|
This does not strip any existing data from the NBT as plugins
|
|
may use this for storing data out of the rendered area.
|
|
|
|
it only impacts data sent from the client.
|
|
|
|
Set -DPaper.maxSignLength=XX to change limit or -1 to disable
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index e241e0cae476ba963aff70b4f7ab038f07207303..fedc4654178a3771004394665914efd2b842432a 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -299,6 +299,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
private final MessageSignatureCache messageSignatureCache = MessageSignatureCache.createDefault();
|
|
private final FutureChain chatMessageChain;
|
|
private boolean waitingForSwitchToConfig;
|
|
+ private static final int MAX_SIGN_LINE_LENGTH = Integer.getInteger("Paper.maxSignLength", 80); // Paper - Limit client sign length
|
|
|
|
public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
|
|
super(server, connection, clientData, player); // CraftBukkit
|
|
@@ -3138,7 +3139,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
|
|
@Override
|
|
public void handleSignUpdate(ServerboundSignUpdatePacket packet) {
|
|
- List<String> list = (List) Stream.of(packet.getLines()).map(ChatFormatting::stripFormatting).collect(Collectors.toList());
|
|
+ // Paper start - Limit client sign length
|
|
+ String[] lines = packet.getLines();
|
|
+ for (int i = 0; i < lines.length; ++i) {
|
|
+ if (MAX_SIGN_LINE_LENGTH > 0 && lines[i].length() > MAX_SIGN_LINE_LENGTH) {
|
|
+ // This handles multibyte characters as 1
|
|
+ int offset = lines[i].codePoints().limit(MAX_SIGN_LINE_LENGTH).map(Character::charCount).sum();
|
|
+ if (offset < lines[i].length()) {
|
|
+ lines[i] = lines[i].substring(0, offset); // this will break any filtering, but filtering is NYI as of 1.17
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ List<String> list = (List) Stream.of(lines).map(ChatFormatting::stripFormatting).collect(Collectors.toList());
|
|
+ // Paper end - Limit client sign length
|
|
|
|
this.filterTextPacket(list).thenAcceptAsync((list1) -> {
|
|
this.updateSignText(packet, list1);
|