Delay economy initialization to server load #4216
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dordsor21
reviewed
Oct 26, 2023
| @@ -128,21 +133,64 @@ protected void configure() { | |||
| @Provides | |||
| @Singleton | |||
| @NonNull EconHandler provideEconHandler() { | |||
| if (!Settings.Enabled_Components.ECONOMY) { | |||
| if (!Settings.Enabled_Components.ECONOMY || !Bukkit.getPluginManager().isPluginEnabled("Vault")) { | |||
There was a problem hiding this comment.
Do we definitely always require Vault?
dordsor21
approved these changes
Oct 26, 2023
dordsor21
approved these changes
Oct 26, 2023
NotMyFault
approved these changes
Oct 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Description
Guice initializes Singletons eagerly, i.e. as soon as we initialize guice itself when enabling the plugin. However, economy implementations might load after PlotSquared (both an economy plugin and P2 will load after Vault, but their load order is not defined).
As a solution, we can wrap the EconHandler and only initialize it once the server is ready. This ensures that all plugins are loaded. We can still fall back to the NullEconHandler if no plugin provides economy by then.
Submitter Checklist