diff --git a/server/src/main/java/dev/plex/hook/VaultHook.java b/server/src/main/java/dev/plex/hook/VaultHook.java index baad2c9..a346be1 100644 --- a/server/src/main/java/dev/plex/hook/VaultHook.java +++ b/server/src/main/java/dev/plex/hook/VaultHook.java @@ -19,6 +19,10 @@ public class VaultHook { if (!Bukkit.getPluginManager().isPluginEnabled("Vault")) return null; RegisteredServiceProvider rsp = Bukkit.getServicesManager().getRegistration(Chat.class); + if (rsp == null) + { + return null; + } CHAT = rsp.getProvider(); return CHAT; } @@ -27,6 +31,10 @@ public class VaultHook { if (!Bukkit.getPluginManager().isPluginEnabled("Vault")) return null; RegisteredServiceProvider rsp = Bukkit.getServicesManager().getRegistration(Permission.class); + if (rsp == null) + { + return null; + } PERMISSIONS = rsp.getProvider(); return PERMISSIONS; } diff --git a/server/src/main/java/dev/plex/permission/handler/VaultPermissionHandler.java b/server/src/main/java/dev/plex/permission/handler/VaultPermissionHandler.java index 30b5588..393d6b4 100644 --- a/server/src/main/java/dev/plex/permission/handler/VaultPermissionHandler.java +++ b/server/src/main/java/dev/plex/permission/handler/VaultPermissionHandler.java @@ -3,7 +3,6 @@ package dev.plex.permission.handler; import dev.plex.api.permission.IPermissionHandler; import dev.plex.hook.VaultHook; import lombok.Getter; -import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; @@ -19,6 +18,10 @@ public class VaultPermissionHandler implements IPermissionHandler { return IPermissionHandler.super.hasPermission(player, permission); } + if (VaultHook.getPermission() == null) + { + return IPermissionHandler.super.hasPermission(player, permission); + } return VaultHook.getPermission().playerHas(null, player, permission); } diff --git a/server/src/main/java/dev/plex/rank/RankManager.java b/server/src/main/java/dev/plex/rank/RankManager.java index 081db93..c711c8e 100644 --- a/server/src/main/java/dev/plex/rank/RankManager.java +++ b/server/src/main/java/dev/plex/rank/RankManager.java @@ -119,6 +119,10 @@ public class RankManager } if (Bukkit.getServer().getPluginManager().isPluginEnabled("Vault") && Plex.get().getSystem().equalsIgnoreCase("permissions")) { + if (VaultHook.getChat() == null || VaultHook.getPermission() == null) + { + return null; + } Player bukkitPlayer = Bukkit.getPlayer(player.getUuid()); String group = VaultHook.getPermission().getPrimaryGroup(bukkitPlayer); String vaultPrefix = VaultHook.getChat().getGroupPrefix(bukkitPlayer.getWorld(), group);