Stop FileWatcher default instance on dedicated server exit (#1757)

neoforged · Dec 11, 2024 · f8e6502 · f8e6502
1 parent 7b47ce1
commit f8e6502
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch b/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch
@@ -44,14 +44,17 @@
              return true;
          }
      }
-@@ -277,6 +_,10 @@
+@@ -277,6 +_,13 @@
          if (this.queryThreadGs4 != null) {
              this.queryThreadGs4.stop();
          }
 +        if (this.dediLanPinger != null) {
 +            this.dediLanPinger.interrupt();
 +            this.dediLanPinger = null;
 +        }
++
++        // Neo: Forcibly stop the FileWatcher default instance, to prevent it from blocking normal JVM exit; see #1626
++        com.electronwill.nightconfig.core.file.FileWatcher.defaultInstance().stop();
      }
 
      @Override