Merge pull request networkfilter#54 from ByteExceptionM/main

Author: nidotls

bungee/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 

bungee/src/main/java/ls/ni/networkfilter/bungee/listeners/PostLoginListener.java

@@ -34,9 +34,7 @@
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.util.Optional;
 
 public class PostLoginListener implements Listener {
 
@@ -56,31 +54,37 @@ public void onEvent(PostLoginEvent event) {
             return;
         }
 
+        event.registerIntent(this.plugin);
+
         this.plugin.getProxy().getScheduler().runAsync(this.plugin, () -> {
-            NetworkFilterResult result = NetworkFilterCommon.getInstance().check(address);
+            try {
+                NetworkFilterResult result = NetworkFilterCommon.getInstance().check(address);
 
-            if (!result.blocked()) {
-                return;
-            }
+                if (!result.blocked()) {
+                    return;
+                }
 
-            if (NetworkFilterCommon.getConfig().getConsequences().getKick().getEnabled()) {
-                String rawMessage = NetworkFilterCommon.getConfig().getConsequences().getKick().getMessage();
-                String message = PlaceholderUtil.replace(rawMessage, result, player.getName(), player.getUniqueId());
+                if (NetworkFilterCommon.getConfig().getConsequences().getKick().getEnabled()) {
+                    String rawMessage = NetworkFilterCommon.getConfig().getConsequences().getKick().getMessage();
+                    String message = PlaceholderUtil.replace(rawMessage, result, player.getName(), player.getUniqueId());
 
-                player.disconnect(TextComponent.fromLegacyText(message));
-            }
+                    player.disconnect(TextComponent.fromLegacyText(message));
+                }
+
+                for (String rawCommand : NetworkFilterCommon.getConfig().getConsequences().getCommands()) {
+                    if (rawCommand.isBlank()) {
+                        continue;
+                    }
 
-            for (String rawCommand : NetworkFilterCommon.getConfig().getConsequences().getCommands()) {
-                if (rawCommand.isBlank()) {
-                    continue;
+                    String command = PlaceholderUtil.replace(rawCommand, result, player.getName(), player.getUniqueId());
+                    this.plugin.getProxy().getPluginManager().dispatchCommand(
+                            this.plugin.getProxy().getConsole(), command);
                 }
 
-                String command = PlaceholderUtil.replace(rawCommand, result, player.getName(), player.getUniqueId());
-                this.plugin.getProxy().getPluginManager().dispatchCommand(
-                        this.plugin.getProxy().getConsole(), command);
+                NetworkFilterCommon.getInstance().sendNotify(result, player.getName(), player.getUniqueId());
+            } finally {
+                event.completeIntent(this.plugin);
             }
-
-            NetworkFilterCommon.getInstance().sendNotify(result, player.getName(), player.getUniqueId());
         });
     }
 }