Will load before Vault, fixing last known Economy issue, no longer re…

…quiring using BlobEconomy in order to use ElasticEconomy
anjoismysign · Dec 27, 2023 · 10a79f4 · 10a79f4
1 parent 2eb51ba
commit 10a79f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/us/mytheria/bloblib/vault/VaultManager.java b/src/main/java/us/mytheria/bloblib/vault/VaultManager.java
@@ -95,9 +95,12 @@ public void onRegister(ServiceRegisterEvent event) {
             }
             case "net.milkbowl.vault.permission.Permission" -> {
                 RegisteredServiceProvider<Permission> provider = (RegisteredServiceProvider<Permission>) eventProvider;
-                vaultPermissionsWorker = new FoundPerms(provider.getProvider());
-                vaultPermsInstalled = true;
-                Bukkit.getLogger().fine("Vault Permissions override");
+                try {
+                    vaultPermissionsWorker = new FoundPerms(provider.getProvider());
+                    vaultPermsInstalled = true;
+                    Bukkit.getLogger().fine("Vault Permissions override");
+                } catch (ClassCastException ignored) {
+                }
             }
             case "net.milkbowl.vault.economy.MultiEconomy" -> {
                 elasticEconomy = ElasticEconomy.of(eventProvider.getProvider());

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ version: ${project.parent.version}
 main: us.mytheria.bloblib.BlobLib
 api-version: 1.17
 load: STARTUP
-softdepend: [ WorldGuard, WorldEdit, Vault, LibsDisguises, ProtocolLib ]
+loadbefore: [ Vault, WorldGuard, WorldEdit, LibsDisguises, ProtocolLib ]
 authors: [ promorrom, j0ach1mmall3, Dean B, FourteenBrush, SmallCode ]
 commands:
   bloblib: