Fixed the reattach firing on shutdown and reload

Author: Simber1

src/club/moddedminecraft/polychat/bukkitclient/BukkitClient.java

@@ -28,6 +28,7 @@ public final class BukkitClient extends JavaPlugin implements Listener{
     public static ActivePlayerThread playerThread;
     public static String idJson = null;
     public static String idJsonNoColor = null;
+    public static boolean reattachKill = false;
 	public static String serverIdText = null;
 	public static ArrayList<String> commands = new ArrayList<>();
 
@@ -63,17 +64,23 @@ public void onEnable() {
         //TODO: check if the folder exists
         handleConfiguration(this.getDataFolder());
         handlePrefix();
-        reattachThread = new ReattachThread(5000);
 
+        reattachThread = new ReattachThread(5000);
         playerThread = new ActivePlayerThread(30000, properties.getProperty("server_id", "DEFAULT_ID"));
+
         handleClientConnection();
-        
+
     	new EventListener(this);
 
     	Runtime.getRuntime().addShutdownHook(new Thread(this::shutdownHook));
-        ServerInfoMessage infoMessage = new ServerInfoMessage(BukkitClient.properties.getProperty("server_id", "DEFAULT_ID"),
+
+        ServerInfoMessage infoMessage = new ServerInfoMessage(
+                BukkitClient.properties.getProperty("server_id", "DEFAULT_ID"),
                 BukkitClient.properties.getProperty("server_name", "DEFAULT_NAME"),
-                BukkitClient.properties.getProperty("server_address", "DEFAULT_ADDRESS"), BukkitClient.getMaxPlayers());
+                BukkitClient.properties.getProperty("server_address", "DEFAULT_ADDRESS"),
+                BukkitClient.getMaxPlayers()
+        );
+
         BukkitClient.sendMessage(infoMessage);
 
         ServerStatusMessage onlineMsg = new ServerStatusMessage(properties.getProperty("server_id"), idJson, (short) 1);
@@ -93,13 +100,18 @@ public void run() {
                 }
             }
         }, 0L, 20L);
+        if(!reattachKill) { //only start it on a fresh start, not on a reload
+            reattachThread.start();//actually start the thread at the end so the main thread is running already
+        }else{
 
-        reattachThread.start(); //actually start the thread at the end so the main thread is running already
+        }
     }
 
     @Override
     public void onDisable() {
     	shutdownClean = true;
+        reattachKill = true;
+
         ServerStatusMessage offlineMsg = new ServerStatusMessage(properties.getProperty("server_id"), idJson, (short) 2);
         sendMessage(offlineMsg);
 
@@ -117,8 +129,6 @@ public void onDisable() {
 
 
     public void shutdownHook() {
-        reattachThread.interrupt();
-        playerThread.interrupt();
         //Sends either crashed or offline depending on if shutdown happened cleanly
         if (!shutdownClean) {
             ServerStatusMessage crashMsg = new ServerStatusMessage(properties.getProperty("server_id"), idJson, (short) 3);
@@ -129,6 +139,7 @@ public void shutdownHook() {
             Thread.sleep(1000);
         } catch (InterruptedException ignored) {
         }
+        messageBus.stop();
     }
 
 	public static ArrayList<String> getOnlinePlayersNames() { //Might have to fix return type

src/club/moddedminecraft/polychat/bukkitclient/EventListener.java

@@ -24,7 +24,7 @@ public EventListener(BukkitClient plugin) {
 
 	@EventHandler
 	public void onChat(AsyncPlayerChatEvent event) {
-		event.setFormat(BukkitClient.idJson + " " + event.getFormat());
+		//event.setFormat(BukkitClient.idJson + " " + event.getPlayer().getDisplayName() + event.getMessage());
 		String id = BukkitClient.properties.getProperty("server_id");
 		String json = BukkitClient.idJson + " " +event.getPlayer().getDisplayName() + ": "+ event.getMessage();  //TODO: Fix this JSON encoding
 		ChatMessage chatMessage = new ChatMessage(BukkitClient.idJsonNoColor + " " + event.getPlayer().getDisplayName(), event.getMessage(), json);

src/club/moddedminecraft/polychat/bukkitclient/threads/ReattachThread.java

@@ -14,6 +14,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 
+import static club.moddedminecraft.polychat.bukkitclient.BukkitClient.reattachKill;
+
 public class ReattachThread extends HeartbeatThread {
 
     private boolean isConnected = true;
@@ -25,31 +27,36 @@ public ReattachThread(int interval) {
     @Override
     protected void run() throws InterruptedException, IOException {
         try {
-            if (BukkitClient.messageBus == null || (BukkitClient.messageBus.isSocketClosed())) {
-                //Tells players ingame that the connection failed
-                if (isConnected) {
-                    isConnected = false; //TODO
-                    BukkitClient.sendGameMessage("[PolyChat] Lost connection to main server, attempting reconnect...");
-                }
+            if(!reattachKill) {
+                if (BukkitClient.messageBus == null || (BukkitClient.messageBus.isSocketClosed())) {
 
-                //Stops threads if they are still running
-                if (BukkitClient.messageBus != null) BukkitClient.messageBus.stop();
-
-                //Attempts to start the connection //TODO
-                BukkitClient.messageBus = new MessageBus(new Socket(BukkitClient.properties.getProperty("address"), Integer.parseInt(BukkitClient.properties.getProperty("port"))), EventListener::handleMessage);
-                BukkitClient.messageBus.start();
-
-                //If the socket was reopened, wait 3 seconds to make sure sending online message works
-                if (!BukkitClient.messageBus.isSocketClosed()) {
-                    Thread.sleep(2000); //TODO
-                    BukkitClient.sendGameMessage("[PolyChat] Connection re-established!");
-                    sendServerOnline();
-                    Thread.sleep(1000);
-                    sendOnlinePlayers();
-                    isConnected = true;
-                }
+                    System.out.println("Firing reattach");
+
+                    //Tells players ingame that the connection failed
+                    if (isConnected) {
+                        isConnected = false; //TODO
+                        BukkitClient.sendGameMessage("[PolyChat] Lost connection to main server, attempting reconnect...");
+                    }
 
+                    //Stops threads if they are still running
+                    if (BukkitClient.messageBus != null) BukkitClient.messageBus.stop();
+
+                    //Attempts to start the connection //TODO
+                    BukkitClient.messageBus = new MessageBus(new Socket(BukkitClient.properties.getProperty("address"), Integer.parseInt(BukkitClient.properties.getProperty("port"))), EventListener::handleMessage);
+                    BukkitClient.messageBus.start();
+
+                    //If the socket was reopened, wait 3 seconds to make sure sending online message works
+                    if (!BukkitClient.messageBus.isSocketClosed()) {
+                        Thread.sleep(2000); //TODO
+                        BukkitClient.sendGameMessage("[PolyChat] Connection re-established!");
+                        sendServerOnline();
+                        Thread.sleep(1000);
+                        sendOnlinePlayers();
+                        isConnected = true;
+                    }
+                }
             }
+
         } catch (UnknownHostException e) {
             System.out.println("Unknown host exception on reattach");
         } catch (IOException e) {