From 41791a085232220f6ea2a592c2dcba686aefd855 Mon Sep 17 00:00:00 2001
From: sciwhiz12 <arnoldnunag12@gmail.com>
Date: Wed, 11 Dec 2024 20:08:56 +0800
Subject: [PATCH] Stop FileWatcher default instance on dedicated server exit
 (#1761)

---
 .../minecraft/server/dedicated/DedicatedServer.java.patch    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch b/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch
index 1085bf08f84..295c2952349 100644
--- a/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch
+++ b/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch
@@ -44,7 +44,7 @@
              return true;
          }
      }
-@@ -277,6 +_,10 @@
+@@ -277,6 +_,13 @@
          if (this.queryThreadGs4 != null) {
              this.queryThreadGs4.stop();
          }
@@ -52,6 +52,9 @@
 +            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