Cleanup

Author: InstanceLabs

API/src/main/java/com/comze_instancelabs/minigamesapi/MinigamesAPI.java

@@ -18,6 +18,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 
+import com.comze_instancelabs.minigamesapi.bungee.BungeeSocket;
 import com.comze_instancelabs.minigamesapi.commands.CommandHandler;
 import com.comze_instancelabs.minigamesapi.config.ArenasConfig;
 import com.comze_instancelabs.minigamesapi.config.ClassesConfig;
@@ -435,7 +436,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 						Player p = (Player) sender;
 						if (p.isOp()) {
 							PluginInstance pli = this.pinstances.get(Bukkit.getPluginManager().getPlugin("MGSkyWars"));
-							pli.sock.sendSignUpdate(pli.getArenas().get(0));
+							BungeeSocket.sendSignUpdate(pli, pli.getArenas().get(0));
 						}
 					}
 				}

API/src/main/java/com/comze_instancelabs/minigamesapi/PluginInstance.java

@@ -73,8 +73,6 @@ public class PluginInstance {
 
 	public HashMap<String, ArrayList<String>> cached_sign_states = new HashMap<String, ArrayList<String>>();
 
-	public BungeeSocket sock;
-	
 	public PluginInstance(JavaPlugin plugin, ArenasConfig arenasconfig, MessagesConfig messagesconfig, ClassesConfig classesconfig, StatsConfig statsconfig, ArrayList<Arena> arenas) {
 		this.arenasconfig = arenasconfig;
 		this.messagesconfig = messagesconfig;
@@ -95,7 +93,6 @@ public PluginInstance(JavaPlugin plugin, ArenasConfig arenasconfig, MessagesConf
 		achievements = new ArenaAchievements(this, plugin);
 		scoreboardManager = new ArenaScoreboard(this, plugin);
 		scoreboardLobbyManager = new ArenaLobbyScoreboard(this, plugin);
-		sock = new BungeeSocket(this);
 		reloadVariables();
 	}
 

API/src/main/java/com/comze_instancelabs/minigamesapi/bungee/BungeeSocket.java

@@ -14,48 +14,37 @@
 public class BungeeSocket {
 
 	// Here sits the lovely MGLib server waiting for requests from our Lobby slaves >:D
+	// Socket server moved to lobby, dis our slave now :(
 
 	// We're gonna send simple strings like: sign:<minigame>:<arena>:<state>:<players>/<amxplayers>
 
-	PluginInstance pli;
-
-	public ArrayList<Socket> clients = new ArrayList<Socket>();
-
-	public BungeeSocket(PluginInstance pli) {
-		this.pli = pli;
-	}
-
-	public String signUpdateString(Arena a) {
+	public static String signUpdateString(PluginInstance pli, Arena a) {
 		if (a == null) {
 			return "sign:" + pli.getPlugin().getName() + ":null:JOIN:0:0";
 		}
 		return "sign:" + pli.getPlugin().getName() + ":" + a.getInternalName() + ":" + a.getArenaState().toString() + ":" + a.getAllPlayers().size() + ":" + a.getMaxPlayers();
 	}
 
-	/*
-	 * public void sendSingUpdate(String arenaname) { for (Socket s : clients) { try { PrintWriter out = new PrintWriter(s.getOutputStream(), true);
-	 * out.println(signUpdateString(pli.getArenaByName(arenaname))); } catch (Exception e) { e.printStackTrace(); } } }
-	 */
+	static ArrayList<Integer> portsUp = new ArrayList<Integer>();
+	static boolean init = false;
+	static boolean initializing = false;
 
-	ArrayList<Integer> portsUp = new ArrayList<Integer>();
-	boolean init = false;
-	boolean initializing = false;
-
-	public void sendSignUpdate(final Arena a) {
+	public static void sendSignUpdate(final PluginInstance pli, final Arena a) {
 		try {
 			System.out.println("" + init);
 			if (init) {
 				for (int i : portsUp) {
 					ArenaLogger.debug("Sending to port " + i);
 					Socket socket = new Socket("127.0.0.1", i);
 					PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
-					out.println(signUpdateString(a));
+					out.println(signUpdateString(pli, a));
 					socket.close();
 				}
 				return;
 			}
 			// Of course we'll have lags at the first sign update as we check through 20 ports
 			if (!initializing) {
+				initializing = true;
 				new Thread(new Runnable() {
 					public void run() {
 						for (int i = 13380; i < 13400; i++) {
@@ -66,7 +55,7 @@ public void run() {
 									portsUp.add(i);
 								}
 								PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
-								out.println(signUpdateString(a));
+								out.println(signUpdateString(pli, a));
 								socket.close();
 							} catch (Exception e) {
 								ArenaLogger.debug("Could not connect to port " + i);
@@ -75,7 +64,6 @@ public void run() {
 						init = true;
 					}
 				}).start();
-				initializing = true;
 			}
 		} catch (Exception e) {
 			e.printStackTrace();

API/src/main/java/com/comze_instancelabs/minigamesapi/util/BungeeUtil.java

@@ -10,6 +10,7 @@
 import com.comze_instancelabs.minigamesapi.Arena;
 import com.comze_instancelabs.minigamesapi.MinigamesAPI;
 import com.comze_instancelabs.minigamesapi.PluginInstance;
+import com.comze_instancelabs.minigamesapi.bungee.BungeeSocket;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 
@@ -29,7 +30,7 @@ public static void connectToServer(JavaPlugin plugin, String player, String serv
 
 	public static void sendSignUpdateRequest(JavaPlugin plugin, String minigame, Arena arena) {
 		PluginInstance pli = MinigamesAPI.getAPI().getPluginInstance(plugin);
-		pli.sock.sendSignUpdate(arena);
+		BungeeSocket.sendSignUpdate(pli, arena);
 		ByteArrayDataOutput out = ByteStreams.newDataOutput();
 		try {
 			out.writeUTF("Forward");