1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0710-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0710-Sanitize-ResourceLocation-error-logging.patch
new file mode 100644
index 0000000000..c2ff3a02e4
--- /dev/null
+++ b/patches/server/0710-Sanitize-ResourceLocation-error-logging.patch
@@ -0,0 +1,22 @@
+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 0e04275f62c5c2d8afede431f78f38f06e8009e6..7017dd42f832d928f1008a05f01701667d951644 100644
+--- a/src/main/java/net/minecraft/resources/ResourceLocation.java
++++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
+@@ -32,9 +32,9 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
+         this.namespace = StringUtils.isEmpty(id[0]) ? "minecraft" : id[0];
+         this.path = id[1];
+         if (!isValidNamespace(this.namespace)) {
+-            throw new ResourceLocationException("Non [a-z0-9_.-] character in namespace of location: " + this.namespace + ":" + this.path);
++            throw new ResourceLocationException("Non [a-z0-9_.-] character in namespace of location: " + org.apache.commons.lang3.StringUtils.normalizeSpace(this.namespace) + ":" + org.apache.commons.lang3.StringUtils.normalizeSpace(this.path)); // Paper
+         } else if (!isValidPath(this.path)) {
+-            throw new ResourceLocationException("Non [a-z0-9/._-] character in path of location: " + this.namespace + ":" + this.path);
++            throw new ResourceLocationException("Non [a-z0-9/._-] character in path of location: " + this.namespace + ":" + org.apache.commons.lang3.StringUtils.normalizeSpace(this.path)); // Paper
+         }
+     }
+