[ci skip]

Bump org.xerial:sqlite-jdbc from 3.40.1.0 to 3.43.2.1

README.md

@@ -9,7 +9,7 @@ MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471
  3. Old bug fixes
  4. Anti Ghost Player(Doubled login bug)
  5. Use the best performance method by server brand
- 6. Bedrock Compatibility(Floodgate needed)
+ 6. Bedrock Compatibility(Floodgate needed)(based on UUID)
  7. Update checker
  8. Integrated GUI Captcha feature(Bedrock compatibility & ProtocolLib needed)(70% Asynchronous)
  9. Improved listeners

pom.xml

@@ -67,11 +67,11 @@
         <maven.minimumVersion>3.6.3</maven.minimumVersion>
 
         <!-- Dependencies versions -->
-        <spigot.version>1.20.1-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.20.2-R0.1-SNAPSHOT</spigot.version>
 
         <!-- Versioning properties -->
         <project.outputName>AuthMe</project.outputName>
-        <project.buildNumber>CUSTOM</project.buildNumber>
+        <project.buildNumber>28</project.buildNumber>
         <project.versionCode>${project.version}-b${project.buildNumber}</project.versionCode>
         <project.finalNameBase>${project.outputName}-${project.version}</project.finalNameBase>
 
@@ -784,7 +784,13 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- Bukkit Libraries  -->
+        <!-- FastUtil -->
+        <!--        <dependency>-->
+        <!--            <groupId>it.unimi.dsi</groupId>-->
+        <!--            <artifactId>fastutil-core</artifactId>-->
+        <!--            <version>8.5.12</version>-->
+        <!--            <scope>provided</scope>-->
+        <!--        </dependency>-->
 
         <!-- ConfigMe -->
         <dependency>
@@ -1078,7 +1084,7 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.40.1.0</version>
+            <version>3.43.2.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/fr/xephi/authme/AuthMe.java

@@ -9,22 +9,18 @@ import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.initialization.DataSourceProvider;
 import fr.xephi.authme.initialization.OnShutdownPlayerSaver;
 import fr.xephi.authme.initialization.OnStartupTasks;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-
 import fr.xephi.authme.initialization.SettingsProvider;
 import fr.xephi.authme.initialization.TaskCloser;
+import fr.xephi.authme.listener.BedrockAutoLoginListener;
 import fr.xephi.authme.listener.BlockListener;
+import fr.xephi.authme.listener.DoubleLoginFixListener;
 import fr.xephi.authme.listener.EntityListener;
+import fr.xephi.authme.listener.GuiCaptchaHandler;
 import fr.xephi.authme.listener.LoginLocationFixListener;
 import fr.xephi.authme.listener.PlayerListener;
 import fr.xephi.authme.listener.PlayerListener111;
 import fr.xephi.authme.listener.PlayerListener19;
 import fr.xephi.authme.listener.PlayerListener19Spigot;
-import fr.xephi.authme.listener.DoubleLoginFixListener;
-import fr.xephi.authme.listener.GuiCaptchaHandler;
 import fr.xephi.authme.listener.PlayerListenerHigherThan18;
 import fr.xephi.authme.listener.ServerListener;
 import fr.xephi.authme.mail.EmailService;
@@ -38,6 +34,7 @@ import fr.xephi.authme.service.yaml.YamlParseException;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SettingsWarner;
 import fr.xephi.authme.settings.properties.EmailSettings;
+import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.task.CleanupTask;
 import fr.xephi.authme.task.purge.PurgeService;
@@ -53,6 +50,9 @@ import org.bukkit.scheduler.BukkitScheduler;
 import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
