1
0
mirror of https://github.com/lucko/LuckPerms.git synced 2025-08-31 18:11:44 +02:00

Improve CraftBukkit detection (#2867)

This commit is contained in:
Federico López
2021-01-31 08:01:44 -03:00
committed by GitHub
parent d485017744
commit b708d04141

View File

@@ -50,8 +50,12 @@ import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.regex.Pattern;
public class BukkitConnectionListener extends AbstractConnectionListener implements Listener {
private static final Predicate<? super String> IS_CRAFTBUKKIT_PREDICATE = Pattern.compile("^(?:git|\\d+)-Bukkit-[0-9a-f]{7}(?: .*)?$").asPredicate();
private final LPBukkitPlugin plugin;
private final boolean detectedCraftBukkitOfflineMode;
@@ -67,7 +71,7 @@ public class BukkitConnectionListener extends AbstractConnectionListener impleme
String version = plugin.getBootstrap().getServer().getVersion();
boolean onlineMode = plugin.getBootstrap().getServer().getOnlineMode();
if (!onlineMode && version.startsWith("git-Bukkit-")) {
if (!onlineMode && IS_CRAFTBUKKIT_PREDICATE.test(version)) {
printCraftBukkitOfflineModeError();
this.detectedCraftBukkitOfflineMode = true;
} else {