Fixed Commands

Author: Simber1

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

@@ -17,6 +17,7 @@
 
 import club.moddedminecraft.polychat.bukkitclient.threads.ActivePlayerThread;
 import club.moddedminecraft.polychat.bukkitclient.threads.ReattachThread;
+import org.bukkit.scheduler.BukkitScheduler;
 
 public final class BukkitClient extends JavaPlugin implements Listener{
 
@@ -28,6 +29,7 @@ public final class BukkitClient extends JavaPlugin implements Listener{
     public static String idJson = null;
     public static String idJsonNoColor = null;
 	public static String serverIdText = null;
+	public static ArrayList<String> commands = new ArrayList<>();
 
     public static void handleClientConnection() {
         try {
@@ -49,6 +51,13 @@ public static void sendGameMessage(String message) {
         Bukkit.broadcastMessage(message);
     }
 
+    public static void runCommand(String command) {  //Command Firer
+        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
+    }
+    public static void addCommand(String command) {  //Holding place for commands
+        commands.add(command);
+    }
+
     @Override
     public void onEnable() {
         //TODO: check if the folder exists
@@ -61,9 +70,28 @@ public void onEnable() {
     	new EventListener(this);
 
     	Runtime.getRuntime().addShutdownHook(new Thread(this::shutdownHook));
+        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.sendMessage(infoMessage);
 
         ServerStatusMessage onlineMsg = new ServerStatusMessage(properties.getProperty("server_id"), idJson, (short) 1);
         sendMessage(onlineMsg);
+
+        BukkitScheduler scheduler = getServer().getScheduler();
+        scheduler.scheduleSyncRepeatingTask(this, new Runnable() { //Repeating task for listening for commands so they are ran on the right thread
+            @Override
+            public void run() {
+                if (commands.size() != 0) {
+                    int i = 0;
+                    while(i<commands.size()){
+                        runCommand(commands.get(i));
+                        i++;
+                    }
+                    commands.clear();
+                }
+            }
+        }, 0L, 20L);
     }
 
     @Override
@@ -72,6 +100,8 @@ public void onDisable() {
         ServerStatusMessage offlineMsg = new ServerStatusMessage(properties.getProperty("server_id"), idJson, (short) 2);
         sendMessage(offlineMsg);
 
+        //TODO: Close Threads
+
     }
 
 

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

@@ -99,13 +99,13 @@ public static void handleMessage(AbstractMessage message) {
 			String command = ((CommandMessage) message).getCommand();
 			String channel = ((CommandMessage) message).getChannel();
 			String serverID = ((CommandMessage) message).getServerID();
-			Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
+			BukkitClient.addCommand(command);
 			// send command output to discord in .5 seconds
 			new Timer().schedule(new TimerTask() { //TODO: Command output returning
 				@Override
 				public void run() {
 					Object sender = null;
-					Bukkit.broadcastMessage("Placeholder");
+					//BukkitClient.sendMessage("Placeholder");
 				}
 			}, 500);
 		}