+import java.io.File;
+import java.io.IOException;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -76,7 +76,7 @@ public class AuthMe extends JavaPlugin {
     // Version and build number values
     private static String pluginVersion = "5.6.0-Fork";
     private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "27";
+    private static String pluginBuildNumber = "30";
     protected final Boolean SHAEnabled = false;
     // Private instances
     private EmailService emailService;
@@ -208,30 +208,38 @@ public class AuthMe extends JavaPlugin {
         purgeService.runAutoPurge();
         // 注册玩家加入事件监听
 //        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS) || settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)/* || settings.getProperty(SecuritySettings.GUI_CAPTCHA)*/) {
-        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) {
+        register3rdPartyListeners();
-            getServer().getPluginManager().registerEvents(new DoubleLoginFixListener((Plugin) this), this);
-        }
-        if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX)) {
-            getServer().getPluginManager().registerEvents(new LoginLocationFixListener((Plugin) this), this);
-        }
-        if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
-            getServer().getPluginManager().registerEvents(new GuiCaptchaHandler((Plugin) this), this);
-            logger.info("(Alpha4)GUICaptcha Feature is enabled successfully!");
-            logger.info("These features are still in development, if you encountered any problem, please report.");
-        } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && !getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
-            logger.warning("ProtocolLib is not loaded, we can't enable GUI Captcha.");
-        }
         logger.info("GitHub: https://github.com/HaHaWTH/AuthMeReReloaded/");
 
         if (settings.getProperty(SecuritySettings.CHECK_FOR_UPDATES)) {
             checkForUpdates();
         }
 
-        if (SHAEnabled){
+        if (SHAEnabled) {
             //shaChecker();
         }
     }
+
     public File pluginfile = getFile();
+
+    private void register3rdPartyListeners() {
+        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) {
+            getServer().getPluginManager().registerEvents(new DoubleLoginFixListener((Plugin) this), this);
+        }
+        if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND) || settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) {
+            getServer().getPluginManager().registerEvents(new LoginLocationFixListener((Plugin) this), this);
+        }
+        if (settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && getServer().getPluginManager().getPlugin("floodgate") != null) {
+            getServer().getPluginManager().registerEvents(new BedrockAutoLoginListener((Plugin) this), this);
+        }
+        if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
+            getServer().getPluginManager().registerEvents(new GuiCaptchaHandler((Plugin) this), this);
+            logger.info("(Beta)GUICaptcha is enabled successfully!");
+            logger.info("These features are still in early development, if you encountered any problem, please report.");
+        } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") == null) {
+            logger.warning("ProtocolLib is not loaded, can't enable GUI Captcha.");
+        }
+    }
     /**
      * Load the version and build number of the plugin from the description file.
      *

src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java

@@ -0,0 +1,40 @@
+package fr.xephi.authme.listener;
+/* Inspired by DongShaoNB/BedrockPlayerSupport **/
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.api.v3.AuthMeApi;
+import fr.xephi.authme.settings.properties.HooksSettings;
+import fr.xephi.authme.settings.properties.SecuritySettings;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.plugin.Plugin;
+
+import java.util.UUID;
+
+import static org.bukkit.Bukkit.getServer;
+
+public class BedrockAutoLoginListener implements Listener {
+    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
+    private final Plugin plugin;
+
+    public BedrockAutoLoginListener(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    private boolean isBedrockPlayer(UUID uuid) {
+        return AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid) && getServer().getPluginManager().getPlugin("floodgate") != null;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        String name = event.getPlayer().getName();
+        UUID uuid = event.getPlayer().getUniqueId();
+        if (isBedrockPlayer(uuid) && !authmeApi.isAuthenticated(player) && authmeApi.isRegistered(name)) {
+            authmeApi.forceLogin(player);
+            player.sendMessage("§a基岩版自动登录完成!");
+        }
+    }
+}

src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java

@@ -1,4 +1,5 @@
 package fr.xephi.authme.listener;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.ListenerPriority;
