Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/world/bentobox/bentobox/BentoBox.java
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,11 @@ private void completeSetup(long loadTime) {
// Enable addons
addonsManager.enableAddons();

// Addons may register a Vault economy provider during their onEnable (e.g. InvSwitcher),
// after the early Vault hook already failed for lack of any economy. Retry now so getVault()
// reflects an economy an addon has since provided.
hookRegistrar.registerVaultHookIfNeeded();

// Register default gamemode placeholders
addonsManager.getGameModeAddons().forEach(placeholdersManager::registerDefaultPlaceholders);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ public void registerEarlyHooks() {
hooksManager.registerHook(new PlaceholderAPIHook());
}

/**
* Re-attempts the Vault economy hook after addons have been enabled.
* <p>
* BentoBox hooks Vault during {@link #registerEarlyHooks()}, before addons are enabled. An addon
* may register a Vault economy provider in its own {@code onEnable()} (e.g. InvSwitcher, which
* provides per-world balances), after that early attempt already failed for lack of any economy.
* A failed hook is discarded by {@link HooksManager}, so {@link BentoBox#getVault()} would stay
* empty even though an economy now exists. This gives the now-present economy a chance to be
* picked up. No-op if Vault is already hooked.
*/
public void registerVaultHookIfNeeded() {
if (plugin.getVault().isEmpty()) {
hooksManager.registerHook(new VaultHook());
}
}

/**
* Registers world-manager hooks (Multiverse variants) that load after BentoBox worlds.
* Must be called after {@code islandWorldManager.registerWorldsToMultiverse()} is ready.
Expand Down
Loading