Move fixing the dimension name into even more correct place

This commit is contained in:
s809
2024-06-28 23:18:24 +05:00
parent 13638cedee
commit 47541fa99c
3 changed files with 4 additions and 4 deletions
@@ -55,7 +55,7 @@ public class ClientPluginChannelApi
private void onCurrentLevelKeyMessage(CurrentLevelKeyMessage msg)
{
if (!msg.levelKey.matches("^[a-zA-Z0-9-_@]{1,50}$"))
if (!msg.levelKey.matches("^(?=.{1,50}$)([a-zA-Z0-9-_]+@)?[a-zA-Z0-9-_]+(:[a-zA-Z0-9-_]+)?$"))
{
throw new IllegalArgumentException("Server sent invalid level key.");
}
@@ -86,7 +86,7 @@ public class ClientOnlySaveStructure extends AbstractSaveStructure
IServerKeyedClientLevel keyedClientLevel = (IServerKeyedClientLevel) newLevelWrapper;
LOGGER.info("Loading level " + newLevelWrapper.getDimensionName() + " with key: " + keyedClientLevel.getServerLevelKey());
// This world was identified by the server directly, so we can know for sure which folder to use.
return new File(getSaveStructureFolderPath() + File.separatorChar + keyedClientLevel.getServerLevelKey());
return new File(getSaveStructureFolderPath() + File.separatorChar + keyedClientLevel.getServerLevelKey().replaceAll(":", "@@"));
}
@@ -141,7 +141,7 @@ public class ClientOnlySaveStructure extends AbstractSaveStructure
{
// no valid sub dimension was found, create a new one
LOGGER.info("Default Sub Dimension not found. Creating: [" + level.getDimensionName() + "]");
return new File(this.folder, level.getDimensionName());
return new File(this.folder, level.getDimensionName().replaceAll(":", "@@"));
}
}
@@ -33,7 +33,7 @@ public interface IServerLevelWrapper extends ILevelWrapper
default String getKeyedLevelDimensionName()
{
String dimensionName = this.getDimensionName().replace(":", "@@");
String dimensionName = this.getDimensionName();
if (ServerNetworking.sendLevelKeys.get())
{