Small consistency fixes

bundabrg · Sep 28, 2020 · d751693 · d751693
1 parent 0ea648b
commit d751693
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java b/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java
@@ -97,7 +97,7 @@ public void onEnable() {
         if (geyserConfig.getRemote().getAuthType().equals("floodgate") && getProxy().getPluginManager().getPlugin("floodgate") == null) {
             geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling"));
             return;
-        } else if (geyserConfig.isAutoconfiguredRemote() && getProxy().getPluginManager().getPlugin("floodgate-bungee") != null) {
+        } else if (geyserConfig.isAutoconfiguredRemote() && getProxy().getPluginManager().getPlugin("floodgate") != null) {
             // Floodgate installed means that the user wants Floodgate authentication
             geyserLogger.debug("Auto-setting to Floodgate authentication.");
             geyserConfig.getRemote().setAuthType("floodgate");

diff --git a/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java b/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java
@@ -101,7 +101,7 @@ public void onEnable() {
             geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling"));
             this.getPluginLoader().disablePlugin(this);
             return;
-        } else if (geyserConfig.isAutoconfiguredRemote() && Bukkit.getPluginManager().getPlugin("floodgate-bukkit") != null) {
+        } else if (geyserConfig.isAutoconfiguredRemote() && Bukkit.getPluginManager().getPlugin("floodgate") != null) {
             // Floodgate installed means that the user wants Floodgate authentication
             geyserLogger.debug("Auto-setting to Floodgate authentication.");
             geyserConfig.getRemote().setAuthType("floodgate");

diff --git a/connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java b/connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java
@@ -37,7 +37,7 @@ public static Path getKeyPath(GeyserJacksonConfiguration config, Object floodgat
 
         if (!Files.exists(floodgateKey) && config.getRemote().getAuthType().equals("floodgate")) {
             if (floodgate != null) {
-                Path autoKey = floodgateDataFolder.resolve("public-key.pem");
+                Path autoKey = floodgateDataFolder.resolve("key.pem");
                 if (Files.exists(autoKey)) {
                     logger.info(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.auto_loaded"));
                     floodgateKey = autoKey;

diff --git a/connector/src/main/resources/config.yml b/connector/src/main/resources/config.yml
@@ -34,9 +34,9 @@ remote:
   auth-type: online
 
 # Floodgate uses encryption to ensure use from authorised sources.
-# This should point to the public key generated by Floodgate (Bungee or CraftBukkit)
+# This should point to the public key generated by Floodgate (BungeeCord, Spigot or Velocity)
 # You can ignore this when not using Floodgate.
-floodgate-key-file: public-key.pem
+floodgate-key-file: key.pem
 
 ## the Xbox/MCPE username is the key for the Java server auth-info
 ## this allows automatic configuration/login to the remote Java server