Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added protection around addon onDisable(). 

https://github.com/BentoBoxWorld/BentoBox/issues/1018
This commit is contained in:
tastybento 2019-10-29 17:52:24 -07:00
parent 9ff2eda576
commit b9a04bcf57
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
View File

@ -416,9 +416,16 @@ public class AddonsManager {
plugin.getFlagsManager().unregister(addon);
// Disable
if (addon.isEnabled()) {
addon.onDisable();
Bukkit.getPluginManager().callEvent(new AddonEvent().builder().addon(addon).reason(AddonEvent.Reason.DISABLE).build());
plugin.log("Disabling " + addon.getDescription().getName() + "...");
try {
addon.onDisable();
} catch (Exception e) {
plugin.logError("Error occured when disabling addon " + addon.getDescription().getName());
plugin.logError("Report this to the addon's author(s)");
addon.getDescription().getAuthors().forEach(plugin::logError);
plugin.logStacktrace(e);
}
Bukkit.getPluginManager().callEvent(new AddonEvent().builder().addon(addon).reason(AddonEvent.Reason.DISABLE).build());
}
// Clear loaders
if (loaders.containsKey(addon)) {