@@ -22,21 +23,24 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.Plugin;
+
 import java.io.File;
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
+
 import static org.bukkit.Bukkit.getLogger;
 import static org.bukkit.Bukkit.getServer;
 public class GuiCaptchaHandler implements Listener{
     //define AuthMeApi
     private final AuthMeApi authmeApi = AuthMeApi.getInstance();
     private final Plugin plugin;
-
+    private PacketAdapter chatPacketListener;
+    private PacketAdapter windowPacketListener;
     //define timesLeft
-    public int timesLeft = 3;
+    private int timesLeft = 3;
     //Use ConcurrentHashMap to store player and their close reason
     /* We used many async tasks so there is concurrent**/
     public static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
@@ -53,6 +57,9 @@ public class GuiCaptchaHandler implements Listener{
         this.plugin = plugin;
     }
 
+    private boolean isBedrockPlayer(UUID uuid) {
+        return AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid) && getServer().getPluginManager().getPlugin("floodgate") != null;
+    }
 
     @EventHandler
     public void onInventoryClick(InventoryClickEvent event) {
@@ -60,35 +67,27 @@ public class GuiCaptchaHandler implements Listener{
             Player player = (Player) event.getWhoClicked();
             ItemStack currentItem = event.getCurrentItem();
             if (!authmeApi.isRegistered(player.getName()) && !closeReasonMap.containsKey(player)) {
-                if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getWhoClicked().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
+                if (isBedrockPlayer(player.getUniqueId())) {
-                    if (!closeReasonMap.containsKey(player)) {
-                        closeReasonMap.put(player,"verified");
-                        return;
-                    }
                     return;
                 }
-                if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)){
+                if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)) {
                     event.setCancelled(true);
                     closeReasonMap.put(player, "verified");
                     player.closeInventory();
                     player.sendMessage("§a验证完成");
-                } else {
-                    player.sendMessage("§c验证失败,你还有" + timesLeft + "§c次机会");
-                    timesLeft--;
                 }
                 //force to string
             }
         }
     }
 
-
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void onPlayerJoin(PlayerJoinEvent event) {
         randomString = "";
         Player playerunreg = event.getPlayer();
         String name = playerunreg.getName();
         if (!authmeApi.isRegistered(name)) {
-            if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getPlayer().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
+            if (isBedrockPlayer(playerunreg.getUniqueId())) {
                 closeReasonMap.put(playerunreg, "verified");
                 playerunreg.sendMessage("§a基岩版自动验证完成");
                 return;
@@ -111,12 +110,12 @@ public class GuiCaptchaHandler implements Listener{
                     randomString = sb.toString();
                     Random random_blockpos = new Random();
                     AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(26));
-                    Inventory menu = Bukkit.createInventory(null, 27, randomString + "请验证你是真人");
+                    Inventory menu = Bukkit.createInventory(playerunreg, 27, randomString + "请验证你是真人");
                     ItemStack item = new ItemStack(Material.REDSTONE_BLOCK);
                     ItemMeta meta = item.getItemMeta();
                     try {
                         if (meta != null) {
-                            meta.setDisplayName("§a我是真人");
+                            meta.setDisplayName("§a" + randomString + "§a我是真人");
                             item.setItemMeta(meta);
                         }
                     } catch (NullPointerException e) {
@@ -150,7 +149,7 @@ public class GuiCaptchaHandler implements Listener{
                     }
 
                     Bukkit.getScheduler().runTask(this.plugin, () -> {
-                        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
+                        windowPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
                             @Override
                             public void onPacketReceiving(PacketEvent event) {
                                 if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
@@ -159,31 +158,31 @@ public class GuiCaptchaHandler implements Listener{
                                             playerunreg.kickPlayer("§c请先完成人机验证!");
                                         });
                                         timesLeft = 3;
-                                        return;
                                     } else {
-                                        timesLeft--;
+                                        --timesLeft;
+                                        if (timesLeft <= 0) {
+                                            Bukkit.getScheduler().runTask(this.plugin, () -> {
+                                                playerunreg.kickPlayer("§c请先完成人机验证!");
+                                            });
+                                            timesLeft = 3;
+                                            return;
+                                        }
                                         playerunreg.sendMessage("§c请先完成验证!,你还有" + timesLeft + "次机会");
-
+                                        event.setCancelled(true);
-                                    }
+                                        random_num.set(random_blockpos.nextInt(26));
-                                    event.setCancelled(true);
-                                    random_num.set(random_blockpos.nextInt(26));
-                                    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
                                         Bukkit.getScheduler().runTask(plugin, () -> {
                                             menu.clear();
                                             menu.setItem(random_num.get(), item);
-                                        });
-
-                                        Bukkit.getScheduler().runTask(plugin, () -> {
                                             playerunreg.openInventory(menu);
                                         });
-                                    });
+                                    }
                                 }
                             }
