Skip to content

Commit 9960a19

Browse files
committed
/websandbox list without verbose shows less information, fits on a line
1 parent 25aea96 commit 9960a19

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ If not given, WebSandboxMC's embedded version of NetCraft will be served up inst
7979
## Commands
8080

8181
* `/websandbox`: show help
82-
* `/websandbox list`: list all web users connected
82+
* `/websandbox list [verbose]`: list all web users connected
8383
* `/websandbox tp <user>`: teleport to given web username
8484
* `/websandbox kick <user>`: disconnect given web username
8585

src/main/java/io/github/satoshinm/WebSandboxMC/bukkit/WsCommand.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
2626
int size = webSocketServerThread.webPlayerBridge.name2channel.size();
2727
sender.sendMessage(size + " web player(s) connected:");
2828

29+
boolean verbose = split.length >= 2 && split[1].equals("verbose");
30+
2931
int i = 1;
3032
for (String name: webSocketServerThread.webPlayerBridge.name2channel.keySet()) { // TODO: sort?
3133
Channel channel = webSocketServerThread.webPlayerBridge.name2channel.get(name);
@@ -37,13 +39,16 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
3739
String entityInfo = "";
3840

3941
if (entity != null) {
40-
entityInfo += " entity "+entity.getEntityId()+" "+entity.getClass().getName();
41-
entityInfo += " at " + entity.getLocation();
42+
entityInfo += " entity "+entity.getEntityId();
43+
if (verbose) {
44+
entityInfo += " "+entity.getClass().getName() + " at " + entity.getLocation();
45+
}
4246
}
4347

4448
sender.sendMessage(i + ". " + name + ", " + ip + entityInfo);
4549
++i;
4650
}
51+
return true;
4752
} else if (subcommand.equals("tp")) {
4853
if (split.length < 2) {
4954
sender.sendMessage("Usage: /websandbox tp <user>");
@@ -93,7 +98,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
9398
webSocketServerThread.webPlayerBridge.clientDisconnected(channel);
9499
return true;
95100
} else { // help
96-
sender.sendMessage("/websandbox list -- list all web users connected");
101+
sender.sendMessage("/websandbox list [verbose] -- list all web users connected");
97102
sender.sendMessage("/websandbox tp <user> -- teleport to given web username");
98103
sender.sendMessage("/websandbox kick <user> -- disconnect given web username");
99104
// TODO: reload, reconfig commands

0 commit comments

Comments
 (0)