Merge branch '1.20.4' into 1.20.4-folia

NiFeather · Mar 23, 2024 · a2289ea · a2289ea
2 parents c4fa13a + e429638
commit a2289ea
Show file tree

Hide file tree

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

diff --git a/src/main/java/xiamomc/morph/network/multiInstance/MultiInstanceService.java b/src/main/java/xiamomc/morph/network/multiInstance/MultiInstanceService.java
@@ -80,7 +80,11 @@ private void load(MorphConfigManager configManager)
     {
         configManager.bind(isMaster, ConfigOption.IS_MASTER);
 
-        isMaster.onValueChanged((o, n) -> prepareInstance(n), true);
+        isMaster.onValueChanged((o, n) ->
+        {
+            if (enabled.get())
+                prepareInstance(n);
+        }, true);
     }
 
     public void onDisable()