From 9d7612cd5553763151bac716115436a8d5721439 Mon Sep 17 00:00:00 2001
From: Deathsbreed <nicolas.ortega.froysa@gmail.com>
Date: Sun, 4 May 2014 20:18:33 -0500
Subject: [PATCH] Can now show client and server versions.

---
 src-client/Client.java       | 10 ++++++++--
 src-server/Server.java       |  2 ++
 src-server/ServerThread.java |  2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src-client/Client.java b/src-client/Client.java
index 7ce0169..80200cb 100644
--- a/src-client/Client.java
+++ b/src-client/Client.java
@@ -47,10 +47,16 @@ public class Client implements Runnable {
 	}
 
 	public void run() {
+		String uinput;
 		while(thread != null) {
 			try {
-				streamOut.writeUTF(console.readLine());
-				streamOut.flush();
+				uinput = console.readLine();
+				if(uinput.equals("/clientVersion")) {
+					System.out.println(version);
+				} else {
+					streamOut.writeUTF(uinput);
+					streamOut.flush();
+				}
 			} catch(IOException e) {
 				System.out.println("Sending error: " + e.getMessage());
 				stop();
diff --git a/src-server/Server.java b/src-server/Server.java
index 2881e5f..f98df95 100644
--- a/src-server/Server.java
+++ b/src-server/Server.java
@@ -92,6 +92,8 @@ public class Server implements Runnable {
 			if(input.equals("/quit")) {
 				clients.get(findClient(id)).send("/quit");
 				remove(id);
+			} else if(input.equals("/serverVersion")) {
+				clients.get(findClient(id)).send(version);
 			} else if(input.equals("/list")) {
 				int pos = findClient(id);
 				for(int i = 0; i < clients.size(); i++) {
diff --git a/src-server/ServerThread.java b/src-server/ServerThread.java
index a927841..a503885 100644
--- a/src-server/ServerThread.java
+++ b/src-server/ServerThread.java
@@ -59,6 +59,8 @@ public class ServerThread extends Thread {
 				" - /myUserName -- Returns your username.\n" +
 				" - /pm [id] [msg] -- Sends a message to only one of the clients.\n" +
 				" - /setUserName [newusername] -- Change your username.\n" +
+				" - /clientVersion -- Returns the version of the client.\n" +
+				" - /serverVersion -- Returns the version of the server.\n" +
 				" - /help -- Show this information.\n" +
 				" - /quit -- Quit.\n");
 			if(admin) {