Temporary fix for #510, bump cloud to rc candidate

GeyserMC · May 14, 2024 · 78302db · 78302db
1 parent 4404c15
commit 78302db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt
@@ -34,7 +34,8 @@ object Versions {
     const val nettyVersion = "4.1.49.Final"
     const val snakeyamlVersion = "1.28"
     // TODO move to cloud release once those have 1.20.5 support
-    const val cloudVersion = "2.0.0-20240503.183307-62" // for cloud-minecraft
+    const val cloudVersion = "2.0.0-beta.7" // for cloud-minecraft
+    const val cloudCore = "2.0.0-rc.1"
     const val bstatsVersion = "3.0.2"
 
     const val javaWebsocketVersion = "1.5.2"

diff --git a/bungee/src/main/java/org/geysermc/floodgate/util/BungeeCommandUtil.java b/bungee/src/main/java/org/geysermc/floodgate/util/BungeeCommandUtil.java
@@ -26,6 +26,7 @@
 package org.geysermc.floodgate.util;
 
 import java.util.Collection;
+import java.util.Locale;
 import java.util.UUID;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
@@ -63,7 +64,10 @@ public BungeeCommandUtil(LanguageManager manager, ProxyServer server, FloodgateA
         ProxiedPlayer player = (ProxiedPlayer) source;
         UUID uuid = player.getUniqueId();
         String username = player.getName();
-        String locale = Utils.getLocale(player.getLocale());
+
+        // TODO temporary fix for https://github.com/SpigotMC/BungeeCord/issues/3680
+        Locale playerLocale = player.getLocale();
+        String locale = Utils.getLocale(playerLocale != null ? playerLocale : Locale.getDefault());
 
         return new PlayerAudience(uuid, username, locale, source, this, true);
     }

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -15,8 +15,7 @@ dependencies {
     api("com.nukkitx.fastutil", "fastutil-short-object-maps", Versions.fastutilVersion)
     api("com.nukkitx.fastutil", "fastutil-int-object-maps", Versions.fastutilVersion)
     api("org.java-websocket", "Java-WebSocket", Versions.javaWebsocketVersion)
-    // TODO move to cloud release
-    api("org.incendo", "cloud-core", "2.0.0-20240503.181645-64")
+    api("org.incendo", "cloud-core", Versions.cloudCore)
     api("org.bstats", "bstats-base", Versions.bstatsVersion)
 }