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

misc(debug): Improved Plugin Messaging Listener debug mode

Browse Source
This commit is contained in:
Adrian 2023-12-07 11:52:47 -05:00
parent 2df0a8b8a4
commit 52b0dca96a
No known key found for this signature in database
GPG Key ID: FB8EF84DCE1BE452
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java
View File

@ -239,13 +239,13 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI {
return config.get().authServers().contains(server); return config.get().authServers().contains(server);
} }
public void logDebug(String msg) { public void logDebug(final String msg) {
if (config.get().advanced().debug()) { if (config.get().advanced().debug()) {
logger.info("[DEBUG] {}", msg); logger.info("[DEBUG] {}", msg);
} }
} }
public void logDebug(Supplier<String> msg) { public void logDebug(final Supplier<String> msg) {
if (config.get().advanced().debug()) { if (config.get().advanced().debug()) {
logger.info("[DEBUG] {}", msg.get()); logger.info("[DEBUG] {}", msg.get());
} }

24
velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/data/PluginMessageListener.java
View File

@ -57,11 +57,7 @@ public final class PluginMessageListener implements Listener<PluginMessageEvent>
@Override @Override
public EventTask executeAsync(final PluginMessageEvent event) { public EventTask executeAsync(final PluginMessageEvent event) {
return EventTask.async(() -> { return EventTask.async(() -> {
final boolean cancelled = !event.getResult().isAllowed() if (notAllowedEvent(event)) {
|| !(event.getSource() instanceof ServerConnection)
|| !(event.getIdentifier().equals(AuthMeVelocityPlugin.MODERN_CHANNEL)
|| event.getIdentifier().equals(AuthMeVelocityPlugin.LEGACY_CHANNEL));
if (cancelled) {
plugin.logDebug("PluginMessageEvent | Not allowed"); plugin.logDebug("PluginMessageEvent | Not allowed");
return; return;
} }
@ -117,6 +113,24 @@ public final class PluginMessageListener implements Listener<PluginMessageEvent>
}); });
} }
private boolean notAllowedEvent(PluginMessageEvent event) {
if (!event.getResult().isAllowed()) {
plugin.logDebug("PluginMessageEvent | Result not allowed");
return true;
}
if (!(event.getSource() instanceof ServerConnection)) {
plugin.logDebug("PluginMessageEvent | Not ServerConnection");
return true;
}
final var identifier = event.getIdentifier();
if (!(identifier.equals(AuthMeVelocityPlugin.MODERN_CHANNEL)
|| identifier.equals(AuthMeVelocityPlugin.LEGACY_CHANNEL))) {
plugin.logDebug("PluginMessageEvent | Not AuthMeVelocity Identifier");
return true;
}
return false;
}
private void createServerConnectionRequest(final Player player, final ServerConnection connection){ private void createServerConnectionRequest(final Player player, final ServerConnection connection){
final RegisteredServer loginServer = player.getCurrentServer().orElse(connection).getServer(); final RegisteredServer loginServer = player.getCurrentServer().orElse(connection).getServer();