Reverted 8ffc1dc

XereoNet · Aug 7, 2012 · 9f93123 · 9f93123 · tips48 · Aug 10, 2012
1 parent acde4eb
commit 9f93123
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/me/neatmonster/spacebukkit/plugins/PluginsManager.java b/src/me/neatmonster/spacebukkit/plugins/PluginsManager.java
@@ -43,11 +43,11 @@ public class PluginsManager {
      * @return Jar File the plugin's code is contained in
      */
     public static File getJAR(final Plugin plugin) {
+        Class<?> currentClass = plugin.getClass();
+        while (!(currentClass.equals(JavaPlugin.class))) {
+            currentClass = currentClass.getSuperclass();
+        }
         try {
-            Class<?> currentClass = plugin.getClass();
-            while (!(currentClass.equals(JavaPlugin.class))) {
-                currentClass = currentClass.getSuperclass();
-            }
             final Class<?>[] methodArgs = {};
             final Method method = currentClass.getDeclaredMethod("getFile", methodArgs);
             method.setAccessible(true);
@@ -63,8 +63,6 @@ public static File getJAR(final Plugin plugin) {
             e.printStackTrace();
         } catch (final InvocationTargetException e) {
             e.printStackTrace();
-        } catch (final NullPointerException e) {
-            // Ignore
         }
         return null;
     }
@@ -76,6 +74,9 @@ public PluginsManager() {
         new Thread(new PluginsRequester()).start();
         final YamlConfiguration configuration = YamlConfiguration.loadConfiguration(JARS_FILE);
         for (final Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+            if (plugin == null) {
+        	continue;
+            }
             final File jar = getJAR(plugin);
             if (jar != null)
                 configuration.set(plugin.getDescription().getName().toLowerCase().replace(" ", ""),