From 2c644deb5a841970d1f8d9fba597023e88a2c658 Mon Sep 17 00:00:00 2001
From: DaMachinator <damachinator@gmail.com>
Date: Fri, 19 Jan 2018 21:52:53 -0500
Subject: [PATCH] Working on network handler

---
 .../java/arcanitor/civilengineering/CivilEngineering.java  | 7 +++++++
 .../civilengineering/eventhandlers/FMLEventHandler.java    | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/arcanitor/civilengineering/CivilEngineering.java b/src/main/java/arcanitor/civilengineering/CivilEngineering.java
index 05fc6ed..4ca3e44 100644
--- a/src/main/java/arcanitor/civilengineering/CivilEngineering.java
+++ b/src/main/java/arcanitor/civilengineering/CivilEngineering.java
@@ -1,6 +1,7 @@
 package arcanitor.civilengineering;
 
 import arcanitor.civilengineering.eventhandlers.FMLEventHandler;
+import arcanitor.civilengineering.network.NetworkHandler;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.*;
 import org.apache.logging.log4j.Logger;
@@ -22,6 +23,7 @@ public class CivilEngineering {
     public static CivilEngineering instance;
 
     public static Logger logger;
+    public static Thread networkThread = new Thread(new NetworkHandler());
 
 
     @Mod.EventHandler
@@ -47,4 +49,9 @@ public class CivilEngineering {
         FMLEventHandler.serverStarting(event);
     }
 
+    @Mod.EventHandler
+    public void serverStopping(FMLServerStoppingEvent event) {
+        logger.info("Demolishing chat bridge.");
+        FMLEventHandler.serverStopping(event);
+    }
 }
diff --git a/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java b/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java
index 2b8cc1b..39fad96 100644
--- a/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java
+++ b/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java
@@ -8,6 +8,7 @@ import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
 
 import java.io.File;
 
@@ -26,6 +27,9 @@ public class FMLEventHandler {
         }
     }
     public static void serverStarting(FMLServerStartingEvent event) {
-        (new Thread(new NetworkHandler())).start();
+        CivilEngineering.networkThread.start();
+    }
+    public static void serverStopping(FMLServerStoppingEvent event) {
+        CivilEngineering.networkThread.interrupt();
     }
 }