Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-12-03 16:13:30 +01:00
Code Issues Projects Releases Wiki Activity

Fixed BentoBox not properly disabling if errors at startup (#1285)

Browse Source 
Fixes #1281
This commit is contained in:
tastybento 2020-04-20 04:15:55 -07:00 committed by GitHub
parent 85d5a3a6ac
commit ee2f86ae3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/world/bentobox/bentobox/BentoBox.java
View File

@ -193,8 +193,8 @@ public class BentoBox extends JavaPlugin {
flagsManager.registerListeners();
// Load metrics
metrics = new BStats(this);
metrics.registerMetrics();
metrics = new BStats(this);
metrics.registerMetrics();
// Register Multiverse hook - MV loads AFTER BentoBox
// Make sure all worlds are already registered to Multiverse.
@ -215,7 +215,7 @@ public class BentoBox extends JavaPlugin {
"[time]", String.valueOf(loadTime + enableTime));
// Poll for blueprints loading to be finished - async so could be a completely variable time
blueprintLoadingTask = Bukkit.getScheduler().runTaskTimer(instance, () -> {
blueprintLoadingTask = Bukkit.getScheduler().runTaskLater(instance, () -> {
if (getBlueprintsManager().isBlueprintsLoaded()) {
blueprintLoadingTask.cancel();
// Tell all addons that everything is loaded
@ -225,7 +225,7 @@ public class BentoBox extends JavaPlugin {
Bukkit.getPluginManager().callEvent(new BentoBoxReadyEvent());
instance.log("All blueprints loaded.");
}
}, 0L, 1L);
}, 1L);
if (getSettings().getDatabaseType().equals(DatabaseSetup.DatabaseType.YAML)) {
logWarning("*** You're still using YAML database ! ***");
@ -235,6 +235,13 @@ public class BentoBox extends JavaPlugin {
logWarning("*** *** *** *** *** *** *** *** *** *** ***");
}
});
Bukkit.getScheduler().runTaskLater(this, () -> {
if (!isLoaded) {
logError("BentoBox could not load correctly. Disabling plugin! Check console for errors.");
this.onDisable();
instance.setEnabled(false);
}
}, 2L);
}
/**