From bd0045257f1e96e39a5a17fc830698159c27f23b Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Thu, 28 May 2015 00:11:18 -0500 Subject: [PATCH] Rebuild patches for upstream changes --- ...p-using-spigot-s-website-for-timings.patch | 7 ++-- .../PaperSpigot-config-files.patch | 34 +++++++++++++++---- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Spigot-API-Patches/Stop-using-spigot-s-website-for-timings.patch b/Spigot-API-Patches/Stop-using-spigot-s-website-for-timings.patch index 3833b118e7..ee3bdb610a 100644 --- a/Spigot-API-Patches/Stop-using-spigot-s-website-for-timings.patch +++ b/Spigot-API-Patches/Stop-using-spigot-s-website-for-timings.patch @@ -1,9 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> -Date: Mon, 28 Jul 2014 03:26:50 -0500 +Date: Thu, 28 May 2015 00:00:29 -0500 Subject: [PATCH] Stop using spigot's website for timings -There's no reason to do so at all, the fact that it just exists as a redirect is both odd and unnecessary diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 @@ -22,8 +21,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 String location = con.getHeaderField( "Location" ); String pasteID = location.substring( "http://paste.ubuntu.com/".length(), location.length() - 1 ); -- sender.sendMessage( ChatColor.GREEN + "View timings results can be viewed at http://www.spigotmc.org/go/timings?url=" + pasteID ); -+ sender.sendMessage( ChatColor.GREEN + "View timings results can be viewed at http://aikar.co/timings.php?url=" + pasteID ); +- sender.sendMessage( ChatColor.GREEN + "Timings results can be viewed at http://www.spigotmc.org/go/timings?url=" + pasteID ); ++ sender.sendMessage( ChatColor.GREEN + "Timings results can be viewed at http://aikar.co/timings.php?url=" + pasteID ); } catch ( IOException ex ) { sender.sendMessage( ChatColor.RED + "Error pasting timings, check your console for more information" ); diff --git a/Spigot-Server-Patches/PaperSpigot-config-files.patch b/Spigot-Server-Patches/PaperSpigot-config-files.patch index 4e8ecf25ed..5573c2efc6 100644 --- a/Spigot-Server-Patches/PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/PaperSpigot-config-files.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> -Date: Sat, 12 Jul 2014 19:32:01 -0500 +Date: Thu, 28 May 2015 00:08:15 -0500 Subject: [PATCH] PaperSpigot config files @@ -9,11 +9,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer - org.spigotmc.SpigotConfig.init(); + org.spigotmc.SpigotConfig.init((File) options.valueOf("spigot-settings")); org.spigotmc.SpigotConfig.registerCommands(); // Spigot end + // PaperSpigot start -+ org.github.paperspigot.PaperSpigotConfig.init(); ++ org.github.paperspigot.PaperSpigotConfig.init((File) options.valueOf("paper-settings")); + org.github.paperspigot.PaperSpigotConfig.registerCommands(); + // PaperSpigot end @@ -47,8 +47,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public final class CraftServer implements Server { } - org.spigotmc.SpigotConfig.init(); // Spigot -+ org.github.paperspigot.PaperSpigotConfig.init(); // PaperSpigot + org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot ++ org.github.paperspigot.PaperSpigotConfig.init((File) console.options.valueOf("paper-settings")); // PaperSpigot for (WorldServer world : console.worlds) { world.worldData.setDifficulty(difficulty); world.setSpawnFlags(monsters, animals); @@ -67,6 +67,25 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); +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 { + .defaultsTo(new File("spigot.yml")) + .describedAs("Yml file"); + // Spigot End ++ ++ // PaperSpigot Start ++ acceptsAll(asList("paper", "paper-settings"), "File for paperspigot settings") ++ .withRequiredArg() ++ .ofType(File.class) ++ .defaultsTo(new File("paper.yml")) ++ .describedAs("Yml file"); ++ // PaperSpigot End + } + }; + diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 @@ -94,7 +113,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +public class PaperSpigotConfig +{ + -+ private static final File CONFIG_FILE = new File( "paper.yml" ); ++ private static File CONFIG_FILE; + private static final String HEADER = "This is the main configuration file for PaperSpigot.\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" @@ -109,8 +128,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + static Map commands; + /*========================================================================*/ + -+ public static void init() ++ public static void init(File configFile) + { ++ CONFIG_FILE = configFile; + config = new YamlConfiguration(); + try + {