diff options
author | md_5 <git@md-5.net> | 2016-08-25 13:11:42 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-08-25 13:11:42 +1000 |
commit | 60c17193545eb53b52873029b1dd97762e805a5c (patch) | |
tree | 3790b1fa8623172bb13dcab7b31d08ba3a53c5c0 /src/main | |
parent | c74e2a73016e1e6b7ebf025e40438e16b90b41a3 (diff) | |
download | craftbukkit-60c17193545eb53b52873029b1dd97762e805a5c.tar craftbukkit-60c17193545eb53b52873029b1dd97762e805a5c.tar.gz craftbukkit-60c17193545eb53b52873029b1dd97762e805a5c.tar.lz craftbukkit-60c17193545eb53b52873029b1dd97762e805a5c.tar.xz craftbukkit-60c17193545eb53b52873029b1dd97762e805a5c.zip |
SPIGOT-2618: Register permissions before plugin enabled.
Brings behaviour in line with command registration, and won't affect plugins which don't already error.
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index a741f1eb..53db00bf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -317,7 +317,7 @@ public final class CraftServer implements Server { for (Plugin plugin : plugins) { if ((!plugin.isEnabled()) && (plugin.getDescription().getLoad() == type)) { - loadPlugin(plugin); + enablePlugin(plugin); } } @@ -343,10 +343,8 @@ public final class CraftServer implements Server { } } - private void loadPlugin(Plugin plugin) { + private void enablePlugin(Plugin plugin) { try { - pluginManager.enablePlugin(plugin); - List<Permission> perms = plugin.getDescription().getPermissions(); for (Permission perm : perms) { @@ -356,6 +354,8 @@ public final class CraftServer implements Server { getLogger().log(Level.WARNING, "Plugin " + plugin.getDescription().getFullName() + " tried to register permission '" + perm.getName() + "' but it's already registered", ex); } } + + pluginManager.enablePlugin(plugin); } catch (Throwable ex) { Logger.getLogger(CraftServer.class.getName()).log(Level.SEVERE, ex.getMessage() + " loading " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex); } |