From 898e27cec799df18027a30cb0ba1dffa7380eb10 Mon Sep 17 00:00:00 2001 From: Ryan Breeding Date: Sat, 19 Jul 2025 12:25:14 -0400 Subject: [PATCH 1/2] Update deprecated PlayerLoginEvent to AsyncPlayerPreLoginEvent --- CHANGELOG.md | 3 +++ gradle.properties | 2 +- .../listener/WorldGuardPlayerListener.java | 18 ++++++------------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f531f712..796dc6ccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 7.0.16 +* Replace deprecated PlayerLoginEvent with AsyncPlayerPreLoginEvent + ## 7.0.14 * Update to 1.21.5 diff --git a/gradle.properties b/gradle.properties index a9a7299c6..14818de67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ group=com.sk89q.worldguard -version=7.0.15-SNAPSHOT +version=7.0.16-SNAPSHOT org.gradle.parallel=true diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java index 1656ab323..e53a4f1f3 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java @@ -49,15 +49,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.Action; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import org.bukkit.event.player.PlayerGameModeChangeEvent; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.event.player.PlayerItemHeldEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerLoginEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.event.player.*; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.inventory.ItemStack; @@ -67,6 +59,8 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; +import static org.bukkit.Bukkit.getPlayer; + /** * Handles all events thrown in relation to a player. */ @@ -168,8 +162,8 @@ public void onPlayerChat(AsyncPlayerChatEvent event) { } @EventHandler(ignoreCancelled = true) - public void onPlayerLogin(PlayerLoginEvent event) { - Player player = event.getPlayer(); + public void onPlayerLogin(AsyncPlayerPreLoginEvent event) { + Player player = getPlayer(event.getUniqueId()); ConfigurationManager cfg = getConfig(); String hostKey = cfg.hostKeys.get(player.getUniqueId().toString()); @@ -187,7 +181,7 @@ public void onPlayerLogin(PlayerLoginEvent event) { if (!hostname.equals(hostKey) && !(cfg.hostKeysAllowFMLClients && (hostname.equals(hostKey + "\u0000FML\u0000") || hostname.equals(hostKey + "\u0000FML2\u0000")))) { - event.disallow(PlayerLoginEvent.Result.KICK_OTHER, + event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "You did not join with the valid host key!"); log.warning("WorldGuard host key check: " + player.getName() + " joined with '" + hostname + From f1176d28b066bb18f95f28d8b9abc3b5a8712d99 Mon Sep 17 00:00:00 2001 From: Ryan Breeding Date: Sat, 19 Jul 2025 12:38:50 -0400 Subject: [PATCH 2/2] Remove Player object in PreLogin Event --- .../listener/WorldGuardPlayerListener.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java index e53a4f1f3..b8909b4c7 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java @@ -55,6 +55,7 @@ import java.util.Iterator; import java.util.Set; +import java.util.UUID; import java.util.logging.Logger; import java.util.regex.Pattern; import javax.annotation.Nullable; @@ -128,6 +129,10 @@ public void onPlayerJoin(PlayerJoinEvent event) { Events.fire(new ProcessPlayerEvent(player)); WorldGuard.getInstance().getExecutorService().submit(() -> WorldGuard.getInstance().getProfileCache().put(new Profile(player.getUniqueId(), player.getName()))); + + if (cfg.deopOnJoin) { + player.setOp(false); + } } @EventHandler(ignoreCancelled = true) @@ -163,12 +168,13 @@ public void onPlayerChat(AsyncPlayerChatEvent event) { @EventHandler(ignoreCancelled = true) public void onPlayerLogin(AsyncPlayerPreLoginEvent event) { - Player player = getPlayer(event.getUniqueId()); + UUID uuid = event.getUniqueId(); + String name = event.getName(); ConfigurationManager cfg = getConfig(); - String hostKey = cfg.hostKeys.get(player.getUniqueId().toString()); + String hostKey = cfg.hostKeys.get(uuid); if (hostKey == null) { - hostKey = cfg.hostKeys.get(player.getName().toLowerCase()); + hostKey = cfg.hostKeys.get(name.toLowerCase()); } if (hostKey != null) { @@ -184,15 +190,11 @@ public void onPlayerLogin(AsyncPlayerPreLoginEvent event) { event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "You did not join with the valid host key!"); log.warning("WorldGuard host key check: " + - player.getName() + " joined with '" + hostname + + name + " joined with '" + hostname + "' but '" + hostKey + "' was expected. Kicked!"); return; } } - - if (cfg.deopOnJoin) { - player.setOp(false); - } } @EventHandler(priority = EventPriority.HIGH)