From 4cdf31cfe8d28ca45707a68b9dcf131a71807067 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Fri, 28 Jun 2024 17:25:09 +0500 Subject: [PATCH] Fix paths unable to be created on Windows --- .../core/api/internal/ClientPluginChannelApi.java | 2 +- .../core/wrapperInterfaces/world/IServerLevelWrapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java index bbddfea23..5b37ada58 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java @@ -55,7 +55,7 @@ public class ClientPluginChannelApi private void onCurrentLevelKeyMessage(CurrentLevelKeyMessage msg) { - if (!msg.levelKey.matches("^(?=.{1,50}$)([a-zA-Z0-9-_]+@)?[a-zA-Z0-9-_]+(:[a-zA-Z0-9-_]+)?$")) + if (!msg.levelKey.matches("^[a-zA-Z0-9-_@]{1,50}$")) { throw new IllegalArgumentException("Server sent invalid level key."); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IServerLevelWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IServerLevelWrapper.java index b4ae28dc8..06b68f50c 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IServerLevelWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IServerLevelWrapper.java @@ -41,7 +41,7 @@ public interface IServerLevelWrapper extends ILevelWrapper if (!levelKeyPrefix.isEmpty()) { - return levelKeyPrefix + "@" + dimensionName; + return levelKeyPrefix + "@" + dimensionName.replace(":", "@@"); } }