Upstream/Challenges
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Challenges.git synced 2025-01-02 14:29:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash while enabling addon.

Browse Source 
This crash happened because BentoBox hookManager is not initialized when addons are enabled.
This commit is contained in:
BONNe 2019-01-26 16:14:43 +02:00
parent 6d1f4999e4
commit 0050a83d1a
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/world/bentobox/challenges/ChallengesAddon.java
View File

@ -40,8 +40,9 @@ public class ChallengesAddon extends Addon {
/** /**
* VaultHook that process economy. * VaultHook that process economy.
* todo: because of BentoBox limitations.
*/ */
private VaultHook vaultHook; private Optional<VaultHook> vaultHook = null;
/** /**
* Level addon. * Level addon.
@ -131,18 +132,19 @@ public class ChallengesAddon extends Addon {
this.levelAddon = (Level) level.get(); this.levelAddon = (Level) level.get();
} }
Optional<VaultHook> vault = this.getPlugin().getVault(); // BentoBox limitation. Cannot check hooks, as HookManager is created after loading addons.
// Optional<VaultHook> vault = this.getPlugin().getVault();
if (!vault.isPresent() || !vault.get().hook()) //
{ // if (!vault.isPresent() || !vault.get().hook())
this.vaultHook = null; // {
this.logWarning("Economy plugin not found so money options will not work!"); // this.vaultHook = null;
} // this.logWarning("Economy plugin not found so money options will not work!");
else // }
{ // else
this.economyProvided = true; // {
this.vaultHook = vault.get(); // this.economyProvided = true;
} // this.vaultHook = vault.get();
// }
// Register the reset listener // Register the reset listener
this.registerListener(new ResetListener(this)); this.registerListener(new ResetListener(this));
@ -245,7 +247,13 @@ public class ChallengesAddon extends Addon {
*/ */
public boolean isEconomyProvided() public boolean isEconomyProvided()
{ {
return economyProvided; if (!this.economyProvided && this.getPlugin().getVault().isPresent() && this.vaultHook == null)
{
this.vaultHook = this.getPlugin().getVault();
this.economyProvided = this.vaultHook.get().hook();
}
return this.economyProvided;
} }
@ -256,7 +264,7 @@ public class ChallengesAddon extends Addon {
*/ */
public VaultHook getEconomyProvider() public VaultHook getEconomyProvider()
{ {
return vaultHook; return vaultHook.orElseGet(null);
} }