Various cleanups and optimizations

This commit is contained in:
kaboom 2022-05-21 03:16:22 +03:00
parent a904674707
commit 308652bfd0

View file

@ -40,6 +40,13 @@ public final class Main extends JavaPlugin implements CommandExecutor, Listener
player.sendMessage("Successfully disabled CommandSpy"); player.sendMessage("Successfully disabled CommandSpy");
} }
private ChatColor getChatColor(final Player player) {
if (config.contains(player.getUniqueId().toString())) {
return ChatColor.YELLOW;
}
return ChatColor.AQUA;
}
@Override @Override
public boolean onCommand(final CommandSender sender, final Command cmd, final String label, public boolean onCommand(final CommandSender sender, final Command cmd, final String label,
final String[] args) { final String[] args) {
@ -50,17 +57,16 @@ public final class Main extends JavaPlugin implements CommandExecutor, Listener
final Player player = (Player) sender; final Player player = (Player) sender;
if (args.length == 0) { if (args.length >= 1 && "on".equalsIgnoreCase(args[0])) {
if (config.contains(player.getUniqueId().toString())) {
disableCommandSpy(player);
} else {
enableCommandSpy(player);
}
} else if ("on".equalsIgnoreCase(args[0])) {
enableCommandSpy(player); enableCommandSpy(player);
} else if ("off".equalsIgnoreCase(args[0])) { return true;
disableCommandSpy(player);
} }
if ((args.length >= 1 && "off".equalsIgnoreCase(args[0]))
|| config.contains(player.getUniqueId().toString())) {
disableCommandSpy(player);
return true;
}
enableCommandSpy(player);
return true; return true;
} }
@ -70,43 +76,39 @@ public final class Main extends JavaPlugin implements CommandExecutor, Listener
return; return;
} }
Set<String> uuids = config.getKeys(false); final Player player = event.getPlayer();
ChatColor color = (uuids.contains(event.getPlayer().getUniqueId().toString())) final ChatColor color = getChatColor(player);
? ChatColor.YELLOW : ChatColor.AQUA; final String message = color + player.getName() + color + ": " + event.getMessage();
for (String uuidString : uuids) { for (String uuidString : config.getKeys(false)) {
UUID uuid = UUID.fromString(uuidString); final UUID uuid = UUID.fromString(uuidString);
final Player recipient = Bukkit.getPlayer(uuid);
if (Bukkit.getPlayer(uuid) != null) { if (recipient == null) {
Bukkit.getPlayer(uuid).sendMessage( continue;
color + ""
+ event.getPlayer().getName() + ""
+ color + ": "
+ event.getMessage()
);
} }
recipient.sendMessage(message);
} }
} }
@EventHandler @EventHandler
void onSignChange(final SignChangeEvent event) { void onSignChange(final SignChangeEvent event) {
Set<String> uuids = config.getKeys(false); final Player player = event.getPlayer();
ChatColor color = (uuids.contains(event.getPlayer().getUniqueId().toString())) final ChatColor color = getChatColor(player);
? ChatColor.YELLOW : ChatColor.AQUA; final String message = color + player.getName() + color
+ " created a sign with contents:";
for (String uuidString : uuids) { for (String uuidString : config.getKeys(false)) {
UUID uuid = UUID.fromString(uuidString); final UUID uuid = UUID.fromString(uuidString);
final Player recipient = Bukkit.getPlayer(uuid);
if (Bukkit.getPlayer(uuid) != null) { if (recipient == null) {
Bukkit.getPlayer(uuid).sendMessage( continue;
color + "" }
+ event.getPlayer().getName() + "" recipient.sendMessage(message);
+ color
+ " created a sign with contents:" for (String line : event.getLines()) {
); recipient.sendMessage(color + " " + line);
for (String line: event.getLines()) {
Bukkit.getPlayer(uuid).sendMessage(color + " " + line);
}
} }
} }
} }