From d3a157672bcef100b5a6d8f61e978e2879d35757 Mon Sep 17 00:00:00 2001 From: Manevolent Date: Fri, 10 Aug 2018 19:27:46 -0400 Subject: [PATCH] More accurate ping and handling all packet types properly --- .../socket/client/LocalTeamspeakClientSocket.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java b/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java index f609409..52040bf 100644 --- a/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java +++ b/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java @@ -868,7 +868,12 @@ public class LocalTeamspeakClientSocket map.put("clid", Integer.toString(clientId)); return new Client(map); }).get(); - return clients.iterator().next(); + + Iterator iterator = clients.iterator(); + if (iterator.hasNext()) + return iterator.next(); + else + return null; } public Channel getChannelInfo(int channelId) @@ -879,7 +884,11 @@ public class LocalTeamspeakClientSocket new CommandSingleParameter("cid", Integer.toString(channelId)) ); - return executeCommand(command, x -> new Channel(x.toMap())).get().iterator().next(); + Iterator iterator = executeCommand(command, x -> new Channel(x.toMap())).get().iterator(); + if (iterator.hasNext()) + return iterator.next(); + else + return null; } public void disconnect()