From 1f1cdb47e4414437dce50b15232997db6ef97ead Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Feb 2014 12:22:25 +1100 Subject: [PATCH] Search for bungee.yml and then plugin.yml for Bungee plugins. --- .../java/net/md_5/bungee/api/plugin/PluginManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java index bbb5ea7f..87b48c1c 100644 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java @@ -308,8 +308,12 @@ public class PluginManager { try ( JarFile jar = new JarFile( file ) ) { - JarEntry pdf = jar.getJarEntry( "plugin.yml" ); - Preconditions.checkNotNull( pdf, "Plugin must have a plugin.yml" ); + JarEntry pdf = jar.getJarEntry( "bungee.yml" ); + if ( pdf == null ) + { + pdf = jar.getJarEntry( "plugin.yml" ); + } + Preconditions.checkNotNull( pdf, "Plugin must have a plugin.yml or bungee.yml" ); try ( InputStream in = jar.getInputStream( pdf ) ) {