geforkt von Mirrors/Paper
1c5f8b0fce
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: 33a2b476 PR-734: Make PlayerInventory#getItem Nullable CraftBukkit Changes: 953d3ddc SPIGOT-3034: PlayerKickEvent.setLeaveMessage(String) doesn't actually do anything 2c47af0c SPIGOT-6963: CraftMetaBlockState#getBlockState applied TileEntity ids without the minecraft namespace prefix.
52 Zeilen
3.0 KiB
Diff
52 Zeilen
3.0 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 10cb5886aa040db25863ee8664ea7529a0f1649f..7634492e62cdc0a6e309f8bcc096efd905e82135 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
|
private int aboveGroundVehicleTickCount;
|
|
private int receivedMovePacketCount;
|
|
private int knownMovePacketCount;
|
|
+ private static final int MAX_SIGN_LINE_LENGTH = Integer.getInteger("Paper.maxSignLength", 80);
|
|
private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
|
|
|
|
public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
|
|
@@ -2893,6 +2894,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
|
|
|
for (int i = 0; i < signText.size(); ++i) {
|
|
TextFilter.FilteredText currentLine = signText.get(i);
|
|
+ // Paper start - cap line length - modified clients can send longer data than normal
|
|
+ if (MAX_SIGN_LINE_LENGTH > 0 && currentLine.getRaw().length() > MAX_SIGN_LINE_LENGTH) {
|
|
+ // This handles multibyte characters as 1
|
|
+ int offset = currentLine.getRaw().codePoints().limit(MAX_SIGN_LINE_LENGTH).map(Character::charCount).sum();
|
|
+ if (offset < currentLine.getRaw().length()) {
|
|
+ signText.set(i, currentLine = net.minecraft.server.network.TextFilter.FilteredText.passThrough(currentLine.getRaw().substring(0, offset))); // this will break any filtering, but filtering is NYI as of 1.17
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
|
|
if (this.player.isTextFilteringEnabled()) {
|
|
lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterText(currentLine.getFiltered())));
|