Merge pull request #525 from Smart123s/fg2-bc

Fix Floodgate 2.0 on BungeeCord

Author: games647

bungee/pom.xml

@@ -124,13 +124,23 @@
         </dependency>
 
         <!-- Bedrock player bridge -->
+        <!-- Should be removed one Floodgate 2.0 gets a stable release -->
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>floodgate-bungee</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
+        <!-- Bedrock player bridge -->
+        <!-- Version 2.0 -->
+        <dependency>
+            <groupId>org.geysermc.floodgate</groupId>
+            <artifactId>bungee</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!--Login plugin-->
         <dependency>
             <groupId>me.vik1395</groupId>

bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java

@@ -87,8 +87,15 @@ public void onEnable() {
 
         //events
         PluginManager pluginManager = getProxy().getPluginManager();
-        boolean floodgateAvail = pluginManager.getPlugin("floodgate") != null;
-        ConnectListener connectListener = new ConnectListener(this, core.getRateLimiter(), floodgateAvail);
+
+        //check Floodgate version
+        String floodgateVersion = "0";
+        Plugin floodgatePlugin = pluginManager.getPlugin("floodgate");
+        if (floodgatePlugin != null) {
+            floodgatePlugin.getDescription().getVersion();
+        }
+
+        ConnectListener connectListener = new ConnectListener(this, core.getRateLimiter(), floodgateVersion);
 
         pluginManager.registerListener(this, connectListener);
         pluginManager.registerListener(this, new PluginMessageListener(this));

bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java

@@ -98,12 +98,12 @@ public class ConnectListener implements Listener {
     private final FastLoginBungee plugin;
     private final RateLimiter rateLimiter;
     private final Property[] emptyProperties = {};
-    private final boolean floodGateAvailable;
+    private final String floodgateVersion;
 
-    public ConnectListener(FastLoginBungee plugin, RateLimiter rateLimiter, boolean floodgateAvailable) {
+    public ConnectListener(FastLoginBungee plugin, RateLimiter rateLimiter, String floodgateVersion) {
         this.plugin = plugin;
         this.rateLimiter = rateLimiter;
-        this.floodGateAvailable = floodgateAvailable;
+        this.floodgateVersion = floodgateVersion;
     }
 
     @EventHandler
@@ -211,6 +211,12 @@ private boolean isBedrockPlayer(UUID correctedUUID) {
         // Floodgate will set a correct UUID at the beginning of the PreLoginEvent
         // and will cancel the online mode login for those players
         // Therefore we just ignore those
-        return floodGateAvailable && FloodgateAPI.isBedrockPlayer(correctedUUID);
+        if (floodgateVersion.startsWith("1")) {
+            return FloodgateAPI.isBedrockPlayer(correctedUUID);
+        } else if (floodgateVersion.startsWith("2")) {
+            return FloodgateAPI.isBedrockPlayer(correctedUUID);
+        }
+
+        return false;
     }
 }