From 4682f6506322be7ccd30e8095971b9ea86f1036c Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Thu, 21 Oct 2021 11:50:56 +0200
Subject: [PATCH] Prevent shutdown error deadlocks

---
 SpigotCore_Main/src/de/steamwar/core/Core.java         | 7 +++++--
 SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/SpigotCore_Main/src/de/steamwar/core/Core.java b/SpigotCore_Main/src/de/steamwar/core/Core.java
index cb51d12..8655496 100644
--- a/SpigotCore_Main/src/de/steamwar/core/Core.java
+++ b/SpigotCore_Main/src/de/steamwar/core/Core.java
@@ -56,6 +56,8 @@ public class Core extends JavaPlugin{
 			version = 12;
 	}
 
+	private ErrorHandler errorHandler;
+
 	@Override
 	public void onLoad() {
 		setInstance(this);
@@ -63,7 +65,7 @@ public class Core extends JavaPlugin{
 	
 	@Override
 	public void onEnable() {
-		new ErrorHandler();
+		errorHandler = new ErrorHandler();
 
 		Bukkit.getPluginManager().registerEvents(new PlayerJoinedEvent(), this);
 		Bukkit.getPluginManager().registerEvents(new ChattingEvent(), this);
@@ -80,7 +82,8 @@ public class Core extends JavaPlugin{
 	}
 
 	@Override
-	public void onDisable(){
+	public void onDisable() {
+		errorHandler.unregister();
 		SQL.close();
 	}
 
diff --git a/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java b/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java
index e5d5bdf..bbc8d50 100644
--- a/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java
+++ b/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java
@@ -39,6 +39,10 @@ public class ErrorHandler extends Handler {
         Logger.getLogger("").addHandler(this);
     }
 
+    void unregister() {
+        Logger.getLogger("").removeHandler(this);
+    }
+
     @Override
     public void publish(LogRecord logRecord) {
         if(logRecord.getLevel().intValue() < Level.WARNING.intValue())