diff --git a/Spigot-API-Patches/0003-Stop-using-spigot-s-website-for-timings.patch b/Spigot-API-Patches/0003-Stop-using-spigot-s-website-for-timings.patch index 4db951e4a9..4ea914c2fb 100644 --- a/Spigot-API-Patches/0003-Stop-using-spigot-s-website-for-timings.patch +++ b/Spigot-API-Patches/0003-Stop-using-spigot-s-website-for-timings.patch @@ -1,12 +1,11 @@ -From b20199c2ef1d64e19d52153ba65fe5bfbddad752 Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Mon, 28 Jul 2014 03:26:50 -0500 +From 1ada1bf4361c4a6312d2228ad5fa62ade8d0d91e Mon Sep 17 00:00:00 2001 +From: Zach Brown +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 552dabb..a652e87 100644 +index fc59aa3..9782a3b 100644 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java @@ -94,7 +94,7 @@ public class TimingsCommand extends BukkitCommand { @@ -22,11 +21,11 @@ index 552dabb..a652e87 100644 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" ); -- -1.9.1 +2.4.1.windows.1 diff --git a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch index 0cf4236248..6313f56a69 100644 --- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch @@ -1,19 +1,19 @@ -From edaf8e2dbbeb2e4d9b4e467dba0b7f5e57f40102 Mon Sep 17 00:00:00 2001 +From e025f6bcd4c2a4211b4c72eeaf18af8d319f38ca Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Sat, 12 Jul 2014 19:32:01 -0500 +Date: Thu, 28 May 2015 00:08:15 -0500 Subject: [PATCH] PaperSpigot config files diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index ebb18c6..4698590 100644 +index 15d161d..8170343 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -177,6 +177,10 @@ 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 @@ -41,14 +41,14 @@ index 6de5ba5..117d44c 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6174417..b5bf0ec 100644 +index 15aa1b7..4ddb088 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -693,6 +693,7 @@ 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,12 +67,31 @@ index 6174417..b5bf0ec 100644 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 337aa29..c936219 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -122,6 +122,14 @@ 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 0000000..fa41614 +index 0000000..eef9722 --- /dev/null +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -0,0 +1,140 @@ +@@ -0,0 +1,141 @@ +package org.github.paperspigot; + +import com.google.common.base.Throwables; @@ -94,7 +113,7 @@ index 0000000..fa41614 +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 0000000..fa41614 + static Map commands; + /*========================================================================*/ + -+ public static void init() ++ public static void init(File configFile) + { ++ CONFIG_FILE = configFile; + config = new YamlConfiguration(); + try + { diff --git a/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch index 740ee6645d..916a119614 100644 --- a/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch @@ -1,11 +1,11 @@ -From 3a58172910a843143496837f4de1a5185c337360 Mon Sep 17 00:00:00 2001 +From 0b4987d924c62805d99df5922954b2cce6a3a81f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 20:41:55 -0600 Subject: [PATCH] Configurable baby zombie movement speed diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 2c0c74c..e915f68 100644 +index 1a8d3d8..6d3b002 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -16,7 +16,7 @@ public class EntityZombie extends EntityMonster { @@ -18,10 +18,10 @@ index 2c0c74c..e915f68 100644 private int bn; private boolean bo = false; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index fa41614..c2003a3 100644 +index eef9722..0e9d57f 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -137,4 +137,10 @@ public class PaperSpigotConfig +@@ -138,4 +138,10 @@ public class PaperSpigotConfig config.addDefault( path, def ); return config.getString( path, config.getString( path ) ); } @@ -33,5 +33,5 @@ index fa41614..c2003a3 100644 + } } -- -1.9.1 +2.4.1.windows.1 diff --git a/Spigot-Server-Patches/0010-Ability-to-disable-asynccatcher.patch b/Spigot-Server-Patches/0010-Ability-to-disable-asynccatcher.patch index 7e5293e342..a8d3f819b9 100644 --- a/Spigot-Server-Patches/0010-Ability-to-disable-asynccatcher.patch +++ b/Spigot-Server-Patches/0010-Ability-to-disable-asynccatcher.patch @@ -1,14 +1,14 @@ -From 28494b41113a7159f6ef4c828238c0492225dd89 Mon Sep 17 00:00:00 2001 +From b70a51538266e463d2f61265e8f241723a60e2aa Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 20:46:54 -0600 Subject: [PATCH] Ability to disable asynccatcher diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index c2003a3..57363d5 100644 +index 0e9d57f..c583a80 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -143,4 +143,14 @@ public class PaperSpigotConfig +@@ -144,4 +144,14 @@ public class PaperSpigotConfig { babyZombieMovementSpeed = getDouble( "settings.baby-zombie-movement-speed", 0.5D ); // Player moves at 0.1F, for reference } @@ -37,5 +37,5 @@ index 4b3aa85..f7e8d16 100644 public static void catchOp(String reason) { -- -1.9.1 +2.4.1.windows.1 diff --git a/Spigot-Server-Patches/0013-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0013-Toggle-for-player-interact-limiter.patch index e89e5d393f..4ada37456a 100644 --- a/Spigot-Server-Patches/0013-Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/0013-Toggle-for-player-interact-limiter.patch @@ -1,11 +1,11 @@ -From d55f015904ac32180e82497bc90fa5e491e1e831 Mon Sep 17 00:00:00 2001 +From 0b7018f9f835891c600dded64e187dc642d3b719 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 21:07:10 -0600 Subject: [PATCH] Toggle for player interact limiter diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9e50ad7..9a82f3b 100644 +index ccb21ed..2428935 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -638,7 +638,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -19,10 +19,10 @@ index 9e50ad7..9a82f3b 100644 } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 ) { diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index bff794a..02c4004 100644 +index c583a80..0cd121b 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -153,4 +153,14 @@ public class PaperSpigotConfig +@@ -154,4 +154,14 @@ public class PaperSpigotConfig Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this is not recommended and may cause issues" ); } } diff --git a/Spigot-Server-Patches/0026-Configurable-strength-and-weakness-effect-modifiers.patch b/Spigot-Server-Patches/0026-Configurable-strength-and-weakness-effect-modifiers.patch index f508b7e8a2..ea58d08095 100644 --- a/Spigot-Server-Patches/0026-Configurable-strength-and-weakness-effect-modifiers.patch +++ b/Spigot-Server-Patches/0026-Configurable-strength-and-weakness-effect-modifiers.patch @@ -1,4 +1,4 @@ -From 176a4043886d2e4298a9350fe1501375274b489e Mon Sep 17 00:00:00 2001 +From 8a82cff8d06b1aa0a6f0b177dbbeab2bc50306cb Mon Sep 17 00:00:00 2001 From: gsand Date: Sun, 8 Mar 2015 03:41:33 -0500 Subject: [PATCH] Configurable strength and weakness effect modifiers @@ -18,10 +18,10 @@ index 620685a..3411b78 100644 } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index 02c4004..c57f83b 100644 +index 0cd121b..815ad97 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -163,4 +163,12 @@ public class PaperSpigotConfig +@@ -164,4 +164,12 @@ public class PaperSpigotConfig Bukkit.getLogger().log( Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users" ); } } @@ -35,5 +35,5 @@ index 02c4004..c57f83b 100644 + } } -- -1.9.1 +2.4.1.windows.1 diff --git a/Spigot-Server-Patches/0033-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch b/Spigot-Server-Patches/0033-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch index 16c09192c2..de8eefa625 100644 --- a/Spigot-Server-Patches/0033-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch +++ b/Spigot-Server-Patches/0033-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch @@ -1,4 +1,4 @@ -From 7e08519d06c1e7334714dc502deec42b3cd34a1d Mon Sep 17 00:00:00 2001 +From 8374f6ca43323da53ee59b7afe95d55398245540 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 30 Nov 2014 18:58:07 -0600 Subject: [PATCH] Allow specified ItemStacks to retain their invalid data @@ -34,7 +34,7 @@ index 1984e7c..e6b557e 100644 } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index c57f83b..19ef586 100644 +index 815ad97..3ab2892 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java @@ -6,11 +6,10 @@ import java.io.IOException; @@ -51,7 +51,7 @@ index c57f83b..19ef586 100644 import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.configuration.InvalidConfigurationException; -@@ -171,4 +170,11 @@ public class PaperSpigotConfig +@@ -172,4 +171,11 @@ public class PaperSpigotConfig strengthEffectModifier = getDouble( "effect-modifiers.strength", 1.3D ); weaknessEffectModifier = getDouble( "effect-modifiers.weakness", -0.5D ); } @@ -64,5 +64,5 @@ index c57f83b..19ef586 100644 + } } -- -2.3.5 +2.4.1.windows.1