mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-28 18:54:48 +01:00
Sanitize ResourceLocation error logging (#6495)
This commit is contained in:
parent
882fe0543a
commit
5ce32344db
1 changed files with 22 additions and 0 deletions
22
patches/server/Sanitize-resourcelocation-error-logging.patch
Normal file
22
patches/server/Sanitize-resourcelocation-error-logging.patch
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
||||||
|
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/resources/ResourceLocation.java
|
||||||
|
+++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
|
||||||
|
@@ -0,0 +0,0 @@ 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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue