RedGuy/AuthMeVelocity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Improved TabComplete Listener

Browse Source
This commit is contained in:
4drian3d 2022-07-12 16:08:12 +00:00
parent 28a845d566
commit 818325a5f9
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java
View File

@ -53,16 +53,16 @@ public final class ProxyListener {
return; return;
} }
Player player = ((Player)event.getCommandSource()); Player player = (Player)event.getCommandSource();
if(api.isLogged(player)){ if (api.isLogged(player)) {
continuation.resume(); continuation.resume();
return; return;
} }
if(api.isInAuthServer(player)){ if (api.isInAuthServer(player)) {
String command = AuthmeUtils.getFirstArgument(event.getCommand()); String command = AuthmeUtils.getFirstArgument(event.getCommand());
if(!config.getCommandsConfig().getAllowedCommands().contains(command)){ if (!config.getCommandsConfig().getAllowedCommands().contains(command)) {
ConfigUtils.sendBlockedMessage(player, config); ConfigUtils.sendBlockedMessage(player, config);
event.setResult(CommandExecuteEvent.CommandResult.denied()); event.setResult(CommandExecuteEvent.CommandResult.denied());
} }
@ -75,7 +75,7 @@ public final class ProxyListener {
@Subscribe(order = PostOrder.FIRST) @Subscribe(order = PostOrder.FIRST)
public void onPlayerChat(final PlayerChatEvent event) { public void onPlayerChat(final PlayerChatEvent event) {
if (!api.isLogged(event.getPlayer())) { if (api.isNotLogged(event.getPlayer())) {
event.setResult(PlayerChatEvent.ChatResult.denied()); event.setResult(PlayerChatEvent.ChatResult.denied());
} }
} }
@ -105,12 +105,19 @@ public final class ProxyListener {
} }
@Subscribe(order = PostOrder.FIRST) @Subscribe(order = PostOrder.FIRST)
public EventTask onTabComplete(TabCompleteEvent event){ public void onTabComplete(TabCompleteEvent event){
return EventTask.async(() -> { if (api.isLogged(event.getPlayer())) {
if (!api.isLogged(event.getPlayer())){ return;
event.getSuggestions().clear(); }
final String command = event.getPartialMessage();
for (final String allowed : config.getCommandsConfig().getAllowedCommands()) {
if (allowed.startsWith(command)) {
return;
} }
}); }
event.getSuggestions().clear();
} }
@Subscribe(order = PostOrder.LATE) @Subscribe(order = PostOrder.LATE)
@ -123,7 +130,7 @@ public final class ProxyListener {
return; return;
} }
@Nullable RegisteredServer server = getAvailableServer(); @Nullable RegisteredServer server = getAvailableServer();
if(server == null) { if (server == null) {
continuation.resume(); continuation.resume();
logger.error("Cannot send the player {} to an auth server", event.getPlayer().getUsername()); logger.error("Cannot send the player {} to an auth server", event.getPlayer().getUsername());
String disconnectMessage = config.getEnsureOptions().getDisconnectMessage(); String disconnectMessage = config.getEnsureOptions().getDisconnectMessage();
@ -135,7 +142,7 @@ public final class ProxyListener {
} }
private @Nullable RegisteredServer getAvailableServer(){ private @Nullable RegisteredServer getAvailableServer() {
for(String sv : config.getAuthServers()){ for(String sv : config.getAuthServers()){
Optional<RegisteredServer> opt = proxy.getServer(sv); Optional<RegisteredServer> opt = proxy.getServer(sv);
if(opt.isPresent()) return opt.get(); if(opt.isPresent()) return opt.get();