twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 04:33:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Guarded against plugins throwing exceptions on enable and disable to prevent potential corruption issues on server start and stop

Browse Source 
By: stevenh <steven.hartland@multiplay.co.uk>
This commit is contained in:
Bukkit/Spigot
2011-05-13 14:50:03 +01:00
parent 4af56e3d16
commit 94aac786c6
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
View File

@@ -246,7 +246,11 @@ public final class SimplePluginManager implements PluginManager {
public void enablePlugin(final Plugin plugin) { public void enablePlugin(final Plugin plugin) {
if (!plugin.isEnabled()) { if (!plugin.isEnabled()) {
plugin.getPluginLoader().enablePlugin(plugin); try {
plugin.getPluginLoader().enablePlugin(plugin);
} catch (Throwable ex) {
server.getLogger().log(Level.SEVERE, ex.getMessage() + " enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
}
} }
} }
@@ -258,9 +262,13 @@ public final class SimplePluginManager implements PluginManager {
public void disablePlugin(final Plugin plugin) { public void disablePlugin(final Plugin plugin) {
if (plugin.isEnabled()) { if (plugin.isEnabled()) {
plugin.getPluginLoader().disablePlugin(plugin); try {
server.getScheduler().cancelTasks(plugin); plugin.getPluginLoader().disablePlugin(plugin);
server.getServicesManager().unregisterAll(plugin); server.getScheduler().cancelTasks(plugin);
server.getServicesManager().unregisterAll(plugin);
} catch (Throwable ex) {
server.getLogger().log(Level.SEVERE, ex.getMessage() + " disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
}
} }
} }