Allow specifying location of spigot.yml

As requested here: http://www.spigotmc.org/threads/specify-location-of-spigot-yml.67747/

CraftBukkit-Patches/0005-Spigot-Configuration.patch

@@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              }
 +            // Spigot start
 +            this.a((PlayerList) (new DedicatedPlayerList(this)));
-+            org.spigotmc.SpigotConfig.init();
++            org.spigotmc.SpigotConfig.init((File) options.valueOf("spigot-settings"));
 +            org.spigotmc.SpigotConfig.registerCommands();
 +            // Spigot end
  
@@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
          }
  
-+        org.spigotmc.SpigotConfig.init(); // Spigot
++        org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          for (WorldServer world : console.worlds) {
              world.worldData.setDifficulty(difficulty);
              world.setSpawnFlags(monsters, animals);
@@ -94,6 +94,25 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
  
          int pollCount = 0;
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -0,0 +0,0 @@ public class Main {
+                 acceptsAll(asList("v", "version"), "Show the CraftBukkit Version");
+ 
+                 acceptsAll(asList("demo"), "Demo mode");
++
++                // Spigot Start
++                acceptsAll(asList("S", "spigot-settings"), "File for spigot settings")
++                        .withRequiredArg()
++                        .ofType(File.class)
++                        .defaultsTo(new File("spigot.yml"))
++                        .describedAs("Yml file");
++                // Spigot End
+             }
+         };
+ 
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
@@ -121,7 +140,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +public class SpigotConfig
 +{
 +
-+    private static final File CONFIG_FILE = new File( "spigot.yml" );
++    private static File CONFIG_FILE;
 +    private static final String HEADER = "This is the main configuration file for Spigot.\n"
 +            + "As you can see, there's tons to configure. Some options may impact gameplay, so use\n"
 +            + "with caution, and make sure you know what each option does before configuring.\n"
@@ -139,8 +158,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    static Map<String, Command> commands;
 +    /*========================================================================*/
 +
-+    public static void init()
++    public static void init(File configFile)
 +    {
++        CONFIG_FILE = configFile;
 +        config = new YamlConfiguration();
 +        try
 +        {
@@ -316,3 +336,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +}
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0015-Metrics.patch

@@ -665,7 +665,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      /*========================================================================*/
 +    private static Metrics metrics;
  
-     public static void init()
+     public static void init(File configFile)
      {
 @@ -0,0 +0,0 @@ public class SpigotConfig
          {
@@ -687,3 +687,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      static void readConfig(Class<?> clazz, Object instance)
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch

@@ -32,3 +32,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch

@@ -49,3 +49,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0029-Configurable-Messages.patch

@@ -103,3 +103,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0048-Watchdog-Thread.patch

@@ -314,3 +314,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +}
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0055-BungeeCord-Support.patch

@@ -212,3 +212,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch

@@ -53,3 +53,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch

@@ -32,3 +32,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  MinecraftServer.main(options);
              } catch (Throwable t) {
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch

@@ -58,3 +58,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch

@@ -89,3 +89,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch

@@ -161,3 +161,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +}
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch

@@ -39,3 +39,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch

@@ -39,3 +39,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch

@@ -57,3 +57,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch

@@ -33,3 +33,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch

@@ -33,3 +33,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch

@@ -76,3 +76,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch

@@ -33,3 +33,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch

@@ -52,3 +52,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch

@@ -58,3 +58,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch

@@ -34,3 +34,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch

@@ -34,3 +34,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch

@@ -71,3 +71,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
  }
 -- 
+1.9.0.msysgit.0
+

CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch

@@ -63,3 +63,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      </Loggers>
  </Configuration>
 -- 
+1.9.0.msysgit.0
+