Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-12-18 14:47:50 +01:00
Code Issues Projects Releases Wiki Activity

Make sure plugin onLoad is really called onLoad. This fixes regression #822 from when we implemented plugin depends.

Browse Source
This commit is contained in:
md_5 2014-01-22 12:07:16 +11:00
parent 05f4e69afd
commit aa91354666
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
View File

@ -179,7 +179,7 @@ public class PluginManager
return plugins.get( name ); return plugins.get( name );
} }
public void loadAndEnablePlugins() public void loadPlugins()
{ {
Map<PluginDescription, Boolean> pluginStatuses = new HashMap<>(); Map<PluginDescription, Boolean> pluginStatuses = new HashMap<>();
for ( Map.Entry<String, PluginDescription> entry : toLoad.entrySet() ) for ( Map.Entry<String, PluginDescription> entry : toLoad.entrySet() )
@ -192,7 +192,10 @@ public class PluginManager
} }
toLoad.clear(); toLoad.clear();
toLoad = null; toLoad = null;
}
public void enablePlugins()
{
for ( Plugin plugin : plugins.values() ) for ( Plugin plugin : plugins.values() )
{ {
try try

4
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -194,11 +194,13 @@ public class BungeeCord extends ProxyServer
pluginsFolder.mkdir(); pluginsFolder.mkdir();
pluginManager.detectPlugins( pluginsFolder ); pluginManager.detectPlugins( pluginsFolder );
pluginManager.loadPlugins();
config.load(); config.load();
isRunning = true; isRunning = true;
pluginManager.loadAndEnablePlugins(); pluginManager.enablePlugins();
connectionThrottle = new ConnectionThrottle( config.getThrottle() ); connectionThrottle = new ConnectionThrottle( config.getThrottle() );
startListeners(); startListeners();