2020-03-15 21:03:36 +01:00
From 55c5ebed011c753b9ae3709fe44b131973154b2b Mon Sep 17 00:00:00 2001
2019-03-02 21:28:04 +01:00
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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2020-02-09 01:32:48 +01:00
index 2c94ca6a8..94d3d602c 100644
2019-03-02 21:28:04 +01:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-05-06 04:58:04 +02:00
@@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
2019-03-02 21:28:04 +01:00
private int E;
private int receivedMovePackets;
private int processedMovePackets;
+ 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 PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
2020-02-09 01:32:48 +01:00
@@ -2562,6 +2563,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
2019-03-02 21:28:04 +01:00
String[] lines = new String[4];
for (int i = 0; i < astring.length; ++i) {
+ // Paper start - cap line length - modified clients can send longer data than normal
+ if (MAX_SIGN_LINE_LENGTH > 0 && astring[i].length() > MAX_SIGN_LINE_LENGTH) {
+ // This handles multibyte characters as 1
+ int offset = astring[i].codePoints().limit(MAX_SIGN_LINE_LENGTH).map(Character::charCount).sum();
2019-09-02 00:21:08 +02:00
+ if (offset < astring[i].length()) {
2019-03-02 21:28:04 +01:00
+ astring[i] = astring[i].substring(0, offset);
+ }
+ }
+ // Paper end
lines[i] = SharedConstants.a(astring[i]); //Paper - Replaced with anvil color stripping method to stop exploits that allow colored signs to be created.
}
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
--
2020-03-15 21:03:36 +01:00
2.25.1
2019-03-02 21:28:04 +01:00