-                        });
+                        };
+                        ProtocolLibrary.getProtocolManager().addPacketListener(windowPacketListener);
                     });
                     Bukkit.getScheduler().runTask(this.plugin, () -> {
-
+                        chatPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
-                        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
                             @Override
                             public void onPacketReceiving(PacketEvent event) {
                                 if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
@@ -191,7 +190,8 @@ public class GuiCaptchaHandler implements Listener{
                                     event.setCancelled(true);
                                 }
                             }
-                        });
+                        };
+                        ProtocolLibrary.getProtocolManager().addPacketListener(chatPacketListener);
                     });
                 });
             });
@@ -222,7 +222,6 @@ public class GuiCaptchaHandler implements Listener{
         // 构建玩家统计数据文件路径
         File statsFile = new File(statsFolder, File.separator + playerUUID + ".json");
         // 删除玩家统计数据文件
-
         if (statsFile.exists()) {
             statsFile.delete();
         }
@@ -234,15 +233,20 @@ public class GuiCaptchaHandler implements Listener{
         String name = player.getName();
         UUID playerUUID = event.getPlayer().getUniqueId();
         if (!authmeApi.isRegistered(name)) {
-            if(AuthMe.settings.getProperty(SecuritySettings.DELETE_UNVERIFIED_PLAYER_DATA) && !closeReasonMap.containsKey(player)){
+            if (AuthMe.settings.getProperty(SecuritySettings.DELETE_UNVERIFIED_PLAYER_DATA) && !closeReasonMap.containsKey(player)) {
-                Bukkit.getScheduler().runTaskLater(this.plugin , () -> {
+                closeReasonMap.remove(player);
-                    if(!player.isOnline()) {
+                Bukkit.getScheduler().runTaskLater(this.plugin, () -> {
+                    if (!player.isOnline()) {
                         deletePlayerData(playerUUID);
                         deletePlayerStats(playerUUID);
                     }
-                },100L);
+                }, 100L);
+                ProtocolLibrary.getProtocolManager().removePacketListener(windowPacketListener);
+                ProtocolLibrary.getProtocolManager().removePacketListener(chatPacketListener);
                 return;
             }
+            ProtocolLibrary.getProtocolManager().removePacketListener(windowPacketListener);
+            ProtocolLibrary.getProtocolManager().removePacketListener(chatPacketListener);
             closeReasonMap.remove(player);
         }
     }

src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.listener;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.settings.properties.SecuritySettings;
+import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -14,33 +15,47 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.Plugin;
 
 
-public class LoginLocationFixListener implements Listener{
+public class LoginLocationFixListener implements Listener {
     private final Plugin plugin;
     private final AuthMeApi authmeApi = AuthMeApi.getInstance();
+
     public LoginLocationFixListener(Plugin plugin) {
         this.plugin = plugin;
     }
+
+    private static Material materialPortal = Material.matchMaterial("PORTAL");
+    private final boolean isSmartAsyncTeleport = AuthMe.settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT);
+    private final boolean isFixPortalStuck = AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL);
+    private final boolean isFixGroundStuck = AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND);
     BlockFace[] faces = {BlockFace.WEST, BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.SOUTH_EAST, BlockFace.SOUTH_WEST, BlockFace.NORTH_EAST, BlockFace.NORTH_WEST};
-    @EventHandler
+
-    public void onPlayerJoin(PlayerJoinEvent event){
+    static {
-        Player player = event.getPlayer();
+        if (materialPortal == null) {
-        Material material = Material.matchMaterial("PORTAL");
+            materialPortal = Material.matchMaterial("PORTAL_BLOCK");
-        if (material == null) {
+            if (materialPortal == null) {
-            material = Material.matchMaterial("PORTAL_BLOCK");
+                materialPortal = Material.matchMaterial("NETHER_PORTAL");
-            if(material == null){
-                material = Material.matchMaterial("NETHER_PORTAL");
             }
         }
+
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
         Location JoinLocation = player.getLocation().getBlock().getLocation().add(0.5, 0.1, 0.5);
-        if (AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) {
+        if (isFixPortalStuck) {
-            if (!JoinLocation.getBlock().getType().equals(material) && !JoinLocation.getBlock().getRelative(BlockFace.UP).getType().equals(material)) {
+            if (!JoinLocation.getBlock().getType().equals(materialPortal) && !JoinLocation.getBlock().getRelative(BlockFace.UP).getType().equals(materialPortal)) {
                 return;
             }
             Block JoinBlock = JoinLocation.getBlock();
             boolean solved = false;
             for (BlockFace face : faces) {
                 if (JoinBlock.getRelative(face).getType().equals(Material.AIR) && JoinBlock.getRelative(face).getRelative(BlockFace.UP).getType().equals(Material.AIR)) {
-                    player.teleport(JoinBlock.getRelative(face).getLocation().add(0.5, 0.1, 0.5));
+                    if (isSmartAsyncTeleport) {
+                        TeleportUtils.teleport(player, JoinBlock.getRelative(face).getLocation().add(0.5, 0.1, 0.5));
+                    } else {
+                        player.teleport(JoinBlock.getRelative(face).getLocation().add(0.5, 0.1, 0.5));
+                    }
                     solved = true;
                     break;
                 }
@@ -50,7 +65,7 @@ public class LoginLocationFixListener implements Listener{
                 JoinBlock.breakNaturally();
             }
             player.sendMessage("§a你在登录时卡在了地狱门, 现已修正");
-        } else if (AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND)) {
+        } else if (isFixGroundStuck) {
             Material UpType = JoinLocation.getBlock().getRelative(BlockFace.UP).getType();
             World world = player.getWorld();
             int MaxHeight = world.getMaxHeight();
@@ -67,12 +82,20 @@ public class LoginLocationFixListener implements Listener{
                     if (JoinBlock.getRelative(BlockFace.DOWN).getType().equals(Material.LAVA)) {
                         JoinBlock.getRelative(BlockFace.DOWN).setType(Material.DIRT);
                     }
-                    player.teleport(JoinBlock.getLocation().add(0.5, 0.1, 0.5));
+                    if (isSmartAsyncTeleport) {
+                        TeleportUtils.teleport(player, JoinBlock.getLocation().add(0.5, 0.1, 0.5));
+                    } else {
+                        player.teleport(JoinBlock.getLocation().add(0.5, 0.1, 0.5));
+                    }
                     player.sendMessage("§a你被埋住了, 坐标已修正, 下次下线之前请小心!");
                     break;
                 }
                 if (i == MaxHeight) {
-                    player.teleport(JoinBlock.getLocation().add(0.5, 1.1, 0.5));
+                    if (isSmartAsyncTeleport) {
+                        TeleportUtils.teleport(player, JoinBlock.getLocation().add(0.5, 1.1, 0.5));
+                    } else {
+                        player.teleport(JoinBlock.getLocation().add(0.5, 1.1, 0.5));
+                    }
                     player.sendMessage("§a你被埋住了, 坐标无法修正, 只好送你去了最高点, 自求多福吧少年~");
                 }
             }

src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java

@@ -2,10 +2,10 @@ package fr.xephi.authme.settings.properties;
 
 import ch.jalu.configme.Comment;
 import ch.jalu.configme.SettingsHolder;
-
 import ch.jalu.configme.properties.Property;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.settings.EnumSetProperty;
+
 import java.util.Set;
 
 import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseStringSetProperty;
@@ -19,15 +19,19 @@ public final class SecuritySettings implements SettingsHolder {
     public static final Property<Boolean> STOP_SERVER_ON_PROBLEM =
         newProperty("Security.SQLProblem.stopServer", false);
 
+    @Comment({"Should we let Bedrock players login automatically?",
+        "(Requires hookFloodgate to be true & floodgate loaded)"})
+    public static final Property<Boolean> FORCE_LOGIN_BEDROCK = newProperty("3rdPartyFeature.features.bedrockAutoLogin", false);
+
     @Comment("Enable the new feature to prevent ghost players?")
     public static final Property<Boolean> ANTI_GHOST_PLAYERS = newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
 
     @Comment({"Choose the best teleport method by server brand?",
         "(Enable this if you are using Paper)"})
-    public static final Property<Boolean> SMART_ASYNC_TELEPORT = newProperty("3rdPartyFeature.optimizes.smartAsyncTeleport",false);
+    public static final Property<Boolean> SMART_ASYNC_TELEPORT = newProperty("3rdPartyFeature.optimizes.smartAsyncTeleport", false);
 
     @Comment("Send a GUI captcha to unregistered players?(Requires ProtocolLib)")
-    public static final Property<Boolean> GUI_CAPTCHA = newProperty("3rdPartyFeature.captcha.guiCaptcha",false);
+    public static final Property<Boolean> GUI_CAPTCHA = newProperty("3rdPartyFeature.captcha.guiCaptcha", false);
 
     @Comment({"Should we kick the players when they don't finish the GUI captcha in seconds?",
         "(less than or equals 0 is disabled)"})
@@ -43,9 +47,6 @@ public final class SecuritySettings implements SettingsHolder {
     @Comment("Which world's player data should be deleted?(Enter the world *FOLDER* name where your players first logged in)")
     public static final Property<String> DELETE_PLAYER_DATA_WORLD = newProperty("3rdPartyFeature.captcha.purgeWorldFolderName","world");
 
-    @Comment("Should we enable the new LoginLocationFix feature?")
-    public static final Property<Boolean> LOGIN_LOC_FIX = newProperty("3rdPartyFeature.fixes.loginLocationFix.enabled", false);
-
     @Comment("Should we fix the location when players logged in the portal?")
     public static final Property<Boolean> LOGIN_LOC_FIX_SUB_PORTAL = newProperty("3rdPartyFeature.fixes.loginLocationFix.fixPortalStuck", false);
 

src/main/java/fr/xephi/authme/util/TeleportUtils.java

@@ -28,6 +28,7 @@ public class TeleportUtils {
         try {//Detect Paper class
             Class<?> paperClass = Class.forName("com.destroystokyo.paper.PaperConfig");
             teleportAsyncMethod = Player.class.getMethod("teleportAsync", Location.class);
+            teleportAsyncMethod.setAccessible(true);
             // if detected,use teleportAsync()
         } catch (ClassNotFoundException | NoSuchMethodException e) {
             teleportAsyncMethod = null;
@@ -38,7 +39,6 @@ public class TeleportUtils {
     public static void teleport(Player player, Location location) {
         if (teleportAsyncMethod != null) {
             try {
-                teleportAsyncMethod.setAccessible(true);
                 teleportAsyncMethod.invoke(player, location);
             } catch (IllegalAccessException | InvocationTargetException e) {
                 player.teleport(location);

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ authors: [${pluginDescription.authors}]
 website: http://github.com/HaHaWTH/AuthMeReReloaded/
 description: A fork of AuthMeReloaded that contains bug fixes
 main: ${pluginDescription.main}
-version: 5.6.0-FORK-b27
+version: 5.6.0-FORK-b30
 api-version: 1.13
 softdepend:
     - Vault