From aee27a10d4d6ce002fcfc53fb110a3400e1e15c3 Mon Sep 17 00:00:00 2001 From: Zach Levis Date: Sun, 26 Jan 2020 20:39:45 -0800 Subject: [PATCH] spigot: For PEX provider, check class presence Previously, just the plugin name was checked, which meant that Dynmap would crash on servers running PEX 2 rather than falling back to another provider such as superperms or op --- .../org/dynmap/bukkit/permissions/PEXPermissions.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spigot/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java b/spigot/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java index dc2213a8..458d9998 100644 --- a/spigot/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java +++ b/spigot/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java @@ -21,9 +21,17 @@ public class PEXPermissions implements PermissionProvider { Plugin permissionsPlugin = server.getPluginManager().getPlugin("PermissionsEx"); if (permissionsPlugin == null) return null; + + try { + Class.forName("ru.tehkode.permissions.bukkit.PermissionsEx"); + } catch (ClassNotFoundException e) { + return null; + } + server.getPluginManager().enablePlugin(permissionsPlugin); if(permissionsPlugin.isEnabled() == false) return null; + //Broken in new dev builds, apparently //if(PermissionsEx.isAvailable() == false) // return null;