Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-25 19:45:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix channel name validation in 1.13 to 1.12.2 protocol (#2701)

Browse Source 
Closes #2187
This commit is contained in:
Gero 2021-10-03 12:12:49 +02:00 committed by GitHub
parent e64a0fb62e
commit a0f26f1ca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/MappingData.java
View File

@ -137,15 +137,17 @@ public class MappingData extends MappingDataBase {
return null; // Not valid
}
int separatorIndex = newId.indexOf(':');
// Vanilla parses ``:`` and ```` as ``minecraft:`` (also ensure there's enough space)
if ((separatorIndex == -1 || separatorIndex == 0) && newId.length() <= 10) {
// Vanilla parses an empty and a missing namespace as the minecraft namespace
if (separatorIndex == -1) {
newId = "minecraft:" + newId;
} else if (separatorIndex == 0) {
newId = "minecraft" + newId;
}
return newId;
}
public static boolean isValid1_13Channel(String channelId) {
return channelId.matches("([0-9a-z_.-]+):([0-9a-z_/.-]+)");
return channelId.matches("([0-9a-z_.-]+:)?[0-9a-z_/.-]+");
}
private void loadTags(Map<String, Integer[]> output, JsonObject newTags) {