Merge branch 'LuckPerms:master' into master

This commit is contained in:
NotAlexNoyle authored and GitHub committed 2025-09-22 07:10:41 -04:00
commit a57ba166ff
6 files changed
+8 -6

No files matched your search

@@ -307,7 +307,7 @@ public class LPBukkitBootstrap implements LuckPermsBootstrap, LoaderBootstrap, B
try {
Class.forName("com.google.gson.JsonElement");
return false;
} catch (ClassNotFoundException e) {
} catch (Exception e) {
return true;
}
}
@@ -347,7 +347,7 @@ public class LPBukkitPlugin extends AbstractLuckPermsPlugin {
try {
Class.forName(className);
return true;
} catch (ClassNotFoundException e) {
} catch (Exception e) {
return false;
}
}
@@ -302,7 +302,7 @@ public class LPBungeeBootstrap implements LuckPermsBootstrap, LoaderBootstrap, B
try {
Class.forName("com.google.gson.internal.bind.TreeTypeAdapter");
return false;
} catch (ClassNotFoundException e) {
} catch (Exception e) {
return true;
}
}
@@ -155,7 +155,7 @@ public class CommandManager {
public CompletableFuture<Void> executeCommand(Sender sender, String label, List<String> args) {
UUID uniqueId = sender.getUniqueId();
if (this.plugin.getConfiguration().get(ConfigKeys.COMMANDS_RATE_LIMIT) && !sender.isConsole() && !this.playerRateLimit.add(uniqueId)) {
if (this.plugin.getConfiguration().get(ConfigKeys.COMMANDS_RATE_LIMIT) && !sender.isConsole() && !Sender.CONSOLE_UUID.equals(uniqueId) && !this.playerRateLimit.add(uniqueId)) {
this.plugin.getLogger().warn("Player '" + uniqueId + "' is spamming LuckPerms commands. Ignoring further inputs.");
return CompletableFuture.completedFuture(null);
}
@@ -143,7 +143,7 @@ public class DependencyRegistry {
try {
Class.forName(className);
return true;
} catch (ClassNotFoundException e) {
} catch (Exception e) {
return false;
}
}
@@ -131,7 +131,9 @@ public class FabricConnectionListener extends AbstractConnectionListener {
}
private void onDisconnect(ServerPlayNetworkHandler netHandler, MinecraftServer server) {
handleDisconnect(netHandler.player.getUuid());
if (!server.isStopped()) {
handleDisconnect(netHandler.player.getUuid());
}
}
}