feat: pass kick message through PlayerBannedEvent for plugin modification

bukkit/src/main/java/me/confuser/banmanager/bukkit/BukkitServer.java

@@ -138,7 +138,11 @@ public CommonEvent callEvent(String name, Object... args) {
         event = new PlayerBanEvent((PlayerBanData) args[0], (boolean) args[1]);
         break;
       case "PlayerBannedEvent":
-        event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
+        PlayerBannedEvent bannedEvent = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
+        if (args.length > 2 && args[2] instanceof Message) {
+          bannedEvent.setKickMessage((Message) args[2]);
+        }
+        event = bannedEvent;
         break;
       case "PlayerUnbanEvent":
         event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);

bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/PlayerBannedEvent.java

@@ -1,14 +1,20 @@
 package me.confuser.banmanager.bukkit.api.events;
 
 import lombok.Getter;
+import lombok.Setter;
 import me.confuser.banmanager.common.data.PlayerBanData;
+import me.confuser.banmanager.common.util.Message;
 
 
 public class PlayerBannedEvent extends SilentEvent {
 
   @Getter
   private PlayerBanData ban;
 
+  @Getter
+  @Setter
+  private Message kickMessage;
+
   public PlayerBannedEvent(PlayerBanData ban, boolean isSilent) {
     super(isSilent, true);
     this.ban = ban;

bungee/src/main/java/me/confuser/banmanager/bungee/BungeeServer.java

@@ -119,7 +119,11 @@ public CommonEvent callEvent(String name, Object... args) {
         event = new PlayerBanEvent((PlayerBanData) args[0], (boolean) args[1]);
         break;
       case "PlayerBannedEvent":
-        event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
+        PlayerBannedEvent bannedEvent = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
+        if (args.length > 2 && args[2] instanceof Message) {
+          bannedEvent.setKickMessage((Message) args[2]);
+        }
+        event = bannedEvent;
         break;
       case "PlayerUnbanEvent":
         event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);

bungee/src/main/java/me/confuser/banmanager/bungee/api/events/PlayerBannedEvent.java

@@ -1,14 +1,20 @@
 package me.confuser.banmanager.bungee.api.events;
 
 import lombok.Getter;
+import lombok.Setter;
 import me.confuser.banmanager.common.data.PlayerBanData;
+import me.confuser.banmanager.common.util.Message;
 
 
 public class PlayerBannedEvent extends SilentEvent {
 
   @Getter
   private PlayerBanData ban;
 
+  @Getter
+  @Setter
+  private Message kickMessage;
+
   public PlayerBannedEvent(PlayerBanData ban, boolean isSilent) {
     super(isSilent);
     this.ban = ban;

common/src/main/java/me/confuser/banmanager/common/commands/BanCommand.java

@@ -140,8 +140,18 @@ public boolean onCommand(CommonSender sender, CommandParser parser) {
       final PlayerBanData ban = new PlayerBanData(player, actor, parser.getReason().getMessage(), isSilent);
       boolean created;
 
+      Message kickMessage = null;
+      if (onlinePlayer != null) {
+        kickMessage = Message.get("ban.player.kick")
+                             .set("displayName", onlinePlayer.getDisplayName())
+                             .set("player", player.getName())
+                             .set("playerId", player.getUUID().toString())
+                             .set("reason", ban.getReason())
+                             .set("actor", actor.getName());
+      }
+
       try {
-        created = getPlugin().getPlayerBanStorage().ban(ban);
+        created = getPlugin().getPlayerBanStorage().ban(ban, false, kickMessage);
       } catch (SQLException e) {
         handlePunishmentCreateException(e, sender, Message.get("ban.error.exists").set("player",
                 targetName));
@@ -154,19 +164,12 @@ public boolean onCommand(CommonSender sender, CommandParser parser) {
 
       handlePrivateNotes(player, actor, parser.getReason());
 
-      getPlugin().getScheduler().runSync(() -> {
-        if (onlinePlayer == null) return;
-
-        Message kickMessage = Message.get("ban.player.kick")
-                                     .set("displayName", onlinePlayer.getDisplayName())
-                                     .set("player", player.getName())
-                                     .set("playerId", player.getUUID().toString())
-                                     .set("reason", ban.getReason())
-                                     .set("id", ban.getId())
-                                     .set("actor", actor.getName());
-
-        onlinePlayer.kick(kickMessage.toString());
-      });
+      if (onlinePlayer != null) {
+        final Message finalKickMessage = kickMessage;
+        getPlugin().getScheduler().runSync(() -> {
+          onlinePlayer.kick(finalKickMessage.toString());
+        });
+      }
     });
 
     return true;

common/src/main/java/me/confuser/banmanager/common/commands/TempBanCommand.java

@@ -162,8 +162,19 @@ public void run() {
         final PlayerBanData ban = new PlayerBanData(player, actor, reason.getMessage(), isSilent, expires);
         boolean created;
 
+        Message kickMessage = null;
+        if (onlinePlayer != null) {
+          kickMessage = Message.get("tempban.player.kick")
+              .set("displayName", onlinePlayer.getDisplayName())
+              .set("player", player.getName())
+              .set("playerId", player.getUUID().toString())
+              .set("reason", ban.getReason())
+              .set("actor", actor.getName())
+              .set("expires", DateUtils.getDifferenceFormat(ban.getExpires()));
+        }
+
         try {
-          created = getPlugin().getPlayerBanStorage().ban(ban);
+          created = getPlugin().getPlayerBanStorage().ban(ban, false, kickMessage);
         } catch (SQLException e) {
           handlePunishmentCreateException(e, sender, Message.get("ban.error.exists").set("player",
               targetName));
@@ -176,20 +187,12 @@ public void run() {
 
         handlePrivateNotes(player, actor, reason);
 
-        getPlugin().getScheduler().runSync(() -> {
-          if (onlinePlayer == null) return;
-
-          Message kickMessage = Message.get("tempban.player.kick")
-              .set("displayName", onlinePlayer.getDisplayName())
-              .set("player", player.getName())
-              .set("playerId", player.getUUID().toString())
-              .set("reason", ban.getReason())
-              .set("actor", actor.getName())
-              .set("id", ban.getId())
-              .set("expires", DateUtils.getDifferenceFormat(ban.getExpires()));
-
-          onlinePlayer.kick(kickMessage.toString());
-        });
+        if (onlinePlayer != null) {
+          final Message finalKickMessage = kickMessage;
+          getPlugin().getScheduler().runSync(() -> {
+            onlinePlayer.kick(finalKickMessage.toString());
+          });
+        }
 
       }
 

common/src/main/java/me/confuser/banmanager/common/storage/PlayerBanStorage.java

@@ -17,6 +17,7 @@
 import me.confuser.banmanager.common.ormlite.table.DatabaseTableConfig;
 import me.confuser.banmanager.common.ormlite.table.TableUtils;
 import me.confuser.banmanager.common.util.IPUtils;
+import me.confuser.banmanager.common.util.Message;
 import me.confuser.banmanager.common.util.TransactionHelper;
 import me.confuser.banmanager.common.util.UUIDUtils;
 
@@ -198,6 +199,10 @@ public boolean ban(PlayerBanData ban) throws SQLException {
   }
 
   public boolean ban(PlayerBanData ban, boolean fromSync) throws SQLException {
+    return ban(ban, fromSync, null);
+  }
+
+  public boolean ban(PlayerBanData ban, boolean fromSync, Message kickMessage) throws SQLException {
     CommonEvent event = plugin.getServer().callEvent("PlayerBanEvent", ban, ban.isSilent());
 
     if (event.isCancelled()) {
@@ -207,7 +212,11 @@ public boolean ban(PlayerBanData ban, boolean fromSync) throws SQLException {
     create(ban);
     bans.put(ban.getPlayer().getUUID(), ban);
 
-    plugin.getServer().callEvent("PlayerBannedEvent", ban, event.isSilent() || (fromSync && !plugin.getConfig().isBroadcastOnSync()));
+    if (kickMessage != null) {
+      kickMessage.set("id", ban.getId());
+    }
+
+    plugin.getServer().callEvent("PlayerBannedEvent", ban, event.isSilent() || (fromSync && !plugin.getConfig().isBroadcastOnSync()), kickMessage);
 
     return true;
   }

e2e/tests/src/ban-unban.test.ts

@@ -11,6 +11,26 @@ import {
 } from './helpers/rcon'
 import { sleep, waitFor } from './helpers/config'
 
+async function createBotWithRetry (
+  username: string,
+  maxAttempts: number = 5,
+  retryDelay: number = 3000
+): Promise<TestBot> {
+  let lastError: Error | null = null
+
+  for (let i = 0; i < maxAttempts; i++) {
+    try {
+      return await createBot(username)
+    } catch (err) {
+      lastError = err as Error
+      console.log(`Bot connection attempt ${i + 1}/${maxAttempts} failed: ${lastError.message}`)
+      if (i < maxAttempts - 1) await sleep(retryDelay)
+    }
+  }
+
+  throw lastError ?? new Error(`Failed to connect after ${maxAttempts} attempts`)
+}
+
 describe('Ban/Unban E2E Tests', () => {
   let staffBot: TestBot
   let targetBot: TestBot | null = null
@@ -45,13 +65,12 @@ describe('Ban/Unban E2E Tests', () => {
 
     try { await unbanPlayer(TARGET_USERNAME) } catch { /* ignore */ }
 
-    await sleep(500)
+    await sleep(3000)
   })
 
   test('banned player cannot join server', async () => {
-    // First, ban the target
     await banPlayer(TARGET_USERNAME, 'Testing ban')
-    await sleep(1000)
+    await sleep(3000)
 
     // Try to connect as the banned player
     try {
@@ -73,15 +92,12 @@ describe('Ban/Unban E2E Tests', () => {
   }, 60000)
 
   test('unbanned player can join server', async () => {
-    // First, ban and then unban the target
     await banPlayer(TARGET_USERNAME, 'Testing ban')
-    await sleep(1000)
+    await sleep(3000)
     await unbanPlayer(TARGET_USERNAME)
-    // Allow extra time for async unban processing (especially on Sponge)
-    await sleep(2000)
 
-    // Now try to connect as the unbanned player
-    targetBot = await createBot(TARGET_USERNAME)
+    // Retry connection -- async unban may still be processing
+    targetBot = await createBotWithRetry(TARGET_USERNAME)
     await waitFor(
       async () => isPlayerInList(TARGET_USERNAME),
       { timeout: 10000, interval: 500, message: 'Unbanned player not in player list' }

fabric/src/main/java/me/confuser/banmanager/fabric/BanManagerEvents.java

@@ -20,9 +20,9 @@ public class BanManagerEvents {
     });
 
   public static final Event<PlayerBannedEvent> PLAYER_BANNED_EVENT = EventFactory.createArrayBacked(PlayerBannedEvent.class,
-    (listeners) -> (banData, silent) -> {
+    (listeners) -> (banData, silent, kickMessage) -> {
       for (PlayerBannedEvent listener : listeners) {
-        listener.onPlayerBanned(banData, silent);
+        listener.onPlayerBanned(banData, silent, kickMessage);
       }
     });
 
@@ -229,7 +229,7 @@ public interface PlayerBanEvent {
 
   @FunctionalInterface
   public interface PlayerBannedEvent {
-    void onPlayerBanned(PlayerBanData banData, boolean silent);
+    void onPlayerBanned(PlayerBanData banData, boolean silent, Message kickMessage);
   }
 
   @FunctionalInterface

fabric/src/main/java/me/confuser/banmanager/fabric/FabricServer.java

@@ -142,7 +142,8 @@ public CommonEvent callEvent(String name, Object... args) {
         break;
       case "PlayerBannedEvent":
         silentValue = new BanManagerEvents.SilentValue((boolean) args[1]);
-        BanManagerEvents.PLAYER_BANNED_EVENT.invoker().onPlayerBanned((PlayerBanData) args[0], silentValue.isSilent());
+        Message bannedKickMessage = args.length > 2 && args[2] instanceof Message ? (Message) args[2] : null;
+        BanManagerEvents.PLAYER_BANNED_EVENT.invoker().onPlayerBanned((PlayerBanData) args[0], silentValue.isSilent(), bannedKickMessage);
         commonEvent = new CommonEvent(false, silentValue.isSilent());
         break;
       case "PlayerUnbanEvent":

fabric/src/main/java/me/confuser/banmanager/fabric/listeners/BanListener.java

@@ -2,6 +2,7 @@
 
 import me.confuser.banmanager.common.BanManagerPlugin;
 import me.confuser.banmanager.common.listeners.CommonBanListener;
+import me.confuser.banmanager.common.util.Message;
 import me.confuser.banmanager.fabric.BanManagerEvents;
 import me.confuser.banmanager.common.data.*;
 
@@ -18,7 +19,7 @@ public BanListener(BanManagerPlugin plugin) {
     BanManagerEvents.NAME_BANNED_EVENT.register(this::notifyOnNameBan);
   }
 
-  private void notifyOnBan(PlayerBanData banData, boolean silent) {
+  private void notifyOnBan(PlayerBanData banData, boolean silent, Message kickMessage) {
     listener.notifyOnBan(banData, silent);
   }
 

fabric/src/main/java/me/confuser/banmanager/fabric/listeners/HookListener.java

@@ -2,6 +2,7 @@
 
 import me.confuser.banmanager.common.BanManagerPlugin;
 import me.confuser.banmanager.common.listeners.CommonHooksListener;
+import me.confuser.banmanager.common.util.Message;
 import me.confuser.banmanager.fabric.BanManagerEvents;
 import me.confuser.banmanager.common.data.*;
 
@@ -36,7 +37,7 @@ private boolean onBan(PlayerBanData banData, BanManagerEvents.SilentValue silent
     return true;
   }
 
-  private void onBan(PlayerBanData banData, boolean silent) {
+  private void onBan(PlayerBanData banData, boolean silent, Message kickMessage) {
     listener.onBan(banData, false, silent);
   }
 

fabric/src/main/java/me/confuser/banmanager/fabric/listeners/WebhookListener.java

@@ -3,6 +3,7 @@
 import me.confuser.banmanager.common.BanManagerPlugin;
 import me.confuser.banmanager.common.listeners.CommonWebhookListener;
 import me.confuser.banmanager.common.listeners.CommonWebhookListener.WebhookData;
+import me.confuser.banmanager.common.util.Message;
 import me.confuser.banmanager.fabric.BanManagerEvents;
 import me.confuser.banmanager.common.data.*;
 
@@ -26,7 +27,7 @@ public WebhookListener(BanManagerPlugin plugin) {
     BanManagerEvents.PLAYER_REPORTED_EVENT.register(this::notifyOnReport);
   }
 
-  private void notifyOnBan(PlayerBanData banData, boolean silent) {
+  private void notifyOnBan(PlayerBanData banData, boolean silent, Message kickMessage) {
     List<WebhookData> webhooks = listener.notifyOnBan(banData);
     sendAll(webhooks, silent);
   }

sponge-api7/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java

@@ -123,7 +123,11 @@ public CommonEvent callEvent(String name, Object... args) {
         event = new PlayerBanEvent((PlayerBanData) args[0], (boolean) args[1]);
         break;
       case "PlayerBannedEvent":
-        event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
+        PlayerBannedEvent bannedEvent = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
+        if (args.length > 2 && args[2] instanceof Message) {
+          bannedEvent.setKickMessage((Message) args[2]);
+        }
+        event = bannedEvent;
         break;
       case "PlayerUnbanEvent":
         event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);

sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerBannedEvent.java

@@ -1,14 +1,20 @@
 package me.confuser.banmanager.sponge.api.events;
 
 import lombok.Getter;
+import lombok.Setter;
 import me.confuser.banmanager.common.data.PlayerBanData;
+import me.confuser.banmanager.common.util.Message;
 
 
 public class PlayerBannedEvent extends SilentEvent {
 
   @Getter
   private PlayerBanData ban;
 
+  @Getter
+  @Setter
+  private Message kickMessage;
+
   public PlayerBannedEvent(PlayerBanData ban, boolean isSilent) {
     super(isSilent);
     this.ban = ban;

sponge/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java

@@ -133,7 +133,11 @@ public CommonEvent callEvent(String name, Object... args) {
                 event = new PlayerBanEvent((PlayerBanData) args[0], (boolean) args[1]);
                 break;
             case "PlayerBannedEvent":
-                event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
+                PlayerBannedEvent bannedEvent = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
+                if (args.length > 2 && args[2] instanceof Message) {
+                    bannedEvent.setKickMessage((Message) args[2]);
+                }
+                event = bannedEvent;
                 break;
             case "PlayerUnbanEvent":
                 event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);