Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-28 03:42:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add extra checks to vault integration

Browse Source
This commit is contained in:
Vankka 2022-01-20 01:19:36 +02:00
parent 00a7cd96a9
commit bdc767ce47
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bukkit/src/main/java/com/discordsrv/bukkit/integration/VaultIntegration.java
View File

@ -27,6 +27,7 @@ import net.milkbowl.vault.permission.Permission;
import org.bukkit.OfflinePlayer;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.ServicesManager;
import org.jetbrains.annotations.Nullable;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
@ -98,9 +99,13 @@ public class VaultIntegration extends PluginIntegration<BukkitDiscordSRV>
return true;
}
private <T> CompletableFuture<T> unsupported() {
private <T> CompletableFuture<T> unsupported(@Nullable Object vault) {
CompletableFuture<T> future = new CompletableFuture<>();
future.completeExceptionally(new RuntimeException("Vault backend unavailable"));
future.completeExceptionally(new RuntimeException(
vault != null
? "Vault backend " + vault.getClass().getName() + " unable to complete request"
: "No vault backend available"
));
return future;
}
@ -127,8 +132,8 @@ public class VaultIntegration extends PluginIntegration<BukkitDiscordSRV>
@Override
public CompletableFuture<Boolean> hasGroup(UUID player, String groupName) {
if (permission == null) {
return unsupported();
if (permission == null || !permission.isEnabled() || !permission.hasGroupSupport()) {
return unsupported(permission);
}
return supply(() -> {
@ -139,8 +144,8 @@ public class VaultIntegration extends PluginIntegration<BukkitDiscordSRV>
@Override
public CompletableFuture<Void> addGroup(UUID player, String groupName) {
if (permission == null) {
return unsupported();
if (permission == null || !permission.isEnabled() || !permission.hasGroupSupport()) {
return unsupported(permission);
}
return supply(() -> {
@ -152,8 +157,8 @@ public class VaultIntegration extends PluginIntegration<BukkitDiscordSRV>
@Override
public CompletableFuture<Void> removeGroup(UUID player, String groupName) {
if (permission == null) {
return unsupported();
if (permission == null || !permission.isEnabled() || !permission.hasGroupSupport()) {
return unsupported(permission);
}
return supply(() -> {
@ -165,8 +170,8 @@ public class VaultIntegration extends PluginIntegration<BukkitDiscordSRV>
@Override
public CompletableFuture<Boolean> hasPermission(UUID player, String permissionNode) {
if (permission == null) {
return unsupported();
if (permission == null || !permission.isEnabled()) {
return unsupported(permission);
}
return supply(() -> {
@ -177,8 +182,8 @@ public class VaultIntegration extends PluginIntegration<BukkitDiscordSRV>
@Override
public CompletableFuture<String> getPrefix(UUID player) {
if (chat == null) {
return unsupported();
if (chat == null || !chat.isEnabled()) {
return unsupported(chat);
}
return supply(() -> {
@ -189,8 +194,8 @@ public class VaultIntegration extends PluginIntegration<BukkitDiscordSRV>
@Override
public CompletableFuture<String> getSuffix(UUID player) {
if (chat == null) {
return unsupported();
if (chat == null || !chat.isEnabled()) {
return unsupported(chat);
}
return supply(() -> {