From 3538f642cd4e27a1ebce447df60959401b43671a Mon Sep 17 00:00:00 2001
From: Mads Boddum <danish_cyborg@hotmail.com>
Date: Wed, 21 Sep 2016 11:26:45 +0200
Subject: [PATCH] Removed unnecessary logic in CorpseService.terminate()

---
 src/services/combat/CorpseService.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/services/combat/CorpseService.java b/src/services/combat/CorpseService.java
index 156710c1..de0eb83b 100644
--- a/src/services/combat/CorpseService.java
+++ b/src/services/combat/CorpseService.java
@@ -54,14 +54,7 @@ public class CorpseService extends Service {
 	
 	@Override
 	public boolean terminate() {
-		if (executor != null) {
-			executor.shutdownNow();
-			try {
-				executor.awaitTermination(3, TimeUnit.SECONDS);
-			} catch (InterruptedException e) {
-				
-			}
-		}
+		executor.shutdown();
 		return super.terminate();
 	}