Add an additional key searching fallback for Floodgate 2.0

bundabrg · Mar 24, 2021 · 677a8d6 · 677a8d6
1 parent 2caf811
commit 677a8d6
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java b/connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java
@@ -33,9 +33,18 @@
 
 public class FloodgateKeyLoader {
     public static Path getKeyPath(GeyserJacksonConfiguration config, Object floodgate, Path floodgateDataFolder, Path geyserDataFolder, GeyserLogger logger) {
+        if (!config.getRemote().getAuthType().equals("floodgate")) {
+            return geyserDataFolder.resolve(config.getFloodgateKeyFile());
+        }
+
         Path floodgateKey = geyserDataFolder.resolve(config.getFloodgateKeyFile());
 
-        if (!Files.exists(floodgateKey) && config.getRemote().getAuthType().equals("floodgate")) {
+        if (config.getFloodgateKeyFile().equals("public-key.pem")) {
+            logger.info("Floodgate 2.0 doesn't use a public/private key system anymore. We'll search for key.pem instead");
+            floodgateKey = geyserDataFolder.resolve("key.pem");
+        }
+
+        if (!Files.exists(floodgateKey)) {
             if (floodgate != null) {
                 Path autoKey = floodgateDataFolder.resolve("key.pem");
                 if (Files.exists(autoKey)) {