Sync with minecraft-api

api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java

@@ -33,13 +33,14 @@
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.introspector.PropertyUtils;
+import tc.oc.minecraft.api.plugin.PluginFinder;
 
 /**
  * Class to manage bridging between plugin duties and implementation duties, for
  * example event handling and plugin management.
  */
 @RequiredArgsConstructor
-public class PluginManager implements tc.oc.minecraft.api.plugin.PluginManager
+public class PluginManager implements PluginFinder, tc.oc.minecraft.api.event.EventBus
 {
 
     private static final Pattern argsSplit = Pattern.compile( " " );

proxy/src/main/java/net/md_5/bungee/BungeeCord.java

@@ -94,6 +94,7 @@
 import net.md_5.bungee.scheduler.BungeeScheduler;
 import net.md_5.bungee.util.CaseInsensitiveMap;
 import org.fusesource.jansi.AnsiConsole;
+import tc.oc.minecraft.api.plugin.PluginFinder;
 
 /**
  * Main BungeeCord proxy class.
@@ -721,4 +722,9 @@ public Title createTitle()
     public Set<Integer> getProtocolVersions() {
         return ImmutableSet.copyOf(ProtocolConstants.SUPPORTED_VERSION_IDS);
     }
+
+    @Override
+    public PluginFinder getPluginFinder() {
+        return pluginManager;
+    }
 }