From 71d5a698e5b49043b4f60c28f38fc9ce99231096 Mon Sep 17 00:00:00 2001 From: Carlos <28845529+mesacarlos@users.noreply.github.com> Date: Mon, 25 May 2020 21:15:08 +0200 Subject: [PATCH] Javadoc updates and catched exception when sending msg to disconnected client --- .../webconsole/util/LoginManager.java | 17 +++++++++++++++++ .../webconsole/websocket/WSServer.java | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/es/mesacarlos/webconsole/util/LoginManager.java b/src/es/mesacarlos/webconsole/util/LoginManager.java index 1cc7419..836e164 100644 --- a/src/es/mesacarlos/webconsole/util/LoginManager.java +++ b/src/es/mesacarlos/webconsole/util/LoginManager.java @@ -15,18 +15,35 @@ public class LoginManager { return instance; } + /** + * Logs user in + * @param address User to login + */ public void logIn(InetSocketAddress address) { loggedInUsers.add(address); } + /** + * Logs user out + * @param address User to logout + */ public void logOut(InetSocketAddress address) { loggedInUsers.remove(address); } + /** + * Check if user is logged in + * @param address User to check + * @return true if user is logged in, false otherwise + */ public boolean isLoggedIn(InetSocketAddress address) { return loggedInUsers.contains(address); } + /** + * Retrieve the full logged-in user list + * @return list of logged in users + */ public ArrayList getLoggedInUsers() { return loggedInUsers; } diff --git a/src/es/mesacarlos/webconsole/websocket/WSServer.java b/src/es/mesacarlos/webconsole/websocket/WSServer.java index f924ff0..2129fe5 100644 --- a/src/es/mesacarlos/webconsole/websocket/WSServer.java +++ b/src/es/mesacarlos/webconsole/websocket/WSServer.java @@ -6,6 +6,7 @@ import java.util.HashMap; import org.bukkit.Bukkit; import org.java_websocket.WebSocket; +import org.java_websocket.exceptions.WebsocketNotConnectedException; import org.java_websocket.handshake.ClientHandshake; import org.java_websocket.server.WebSocketServer; @@ -106,7 +107,12 @@ public class WSServer extends WebSocketServer { * @param content JSONOutput object */ public void sendToClient(WebSocket conn, JSONOutput content) { - conn.send(content.toJSON()); + try { + conn.send(content.toJSON()); + }catch(WebsocketNotConnectedException e) { + Bukkit.getLogger().warning("Tried to send message to a disconnected client."); + } + } } \ No newline at end of file