Merge branch 'master' into feature/sounds

connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ *
+ *  @author GeyserMC
+ *  @link https://github.com/GeyserMC/Geyser
+ *
+ */
+
+package org.geysermc.connector;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class FloodgateKeyLoader {
+    public static Path getKey(GeyserLogger logger, GeyserConfiguration config, Path floodgateKey, Object floodgate, Path floodgateFolder) {
+        if (!Files.exists(floodgateKey) && config.getRemote().getAuthType().equals("floodgate")) {
+            if (floodgate != null) {
+                Path autoKey = floodgateFolder.resolve("public-key.pem");
+                if (Files.exists(autoKey)) {
+                    logger.info("Auto-loaded floodgate key");
+                    floodgateKey = autoKey;
+                } else {
+                    logger.error("Auth-type set to floodgate and the public key is missing!");
+                }
+            } else {
+                logger.error("Auth-type set to floodgate but floodgate is not installed!");
+            }
+        }
+
+        return floodgateKey;
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/java/JavaServerDeclareCommandsTranslator.java

@@ -59,6 +59,7 @@ public class JavaServerDeclareCommandsTranslator extends PacketTranslator<Server
 
             // Make sure we don't have duplicated commands (happens if there is more than 1 root node)
             if (commands.containsKey(nodeIndex)) { continue; }
+            if (commands.containsValue(node.getName())) { continue; }
 
             // Get and update the commandArgs list with the found arguments
             if (node.getChildIndices().length >= 1) {