From 4ed073195621fb91a2286771876a598b2657af38 Mon Sep 17 00:00:00 2001
From: "Blue (Lukas Rieger)" <blue@bluecolored.de>
Date: Sat, 23 Nov 2019 21:57:11 +0100
Subject: [PATCH] Fix bluemap not stopping correctly when stopping the server

---
 .../bluemap/sponge/SpongePlugin.java          | 40 ++++++-------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java b/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java
index cc21bb7d..4116f09c 100644
--- a/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java
+++ b/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java
@@ -140,11 +140,7 @@ public synchronized void load() throws ExecutionException, IOException, NoSuchRe
 			handleMissingResources(defaultResourceFile, configFile);
 			unload();
 			
-			//only register reload command
-			syncExecutor.submit(() -> //just to be save we do this on the server thread
-				Sponge.getCommandManager().register(this, new Commands(this).createStandaloneReloadCommand(), "bluemap")
-			).get();
-			
+			Sponge.getCommandManager().register(this, new Commands(this).createStandaloneReloadCommand(), "bluemap");
 			return;
 		}
 		
@@ -232,9 +228,7 @@ public synchronized void load() throws ExecutionException, IOException, NoSuchRe
 		}
 		
 		//start map updater
-		syncExecutor.submit(() ->
-			this.updateHandler = new MapUpdateHandler()
-		).get();
+		this.updateHandler = new MapUpdateHandler();
 		
 		//create/update webfiles
 		WebFilesManager webFilesManager = new WebFilesManager(config.getWebRoot());
@@ -261,9 +255,7 @@ public synchronized void load() throws ExecutionException, IOException, NoSuchRe
 		}
 
 		//init commands
-		syncExecutor.submit(() -> //just to be save we do this on the server thread
-			Sponge.getCommandManager().register(this, new Commands(this).createRootCommand(), "bluemap")
-		).get();
+		Sponge.getCommandManager().register(this, new Commands(this).createRootCommand(), "bluemap");
 		
 		//metrics
 		Sponge.getScheduler().createTaskBuilder()
@@ -279,20 +271,14 @@ public synchronized void load() throws ExecutionException, IOException, NoSuchRe
 	}
 	
 	public synchronized void unload() {
-		try {
-			syncExecutor.submit(() -> { //just to be save we do this on the server thread
-				//unregister commands
-				Sponge.getCommandManager().getOwnedBy(this).forEach(Sponge.getCommandManager()::removeMapping);
+		//unregister commands
+		Sponge.getCommandManager().getOwnedBy(this).forEach(Sponge.getCommandManager()::removeMapping);
 
-				//unregister listeners
-				if (updateHandler != null) Sponge.getEventManager().unregisterListeners(updateHandler);
-				
-				//stop scheduled tasks
-				Sponge.getScheduler().getScheduledTasks(this).forEach(t -> t.cancel());
-			}).get();
-		} catch (InterruptedException | ExecutionException unexpected) {
-			throw new RuntimeException("Unexpected exception!", unexpected); //should never happen
-		}
+		//unregister listeners
+		if (updateHandler != null) Sponge.getEventManager().unregisterListeners(updateHandler);
+
+		//stop scheduled tasks
+		Sponge.getScheduler().getScheduledTasks(this).forEach(t -> t.cancel());
 		
 		//stop services
 		if (renderManager != null) renderManager.stop();
@@ -354,10 +340,8 @@ public void onServerStart(GameStartingServerEvent evt) {
 
 	@Listener
 	public void onServerStop(GameStoppingEvent evt) {
-		asyncExecutor.execute(() -> {
-			unload();
-			Logger.global.logInfo("Saved and stopped!");
-		});
+		unload();
+		Logger.global.logInfo("Saved and stopped!");
 	}
 	
 	@Listener