Redundant

What's the point of a username.. when there's already a name.

Author: YoFuzzy3

CommandSyncClient/src/com/fuzzoland/CommandSyncClient/CSC.java

@@ -20,12 +20,11 @@ public class CSC extends JavaPlugin{
 	public List<String> oq = Collections.synchronizedList(new ArrayList<String>());
 	public Integer qc = 0;
 	public String spacer = "@#@";
-	public String user;
 	public String pass;
 
 	public void onEnable(){
 		String[] data = loadConfig();
-		if(data[3].equals("UNSET") || data[4].equals("UNSET") || data[5].equals("UNSET")){
+		if(data[3].equals("UNSET") || data[4].equals("UNSET")){
 			System.out.println("[CommandSync] !!! THE CONFIG FILE CONTAINS UNSET VALUES - YOU MUST FIX THEM BEFORE THE PLUGIN WILL WORK !!! ");
 			return;
 		}
@@ -35,8 +34,7 @@ public void onEnable(){
 		}catch(Exception e){
 			e.printStackTrace();
 		}
-		user = data[4];
-		pass = data[5];
+		pass = data[4];
 		loadData();
 		getCommand("Sync").setExecutor(new CommandSynchronize(this));
 	}
@@ -47,7 +45,7 @@ public void onDisable(){
 
 	private String[] loadConfig(){
 		String[] defaults = new String[]{
-			"ip=localhost", "port=9190", "heartbeat=1000", "name=UNSET", "user=UNSET", "pass=UNSET"
+			"ip=localhost", "port=9190", "heartbeat=1000", "name=UNSET", "pass=UNSET"
 		};
 		String[] data = new String[defaults.length];
 		try{

CommandSyncClient/src/com/fuzzoland/CommandSyncClient/ClientThread.java

@@ -89,15 +89,14 @@ private void connect(Boolean sleep){
 			socket = new Socket(ip, port);
 			out = new PrintWriter(socket.getOutputStream(), true);
 			in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-			out.println(plugin.user);
-			out.println(plugin.pass);
+			out.println(name);
 			if(in.readLine().equals("n")){
-				System.out.println("[CommandSync] Sent invalid username or password.");
-				return;
+			    System.out.println("[CommandSync] The name " + name + " is already connected.");
+			    return;
 			}
-			out.println(name);
+			out.println(plugin.pass);
 			if(in.readLine().equals("n")){
-				System.out.println("[CommandSync] Sent a name that is already connected.");
+				System.out.println("[CommandSync] The password is invalid.");
 				return;
 			}
 			connected = true;

CommandSyncServer/src/com/fuzzoland/CommandSyncServer/CSS.java

@@ -19,10 +19,10 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import com.fuzzoland.CommandSyncServer.Metrics.Graph;
-
 import net.md_5.bungee.api.plugin.Plugin;
 
+import com.fuzzoland.CommandSyncServer.Metrics.Graph;
+
 public class CSS extends Plugin{
 
 	public ServerSocket server;
@@ -31,12 +31,11 @@ public class CSS extends Plugin{
 	public Map<String, List<String>> pq = Collections.synchronizedMap(new HashMap<String, List<String>>());
 	public Map<String, Integer> qc = Collections.synchronizedMap(new HashMap<String, Integer>());
 	public String spacer = "@#@";
-	public String user;
 	public String pass;
 
 	public void onEnable(){
 		String[] data = loadConfig();
-		if(data[3].equals("UNSET") || data[4].equals("UNSET")){
+		if(data[3].equals("UNSET")){
 			System.out.println("[CommandSync] !!! THE CONFIG FILE CONTAINS UNSET VALUES - YOU MUST FIX THEM BEFORE THE PLUGIN WILL WORK !!! ");
 			return;
 		}
@@ -47,8 +46,7 @@ public void onEnable(){
 		}catch(Exception e){
 			e.printStackTrace();
 		}
-		user = data[3];
-		pass = data[4];
+		pass = data[3];
 		loadData();
 		try{
 		    Metrics metrics = new Metrics(this);
@@ -83,7 +81,7 @@ public void onDisable(){
 
 	private String[] loadConfig(){
 		String[] defaults = new String[]{
-			"ip=localhost", "port=9190", "heartbeat=1000", "user=UNSET", "pass=UNSET"
+			"ip=localhost", "port=9190", "heartbeat=1000", "pass=UNSET"
 		};
 		String[] data = new String[defaults.length];
 		try{

CommandSyncServer/src/com/fuzzoland/CommandSyncServer/ClientHandler.java

@@ -27,18 +27,17 @@ public ClientHandler(CSS plugin, Socket socket, Integer heartbeat) throws IOExce
 		out = new PrintWriter(socket.getOutputStream(), true);
 		in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
 		System.out.println("[CommandSync] Received new connection from " + socket.getInetAddress().getHostName() + ":" + socket.getPort() + ".");
-		String user = in.readLine();
-		String pass = in.readLine();
-		if(!user.equals(plugin.user) || !pass.equals(plugin.pass)){
-			System.out.println("[" + socket.getInetAddress().getHostName() + ":" + socket.getPort() + "] [" + name + "] Provided invalid username or password.");
-			out.println("n");
-			socket.close();
-			return;
-		}
-		out.println("y");
 		name = in.readLine();
 		if(plugin.c.contains(name)){
-			System.out.println("[" + socket.getInetAddress().getHostName() + ":" + socket.getPort() + "] [" + name + "] Provided a name that is already connected.");
+		    System.out.println("[" + socket.getInetAddress().getHostName() + ":" + socket.getPort() + "] [" + name + "] Provided a name that is already connected.");
+		    out.println("n");
+		    socket.close();
+		    return;
+		}
+		out.println("y");
+		String pass = in.readLine();
+		if(!pass.equals(plugin.pass)){
+			System.out.println("[" + socket.getInetAddress().getHostName() + ":" + socket.getPort() + "] [" + name + "] Provided an invalid password.");
 			out.println("n");
 			socket.close();
 			return;