From bfed49407fa19858d9a979605d2b137045c933f0 Mon Sep 17 00:00:00 2001
From: Cirsius <goodahhuncleproductions@gmail.com>
Date: Fri, 2 Jan 2026 17:42:22 -0600
Subject: [PATCH 1/2] fix bug w ipv6

---
 .../java/dev/colbster937/originblacklist/base/IPBlacklist.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/dev/colbster937/originblacklist/base/IPBlacklist.java b/src/main/java/dev/colbster937/originblacklist/base/IPBlacklist.java
index 20a9de6..72cb01b 100644
--- a/src/main/java/dev/colbster937/originblacklist/base/IPBlacklist.java
+++ b/src/main/java/dev/colbster937/originblacklist/base/IPBlacklist.java
@@ -22,6 +22,9 @@ public class IPBlacklist {
             if (addr.startsWith("/")) {
                 addr1 = addr.substring(1);
             }
+            if (addr1.startsWith("[") && addr1.endsWith("]")) {
+                addr1 = addr1.substring(1, addr1.length() - 1);
+            }
             ip = new IPAddressString(addr1).toAddress();
         } catch (AddressStringException e) {
             throw new RuntimeException("Invalid IP address: " + addr, e);

From c913d9d34e79c2ef5602ca10fb962375301b26fd Mon Sep 17 00:00:00 2001
From: Cirsius <goodahhuncleproductions@gmail.com>
Date: Fri, 2 Jan 2026 19:12:21 -0600
Subject: [PATCH 2/2] make work with eaglermotd

---
 src/main/java/dev/colbster937/originblacklist/base/Base.java | 2 ++
 .../originblacklist/bukkit/OriginBlacklistBukkit.java        | 5 +++--
 .../originblacklist/bungee/OriginBlacklistBungee.java        | 3 ++-
 .../originblacklist/velocity/OriginBlacklistVelocity.java    | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/dev/colbster937/originblacklist/base/Base.java b/src/main/java/dev/colbster937/originblacklist/base/Base.java
index e7a9d9a..6165432 100644
--- a/src/main/java/dev/colbster937/originblacklist/base/Base.java
+++ b/src/main/java/dev/colbster937/originblacklist/base/Base.java
@@ -209,6 +209,8 @@ public class Base {
                 getLogger().error(ex.toString());
             }
         }
+        conn.sendToUser();
+        conn.disconnect();
     }
 
     public static boolean matches(String text1, String text2) {
diff --git a/src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java b/src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java
index 26d2cf8..f3051a9 100644
--- a/src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java
+++ b/src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java
@@ -5,8 +5,9 @@ import net.lax1dude.eaglercraft.backend.server.api.bukkit.EaglerXServerAPI;
 import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftLoginEvent;
 import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.Plugin;
 
@@ -47,7 +48,7 @@ public class OriginBlacklistBukkit extends JavaPlugin implements Listener {
         Base.handleConnection(event);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onMOTD(EaglercraftMOTDEvent event) {
         Base.handleMOTD(event);
     }
diff --git a/src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java b/src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java
index 7f89c4f..113888a 100644
--- a/src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java
+++ b/src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java
@@ -8,6 +8,7 @@ import net.md_5.bungee.api.event.PreLoginEvent;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.event.EventPriority;
 
 public class OriginBlacklistBungee extends Plugin implements Listener {
 
@@ -46,7 +47,7 @@ public class OriginBlacklistBungee extends Plugin implements Listener {
         Base.handleConnection(event);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onMOTD(EaglercraftMOTDEvent event) {
         Base.handleMOTD(event);
     }
diff --git a/src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java b/src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java
index 54ee766..9414625 100644
--- a/src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java
+++ b/src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java
@@ -1,6 +1,7 @@
 package dev.colbster937.originblacklist.velocity;
 
 import com.google.inject.Inject;
+import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.connection.PreLoginEvent;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.Subscribe;
@@ -51,7 +52,7 @@ public class OriginBlacklistVelocity {
         Base.handleConnection(event);
     }
 
-    @Subscribe
+    @Subscribe(order = PostOrder.LAST)
     public void onMOTD(EaglercraftMOTDEvent event) {
         Base.handleMOTD(event);
     }