Colbster937/originblacklist
1
0
Fork 0
mirror of https://github.com/colbster937/originblacklist.git synced 2026-02-04 02:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from Cirsius/main

Browse Source 
bug fixes by @cirsius
This commit is contained in:
Colbster937
2026-01-02 19:37:27 -06:00
committed by GitHub
parent d4541c9de4 c913d9d34e
commit ee4b14bf30
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dev/colbster937/originblacklist/base/Base.java
View File

@@ -209,6 +209,8 @@ public class Base {
getLogger().error(ex.toString()); getLogger().error(ex.toString());
} }
} }
conn.sendToUser();
conn.disconnect();
} }
public static boolean matches(String text1, String text2) { public static boolean matches(String text1, String text2) {

3
src/main/java/dev/colbster937/originblacklist/base/IPBlacklist.java
View File

@@ -22,6 +22,9 @@ public class IPBlacklist {
if (addr.startsWith("/")) { if (addr.startsWith("/")) {
addr1 = addr.substring(1); addr1 = addr.substring(1);
} }
if (addr1.startsWith("[") && addr1.endsWith("]")) {
addr1 = addr1.substring(1, addr1.length() - 1);
}
ip = new IPAddressString(addr1).toAddress(); ip = new IPAddressString(addr1).toAddress();
} catch (AddressStringException e) { } catch (AddressStringException e) {
throw new RuntimeException("Invalid IP address: " + addr, e); throw new RuntimeException("Invalid IP address: " + addr, e);

5
src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java
View File

@@ -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.EaglercraftLoginEvent;
import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent; import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; 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.java.JavaPlugin;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@@ -47,7 +48,7 @@ public class OriginBlacklistBukkit extends JavaPlugin implements Listener {
Base.handleConnection(event); Base.handleConnection(event);
} }
@EventHandler @EventHandler(priority = EventPriority.MONITOR)
public void onMOTD(EaglercraftMOTDEvent event) { public void onMOTD(EaglercraftMOTDEvent event) {
Base.handleMOTD(event); Base.handleMOTD(event);
} }

3
src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java
View File

@@ -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.Plugin;
import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventHandler;
import net.md_5.bungee.event.EventPriority;
public class OriginBlacklistBungee extends Plugin implements Listener { public class OriginBlacklistBungee extends Plugin implements Listener {
@@ -46,7 +47,7 @@ public class OriginBlacklistBungee extends Plugin implements Listener {
Base.handleConnection(event); Base.handleConnection(event);
} }
@EventHandler @EventHandler(priority = EventPriority.HIGHEST)
public void onMOTD(EaglercraftMOTDEvent event) { public void onMOTD(EaglercraftMOTDEvent event) {
Base.handleMOTD(event); Base.handleMOTD(event);
} }

3
src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java
View File

@@ -1,6 +1,7 @@
package dev.colbster937.originblacklist.velocity; package dev.colbster937.originblacklist.velocity;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.velocitypowered.api.event.PostOrder;
import com.velocitypowered.api.event.connection.PreLoginEvent; import com.velocitypowered.api.event.connection.PreLoginEvent;
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.Subscribe;
@@ -51,7 +52,7 @@ public class OriginBlacklistVelocity {
Base.handleConnection(event); Base.handleConnection(event);
} }
@Subscribe @Subscribe(order = PostOrder.LAST)
public void onMOTD(EaglercraftMOTDEvent event) { public void onMOTD(EaglercraftMOTDEvent event) {
Base.handleMOTD(event); Base.handleMOTD(event);
} }