Fix common config sync issue on the server

SAGESSE-CN · Feb 13, 2023 · 1e47b96 · 1e47b96
1 parent e4d791b
commit 1e47b96
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/common/src/main/java/moe/plushie/armourers_workshop/init/ModConfigSpec.java b/common/src/main/java/moe/plushie/armourers_workshop/init/ModConfigSpec.java
@@ -209,11 +209,11 @@ public Common() {
     }
 
     public static void init() {
-        EnvironmentExecutor.didSetup(EnvironmentType.COMMON, () -> () -> {
+        EnvironmentExecutor.didSetup(EnvironmentType.COMMON, () -> () -> COMMON.notify(() -> {
             // when the server config is changes, we need to synchronize it again.
             if (EnvironmentManager.getServer() != null && EnvironmentManager.isDedicatedServer()) {
-                COMMON.notify(() -> NetworkManager.sendToAll(new UpdateContextPacket()));
+                NetworkManager.sendToAll(new UpdateContextPacket());
             }
-        });
+        }));
     }
 }
diff --git a/...n/java/moe/plushie/armourers_workshop/init/platform/fabric/builder/ConfigBuilderImpl.java b/...n/java/moe/plushie/armourers_workshop/init/platform/fabric/builder/ConfigBuilderImpl.java
@@ -97,8 +97,7 @@ public void apply(Map<String, Object> snapshot) {
                     value.setter.accept(object);
                 }
             });
-            // when the config did changes, we need notify to all listeners.
-            this.listeners.forEach(Runnable::run);
+            this.setChanged();
         }
 
         @Override
@@ -113,8 +112,7 @@ public void reload() {
                     value.setter.accept(value.read());
                 }
             });
-            // when the config did changes, we need notify to all listeners.
-            this.listeners.forEach(Runnable::run);
+            this.setChanged();
         }
 
         @Override
@@ -131,13 +129,19 @@ public void save() {
             });
             if (this.spec != null) {
                 this.spec.save();
+                this.setChanged();
             }
         }
 
         @Override
         public void notify(Runnable action) {
             this.listeners.add(action);
         }
+
+        private void setChanged() {
+            // when the config did changes, we need notify to all listeners.
+            this.listeners.forEach(Runnable::run);
+        }
     }
 
     public static class ValueProxy<T> implements IConfigValue<T> {

diff --git a/...in/java/moe/plushie/armourers_workshop/init/platform/forge/builder/ConfigBuilderImpl.java b/...in/java/moe/plushie/armourers_workshop/init/platform/forge/builder/ConfigBuilderImpl.java
@@ -95,8 +95,7 @@ public void apply(Map<String, Object> snapshot) {
                     value.setter.accept(object);
                 }
             });
-            // when the config did changes, we need notify to all listeners.
-            this.listeners.forEach(Runnable::run);
+            this.setChanged();
         }
 
         @Override
@@ -111,8 +110,7 @@ public void reload() {
                     value.setter.accept(value.read());
                 }
             });
-            // when the config did changes, we need notify to all listeners.
-            this.listeners.forEach(Runnable::run);
+            this.setChanged();
         }
 
         @Override
@@ -129,13 +127,19 @@ public void save() {
             });
             if (this.spec != null) {
                 this.spec.save();
+                this.setChanged();
             }
         }
 
         @Override
         public void notify(Runnable action) {
             this.listeners.add(action);
         }
+
+        private void setChanged() {
+            // when the config did changes, we need notify to all listeners.
+            this.listeners.forEach(Runnable::run);
+        }
     }
 
     public static class ValueProxy<T> implements IConfigValue<T> {