aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0605-Sanitize-ResourceLocation-error-logging.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0605-Sanitize-ResourceLocation-error-logging.patch')
-rw-r--r--patches/server/0605-Sanitize-ResourceLocation-error-logging.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/patches/server/0605-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0605-Sanitize-ResourceLocation-error-logging.patch
new file mode 100644
index 0000000000..602f0d3b27
--- /dev/null
+++ b/patches/server/0605-Sanitize-ResourceLocation-error-logging.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <[email protected]>
+Date: Thu, 26 Aug 2021 12:09:47 +0200
+Subject: [PATCH] Sanitize ResourceLocation error logging
+
+
+diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java
+index 262660d115a5d5cbecfbae995955a24283e666b0..87afe84791af2d5e9f869cd4c09eed4bb5fee75b 100644
+--- a/src/main/java/net/minecraft/resources/ResourceLocation.java
++++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
+@@ -247,7 +247,7 @@ public final class ResourceLocation implements Comparable<ResourceLocation> {
+
+ private static String assertValidNamespace(String namespace, String path) {
+ if (!isValidNamespace(namespace)) {
+- throw new ResourceLocationException("Non [a-z0-9_.-] character in namespace of location: " + namespace + ":" + path);
++ throw new ResourceLocationException("Non [a-z0-9_.-] character in namespace of location: " + org.apache.commons.lang3.StringUtils.normalizeSpace(namespace) + ":" + org.apache.commons.lang3.StringUtils.normalizeSpace(path)); // Paper - Sanitize ResourceLocation error logging
+ } else {
+ return namespace;
+ }
+@@ -268,7 +268,7 @@ public final class ResourceLocation implements Comparable<ResourceLocation> {
+
+ private static String assertValidPath(String namespace, String path) {
+ if (!isValidPath(path)) {
+- throw new ResourceLocationException("Non [a-z0-9/._-] character in path of location: " + namespace + ":" + path);
++ throw new ResourceLocationException("Non [a-z0-9/._-] character in path of location: " + namespace + ":" + org.apache.commons.lang3.StringUtils.normalizeSpace(path)); // Paper - Sanitize ResourceLocation error logging
+ } else {
+ return path;
+ }