From e02c2394217d96ca9be7512c6e5a7d7ccb6be051 Mon Sep 17 00:00:00 2001 From: Ginger Geek Date: Mon, 25 May 2015 20:09:58 +0100 Subject: [PATCH] Allow specifying location of spigot.yml As requested here: http://www.spigotmc.org/threads/specify-location-of-spigot-yml.67747/ --- .../0005-Spigot-Configuration.patch | 40 ++++++++++++++----- CraftBukkit-Patches/0015-Metrics.patch | 10 ++--- ...7-Allow-Disabling-of-Command-Logging.patch | 8 ++-- ...low-Disabling-of-Command-TabComplete.patch | 10 ++--- .../0029-Configurable-Messages.patch | 10 ++--- .../0048-Watchdog-Thread.patch | 10 ++--- .../0055-BungeeCord-Support.patch | 10 ++--- ...Configurable-Amount-of-Netty-Threads.patch | 8 ++-- ...-Warn-if-PermGen-may-be-insufficient.patch | 8 ++-- .../0066-Add-Late-Bind-Option.patch | 10 ++--- ...low-statistics-to-be-disabled-forced.patch | 8 ++-- .../0073-Highly-Optimized-Tick-Loop.patch | 8 ++-- .../0075-Configurable-Ping-Sample-Size.patch | 8 ++-- .../0076-Add-Optional-Tick-Shuffling.patch | 8 ++-- .../0081-Spam-Filter-Exclusions.patch | 8 ++-- ...tion-to-Silence-CommandBlock-Console.patch | 8 ++-- ...Allow-Disabling-Creative-Item-Filter.patch | 8 ++-- ...mmands-to-be-the-main-version-of-a-c.patch | 10 ++--- .../0116-Configurable-UserCache-cap.patch | 8 ++-- ...able-save-on-stop-only-for-UserCache.patch | 8 ++-- ...21-Prevent-Unbounded-IntCache-Growth.patch | 8 ++-- ...ake-moved-wrongly-limit-configurable.patch | 8 ++-- ...moved-too-quickly-limit-configurable.patch | 8 ++-- .../0139-Allow-Attribute-Capping.patch | 8 ++-- .../0146-Make-debug-logging-togglable.patch | 8 ++-- 25 files changed, 133 insertions(+), 113 deletions(-) diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch index f96b648..d1d94fd 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 7aa8f30d33ee7c3805cd69598a52f256e19159a0 Mon Sep 17 00:00:00 2001 +From f1ff282a5e14c496d23852d8358ff153684cc6a9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Configuration Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 1094be8..7e440b0 100644 +index 1094be8..24ecbd2 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -162,6 +162,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -15,7 +15,7 @@ index 1094be8..7e440b0 100644 } + // 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 @@ -55,7 +55,7 @@ index d83842a..0356d9e 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 4b3fcac..2aceeb4 100644 +index 4b3fcac..8668686 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -247,8 +247,10 @@ public final class CraftServer implements Server { @@ -75,7 +75,7 @@ index 4b3fcac..2aceeb4 100644 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,12 +94,31 @@ index 4b3fcac..2aceeb4 100644 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 4e642b7..aca0d97 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -114,6 +114,14 @@ 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 0000000..6837305 +index 0000000..cb88089 --- /dev/null +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -0,0 +1,138 @@ +@@ -0,0 +1,139 @@ +package org.spigotmc; + +import com.google.common.base.Throwables; @@ -121,7 +140,7 @@ index 0000000..6837305 +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 0000000..6837305 + static Map commands; + /*========================================================================*/ + -+ public static void init() ++ public static void init(File configFile) + { ++ CONFIG_FILE = configFile; + config = new YamlConfiguration(); + try + { @@ -316,5 +336,5 @@ index 0000000..961ddb4 + } +} -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0015-Metrics.patch b/CraftBukkit-Patches/0015-Metrics.patch index 6dc29a7..a906faa 100644 --- a/CraftBukkit-Patches/0015-Metrics.patch +++ b/CraftBukkit-Patches/0015-Metrics.patch @@ -1,4 +1,4 @@ -From fc05d78cd33c1c9c04434b6dbc76544c62765ea4 Mon Sep 17 00:00:00 2001 +From adcceacaaaa05206db36e6c06c3cded1ddb31150 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics @@ -656,7 +656,7 @@ index 0000000..a5fd59d + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 6837305..fdd4fe1 100644 +index cb88089..dcca493 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -36,6 +36,7 @@ public class SpigotConfig @@ -665,9 +665,9 @@ index 6837305..fdd4fe1 100644 /*========================================================================*/ + private static Metrics metrics; - public static void init() + public static void init(File configFile) { -@@ -67,6 +68,18 @@ public class SpigotConfig +@@ -68,6 +69,18 @@ public class SpigotConfig { MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() ); } @@ -687,5 +687,5 @@ index 6837305..fdd4fe1 100644 static void readConfig(Class clazz, Object instance) -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch index a39ca13..b925b32 100644 --- a/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch @@ -1,4 +1,4 @@ -From 4b599e4c91e96813a50e4dd2587d65e618018759 Mon Sep 17 00:00:00 2001 +From 56bf7e9fe6eebb3fc7eab2b589ca2bee149f8d26 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:01:29 +1000 Subject: [PATCH] Allow Disabling of Command Logging @@ -17,10 +17,10 @@ index 794464a..40fa8b7 100644 CraftPlayer player = this.getPlayer(); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index fdd4fe1..4e7d731 100644 +index dcca493..3999f5b 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -148,4 +148,10 @@ public class SpigotConfig +@@ -149,4 +149,10 @@ public class SpigotConfig config.addDefault( path, def ); return config.getDouble( path, config.getDouble( path ) ); } @@ -32,5 +32,5 @@ index fdd4fe1..4e7d731 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch index 5910335..ba6d0ea 100644 --- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch @@ -1,11 +1,11 @@ -From 9a1f77ca41cb524963d196c6365f4e70f56d4589 Mon Sep 17 00:00:00 2001 +From a8f27533733edea2d3e2672c663c2a00d10ba137 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 58d52d8..905573c 100644 +index 1a6316d..3d41eb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1571,6 +1571,13 @@ public final class CraftServer implements Server { @@ -23,10 +23,10 @@ index 58d52d8..905573c 100644 try { completions = getCommandMap().tabComplete(player, message.substring(1)); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 4e7d731..0a6ab75 100644 +index 3999f5b..ca001e9 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -154,4 +154,21 @@ public class SpigotConfig +@@ -155,4 +155,21 @@ public class SpigotConfig { logCommands = getBoolean( "commands.log", true ); } @@ -49,5 +49,5 @@ index 4e7d731..0a6ab75 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0029-Configurable-Messages.patch b/CraftBukkit-Patches/0029-Configurable-Messages.patch index 2b97d5a..d93cf40 100644 --- a/CraftBukkit-Patches/0029-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0029-Configurable-Messages.patch @@ -1,4 +1,4 @@ -From ce955efa982c42cf7a948bff866dd127ade52e0f Mon Sep 17 00:00:00 2001 +From e99ecec40fd58c6b7be7a441e90b6bfa8d445f75 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages @@ -45,7 +45,7 @@ index 7918bcb..825823d 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 905573c..f0453e6 100644 +index 3d41eb1..1125ff2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -628,11 +628,7 @@ public final class CraftServer implements Server { @@ -62,7 +62,7 @@ index 905573c..f0453e6 100644 return false; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 0a6ab75..95bb141 100644 +index ca001e9..3726ea5 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -12,6 +12,7 @@ import java.util.Map; @@ -73,7 +73,7 @@ index 0a6ab75..95bb141 100644 import org.bukkit.command.Command; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; -@@ -171,4 +172,28 @@ public class SpigotConfig +@@ -172,4 +173,28 @@ public class SpigotConfig } tabComplete = getInt( "commands.tab-complete", 0 ); } @@ -103,5 +103,5 @@ index 0a6ab75..95bb141 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0048-Watchdog-Thread.patch b/CraftBukkit-Patches/0048-Watchdog-Thread.patch index e0363fd..2353c40 100644 --- a/CraftBukkit-Patches/0048-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0048-Watchdog-Thread.patch @@ -1,11 +1,11 @@ -From 18d05e9dbd7e0275546b0d0332c63d303d614360 Mon Sep 17 00:00:00 2001 +From e3b830054346481eeebfb9171869901b42a0897e Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 5 Aug 2014 17:20:19 +0100 Subject: [PATCH] Watchdog Thread. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 948a2f6..7714dcb 100644 +index 22d51aa..7f7ec42 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -270,7 +270,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -168,10 +168,10 @@ index 0000000..429c258 + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 95bb141..c071421 100644 +index 3726ea5..34def7b 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -196,4 +196,18 @@ public class SpigotConfig +@@ -197,4 +197,18 @@ public class SpigotConfig outdatedClientMessage = transform( getString( "messages.outdated-client", outdatedClientMessage ) ); outdatedServerMessage = transform( getString( "messages.outdated-server", outdatedServerMessage ) ); } @@ -314,5 +314,5 @@ index 0000000..de08ad6 + } +} -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0055-BungeeCord-Support.patch b/CraftBukkit-Patches/0055-BungeeCord-Support.patch index df61848..b1fa68d 100644 --- a/CraftBukkit-Patches/0055-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0055-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 93067185017bb7bcd1f431b3fc5d466b2aff8515 Mon Sep 17 00:00:00 2001 +From 5701be9c3222212075e84275f354ee7a419318ad Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -157,7 +157,7 @@ index 665d58e..0dcf37e 100644 if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f0453e6..46710d8 100644 +index 1125ff2..04e2f70 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -561,7 +561,13 @@ public final class CraftServer implements Server { @@ -193,10 +193,10 @@ index a5b7b75..28b4647 100644 { return getHandle().collidesWithEntities; diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index c071421..47ab82f 100644 +index 34def7b..824ba7a 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -210,4 +210,14 @@ public class SpigotConfig +@@ -211,4 +211,14 @@ public class SpigotConfig commands.put( "restart", new RestartCommand( "restart" ) ); WatchdogThread.doStart( timeoutTime, restartOnCrash ); } @@ -212,5 +212,5 @@ index c071421..47ab82f 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch index b40703c..ba30279 100644 --- a/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From be81b1a2a4b43c145bdaddbe15bff4f9121645f0 Mon Sep 17 00:00:00 2001 +From 1e99fd9f92d823170985e919accc98265d5d082c Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 11:58:58 +1100 Subject: [PATCH] Configurable Amount of Netty Threads @@ -37,10 +37,10 @@ index 054a269..b3d89c1 100644 public boolean as() { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 47ab82f..865a17f 100644 +index 824ba7a..a306266 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -220,4 +220,11 @@ public class SpigotConfig +@@ -221,4 +221,11 @@ public class SpigotConfig } bungee = getBoolean( "settings.bungeecord", false ); } @@ -53,5 +53,5 @@ index 47ab82f..865a17f 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch index e92658a..3020721 100644 --- a/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch +++ b/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch @@ -1,14 +1,14 @@ -From 2d6caad78d93dcf69a495a49d774d24e2929730c Mon Sep 17 00:00:00 2001 +From 963b791c91cc99d28cf06b1da6b51c73e772dd25 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 14:07:41 +1100 Subject: [PATCH] Warn if PermGen may be insufficient diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 4e642b7..c5bc388 100644 +index aca0d97..337aa29 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -165,6 +165,22 @@ public class Main { +@@ -173,6 +173,22 @@ public class Main { useConsole = false; } @@ -32,5 +32,5 @@ index 4e642b7..c5bc388 100644 MinecraftServer.main(options); } catch (Throwable t) { -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch index 65cbfdd..585f201 100644 --- a/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From 93e9dc8adcc418a1a59183f2b42a7446977b96a3 Mon Sep 17 00:00:00 2001 +From 90bf9dee67afa7e42e9956d5d870b572f98f2938 Mon Sep 17 00:00:00 2001 From: slide23 Date: Fri, 20 Dec 2013 20:15:33 -0600 Subject: [PATCH] Add Late Bind Option @@ -6,7 +6,7 @@ Subject: [PATCH] Add Late Bind Option Add late-bind config option to delay binding until loading is done. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 7714dcb..def9dea 100644 +index 7f7ec42..b7f2382 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -173,6 +173,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -44,10 +44,10 @@ index 7714dcb..def9dea 100644 Thread thread1 = new Thread(new ThreadWatchdog(this)); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 865a17f..f3187f8 100644 +index a306266..4edc6af 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -227,4 +227,9 @@ public class SpigotConfig +@@ -228,4 +228,9 @@ public class SpigotConfig System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) ); Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count ); } @@ -58,5 +58,5 @@ index 865a17f..f3187f8 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch index 54186a4..e7ac262 100644 --- a/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch @@ -1,4 +1,4 @@ -From b665d148f313bb73355a179f32960a9b65b6fa73 Mon Sep 17 00:00:00 2001 +From 82425c7b387b9dde3f71c10cc3261715df2452a8 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 7 Jan 2014 15:56:26 +0000 Subject: [PATCH] Allow statistics to be disabled/forced @@ -40,7 +40,7 @@ index 46845cd..22c2ffd 100644 super.setStatistic(entityhuman, statistic, i); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index f3187f8..9566cfa 100644 +index 4edc6af..a2be9df 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -10,10 +10,12 @@ import java.util.HashMap; @@ -56,7 +56,7 @@ index f3187f8..9566cfa 100644 import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; -@@ -232,4 +234,31 @@ public class SpigotConfig +@@ -233,4 +235,31 @@ public class SpigotConfig private static void lateBind() { lateBind = getBoolean( "settings.late-bind", false ); } @@ -89,5 +89,5 @@ index f3187f8..9566cfa 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch index 8a01c71..8c5f1c6 100644 --- a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch @@ -1,4 +1,4 @@ -From 140f63aafc48a95fc4925bca78e040df1431f13d Mon Sep 17 00:00:00 2001 +From 02bf7bff7f53ec05701038c693e28e5f983b9bcd Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop @@ -96,10 +96,10 @@ index 7060622..b61af44 100644 this.a((CrashReport) null); } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 9566cfa..345a49c 100644 +index a2be9df..e1cc2e0 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -261,4 +261,9 @@ public class SpigotConfig +@@ -262,4 +262,9 @@ public class SpigotConfig "screen." ); } } @@ -161,5 +161,5 @@ index 0000000..be2e31d + } +} -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch index 957cac6..9ab9123 100644 --- a/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From 6a38dcdbc7ba38400057409c290a8264a60fdd39 Mon Sep 17 00:00:00 2001 +From ec3323930633149b8ba9aced3bcf62355ee8663f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 26 Jan 2014 21:48:34 +1100 Subject: [PATCH] Configurable Ping Sample Size @@ -23,10 +23,10 @@ index 285fd4b..684d4fa 100644 ServerPing ping = new ServerPing(); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 345a49c..a0d88ec 100644 +index e1cc2e0..936c860 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -266,4 +266,11 @@ public class SpigotConfig +@@ -267,4 +267,11 @@ public class SpigotConfig { commands.put( "tps", new TicksPerSecondCommand( "tps" ) ); } @@ -39,5 +39,5 @@ index 345a49c..a0d88ec 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch index dd557fb..85a2c4d 100644 --- a/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 32339ec1d327a055f3bab4f9717d51264f46a724 Mon Sep 17 00:00:00 2001 +From e78650aba2ac8f033e980d8527ecc414d4daef46 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 27 Jan 2014 08:39:26 +1100 Subject: [PATCH] Add Optional Tick Shuffling @@ -24,10 +24,10 @@ index 86b1f37..cfd4ca1 100644 while (iterator.hasNext()) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index a0d88ec..f19d415 100644 +index 936c860..83e575f 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -273,4 +273,10 @@ public class SpigotConfig +@@ -274,4 +274,10 @@ public class SpigotConfig playerSample = getInt( "settings.sample-count", 12 ); System.out.println( "Server Ping Player Sample Count: " + playerSample ); } @@ -39,5 +39,5 @@ index a0d88ec..f19d415 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch index 81f0ee5..eb5d8e3 100644 --- a/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch @@ -1,4 +1,4 @@ -From db5fb0bd7b0ae00c02177b774c7b362a471cd19d Mon Sep 17 00:00:00 2001 +From f9fa84c647a91560542e38d11eb29e77aef42a22 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 8 Feb 2014 08:13:40 +0000 Subject: [PATCH] Spam Filter Exclusions @@ -31,7 +31,7 @@ index 0d45439..f3365ca 100644 Waitable waitable = new Waitable() { @Override diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index f19d415..8419c28 100644 +index 83e575f..a0a59bb 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -6,6 +6,7 @@ import java.io.IOException; @@ -42,7 +42,7 @@ index f19d415..8419c28 100644 import java.util.HashMap; import java.util.List; import java.util.Map; -@@ -279,4 +280,13 @@ public class SpigotConfig +@@ -280,4 +281,13 @@ public class SpigotConfig { playerShuffle = getInt( "settings.player-shuffle", 0 ); } @@ -57,5 +57,5 @@ index f19d415..8419c28 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch index 8e09f12..2fcab03 100644 --- a/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From e3c3d2ba531d02e52c8edd053482b612d6c009be Mon Sep 17 00:00:00 2001 +From 100bb30d9a6782b30d1d86f92a3aeb344043a6c4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 9 Feb 2014 14:39:01 +1100 Subject: [PATCH] Add Option to Silence CommandBlock Console @@ -18,10 +18,10 @@ index 81289b7..fc52287 100644 } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 8419c28..f58208e 100644 +index a0a59bb..039777a 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -289,4 +289,10 @@ public class SpigotConfig +@@ -290,4 +290,10 @@ public class SpigotConfig "/skill" } ) ); } @@ -33,5 +33,5 @@ index 8419c28..f58208e 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch index ae35e76..fdefb65 100644 --- a/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch @@ -1,4 +1,4 @@ -From 479c5a56c49ad5607bc55371a52a4bb83ea4ba12 Mon Sep 17 00:00:00 2001 +From 9da1e626cbaf538b8c10fbef36303da60347ca45 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 18:18:01 +1100 Subject: [PATCH] Allow Disabling Creative Item Filter @@ -18,10 +18,10 @@ index f3365ca..f40c7c9 100644 // CraftBukkit start - Call click event if (flag || (flag1 && !ItemStack.matches(this.player.defaultContainer.getSlot(packetplayinsetcreativeslot.a()).getItem(), packetplayinsetcreativeslot.getItemStack()))) { // Insist on valid slot diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index f58208e..86c45c6 100644 +index 039777a..686b8bd 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -295,4 +295,10 @@ public class SpigotConfig +@@ -296,4 +296,10 @@ public class SpigotConfig { silentCommandBlocks = getBoolean( "commands.silent-commandblock-console", false ); } @@ -33,5 +33,5 @@ index f58208e..86c45c6 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index 68994e0..e83ed5d 100644 --- a/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,11 +1,11 @@ -From 7fe22630471a1658dc748f921167c0d6de4e8093 Mon Sep 17 00:00:00 2001 +From b901732728a8974b6154dd30e117c2b0a0f1a9cf Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 12 Feb 2014 20:44:14 +0000 Subject: [PATCH] Allow vanilla commands to be the main version of a command diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 46710d8..238e282 100644 +index 04e2f70..4200f7d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -317,8 +317,11 @@ public final class CraftServer implements Server { @@ -44,7 +44,7 @@ index 46710d8..238e282 100644 } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 86c45c6..4932990 100644 +index 686b8bd..3a8734f 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -8,8 +8,10 @@ import java.lang.reflect.Method; @@ -58,7 +58,7 @@ index 86c45c6..4932990 100644 import java.util.logging.Level; import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.server.MinecraftServer; -@@ -301,4 +303,16 @@ public class SpigotConfig +@@ -302,4 +304,16 @@ public class SpigotConfig { filterCreativeItems = getBoolean( "settings.filter-creative-items", true ); } @@ -76,5 +76,5 @@ index 86c45c6..4932990 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch index f4fb6fe..37e61fd 100644 --- a/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch @@ -1,4 +1,4 @@ -From d7e6fed853926571a63f8c90315f252ea09ce412 Mon Sep 17 00:00:00 2001 +From 083b5e02fc877acd03637dab3da618a64b53ba64 Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 25 Apr 2014 18:17:30 -0400 Subject: [PATCH] Configurable UserCache cap @@ -18,10 +18,10 @@ index 021853e..31b4e81 100644 try { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 4932990..d416087 100644 +index 3a8734f..e88765b 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -315,4 +315,10 @@ public class SpigotConfig +@@ -316,4 +316,10 @@ public class SpigotConfig replaceCommands = new HashSet( (List) getList( "commands.replace-commands", Arrays.asList( "setblock", "summon", "testforblock", "tellraw" ) ) ); } @@ -33,5 +33,5 @@ index 4932990..d416087 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch index 6018715..b9a82c5 100644 --- a/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,4 +1,4 @@ -From e5b7581e6b9e2c21dd3a8e45b153229f5d34eab4 Mon Sep 17 00:00:00 2001 +From 72dea5f667ed31b110f1d183e736c1f0a437682d Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 23 May 2014 18:05:10 -0400 Subject: [PATCH] Configurable save-on-stop-only for UserCache @@ -37,10 +37,10 @@ index 31b4e81..72154d4 100644 } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index d416087..78dcb39 100644 +index e88765b..f35e92e 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -321,4 +321,10 @@ public class SpigotConfig +@@ -322,4 +322,10 @@ public class SpigotConfig { userCacheCap = getInt( "settings.user-cache-size", 1000 ); } @@ -52,5 +52,5 @@ index d416087..78dcb39 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch index b866d2c..f167765 100644 --- a/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From 366f02b348c73826f2c25a41263128e6a4c85370 Mon Sep 17 00:00:00 2001 +From 44a277191897011b8188d9cce87ef2e6f793f91e Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Jun 2014 19:40:00 +1000 Subject: [PATCH] Prevent Unbounded IntCache Growth @@ -43,10 +43,10 @@ index 8167fdd..95060a4 100644 } } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 78dcb39..c5e995b 100644 +index f35e92e..921d7d5 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -327,4 +327,10 @@ public class SpigotConfig +@@ -328,4 +328,10 @@ public class SpigotConfig { saveUserCacheOnStopOnly = getBoolean( "settings.save-user-cache-on-stop-only", false ); } @@ -58,5 +58,5 @@ index 78dcb39..c5e995b 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch index 6002ada..e7087ac 100644 --- a/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch @@ -1,4 +1,4 @@ -From b4722530694ee61c1ebed13ba1c0e550e62fbbd6 Mon Sep 17 00:00:00 2001 +From 8e4e7ddb561ab48c6ed60a4f4fbbdf6cc2ed30c1 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 4 Jul 2014 23:03:13 +0200 Subject: [PATCH] Make "moved wrongly" limit configurable @@ -19,10 +19,10 @@ index 2469f48..3fe7038 100644 PlayerConnection.c.warn(this.player.getName() + " moved wrongly!"); } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index c5e995b..759a95a 100644 +index 921d7d5..7e774f2 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -333,4 +333,10 @@ public class SpigotConfig +@@ -334,4 +334,10 @@ public class SpigotConfig { intCacheLimit = getInt( "settings.int-cache-limit", 1024 ); } @@ -34,5 +34,5 @@ index c5e995b..759a95a 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch index 3e8da65..07b12bf 100644 --- a/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch @@ -1,4 +1,4 @@ -From f6c0aaefac6ec26633afb1c02fef8adc2e5e0c7a Mon Sep 17 00:00:00 2001 +From 1fb16f928836f17ffa517b01c58cd508a1d7f120 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Tue, 22 Jul 2014 15:59:01 +0200 Subject: [PATCH] Make "moved too quickly" limit configurable @@ -19,10 +19,10 @@ index 3fe7038..ccb21ed 100644 this.a(this.o, this.p, this.q, this.player.yaw, this.player.pitch); return; diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 759a95a..8233de7 100644 +index 7e774f2..2a23a4e 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -339,4 +339,10 @@ public class SpigotConfig +@@ -340,4 +340,10 @@ public class SpigotConfig { movedWronglyThreshold = getDouble( "settings.moved-wrongly-threshold", 0.0625D ); } @@ -34,5 +34,5 @@ index 759a95a..8233de7 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch index 3fb92db..6f0406c 100644 --- a/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From 3195bf83838b1ae725960fc7e3a5fec31a1563fb Mon Sep 17 00:00:00 2001 +From a61403a4a63d3cb2f3c78afd0089fe457ddeb029 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 28 Jul 2014 16:55:51 +1000 Subject: [PATCH] Allow Attribute Capping. @@ -40,7 +40,7 @@ index 59b06c4..0cc3e2f 100644 public static NBTTagList a(AttributeMapBase attributemapbase) { NBTTagList nbttaglist = new NBTTagList(); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 8233de7..8cc0d7c 100644 +index 2a23a4e..a187598 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -14,6 +14,8 @@ import java.util.Map; @@ -52,7 +52,7 @@ index 8233de7..8cc0d7c 100644 import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; import org.bukkit.ChatColor; -@@ -345,4 +347,17 @@ public class SpigotConfig +@@ -346,4 +348,17 @@ public class SpigotConfig { movedTooQuicklyThreshold = getDouble( "settings.moved-too-quickly-threshold", 100.0D ); } @@ -71,5 +71,5 @@ index 8233de7..8cc0d7c 100644 + } } -- -2.1.4 +1.9.0.msysgit.0 diff --git a/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch index 400923f..2e8cbd1 100644 --- a/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch @@ -1,11 +1,11 @@ -From 30e37ea979d293681e83f54326614f7d49259c72 Mon Sep 17 00:00:00 2001 +From d1f07a955fb6eb515f8bd117427c3d5e2941677d Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 17 Aug 2014 12:42:53 +0200 Subject: [PATCH] Make debug logging togglable. diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 8cc0d7c..4402fe5 100644 +index a187598..f6a67d6 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -17,6 +17,9 @@ import gnu.trove.map.hash.TObjectIntHashMap; @@ -18,7 +18,7 @@ index 8cc0d7c..4402fe5 100644 import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.Command; -@@ -360,4 +363,27 @@ public class SpigotConfig +@@ -361,4 +364,27 @@ public class SpigotConfig attackDamage = getDouble( "settings.attribute.attackDamage.max", attackDamage ); ( (AttributeRanged) GenericAttributes.ATTACK_DAMAGE ).b = attackDamage; } @@ -63,5 +63,5 @@ index 08d68aa..f37d1c2 100644 -- -2.1.4 +1.9.0.msysgit.0