From 48c652b3871d68f8213eb69ab80dd775c5f2e890 Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 15 Aug 2026 08:33:16 +0100 Subject: [PATCH] Fix issue on Bukkit with missing Player#locale method (#4295) --- .../luckperms/bukkit/BukkitSenderFactory.java | 3 +- .../bukkit/util/PlayerLocaleUtil.java | 59 +++++++++++-------- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java index d657514e6..d043cd8d5 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.bukkit; import me.lucko.luckperms.bukkit.util.PaperAdventureBridge; +import me.lucko.luckperms.bukkit.util.PlayerLocaleUtil; import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.sender.SenderFactory; @@ -123,7 +124,7 @@ public abstract class BukkitSenderFactory extends SenderFactory GET_LOCALE_FUNCTION; + private static final Function GET_LOCALE_FUNCTION = getLocaleFunction(); - static { - Function function; + private static Function getLocaleFunction() { + // modern Paper try { - // modern bukkit - Player.class.getMethod("getLocale"); - function = Player::getLocale; - } catch (ReflectiveOperationException ex) { - try { - // legacy spigot method - Method legacyMethod = Player.Spigot.class.getMethod("getLocale"); - function = player -> { - try { - return (String) legacyMethod.invoke(player.spigot()); - } catch (ReflectiveOperationException e) { - throw new RuntimeException(e); - } - }; - } catch (ReflectiveOperationException e) { - // fallback - function = player -> null; - } + Player.class.getMethod("locale"); + return Player::locale; + } catch (ReflectiveOperationException e) { + // ignore } - GET_LOCALE_FUNCTION = function; + + // modern bukkit + try { + Player.class.getMethod("getLocale"); + return player -> TranslationManager.parseLocale(player.getLocale()); + } catch (ReflectiveOperationException e) { + // ignore + } + + // legacy spigot method + try { + Method legacyMethod = Player.Spigot.class.getMethod("getLocale"); + return player -> { + try { + String localeString = (String) legacyMethod.invoke(player.spigot()); + return TranslationManager.parseLocale(localeString); + } catch (ReflectiveOperationException ex) { + throw new RuntimeException(ex); + } + }; + } catch (ReflectiveOperationException e) { + // ignore + } + + // fallback + return player -> null; } - public static String getLocale(Player player) { + public static Locale getLocale(Player player) { return GET_LOCALE_FUNCTION.apply(player); }