From eaee05df3f3fc04e1ed89ff75c1cd5cbd99c7a9e Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 25 Feb 2023 08:56:40 -0600 Subject: [PATCH] Change the default multiplayer save mode to "name_only" This is done to prevent issues with Realms --- .../main/java/com/seibel/lod/core/config/Config.java | 2 +- .../main/java/com/seibel/lod/core/util/LodUtil.java | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/com/seibel/lod/core/config/Config.java b/core/src/main/java/com/seibel/lod/core/config/Config.java index 1372f16df..60c7c220b 100644 --- a/core/src/main/java/com/seibel/lod/core/config/Config.java +++ b/core/src/main/java/com/seibel/lod/core/config/Config.java @@ -647,7 +647,7 @@ public class Config .comment("" + " What multiplayer save folders should be named. \n" + "\n" - + " " + EServerFolderNameMode.AUTO + ": " + EServerFolderNameMode.NAME_IP + " for LAN connections, " + EServerFolderNameMode.NAME_IP_PORT + " for all others. \n" + + " " + EServerFolderNameMode.AUTO + ": Defaults to " + EServerFolderNameMode.NAME_ONLY + " for both standard multiplayer and LAN. \n" + " " + EServerFolderNameMode.NAME_ONLY + ": Example: \"Minecraft Server\" \n" + " " + EServerFolderNameMode.NAME_IP + ": Example: \"Minecraft Server IP 192.168.1.40\" \n" + " " + EServerFolderNameMode.NAME_IP_PORT + ": Example: \"Minecraft Server IP 192.168.1.40:25565\"" diff --git a/core/src/main/java/com/seibel/lod/core/util/LodUtil.java b/core/src/main/java/com/seibel/lod/core/util/LodUtil.java index adab90b8f..b34872d30 100644 --- a/core/src/main/java/com/seibel/lod/core/util/LodUtil.java +++ b/core/src/main/java/com/seibel/lod/core/util/LodUtil.java @@ -187,16 +187,7 @@ public class LodUtil EServerFolderNameMode folderNameMode = Config.Client.Multiplayer.serverFolderNameMode.get(); if (folderNameMode == EServerFolderNameMode.AUTO) { - if (parsedIp.isLan()) - { - // LAN - folderNameMode = EServerFolderNameMode.NAME_IP; - } - else - { - // normal multiplayer - folderNameMode = EServerFolderNameMode.NAME_IP_PORT; - } + folderNameMode = EServerFolderNameMode.NAME_ONLY; }