From fc067a2ae03aac13cf0f1a2874946e72812c17fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Thu, 26 Dec 2024 20:49:24 +0100 Subject: [PATCH] moved late integrity check to login flow --- .../spawn/appliances/whitelist/PlayerJoinListener.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java index 98ea1f2..180297f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java @@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo; import org.bukkit.event.EventHandler; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; -import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerLoginEvent; public class PlayerJoinListener extends ApplianceListener { @EventHandler @@ -20,11 +20,14 @@ public class PlayerJoinListener extends ApplianceListener { } @EventHandler - public void joinEvent(PlayerJoinEvent event) { + public void joinEvent(PlayerLoginEvent event) { try { this.getAppliance().lateIntegrityCheck(event.getPlayer()); } catch(DisconnectInfo.Throwable e) { - e.getDisconnectScreen().applyKick(event.getPlayer()); + event.disallow( + PlayerLoginEvent.Result.KICK_WHITELIST, + e.getDisconnectScreen().getComponent() + ); } } }