fix webhook with ipv6

colbster937 · colbster937 · commit 58e9819c3a02 · 2025-07-09T17:15:32.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 
 
 group = 'dev.colbster937'
-version = '1.1.0'
+version = '1.1.1'
 description = 'A reimplementation of OriginBlacklist for EaglerXServer'
 def targetJavaVersion = 17
 
diff --git a/src/main/java/dev/colbster937/originblacklist/base/Base.java b/src/main/java/dev/colbster937/originblacklist/base/Base.java
@@ -256,7 +256,9 @@ public static void webhook(IEaglerLoginConnection plr, String origin, String bra
     }
 
     public static String getAddr(IEaglerLoginConnection plr) {
-        return (plr.getPlayerAddress() != null ? plr.getPlayerAddress().toString().substring(1) : "undefined:undefined").split(":")[0];
+        var addr1 = plr.getPlayerAddress() != null ? plr.getPlayerAddress().toString().substring(1) : "undefined:undefined";
+        var addr2 = addr1.lastIndexOf(':') != -1 ? addr1.substring(0, addr1.lastIndexOf(':')) : addr1;
+        return addr2;
     }
 
     public static void init() {

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,9 @@ public static void webhook(IEaglerLoginConnection plr, String origin, String bra`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`public static String getAddr(IEaglerLoginConnection plr) {`
`259`		`- return (plr.getPlayerAddress() != null ? plr.getPlayerAddress().toString().substring(1) : "undefined:undefined").split(":")[0];`
	`259`	`+ var addr1 = plr.getPlayerAddress() != null ? plr.getPlayerAddress().toString().substring(1) : "undefined:undefined";`
	`260`	`+ var addr2 = addr1.lastIndexOf(':') != -1 ? addr1.substring(0, addr1.lastIndexOf(':')) : addr1;`
	`261`	`+ return addr2;`
`260`	`262`	`}`
`261`	`263`
`262`	`264`	`public static void init() {`