Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-09-27 22:27:29 +02:00
Code Issues Projects Releases Wiki Activity

Add some defensive code to try and load addons if they are not pladdons

Browse Source
This commit is contained in:
tastybento 2024-02-01 22:46:00 -08:00
parent 471e8d681b
commit 6316ff4a93
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,15 +198,23 @@ public class AddonsManager {
Addon addon; Addon addon;
try { try {
Plugin pladdon = Bukkit.getPluginManager().loadPlugin(f); Plugin pladdon = Bukkit.getPluginManager().loadPlugin(f);
if (pladdon instanceof Pladdon pl) { if (pladdon != null && pladdon instanceof Pladdon pl) {
addon = pl.getAddon(); addon = pl.getAddon();
addon.setDescription(AddonClassLoader.asDescription(data)); addon.setDescription(AddonClassLoader.asDescription(data));
// Mark pladdon as enabled. // Mark pladdon as enabled.
pl.setEnabled(); pl.setEnabled();
pladdons.put(addon, pladdon); pladdons.put(addon, pladdon);
} else { } else {
plugin.logError("Could not load pladdon!"); // Try to load it as an addon
return new PladdonData(null, false); BentoBox.getInstance()
.log("Failed to load " + f.getName() + ", trying to load it as a BentoBox addon");
// Addon not pladdon
AddonClassLoader addonClassLoader = new AddonClassLoader(this, data, f,
this.getClass().getClassLoader());
// Get the addon itself
addon = addonClassLoader.getAddon();
// Add to the list of loaders
loaders.put(addon, addonClassLoader);
} }
} catch (Exception ex) { } catch (Exception ex) {
// Addon not pladdon // Addon not pladdon