Merge branch '1.20.4' into 1.20.4-folia

NiFeather · Mar 23, 2024 · c4fa13a · c4fa13a
2 parents a10911b + 5a9b73a
commit c4fa13a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-project_version=1.0.10
+project_version=1.0.11
 
 # FM Protocols
 protocols_version=09b2b0a077

diff --git a/src/main/java/xiamomc/morph/config/MorphConfigManager.java b/src/main/java/xiamomc/morph/config/MorphConfigManager.java
@@ -258,6 +258,7 @@ public void reload()
 
             newConfig.set(ConfigOption.VERSION.toString(), targetVersion);
 
+            //todo: 将~UNSET作为留空的保留字符串写入PluginBase
             if (((String)newConfig.get(ConfigOption.MASTER_SECRET.toString(), "~UNSET")).equalsIgnoreCase("~UNSET"))
             {
                 var defVal = ConfigOption.MASTER_SECRET.defaultValue.toString();