mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 01:17:44 +01:00
32 lines
2.0 KiB
Diff
32 lines
2.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: 0x22 <0x22@futureclient.net>
|
||
|
|
Date: Thu, 26 Apr 2018 04:41:11 -0400
|
||
|
|
Subject: [PATCH] Fix exploit that allowed colored signs to be created
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/SharedConstants.java b/src/main/java/net/minecraft/SharedConstants.java
|
||
|
|
index b92975aa85fd79c70d6bec014284e8f55d0d3a4b..d5d6c545182b9b0b6aa5e52f1f9858450a17038e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/SharedConstants.java
|
||
|
|
+++ b/src/main/java/net/minecraft/SharedConstants.java
|
||
|
|
@@ -20,6 +20,7 @@ public class SharedConstants {
|
||
|
|
return c0 != 167 && c0 >= ' ' && c0 != 127;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public static String filterAllowedChatCharacters(String input) { return a(input); } // Paper - OBFHELPER
|
||
|
|
public static String a(String s) {
|
||
|
|
StringBuilder stringbuilder = new StringBuilder();
|
||
|
|
char[] achar = s.toCharArray();
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
index 1860def3971d1e17429bdde51c2bc336887da233..6c5966901ffdc3c7f9950ff8b40fbf2489acbd4b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
@@ -2788,7 +2788,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||
|
|
List<net.kyori.adventure.text.Component> lines = new java.util.ArrayList<>();
|
||
|
|
|
||
|
|
for (int i = 0; i < list.size(); ++i) {
|
||
|
|
- lines.add(net.kyori.adventure.text.Component.text(list.get(i)));
|
||
|
|
+ lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterAllowedChatCharacters(list.get(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.at(worldserver, blockposition), this.getPlayer(), lines);
|
||
|
|
this.server.getPluginManager().callEvent(event);
|