diff --git a/Spigot-Server-Patches/0004-Paper-Metrics.patch b/Spigot-Server-Patches/0004-Paper-Metrics.patch
index 035fed498c..9dafc4030e 100644
--- a/Spigot-Server-Patches/0004-Paper-Metrics.patch
+++ b/Spigot-Server-Patches/0004-Paper-Metrics.patch
@@ -1,4 +1,4 @@
-From 2902500d723cf936cc974c37000b24330a44954d Mon Sep 17 00:00:00 2001
+From 830990ded44f082398d0a8dedce7c91b25db1243 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 24 Mar 2017 23:56:01 -0500
 Subject: [PATCH] Paper Metrics
@@ -15,20 +15,10 @@ decisions on behalf of the project.
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
 new file mode 100644
-index 000000000..585260697
+index 000000000..91c2aae03
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -0,0 +1,985 @@
-+/*
-+ * This is a modified version of the bStats-Metrics class, licensed under the GNU LGPL v3
-+ * 
-+ * The original version of this file, as of the creation of this modified version, can be found here:
-+ *     https://github.com/BtoBastian/bStats-Metrics/blob/94acfb0e97831d866b9e6a28d442a27e4862d954/bstats-bukkit/src/main/java/org/bstats/Metrics.java
-+ *     
-+ * The license that accompanies that file, as of the creation of this modified version, can be found here:
-+ *     https://github.com/BtoBastian/bStats-Metrics/blob/94acfb0e97831d866b9e6a28d442a27e4862d954/LICENSE
-+ */
-+
+@@ -0,0 +1,603 @@
 +package com.destroystokyo.paper;
 +
 +import net.minecraft.server.MinecraftServer;
@@ -38,18 +28,15 @@ index 000000000..585260697
 +import org.json.simple.JSONObject;
 +
 +import javax.net.ssl.HttpsURLConnection;
-+import java.io.*;
++import java.io.ByteArrayOutputStream;
++import java.io.DataOutputStream;
++import java.io.File;
++import java.io.IOException;
 +import java.net.URL;
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.Map;
-+import java.util.UUID;
-+import java.util.concurrent.Executors;
-+import java.util.concurrent.ScheduledExecutorService;
-+import java.util.concurrent.TimeUnit;
++import java.util.*;
++import java.util.concurrent.Callable;
 +import java.util.logging.Level;
++import java.util.logging.Logger;
 +import java.util.zip.GZIPOutputStream;
 +
 +/**
@@ -57,73 +44,45 @@ index 000000000..585260697
 + *
 + * Check out https://bStats.org/ to learn more about bStats!
 + */
-+class Metrics {
-+
-+    static {
-+        // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
-+        final String defaultPackage = new String(new byte[] { 'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's' });
-+        final String examplePackage = new String(new byte[] { 'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e' });
-+        // We want to make sure nobody just copy & pastes the example and use the wrong package names
-+        if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
-+            throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
-+        }
-+    }
++public class Metrics {
 +
 +    // The version of this bStats class
 +    public static final int B_STATS_VERSION = 1;
 +
 +    // The url to which the data is sent
-+    private static final String URL = "https://bStats.org/submitData/bukkit";
++    private static final String URL = "https://bStats.org/submitData/server-implementation";
 +
 +    // Should failed requests be logged?
-+    private static boolean logFailedRequests;
++    private static boolean logFailedRequests = false;
++
++    // The logger for the failed requests
++    private static Logger logger = Logger.getLogger("bStats");
++
++    // The name of the server software
++    private final String name;
 +
 +    // The uuid of the server
-+    private static String serverUUID;
++    private final String serverUUID;
 +
 +    // A list with all custom charts
 +    private final List<CustomChart> charts = new ArrayList<>();
-+    
-+    // Executor for use in scheduling work and submitting data
-+    private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
 +
 +    /**
 +     * Class constructor.
++     *
++     * @param name              The name of the server software.
++     * @param serverUUID        The uuid of the server.
++     * @param logFailedRequests Whether failed requests should be logged or not.
++     * @param logger            The logger for the failed requests.
 +     */
-+    public Metrics() {
++    public Metrics(String name, String serverUUID, boolean logFailedRequests, Logger logger) {
++        this.name = name;
++        this.serverUUID = serverUUID;
++        Metrics.logFailedRequests = logFailedRequests;
++        Metrics.logger = logger;
 +
-+        // Get the config file
-+        File configFile = new File(new File((File) MinecraftServer.getServer().options.valueOf("plugins"), "bStats"), "config.yml");
-+        YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-+
-+        // Check if the config file exists
-+        if (!config.isSet("serverUuid")) {
-+
-+            // Add default values
-+            config.addDefault("enabled", true);
-+            // Every server gets it's unique random id.
-+            config.addDefault("serverUuid", UUID.randomUUID().toString());
-+            // Should failed request be logged?
-+            config.addDefault("logFailedRequests", false);
-+
-+            // Inform the server owners about bStats
-+            config.options().header(
-+                    "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
-+                            "To honor their work, you should not disable it.\n" +
-+                            "This has nearly no effect on the server performance!\n" +
-+                            "Check out https://bStats.org/ to learn more :)"
-+            ).copyDefaults(true);
-+            try {
-+                config.save(configFile);
-+            } catch (IOException ignored) { }
-+        }
-+
-+        // Load the data
-+        serverUUID = config.getString("serverUuid");
-+        logFailedRequests = config.getBoolean("logFailedRequests", false);
-+        if (config.getBoolean("enabled", true)) {
-+            startSubmitting();
-+        }
++        // Start submitting the data
++        startSubmitting();
 +    }
 +
 +    /**
@@ -142,11 +101,13 @@ index 000000000..585260697
 +     * Starts the Scheduler which submits our data every 30 minutes.
 +     */
 +    private void startSubmitting() {
-+        executor.scheduleAtFixedRate(() -> {
-+                // Nevertheless we want our code to run in the main thread, so we have to use the MC scheduler
-+                // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
-+                MinecraftServer.getServer().postToMainThread(this::submitData);
-+        }, 5, 30, TimeUnit.MINUTES);
++        final Timer timer = new Timer(true);
++        timer.scheduleAtFixedRate(new TimerTask() {
++            @Override
++            public void run() {
++                submitData();
++            }
++        }, 1000 * 60 * 5, 1000 * 60 * 30);
 +        // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
 +        // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
 +        // WARNING: Just don't do it!
@@ -157,14 +118,10 @@ index 000000000..585260697
 +     *
 +     * @return The plugin specific data.
 +     */
-+    public JSONObject getPluginData() {
++    private JSONObject getPluginData() {
 +        JSONObject data = new JSONObject();
 +
-+        String pluginName = "Paper";
-+        String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
-+
-+        data.put("pluginName", pluginName); // Append the name of the plugin
-+        data.put("pluginVersion", pluginVersion); // Append the version of the plugin
++        data.put("pluginName", name); // Append the name of the server software
 +        JSONArray customCharts = new JSONArray();
 +        for (CustomChart customChart : charts) {
 +            // Add the data of the custom charts
@@ -185,14 +142,7 @@ index 000000000..585260697
 +     * @return The server specific data.
 +     */
 +    private JSONObject getServerData() {
-+        // Minecraft specific data
-+        int playerAmount = Bukkit.getOnlinePlayers().size();
-+        int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
-+        String bukkitVersion = org.bukkit.Bukkit.getVersion();
-+        bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
-+
-+        // OS/Java specific data
-+        String javaVersion = System.getProperty("java.version");
++        // OS specific data
 +        String osName = System.getProperty("os.name");
 +        String osArch = System.getProperty("os.arch");
 +        String osVersion = System.getProperty("os.version");
@@ -202,11 +152,6 @@ index 000000000..585260697
 +
 +        data.put("serverUUID", serverUUID);
 +
-+        data.put("playerAmount", playerAmount);
-+        data.put("onlineMode", onlineMode);
-+        data.put("bukkitVersion", bukkitVersion);
-+
-+        data.put("javaVersion", javaVersion);
 +        data.put("osName", osName);
 +        data.put("osArch", osArch);
 +        data.put("osVersion", osVersion);
@@ -222,21 +167,18 @@ index 000000000..585260697
 +        final JSONObject data = getServerData();
 +
 +        JSONArray pluginData = new JSONArray();
-+        pluginData.add(this.getPluginData());
++        pluginData.add(getPluginData());
 +        data.put("plugins", pluginData);
 +
-+        // Post to separate thread for the connection to the bStats server
-+        executor.execute(() -> {
-+            try {
-+                // Send the data
-+                sendData(data);
-+            } catch (Exception e) {
-+                // Something went wrong! :(
-+                if (logFailedRequests) {
-+                    Bukkit.getLogger().log(Level.WARNING, "Could not submit stats for Paper", e);
-+                }
++        try {
++            // We are still in the Thread of the timer, so nothing get blocked :)
++            sendData(data);
++        } catch (Exception e) {
++            // Something went wrong! :(
++            if (logFailedRequests) {
++                logger.log(Level.WARNING, "Could not submit stats of " + name, e);
 +            }
-+        });
++        }
 +    }
 +
 +    /**
@@ -249,9 +191,6 @@ index 000000000..585260697
 +        if (data == null) {
 +            throw new IllegalArgumentException("Data cannot be null!");
 +        }
-+        if (Bukkit.isPrimaryThread()) {
-+            throw new IllegalAccessException("This method must not be called from the main thread!");
-+        }
 +        HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
 +
 +        // Compress the data to save bandwidth
@@ -300,21 +239,21 @@ index 000000000..585260697
 +    public static abstract class CustomChart {
 +
 +        // The id of the chart
-+        protected final String chartId;
++        final String chartId;
 +
 +        /**
 +         * Class constructor.
 +         *
 +         * @param chartId The id of the chart.
 +         */
-+        public CustomChart(String chartId) {
++        CustomChart(String chartId) {
 +            if (chartId == null || chartId.isEmpty()) {
 +                throw new IllegalArgumentException("ChartId cannot be null or empty!");
 +            }
 +            this.chartId = chartId;
 +        }
 +
-+        protected JSONObject getRequestJsonObject() {
++        private JSONObject getRequestJsonObject() {
 +            JSONObject chart = new JSONObject();
 +            chart.put("chartId", chartId);
 +            try {
@@ -326,42 +265,39 @@ index 000000000..585260697
 +                chart.put("data", data);
 +            } catch (Throwable t) {
 +                if (logFailedRequests) {
-+                    Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
++                    logger.log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
 +                }
 +                return null;
 +            }
 +            return chart;
 +        }
 +
-+        protected abstract JSONObject getChartData();
++        protected abstract JSONObject getChartData() throws Exception;
 +
 +    }
 +
 +    /**
 +     * Represents a custom simple pie.
 +     */
-+    public static abstract class SimplePie extends CustomChart {
++    public static class SimplePie extends CustomChart {
++
++        private final Callable<String> callable;
 +
 +        /**
 +         * Class constructor.
 +         *
-+         * @param chartId The id of the chart.
++         * @param chartId  The id of the chart.
++         * @param callable The callable which is used to request the chart data.
 +         */
-+        public SimplePie(String chartId) {
++        public SimplePie(String chartId, Callable<String> callable) {
 +            super(chartId);
++            this.callable = callable;
 +        }
 +
-+        /**
-+         * Gets the value of the pie.
-+         *
-+         * @return The value of the pie.
-+         */
-+        public abstract String getValue();
-+
 +        @Override
-+        protected JSONObject getChartData() {
++        protected JSONObject getChartData() throws Exception {
 +            JSONObject data = new JSONObject();
-+            String value = getValue();
++            String value = callable.call();
 +            if (value == null || value.isEmpty()) {
 +                // Null = skip the chart
 +                return null;
@@ -374,31 +310,26 @@ index 000000000..585260697
 +    /**
 +     * Represents a custom advanced pie.
 +     */
-+    public static abstract class AdvancedPie extends CustomChart {
++    public static class AdvancedPie extends CustomChart {
++
++        private final Callable<Map<String, Integer>> callable;
 +
 +        /**
 +         * Class constructor.
 +         *
-+         * @param chartId The id of the chart.
++         * @param chartId  The id of the chart.
++         * @param callable The callable which is used to request the chart data.
 +         */
-+        public AdvancedPie(String chartId) {
++        public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
 +            super(chartId);
++            this.callable = callable;
 +        }
 +
-+        /**
-+         * Gets the values of the pie.
-+         *
-+         * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
-+         *                 You don't have to create a map yourself!
-+         * @return The values of the pie.
-+         */
-+        public abstract HashMap<String, Integer> getValues(HashMap<String, Integer> valueMap);
-+
 +        @Override
-+        protected JSONObject getChartData() {
++        protected JSONObject getChartData() throws Exception {
 +            JSONObject data = new JSONObject();
 +            JSONObject values = new JSONObject();
-+            HashMap<String, Integer> map = getValues(new HashMap<String, Integer>());
++            Map<String, Integer> map = callable.call();
 +            if (map == null || map.isEmpty()) {
 +                // Null = skip the chart
 +                return null;
@@ -421,30 +352,76 @@ index 000000000..585260697
 +    }
 +
 +    /**
-+     * Represents a custom single line chart.
++     * Represents a custom drilldown pie.
 +     */
-+    public static abstract class SingleLineChart extends CustomChart {
++    public static class DrilldownPie extends CustomChart {
++
++        private final Callable<Map<String, Map<String, Integer>>> callable;
 +
 +        /**
 +         * Class constructor.
 +         *
-+         * @param chartId The id of the chart.
++         * @param chartId  The id of the chart.
++         * @param callable The callable which is used to request the chart data.
 +         */
-+        public SingleLineChart(String chartId) {
++        public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
 +            super(chartId);
++            this.callable = callable;
 +        }
 +
++        @Override
++        public JSONObject getChartData() throws Exception {
++            JSONObject data = new JSONObject();
++            JSONObject values = new JSONObject();
++            Map<String, Map<String, Integer>> map = callable.call();
++            if (map == null || map.isEmpty()) {
++                // Null = skip the chart
++                return null;
++            }
++            boolean reallyAllSkipped = true;
++            for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
++                JSONObject value = new JSONObject();
++                boolean allSkipped = true;
++                for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
++                    value.put(valueEntry.getKey(), valueEntry.getValue());
++                    allSkipped = false;
++                }
++                if (!allSkipped) {
++                    reallyAllSkipped = false;
++                    values.put(entryValues.getKey(), value);
++                }
++            }
++            if (reallyAllSkipped) {
++                // Null = skip the chart
++                return null;
++            }
++            data.put("values", values);
++            return data;
++        }
++    }
++
++    /**
++     * Represents a custom single line chart.
++     */
++    public static class SingleLineChart extends CustomChart {
++
++        private final Callable<Integer> callable;
++
 +        /**
-+         * Gets the value of the chart.
++         * Class constructor.
 +         *
-+         * @return The value of the chart.
++         * @param chartId  The id of the chart.
++         * @param callable The callable which is used to request the chart data.
 +         */
-+        public abstract int getValue();
++        public SingleLineChart(String chartId, Callable<Integer> callable) {
++            super(chartId);
++            this.callable = callable;
++        }
 +
 +        @Override
-+        protected JSONObject getChartData() {
++        protected JSONObject getChartData() throws Exception {
 +            JSONObject data = new JSONObject();
-+            int value = getValue();
++            int value = callable.call();
 +            if (value == 0) {
 +                // Null = skip the chart
 +                return null;
@@ -458,31 +435,26 @@ index 000000000..585260697
 +    /**
 +     * Represents a custom multi line chart.
 +     */
-+    public static abstract class MultiLineChart extends CustomChart {
++    public static class MultiLineChart extends CustomChart {
++
++        private final Callable<Map<String, Integer>> callable;
 +
 +        /**
 +         * Class constructor.
 +         *
-+         * @param chartId The id of the chart.
++         * @param chartId  The id of the chart.
++         * @param callable The callable which is used to request the chart data.
 +         */
-+        public MultiLineChart(String chartId) {
++        public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
 +            super(chartId);
++            this.callable = callable;
 +        }
 +
-+        /**
-+         * Gets the values of the chart.
-+         *
-+         * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
-+         *                 You don't have to create a map yourself!
-+         * @return The values of the chart.
-+         */
-+        public abstract HashMap<String, Integer> getValues(HashMap<String, Integer> valueMap);
-+
 +        @Override
-+        protected JSONObject getChartData() {
++        protected JSONObject getChartData() throws Exception {
 +            JSONObject data = new JSONObject();
 +            JSONObject values = new JSONObject();
-+            HashMap<String, Integer> map = getValues(new HashMap<String, Integer>());
++            Map<String, Integer> map = callable.call();
 +            if (map == null || map.isEmpty()) {
 +                // Null = skip the chart
 +                return null;
@@ -508,31 +480,26 @@ index 000000000..585260697
 +    /**
 +     * Represents a custom simple bar chart.
 +     */
-+    public static abstract class SimpleBarChart extends CustomChart {
++    public static class SimpleBarChart extends CustomChart {
++
++        private final Callable<Map<String, Integer>> callable;
 +
 +        /**
 +         * Class constructor.
 +         *
-+         * @param chartId The id of the chart.
++         * @param chartId  The id of the chart.
++         * @param callable The callable which is used to request the chart data.
 +         */
-+        public SimpleBarChart(String chartId) {
++        public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
 +            super(chartId);
++            this.callable = callable;
 +        }
 +
-+        /**
-+         * Gets the value of the chart.
-+         *
-+         * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
-+         *                 You don't have to create a map yourself!
-+         * @return The value of the chart.
-+         */
-+        public abstract HashMap<String, Integer> getValues(HashMap<String, Integer> valueMap);
-+
 +        @Override
-+        protected JSONObject getChartData() {
++        protected JSONObject getChartData() throws Exception {
 +            JSONObject data = new JSONObject();
 +            JSONObject values = new JSONObject();
-+            HashMap<String, Integer> map = getValues(new HashMap<String, Integer>());
++            Map<String, Integer> map = callable.call();
 +            if (map == null || map.isEmpty()) {
 +                // Null = skip the chart
 +                return null;
@@ -551,31 +518,26 @@ index 000000000..585260697
 +    /**
 +     * Represents a custom advanced bar chart.
 +     */
-+    public static abstract class AdvancedBarChart extends CustomChart {
++    public static class AdvancedBarChart extends CustomChart {
++
++        private final Callable<Map<String, int[]>> callable;
 +
 +        /**
 +         * Class constructor.
 +         *
-+         * @param chartId The id of the chart.
++         * @param chartId  The id of the chart.
++         * @param callable The callable which is used to request the chart data.
 +         */
-+        public AdvancedBarChart(String chartId) {
++        public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
 +            super(chartId);
++            this.callable = callable;
 +        }
 +
-+        /**
-+         * Gets the value of the chart.
-+         *
-+         * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
-+         *                 You don't have to create a map yourself!
-+         * @return The value of the chart.
-+         */
-+        public abstract HashMap<String, int[]> getValues(HashMap<String, int[]> valueMap);
-+
 +        @Override
-+        protected JSONObject getChartData() {
++        protected JSONObject getChartData() throws Exception {
 +            JSONObject data = new JSONObject();
 +            JSONObject values = new JSONObject();
-+            HashMap<String, int[]> map = getValues(new HashMap<String, int[]>());
++            Map<String, int[]> map = callable.call();
 +            if (map == null || map.isEmpty()) {
 +                // Null = skip the chart
 +                return null;
@@ -602,429 +564,84 @@ index 000000000..585260697
 +
 +    }
 +
-+    /**
-+     * Represents a custom simple map chart.
-+     */
-+    public static abstract class SimpleMapChart extends CustomChart {
++    static class PaperMetrics {
++        static void startMetrics() {
++            // Get the config file
++            File configFile = new File(new File((File) MinecraftServer.getServer().options.valueOf("plugins"), "bStats"), "config.yml");
++            YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
 +
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId The id of the chart.
-+         */
-+        public SimpleMapChart(String chartId) {
-+            super(chartId);
-+        }
++            // Check if the config file exists
++            if (!config.isSet("serverUuid")) {
 +
-+        /**
-+         * Gets the value of the chart.
-+         *
-+         * @return The value of the chart.
-+         */
-+        public abstract Country getValue();
++                // Add default values
++                config.addDefault("enabled", true);
++                // Every server gets it's unique random id.
++                config.addDefault("serverUuid", UUID.randomUUID().toString());
++                // Should failed request be logged?
++                config.addDefault("logFailedRequests", false);
 +
-+        @Override
-+        protected JSONObject getChartData() {
-+            JSONObject data = new JSONObject();
-+            Country value = getValue();
-+
-+            if (value == null) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("value", value.getCountryIsoTag());
-+            return data;
-+        }
-+
-+    }
-+
-+    /**
-+     * Represents a custom advanced map chart.
-+     */
-+    public static abstract class AdvancedMapChart extends CustomChart {
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId The id of the chart.
-+         */
-+        public AdvancedMapChart(String chartId) {
-+            super(chartId);
-+        }
-+
-+        /**
-+         * Gets the value of the chart.
-+         *
-+         * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
-+         *                 You don't have to create a map yourself!
-+         * @return The value of the chart.
-+         */
-+        public abstract HashMap<Country, Integer> getValues(HashMap<Country, Integer> valueMap);
-+
-+        @Override
-+        protected JSONObject getChartData() {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            HashMap<Country, Integer> map = getValues(new HashMap<Country, Integer>());
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            boolean allSkipped = true;
-+            for (Map.Entry<Country, Integer> entry : map.entrySet()) {
-+                if (entry.getValue() == 0) {
-+                    continue; // Skip this invalid
-+                }
-+                allSkipped = false;
-+                values.put(entry.getKey().getCountryIsoTag(), entry.getValue());
-+            }
-+            if (allSkipped) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+
-+    }
-+
-+    /**
-+     * A enum which is used for custom maps.
-+     */
-+    public enum Country {
-+
-+        /**
-+         * bStats will use the country of the server.
-+         */
-+        AUTO_DETECT("AUTO", "Auto Detected"),
-+
-+        ANDORRA("AD", "Andorra"),
-+        UNITED_ARAB_EMIRATES("AE", "United Arab Emirates"),
-+        AFGHANISTAN("AF", "Afghanistan"),
-+        ANTIGUA_AND_BARBUDA("AG", "Antigua and Barbuda"),
-+        ANGUILLA("AI", "Anguilla"),
-+        ALBANIA("AL", "Albania"),
-+        ARMENIA("AM", "Armenia"),
-+        NETHERLANDS_ANTILLES("AN", "Netherlands Antilles"),
-+        ANGOLA("AO", "Angola"),
-+        ANTARCTICA("AQ", "Antarctica"),
-+        ARGENTINA("AR", "Argentina"),
-+        AMERICAN_SAMOA("AS", "American Samoa"),
-+        AUSTRIA("AT", "Austria"),
-+        AUSTRALIA("AU", "Australia"),
-+        ARUBA("AW", "Aruba"),
-+        ALAND_ISLANDS("AX", "Åland Islands"),
-+        AZERBAIJAN("AZ", "Azerbaijan"),
-+        BOSNIA_AND_HERZEGOVINA("BA", "Bosnia and Herzegovina"),
-+        BARBADOS("BB", "Barbados"),
-+        BANGLADESH("BD", "Bangladesh"),
-+        BELGIUM("BE", "Belgium"),
-+        BURKINA_FASO("BF", "Burkina Faso"),
-+        BULGARIA("BG", "Bulgaria"),
-+        BAHRAIN("BH", "Bahrain"),
-+        BURUNDI("BI", "Burundi"),
-+        BENIN("BJ", "Benin"),
-+        SAINT_BARTHELEMY("BL", "Saint Barthélemy"),
-+        BERMUDA("BM", "Bermuda"),
-+        BRUNEI("BN", "Brunei"),
-+        BOLIVIA("BO", "Bolivia"),
-+        BONAIRE_SINT_EUSTATIUS_AND_SABA("BQ", "Bonaire, Sint Eustatius and Saba"),
-+        BRAZIL("BR", "Brazil"),
-+        BAHAMAS("BS", "Bahamas"),
-+        BHUTAN("BT", "Bhutan"),
-+        BOUVET_ISLAND("BV", "Bouvet Island"),
-+        BOTSWANA("BW", "Botswana"),
-+        BELARUS("BY", "Belarus"),
-+        BELIZE("BZ", "Belize"),
-+        CANADA("CA", "Canada"),
-+        COCOS_ISLANDS("CC", "Cocos Islands"),
-+        THE_DEMOCRATIC_REPUBLIC_OF_CONGO("CD", "The Democratic Republic Of Congo"),
-+        CENTRAL_AFRICAN_REPUBLIC("CF", "Central African Republic"),
-+        CONGO("CG", "Congo"),
-+        SWITZERLAND("CH", "Switzerland"),
-+        COTE_D_IVOIRE("CI", "Côte d'Ivoire"),
-+        COOK_ISLANDS("CK", "Cook Islands"),
-+        CHILE("CL", "Chile"),
-+        CAMEROON("CM", "Cameroon"),
-+        CHINA("CN", "China"),
-+        COLOMBIA("CO", "Colombia"),
-+        COSTA_RICA("CR", "Costa Rica"),
-+        CUBA("CU", "Cuba"),
-+        CAPE_VERDE("CV", "Cape Verde"),
-+        CURACAO("CW", "Curaçao"),
-+        CHRISTMAS_ISLAND("CX", "Christmas Island"),
-+        CYPRUS("CY", "Cyprus"),
-+        CZECH_REPUBLIC("CZ", "Czech Republic"),
-+        GERMANY("DE", "Germany"),
-+        DJIBOUTI("DJ", "Djibouti"),
-+        DENMARK("DK", "Denmark"),
-+        DOMINICA("DM", "Dominica"),
-+        DOMINICAN_REPUBLIC("DO", "Dominican Republic"),
-+        ALGERIA("DZ", "Algeria"),
-+        ECUADOR("EC", "Ecuador"),
-+        ESTONIA("EE", "Estonia"),
-+        EGYPT("EG", "Egypt"),
-+        WESTERN_SAHARA("EH", "Western Sahara"),
-+        ERITREA("ER", "Eritrea"),
-+        SPAIN("ES", "Spain"),
-+        ETHIOPIA("ET", "Ethiopia"),
-+        FINLAND("FI", "Finland"),
-+        FIJI("FJ", "Fiji"),
-+        FALKLAND_ISLANDS("FK", "Falkland Islands"),
-+        MICRONESIA("FM", "Micronesia"),
-+        FAROE_ISLANDS("FO", "Faroe Islands"),
-+        FRANCE("FR", "France"),
-+        GABON("GA", "Gabon"),
-+        UNITED_KINGDOM("GB", "United Kingdom"),
-+        GRENADA("GD", "Grenada"),
-+        GEORGIA("GE", "Georgia"),
-+        FRENCH_GUIANA("GF", "French Guiana"),
-+        GUERNSEY("GG", "Guernsey"),
-+        GHANA("GH", "Ghana"),
-+        GIBRALTAR("GI", "Gibraltar"),
-+        GREENLAND("GL", "Greenland"),
-+        GAMBIA("GM", "Gambia"),
-+        GUINEA("GN", "Guinea"),
-+        GUADELOUPE("GP", "Guadeloupe"),
-+        EQUATORIAL_GUINEA("GQ", "Equatorial Guinea"),
-+        GREECE("GR", "Greece"),
-+        SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS("GS", "South Georgia And The South Sandwich Islands"),
-+        GUATEMALA("GT", "Guatemala"),
-+        GUAM("GU", "Guam"),
-+        GUINEA_BISSAU("GW", "Guinea-Bissau"),
-+        GUYANA("GY", "Guyana"),
-+        HONG_KONG("HK", "Hong Kong"),
-+        HEARD_ISLAND_AND_MCDONALD_ISLANDS("HM", "Heard Island And McDonald Islands"),
-+        HONDURAS("HN", "Honduras"),
-+        CROATIA("HR", "Croatia"),
-+        HAITI("HT", "Haiti"),
-+        HUNGARY("HU", "Hungary"),
-+        INDONESIA("ID", "Indonesia"),
-+        IRELAND("IE", "Ireland"),
-+        ISRAEL("IL", "Israel"),
-+        ISLE_OF_MAN("IM", "Isle Of Man"),
-+        INDIA("IN", "India"),
-+        BRITISH_INDIAN_OCEAN_TERRITORY("IO", "British Indian Ocean Territory"),
-+        IRAQ("IQ", "Iraq"),
-+        IRAN("IR", "Iran"),
-+        ICELAND("IS", "Iceland"),
-+        ITALY("IT", "Italy"),
-+        JERSEY("JE", "Jersey"),
-+        JAMAICA("JM", "Jamaica"),
-+        JORDAN("JO", "Jordan"),
-+        JAPAN("JP", "Japan"),
-+        KENYA("KE", "Kenya"),
-+        KYRGYZSTAN("KG", "Kyrgyzstan"),
-+        CAMBODIA("KH", "Cambodia"),
-+        KIRIBATI("KI", "Kiribati"),
-+        COMOROS("KM", "Comoros"),
-+        SAINT_KITTS_AND_NEVIS("KN", "Saint Kitts And Nevis"),
-+        NORTH_KOREA("KP", "North Korea"),
-+        SOUTH_KOREA("KR", "South Korea"),
-+        KUWAIT("KW", "Kuwait"),
-+        CAYMAN_ISLANDS("KY", "Cayman Islands"),
-+        KAZAKHSTAN("KZ", "Kazakhstan"),
-+        LAOS("LA", "Laos"),
-+        LEBANON("LB", "Lebanon"),
-+        SAINT_LUCIA("LC", "Saint Lucia"),
-+        LIECHTENSTEIN("LI", "Liechtenstein"),
-+        SRI_LANKA("LK", "Sri Lanka"),
-+        LIBERIA("LR", "Liberia"),
-+        LESOTHO("LS", "Lesotho"),
-+        LITHUANIA("LT", "Lithuania"),
-+        LUXEMBOURG("LU", "Luxembourg"),
-+        LATVIA("LV", "Latvia"),
-+        LIBYA("LY", "Libya"),
-+        MOROCCO("MA", "Morocco"),
-+        MONACO("MC", "Monaco"),
-+        MOLDOVA("MD", "Moldova"),
-+        MONTENEGRO("ME", "Montenegro"),
-+        SAINT_MARTIN("MF", "Saint Martin"),
-+        MADAGASCAR("MG", "Madagascar"),
-+        MARSHALL_ISLANDS("MH", "Marshall Islands"),
-+        MACEDONIA("MK", "Macedonia"),
-+        MALI("ML", "Mali"),
-+        MYANMAR("MM", "Myanmar"),
-+        MONGOLIA("MN", "Mongolia"),
-+        MACAO("MO", "Macao"),
-+        NORTHERN_MARIANA_ISLANDS("MP", "Northern Mariana Islands"),
-+        MARTINIQUE("MQ", "Martinique"),
-+        MAURITANIA("MR", "Mauritania"),
-+        MONTSERRAT("MS", "Montserrat"),
-+        MALTA("MT", "Malta"),
-+        MAURITIUS("MU", "Mauritius"),
-+        MALDIVES("MV", "Maldives"),
-+        MALAWI("MW", "Malawi"),
-+        MEXICO("MX", "Mexico"),
-+        MALAYSIA("MY", "Malaysia"),
-+        MOZAMBIQUE("MZ", "Mozambique"),
-+        NAMIBIA("NA", "Namibia"),
-+        NEW_CALEDONIA("NC", "New Caledonia"),
-+        NIGER("NE", "Niger"),
-+        NORFOLK_ISLAND("NF", "Norfolk Island"),
-+        NIGERIA("NG", "Nigeria"),
-+        NICARAGUA("NI", "Nicaragua"),
-+        NETHERLANDS("NL", "Netherlands"),
-+        NORWAY("NO", "Norway"),
-+        NEPAL("NP", "Nepal"),
-+        NAURU("NR", "Nauru"),
-+        NIUE("NU", "Niue"),
-+        NEW_ZEALAND("NZ", "New Zealand"),
-+        OMAN("OM", "Oman"),
-+        PANAMA("PA", "Panama"),
-+        PERU("PE", "Peru"),
-+        FRENCH_POLYNESIA("PF", "French Polynesia"),
-+        PAPUA_NEW_GUINEA("PG", "Papua New Guinea"),
-+        PHILIPPINES("PH", "Philippines"),
-+        PAKISTAN("PK", "Pakistan"),
-+        POLAND("PL", "Poland"),
-+        SAINT_PIERRE_AND_MIQUELON("PM", "Saint Pierre And Miquelon"),
-+        PITCAIRN("PN", "Pitcairn"),
-+        PUERTO_RICO("PR", "Puerto Rico"),
-+        PALESTINE("PS", "Palestine"),
-+        PORTUGAL("PT", "Portugal"),
-+        PALAU("PW", "Palau"),
-+        PARAGUAY("PY", "Paraguay"),
-+        QATAR("QA", "Qatar"),
-+        REUNION("RE", "Reunion"),
-+        ROMANIA("RO", "Romania"),
-+        SERBIA("RS", "Serbia"),
-+        RUSSIA("RU", "Russia"),
-+        RWANDA("RW", "Rwanda"),
-+        SAUDI_ARABIA("SA", "Saudi Arabia"),
-+        SOLOMON_ISLANDS("SB", "Solomon Islands"),
-+        SEYCHELLES("SC", "Seychelles"),
-+        SUDAN("SD", "Sudan"),
-+        SWEDEN("SE", "Sweden"),
-+        SINGAPORE("SG", "Singapore"),
-+        SAINT_HELENA("SH", "Saint Helena"),
-+        SLOVENIA("SI", "Slovenia"),
-+        SVALBARD_AND_JAN_MAYEN("SJ", "Svalbard And Jan Mayen"),
-+        SLOVAKIA("SK", "Slovakia"),
-+        SIERRA_LEONE("SL", "Sierra Leone"),
-+        SAN_MARINO("SM", "San Marino"),
-+        SENEGAL("SN", "Senegal"),
-+        SOMALIA("SO", "Somalia"),
-+        SURINAME("SR", "Suriname"),
-+        SOUTH_SUDAN("SS", "South Sudan"),
-+        SAO_TOME_AND_PRINCIPE("ST", "Sao Tome And Principe"),
-+        EL_SALVADOR("SV", "El Salvador"),
-+        SINT_MAARTEN_DUTCH_PART("SX", "Sint Maarten (Dutch part)"),
-+        SYRIA("SY", "Syria"),
-+        SWAZILAND("SZ", "Swaziland"),
-+        TURKS_AND_CAICOS_ISLANDS("TC", "Turks And Caicos Islands"),
-+        CHAD("TD", "Chad"),
-+        FRENCH_SOUTHERN_TERRITORIES("TF", "French Southern Territories"),
-+        TOGO("TG", "Togo"),
-+        THAILAND("TH", "Thailand"),
-+        TAJIKISTAN("TJ", "Tajikistan"),
-+        TOKELAU("TK", "Tokelau"),
-+        TIMOR_LESTE("TL", "Timor-Leste"),
-+        TURKMENISTAN("TM", "Turkmenistan"),
-+        TUNISIA("TN", "Tunisia"),
-+        TONGA("TO", "Tonga"),
-+        TURKEY("TR", "Turkey"),
-+        TRINIDAD_AND_TOBAGO("TT", "Trinidad and Tobago"),
-+        TUVALU("TV", "Tuvalu"),
-+        TAIWAN("TW", "Taiwan"),
-+        TANZANIA("TZ", "Tanzania"),
-+        UKRAINE("UA", "Ukraine"),
-+        UGANDA("UG", "Uganda"),
-+        UNITED_STATES_MINOR_OUTLYING_ISLANDS("UM", "United States Minor Outlying Islands"),
-+        UNITED_STATES("US", "United States"),
-+        URUGUAY("UY", "Uruguay"),
-+        UZBEKISTAN("UZ", "Uzbekistan"),
-+        VATICAN("VA", "Vatican"),
-+        SAINT_VINCENT_AND_THE_GRENADINES("VC", "Saint Vincent And The Grenadines"),
-+        VENEZUELA("VE", "Venezuela"),
-+        BRITISH_VIRGIN_ISLANDS("VG", "British Virgin Islands"),
-+        U_S__VIRGIN_ISLANDS("VI", "U.S. Virgin Islands"),
-+        VIETNAM("VN", "Vietnam"),
-+        VANUATU("VU", "Vanuatu"),
-+        WALLIS_AND_FUTUNA("WF", "Wallis And Futuna"),
-+        SAMOA("WS", "Samoa"),
-+        YEMEN("YE", "Yemen"),
-+        MAYOTTE("YT", "Mayotte"),
-+        SOUTH_AFRICA("ZA", "South Africa"),
-+        ZAMBIA("ZM", "Zambia"),
-+        ZIMBABWE("ZW", "Zimbabwe");
-+
-+        private String isoTag;
-+        private String name;
-+
-+        Country(String isoTag, String name) {
-+            this.isoTag = isoTag;
-+            this.name = name;
-+        }
-+
-+        /**
-+         * Gets the name of the country.
-+         *
-+         * @return The name of the country.
-+         */
-+        public String getCountryName() {
-+            return name;
-+        }
-+
-+        /**
-+         * Gets the iso tag of the country.
-+         *
-+         * @return The iso tag of the country.
-+         */
-+        public String getCountryIsoTag() {
-+            return isoTag;
-+        }
-+
-+        /**
-+         * Gets a country by it's iso tag.
-+         *
-+         * @param isoTag The iso tag of the county.
-+         * @return The country with the given iso tag or <code>null</code> if unknown.
-+         */
-+        public static Country byIsoTag(String isoTag) {
-+            for (Country country : Country.values()) {
-+                if (country.getCountryIsoTag().equals(isoTag)) {
-+                    return country;
++                // Inform the server owners about bStats
++                config.options().header(
++                        "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
++                                "To honor their work, you should not disable it.\n" +
++                                "This has nearly no effect on the server performance!\n" +
++                                "Check out https://bStats.org/ to learn more :)"
++                ).copyDefaults(true);
++                try {
++                    config.save(configFile);
++                } catch (IOException ignored) {
 +                }
 +            }
-+            return null;
-+        }
++            // Load the data
++            String serverUUID = config.getString("serverUuid");
++            boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
++            // Only start Metrics, if it's enabled in the config
++            if (config.getBoolean("enabled", true)) {
++                Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
 +
-+        /**
-+         * Gets a country by a locale.
-+         *
-+         * @param locale The locale.
-+         * @return The country from the giben locale or <code>null</code> if unknown country or
-+         *         if the locale does not contain a country.
-+         */
-+        public static Country byLocale(Locale locale) {
-+            return byIsoTag(locale.getCountry());
-+        }
++                metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
++                    String minecraftVersion = Bukkit.getVersion();
++                    minecraftVersion = minecraftVersion.substring(minecraftVersion.indexOf("MC: ") + 4, minecraftVersion.length() - 1);
++                    return minecraftVersion;
++                }));
 +
++                metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
++                metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline"));
++                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"));
++
++                metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
++                    Map<String, Map<String, Integer>> map = new HashMap<>();
++                    String javaVersion = System.getProperty("java.version");
++                    Map<String, Integer> entry = new HashMap<>();
++                    entry.put(javaVersion, 1);
++                    map.put("Java " + javaVersion.substring(0, 3), entry);
++                    return map;
++                }));
++            }
++
++        }
 +    }
-+
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 328ff012b..75d4048a9 100644
+index 328ff012b..1594d7ca4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -39,7 +39,8 @@ public class PaperConfig {
+@@ -39,6 +39,7 @@ public class PaperConfig {
      static Map<String, Command> commands;
      private static boolean verbose;
      /*========================================================================*/
--
-+    private static Metrics metrics;
-+    
++    private static boolean metricsStarted;
+ 
      public static void init(File configFile) {
          CONFIG_FILE = configFile;
-         config = new YamlConfiguration();
-@@ -72,6 +73,10 @@ public class PaperConfig {
+@@ -72,6 +73,11 @@ public class PaperConfig {
          for (Map.Entry<String, Command> entry : commands.entrySet()) {
              MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue());
          }
-+        
-+        if (metrics == null) {
-+            metrics = new Metrics();
++
++        if (!metricsStarted) {
++            Metrics.PaperMetrics.startMetrics();
++            metricsStarted = true;
 +        }
      }
  
@@ -1050,5 +667,5 @@ index d386a876b..ba51303b2 100644
  
      static void readConfig(Class<?> clazz, Object instance)
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index 65b698cefe..60c8212d14 100644
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,11 +1,11 @@
-From 7d15c7cd26f998e90cb1854d92547f803d07a40b Mon Sep 17 00:00:00 2001
+From be6fc8fd90adbee10abc3c19b9baffa4e9b55618 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
 
 
 diff --git a/pom.xml b/pom.xml
-index 8b96966d..8d1e8680 100644
+index 8b96966d8..8d1e8680b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -66,6 +66,12 @@
@@ -23,7 +23,7 @@ index 8b96966d..8d1e8680 100644
              <version>3.0.3</version>
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 00000000..4b4b77a5
+index 000000000..4b4b77a5c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,124 @@
@@ -153,7 +153,7 @@ index 00000000..4b4b77a5
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 00000000..b79f1be7
+index 000000000..b79f1be7a
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,126 @@
@@ -285,7 +285,7 @@ index 00000000..b79f1be7
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 00000000..e7789117
+index 000000000..e7789117b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,101 @@
@@ -391,7 +391,7 @@ index 00000000..e7789117
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 75d4048a..1ea799d5 100644
+index 1594d7ca4..007589314 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -409,7 +409,7 @@ index 75d4048a..1ea799d5 100644
  
  public class PaperConfig {
  
-@@ -175,4 +178,24 @@ public class PaperConfig {
+@@ -176,4 +179,24 @@ public class PaperConfig {
          config.addDefault(path, def);
          return config.getString(path, config.getString(path));
      }
@@ -435,7 +435,7 @@ index 75d4048a..1ea799d5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e8511ac9..d3f1a4ac 100644
+index e8511ac9a..d3f1a4ac0 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -35,6 +35,15 @@ public class Block {
@@ -455,7 +455,7 @@ index e8511ac9..d3f1a4ac 100644
      public static int getId(Block block) {
          return Block.REGISTRY.a(block); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 81fc04ed..bd3b1602 100644
+index 81fc04ed3..bd3b16025 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -900,7 +900,7 @@ public class Chunk {
@@ -503,7 +503,7 @@ index 81fc04ed..bd3b1602 100644
  
      private void z() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index daf2c0a6..3ba489d4 100644
+index daf2c0a67..3ba489d4f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -195,7 +195,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -525,7 +525,7 @@ index daf2c0a6..3ba489d4 100644
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a97e7d3c..4890023d 100644
+index a97e7d3c2..4890023d7 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -565,7 +565,7 @@ index a97e7d3c..4890023d 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index cb83e4f5..e6819139 100644
+index cb83e4f56..e6819139f 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -23,7 +23,7 @@ import java.io.PrintStream;
@@ -618,7 +618,7 @@ index cb83e4f5..e6819139 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9bd9dc28..14d23556 100644
+index 9bd9dc28b..14d23556f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
@@ -657,7 +657,7 @@ index 9bd9dc28..14d23556 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e9002c95..b22f81b1 100644
+index e9002c953..b22f81b12 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -728,7 +728,7 @@ index e9002c95..b22f81b1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 347a2b67..aceb08ce 100644
+index 347a2b671..aceb08ce1 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -175,7 +175,7 @@ public class EntityTracker {
@@ -759,7 +759,7 @@ index 347a2b67..aceb08ce 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cc0efa2e..1b432f0d 100644
+index cc0efa2e0..1b432f0d7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -47,8 +47,8 @@ import org.bukkit.Bukkit;
@@ -900,7 +900,7 @@ index cc0efa2e..1b432f0d 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 703d5813..021dfba1 100644
+index 703d5813d..021dfba14 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -1000,7 +1000,7 @@ index 703d5813..021dfba1 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9897bade..27283efa 100644
+index 9897bade8..27283efad 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1048,7 +1048,7 @@ index 9897bade..27283efa 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index f74b0679..1fc632e0 100644
+index f74b06794..1fc632e0c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,15 +1,21 @@
@@ -1078,7 +1078,7 @@ index f74b0679..1fc632e0 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index be52f3ad..d778eafb 100644
+index be52f3ad1..d778eafb3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1102,7 +1102,7 @@ index be52f3ad..d778eafb 100644
  
      public void addWhitelist(GameProfile gameprofile) {
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index f1f20650..fb350c40 100644
+index f1f206501..fb350c408 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -1,5 +1,7 @@
@@ -1144,7 +1144,7 @@ index f1f20650..fb350c40 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 6958a2e0..b3d3df4c 100644
+index 6958a2e0f..b3d3df4cf 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1164,7 +1164,7 @@ index 6958a2e0..b3d3df4c 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 758962e6..a87b3727 100644
+index 758962e67..a87b37277 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@@ -1270,7 +1270,7 @@ index 758962e6..a87b3727 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 391a09c5..96693899 100644
+index 391a09c52..966938997 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -247,13 +247,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -1403,7 +1403,7 @@ index 391a09c5..96693899 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 587d23df..d27e2ce9 100644
+index 587d23dfd..d27e2ce98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1741,6 +1741,7 @@ public final class CraftServer implements Server {
@@ -1441,7 +1441,7 @@ index 587d23df..d27e2ce9 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 41d2d87e..00000000
+index 41d2d87ee..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,173 +0,0 @@
@@ -1619,7 +1619,7 @@ index 41d2d87e..00000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b446..b5efb9c3 100644
+index 3a95b4465..b5efb9c3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1663,7 +1663,7 @@ index 3a95b446..b5efb9c3 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5ceb086e..b56ae7a3 100644
+index 5ceb086e5..b56ae7a36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -39,15 +39,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1697,7 +1697,7 @@ index 5ceb086e..b56ae7a3 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 92d217bc..9952b64b 100644
+index 92d217bce..9952b64be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@@ -1773,7 +1773,7 @@ index 92d217bc..9952b64b 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 220e39ab..afc6c17e 100644
+index 220e39abe..afc6c17e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,8 +1,8 @@
@@ -1855,7 +1855,7 @@ index 220e39ab..afc6c17e 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b..3d90b342 100644
+index e52ef47b7..3d90b3426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1867,7 +1867,7 @@ index e52ef47b..3d90b342 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c32d44df..5c2fb005 100644
+index c32d44df0..5c2fb0058 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither;
diff --git a/Spigot-Server-Patches/0018-Metrics.patch b/Spigot-Server-Patches/0018-Metrics.patch
deleted file mode 100644
index 5cfa88cc4b..0000000000
--- a/Spigot-Server-Patches/0018-Metrics.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7ebf3a58079064072c7e0aa534b092ba412ed5c8 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 14:54:32 -0600
-Subject: [PATCH] Metrics
-
-
-diff --git a/src/main/java/org/spigotmc/Metrics.java b/src/main/java/org/spigotmc/Metrics.java
-index a5fd59d5e..680283ce0 100644
---- a/src/main/java/org/spigotmc/Metrics.java
-+++ b/src/main/java/org/spigotmc/Metrics.java
-@@ -344,7 +344,7 @@ public class Metrics {
-      */
-     private void postPlugin(final boolean isPing) throws IOException {
-         // Server software specific section
--        String pluginName = "Spigot";
-+        String pluginName = "PaperSpigot"; // Paper - Keep old name for legacy data
-         boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
-         String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
-         String serverVersion = Bukkit.getVersion();
--- 
-2.12.0.windows.1
-
diff --git a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch
rename to Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch
index 1794f20cd4..4823367970 100644
--- a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,4 +1,4 @@
-From 29afd8bc4380e527ae39018fde2d7842239bc4dc Mon Sep 17 00:00:00 2001
+From ae8b5ae151c33ea2fb2dbdda86cc8eb3922ccf47 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 15:08:03 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
@@ -20,5 +20,5 @@ index bd3b16025..1c0108ef1 100644
              System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
                  + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!");
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch
rename to Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch
index aa633495be..f90f92f752 100644
--- a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch
@@ -1,4 +1,4 @@
-From 6ee4894cd7619d860ec2d48dc29031bf2bd0384b Mon Sep 17 00:00:00 2001
+From 25724130e87f1b906d5143058d200b6d04b59e18 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 22:01:19 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
@@ -186,5 +186,5 @@ index 3d61c2d68..586ceaa67 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
similarity index 98%
rename from Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
rename to Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
index ec37aa4151..9276176547 100644
--- a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From b57fe9f86395e7db8e78eca60a656aa263d39d2c Mon Sep 17 00:00:00 2001
+From dff249a4a075a2bab36f65251537d6b8882e0768 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d9e4f1a9..c4497aaa 100644
+index d9e4f1a9f..c4497aaa6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -113,16 +113,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -147,7 +147,7 @@ index d9e4f1a9..c4497aaa 100644
                      }
                      lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index db4ac484..0f77d067 100644
+index db4ac484f..0f77d0674 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1738,6 +1738,17 @@ public final class CraftServer implements Server {
@@ -169,7 +169,7 @@ index db4ac484..0f77d067 100644
      {
  
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index be2e31de..6d21c326 100644
+index be2e31dea..6d21c3269 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -1,8 +1,5 @@
diff --git a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch
similarity index 93%
rename from Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
rename to Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch
index b65da3f3d8..ae44cf8c9e 100644
--- a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch
@@ -1,4 +1,4 @@
-From b3d1c2d9a1d5bf7b73627520a8887224643a0feb Mon Sep 17 00:00:00 2001
+From a876defc63064db6b4c54a0af7cc133dd2479aec Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
@@ -24,5 +24,5 @@ index 6509df573..87ac74420 100644
  
      @Override
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch
rename to Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch
index 05b83c06c4..c17daf5a76 100644
--- a/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch
@@ -1,4 +1,4 @@
-From 066da232470e76f73ce6f5ac3bc9fba3f4e0d029 Mon Sep 17 00:00:00 2001
+From a35538236be21ec093715779bf57044a413516f3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:19:01 -0600
 Subject: [PATCH] Add async chunk load API
@@ -36,5 +36,5 @@ index 822d73b9e..f65611a6a 100644
          return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0024-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0024-Entity-Origin-API.patch
rename to Spigot-Server-Patches/0023-Entity-Origin-API.patch
index 1bd70f67c7..50f220d9c8 100644
--- a/Spigot-Server-Patches/0024-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From 16134083d0eea50c8ec22f6a7421d056d58d3292 Mon Sep 17 00:00:00 2001
+From 1f83e96b7750ff012aa3510df4eba6f2f25efde8 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -155,5 +155,5 @@ index c493c9c0c..93843aa50 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
similarity index 97%
rename from Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch
rename to Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
index 9d25a3d07c..957f2ce03f 100644
--- a/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,4 +1,4 @@
-From 555c9dbf56471528d900454f8556dcc19c7af2e3 Mon Sep 17 00:00:00 2001
+From d19627bd77a6f4f3b3360d3ba224224b206344ce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
@@ -62,5 +62,5 @@ index 39919ab1c..632d5c760 100644
                      // Spigot start
                      finally {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
similarity index 97%
rename from Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch
rename to Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
index 4ea3a1054b..64e5cff1dd 100644
--- a/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
@@ -1,4 +1,4 @@
-From 4769d44f5b85ef49a3bbd628be4e7e2f86fa7521 Mon Sep 17 00:00:00 2001
+From 52e6992f765e671f1ed612870e81947d646aca17 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
@@ -87,5 +87,5 @@ index fd3337d3f..ca1faa41d 100644
          int i;
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 92%
rename from Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch
rename to Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
index 1e09592205..dfa62fd269 100644
--- a/Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -1,4 +1,4 @@
-From 5b5459ca71a1bc441e5c57a852d70ecbdb24bd5d Mon Sep 17 00:00:00 2001
+From 3119d5d5e0f90c64083736d6665a65950b605149 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
@@ -18,5 +18,5 @@ index caec56824..30b54a50e 100644
                  file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                  if ( file.exists() )
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
similarity index 93%
rename from Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch
rename to Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
index 63f8e68352..b0dade80d7 100644
--- a/Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
@@ -1,4 +1,4 @@
-From dfbba8355e51c337187a93a3db380b223f626892 Mon Sep 17 00:00:00 2001
+From b5310cf63d22fdf8714b2bfaea8ce9c66c3d5758 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
 Subject: [PATCH] Always tick falling blocks
@@ -25,5 +25,5 @@ index 5c2fb0058..c411ce886 100644
                  || entity instanceof EntityFireworks )
          {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0029-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch
similarity index 98%
rename from Spigot-Server-Patches/0029-Lighting-Queue.patch
rename to Spigot-Server-Patches/0028-Lighting-Queue.patch
index 84221c704a..b17cec7e97 100644
--- a/Spigot-Server-Patches/0029-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From d13d53ab6bafe9851cb3a816ca64e42ab83d6d29 Mon Sep 17 00:00:00 2001
+From ddc58c0259cad56358f0e79c327658a407436af5 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -97,7 +97,7 @@ index 3ba489d4f..f7f2d12cf 100644
          // Update neighbor counts
          for (int x = -2; x < 3; x++) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4476799d8..f953ef8e0 100644
+index c4497aaa6..ca0ff4d30 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -721,7 +721,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -238,5 +238,5 @@ index 632d5c760..e6e85e7a8 100644
                  }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
similarity index 96%
rename from Spigot-Server-Patches/0030-Configurable-end-credits.patch
rename to Spigot-Server-Patches/0029-Configurable-end-credits.patch
index 717f2aef87..bec4d8a193 100644
--- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From 6e48bc7be8c37a8e58e0a2731860aa4c48ce9190 Mon Sep 17 00:00:00 2001
+From d5161bb68e53e6d14389c17582a73a10fce3aeee Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -52,5 +52,5 @@ index 030a3e51c..79c9601fa 100644
                  } else {
                      this.b((Statistic) AchievementList.D);
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
rename to Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch
index 45136544f3..88e5b7820d 100644
--- a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -1,4 +1,4 @@
-From cca16ca09a209720483d4fe88d1f2b8537ae7b75 Mon Sep 17 00:00:00 2001
+From 6da14448ed853c7b336d8ff6ce0952ebf5b9af2a Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
@@ -25,5 +25,5 @@ index 904bee8b5..4e05bcdfa 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0032-Generator-Settings.patch b/Spigot-Server-Patches/0031-Generator-Settings.patch
similarity index 99%
rename from Spigot-Server-Patches/0032-Generator-Settings.patch
rename to Spigot-Server-Patches/0031-Generator-Settings.patch
index 21310b3783..b4cff3740a 100644
--- a/Spigot-Server-Patches/0032-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0031-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From 8890e82c87bc665f7532115c8e0eb088f0c1b2de Mon Sep 17 00:00:00 2001
+From 886b8af6b9e07e9214c61bf0ba100e8d4c5a0ac3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
@@ -265,5 +265,5 @@ index fb350c408..9c1605b14 100644
          ObjectIterator objectiterator = this.c.values().iterator();
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0033-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch
similarity index 98%
rename from Spigot-Server-Patches/0033-Optimize-explosions.patch
rename to Spigot-Server-Patches/0032-Optimize-explosions.patch
index e7fd8eb256..f03334a07a 100644
--- a/Spigot-Server-Patches/0033-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 9d5e09ca837a92224b403ec20930f9ad1e300ed8 Mon Sep 17 00:00:00 2001
+From 000f618c3793428ef5abd2cb979e9241f44fcc5a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -124,7 +124,7 @@ index 4e05bcdfa..49fc95e35 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f953ef8e0..3b67ff52e 100644
+index ca0ff4d30..e7c63a953 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -886,6 +886,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -156,5 +156,5 @@ index e6e85e7a8..5f7590e11 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch
similarity index 92%
rename from Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch
rename to Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch
index ee75c30970..c26dca3854 100644
--- a/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch
@@ -1,4 +1,4 @@
-From 3c56dc7c870aa521f719c5109fde8f44f3158c22 Mon Sep 17 00:00:00 2001
+From 4286caaef0038d040cac7066e78873f7fe5c44d0 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 12:03:23 -0600
 Subject: [PATCH] Stop updating flowing block if material has changed
@@ -17,5 +17,5 @@ index f4ac7bafa..801b9cb7b 100644
          IBlockData iblockdata2 = world.getType(blockposition.down());
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0035-Fast-draining.patch b/Spigot-Server-Patches/0034-Fast-draining.patch
similarity index 98%
rename from Spigot-Server-Patches/0035-Fast-draining.patch
rename to Spigot-Server-Patches/0034-Fast-draining.patch
index a025783717..534ac2fc71 100644
--- a/Spigot-Server-Patches/0035-Fast-draining.patch
+++ b/Spigot-Server-Patches/0034-Fast-draining.patch
@@ -1,4 +1,4 @@
-From d20531320914b578667604dc1a7d557b1c61b0f8 Mon Sep 17 00:00:00 2001
+From ccf86c26bd1bd5ec98c8410fd7140cf5830b16af Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:20:52 -0600
 Subject: [PATCH] Fast draining
@@ -109,5 +109,5 @@ index 801b9cb7b..8e9de3bcb 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch
similarity index 96%
rename from Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch
rename to Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch
index 7778b73d71..bce1782151 100644
--- a/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch
@@ -1,4 +1,4 @@
-From 915fe90596915de1e459fcb7965d62f72b9f9d4f Mon Sep 17 00:00:00 2001
+From ec526d2a02bbc74f962bf21806940ad169baed8e Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed
@@ -47,5 +47,5 @@ index 660f3bcce..a27512c0f 100644
          return this.e;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0037-Add-player-view-distance-API.patch
rename to Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
index bc2fe39478..866afc42e7 100644
--- a/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
@@ -1,4 +1,4 @@
-From aba5e7d678803a80c6c72216a765652e920f1ea7 Mon Sep 17 00:00:00 2001
+From 5ef6465bc8b487a3f06e10963e579fde91f5251d Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
@@ -215,5 +215,5 @@ index 87ac74420..16dcaba3f 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0038-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
similarity index 97%
rename from Spigot-Server-Patches/0038-Disable-explosion-knockback.patch
rename to Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
index bbaa6e987a..56ab5cfaea 100644
--- a/Spigot-Server-Patches/0038-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
@@ -1,4 +1,4 @@
-From fbb70839f7188d6096dff42ca1b3fdcf8c715f90 Mon Sep 17 00:00:00 2001
+From 91cdc4554cebe5d6b7ae636e7768ce5fe8365855 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
@@ -69,5 +69,5 @@ index 49fc95e35..d7bc6a0ed 100644
                              }
                          }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0039-Disable-thunder.patch b/Spigot-Server-Patches/0038-Disable-thunder.patch
similarity index 95%
rename from Spigot-Server-Patches/0039-Disable-thunder.patch
rename to Spigot-Server-Patches/0038-Disable-thunder.patch
index f268b13067..355a37f549 100644
--- a/Spigot-Server-Patches/0039-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0038-Disable-thunder.patch
@@ -1,4 +1,4 @@
-From 4171809caf6057e84b0b1cf5ec03a259cde6c688 Mon Sep 17 00:00:00 2001
+From 05106693177445d76ea1325231181bd3404e6da1 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
@@ -33,5 +33,5 @@ index 966938997..ce087eb7d 100644
                      l = this.l >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0040-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch
similarity index 95%
rename from Spigot-Server-Patches/0040-Disable-ice-and-snow.patch
rename to Spigot-Server-Patches/0039-Disable-ice-and-snow.patch
index 0eea5eb3ff..869ec2096d 100644
--- a/Spigot-Server-Patches/0040-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch
@@ -1,4 +1,4 @@
-From 708e3b196dead7aa3871281f6922384c56c32257 Mon Sep 17 00:00:00 2001
+From 84e563f38e936dd47f7390190f080b89f445b76f Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
@@ -32,5 +32,5 @@ index ce087eb7d..ac8dc5f2f 100644
                      l = this.l >> 2;
                      blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0041-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch
similarity index 97%
rename from Spigot-Server-Patches/0041-Configurable-mob-spawner-tick-rate.patch
rename to Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch
index c9756fc1db..001625f333 100644
--- a/Spigot-Server-Patches/0041-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch
@@ -1,4 +1,4 @@
-From e483c2457d3eec68120dc6058950d391e6f54455 Mon Sep 17 00:00:00 2001
+From dbcc226d6239952ce5b5db079ef633eada51a50d Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
@@ -64,5 +64,5 @@ index 796b3e53f..ce1db632d 100644
                  }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0042-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch
similarity index 98%
rename from Spigot-Server-Patches/0042-Send-absolute-position-the-first-time-an-entity-is-s.patch
rename to Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch
index 5c533a99ff..6ab443fc2d 100644
--- a/Spigot-Server-Patches/0042-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -1,4 +1,4 @@
-From a66312a6f87feb99a654ae23975f5130db7c5b26 Mon Sep 17 00:00:00 2001
+From e2339144ecaec2b719659708e3567d04d491cdb3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
@@ -76,5 +76,5 @@ index 1493f9ab3..f542bf491 100644
  
                      entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0043-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0043-Add-BeaconEffectEvent.patch
rename to Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch
index 4b23565614..f83fb5d602 100644
--- a/Spigot-Server-Patches/0043-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch
@@ -1,4 +1,4 @@
-From 1f602d61011394e08fb6e7511fac2ed306e188a2 Mon Sep 17 00:00:00 2001
+From 3308547d075d0d0e431b0273cfba7fcc8d38444b Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -69,5 +69,5 @@ index 6f2fcd22e..71ecc5493 100644
          }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0044-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0044-Configurable-container-update-tick-rate.patch
rename to Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
index 3bca8b91e3..2d0b49ba82 100644
--- a/Spigot-Server-Patches/0044-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
@@ -1,4 +1,4 @@
-From ff439bb924729825a7d8c535b306a61a4bbecb0e Mon Sep 17 00:00:00 2001
+From ad16101c81f51dd63f5aff74cc1f10414650e8ce Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -45,5 +45,5 @@ index 1ed1859b8..4866f9f34 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0045-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
similarity index 95%
rename from Spigot-Server-Patches/0045-Use-UserCache-for-player-heads.patch
rename to Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
index b43e98210d..b5be8d9aea 100644
--- a/Spigot-Server-Patches/0045-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
@@ -1,4 +1,4 @@
-From 9ebcc2f689753eb2c2ec33864e05450f9cee2fa3 Mon Sep 17 00:00:00 2001
+From 526ed5df91f1b0ca392b4707f6aa7a8384c27acd Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
@@ -31,5 +31,5 @@ index f07eb2f75..18cc74639 100644
              // Spigot end
          }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0046-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
similarity index 96%
rename from Spigot-Server-Patches/0046-Disable-spigot-tick-limiters.patch
rename to Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
index a17fc40644..f2c6ede52b 100644
--- a/Spigot-Server-Patches/0046-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
@@ -1,4 +1,4 @@
-From 85294ba8067c8ab43419b70379c53aaff9845630 Mon Sep 17 00:00:00 2001
+From bf5743f31df9d1cd46c219f13808a0063a09e6b0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
@@ -35,5 +35,5 @@ index 5f7590e11..a1cdcd71b 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0047-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch
similarity index 92%
rename from Spigot-Server-Patches/0047-Configurable-Chunk-IO-Thread-Base-Count.patch
rename to Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch
index 1e38d981f1..f56abd6ec7 100644
--- a/Spigot-Server-Patches/0047-Configurable-Chunk-IO-Thread-Base-Count.patch
+++ b/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch
@@ -1,14 +1,14 @@
-From 4d33547c24567a2bedc35176c38b04c8f7320f38 Mon Sep 17 00:00:00 2001
+From e576a2e6f75c9065ff77b0d808d9deb8828c2a2a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1ea799d59..8c8bc4c86 100644
+index 007589314..9a6f87e59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -198,4 +198,9 @@ public class PaperConfig {
+@@ -199,4 +199,9 @@ public class PaperConfig {
                  " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
                  " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
      }
@@ -39,5 +39,5 @@ index e4fd9bc60..7b7a3d01b 100644
  
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0048-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch b/Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
similarity index 96%
rename from Spigot-Server-Patches/0048-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
rename to Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
index c4b2515dc2..93e445fceb 100644
--- a/Spigot-Server-Patches/0048-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
+++ b/Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
@@ -1,4 +1,4 @@
-From 8bd51ec6ce48f100cc32ac4268904c7bd54874ba Mon Sep 17 00:00:00 2001
+From ce608a503abf342c96c23e68f479c099be811aa7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:51:51 -0600
 Subject: [PATCH] Don't create Region File's when checking if chunk exists
@@ -49,5 +49,5 @@ index f23429898..933934fb6 100644
                  file1.mkdirs();
              }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch
index da90c58d39..5c38cea4f1 100644
--- a/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From cc53a532b798a31431e55027980618f421451d8b Mon Sep 17 00:00:00 2001
+From 2e3b2f159778b82cd48210b44e1ce8dffeb91c78 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 676cc3f3e..4e35e9102 100644
+index d778eafb3..d6a2bbc08 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -104,6 +104,21 @@ public abstract class PlayerList {
@@ -32,5 +32,5 @@ index 676cc3f3e..4e35e9102 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch
similarity index 95%
rename from Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch
rename to Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch
index 5f8de626d3..7082f8485f 100644
--- a/Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch
@@ -1,4 +1,4 @@
-From 1410382d853ba361a079502d38568f4eb55113de Mon Sep 17 00:00:00 2001
+From 1c4b779cc2accfe5eae2d1435bdf0e1e2a74f319 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
@@ -35,5 +35,5 @@ index c75ed8a36..9c4d1c938 100644
  
          EntityOcelot entityocelot;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
similarity index 98%
rename from Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
rename to Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
index 7aeae21ef8..6e7cd59624 100644
--- a/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From e66b45a8fc4d658d70b3faff1ab27165f4c7e879 Mon Sep 17 00:00:00 2001
+From acaa4a559a33fe2e2dae4fb4f59aaea68ff00490 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -82,5 +82,5 @@ index 0f77d0674..5302bb283 100644
              return true;
          }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 95%
rename from Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
index c658917dde..d1347c3e67 100644
--- a/Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,4 +1,4 @@
-From 6b32181201c024700da5cf0fd078deaa091230cd Mon Sep 17 00:00:00 2001
+From 71575ec7e7c01c6ffae6465bb584e0bbb5d4e109 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
@@ -33,5 +33,5 @@ index 8fb14d6b5..c68429fb1 100644
                  }
              }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0053-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0052-Optimize-Pathfinding.patch
similarity index 95%
rename from Spigot-Server-Patches/0053-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0052-Optimize-Pathfinding.patch
index 16fb9457fc..b9d1e3766c 100644
--- a/Spigot-Server-Patches/0053-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0052-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From c2e8208e724845d130dbf63019835d6ea9088f3a Mon Sep 17 00:00:00 2001
+From 0a119adb2127be5db1c6efba9c6cfeeecc3926d4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -47,5 +47,5 @@ index 4f28b8819..43b2be505 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 98%
rename from Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch
index 4a500f7940..f823900a13 100644
--- a/Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From b0c16e419f39727b2b51bc84b777dc9eb42a8131 Mon Sep 17 00:00:00 2001
+From 082fa781df2dfffd7b1774cfe10089544daa70a9 Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -95,5 +95,5 @@ index b80f95159..e1fc4ea6c 100644
  
              while (iterator.hasNext()) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch
similarity index 83%
rename from Spigot-Server-Patches/0055-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0054-Expose-server-CommandMap.patch
index df9f4dfb54..5a7623c480 100644
--- a/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch
@@ -1,11 +1,11 @@
-From 8eb9c58348a5373d07490079d2018313dfec3b64 Mon Sep 17 00:00:00 2001
+From ccbbc6329f8ab2240eabdc1e2eb4bdc5e3e29834 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a795a165a..03bc0171b 100644
+index 5302bb283..cab671d68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1567,6 +1567,7 @@ public final class CraftServer implements Server {
@@ -17,5 +17,5 @@ index a795a165a..03bc0171b 100644
          return commandMap;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 93%
rename from Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
index ae68c107fe..7f322e5017 100644
--- a/Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,4 +1,4 @@
-From e82e41369c3b18bf01ffa5a9ce73aceff5ea39a0 Mon Sep 17 00:00:00 2001
+From ae0cf0afb053eb18ce36346f330d8940c9f8aeea Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
@@ -21,5 +21,5 @@ index 27cd0d43d..61032eb2f 100644
  
          if (health == 0) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch
similarity index 98%
rename from Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch
index 0df81de85d..b2b8d90a39 100644
--- a/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 1cde879dc1017264aa0d84569843d35006fa3f63 Mon Sep 17 00:00:00 2001
+From ca1b52f9e3a17711934151e7ff7a2af41d700320 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -78,7 +78,7 @@ index 7bcafa8bb..4f6c1c2e7 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cc26aa748..2bcf3976f 100644
+index 16dcaba3f..0e7086da3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -175,5 +175,5 @@ index cc26aa748..2bcf3976f 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch
similarity index 92%
rename from Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch
index dd34c89d57..b7fa50f524 100644
--- a/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch
@@ -1,4 +1,4 @@
-From b73de79664f1d4e137d6c4764881817d39bbcb1d Mon Sep 17 00:00:00 2001
+From 20d8fcc6f23ec8125341558bdf29c7dc015258b1 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
@@ -18,5 +18,5 @@ index 686250ea8..b826089d1 100644
                  itemstack1 = playerinventory.getCarried();
                  if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
similarity index 97%
rename from Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
index fcb279f621..4db00e534a 100644
--- a/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,4 +1,4 @@
-From 7c794303b52022aca46e88ccf0dd466abd2700ab Mon Sep 17 00:00:00 2001
+From 87607d3f2bf2e768f4e192bd97576dd95fe3efd5 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
@@ -84,5 +84,5 @@ index a1cdcd71b..354a7309b 100644
          this.f.clear();
          this.l();
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch
similarity index 96%
rename from Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch
index abd4a22a08..a447ec9c55 100644
--- a/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch
@@ -1,4 +1,4 @@
-From adea9822f254f16ea903bfcf4a929946a6879cd0 Mon Sep 17 00:00:00 2001
+From d04bed0a2739870f17f68f432a430319d515e2d9 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
@@ -54,5 +54,5 @@ index 1d5dce10e..7ca2617a8 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0061-Add-velocity-warnings.patch b/Spigot-Server-Patches/0060-Add-velocity-warnings.patch
similarity index 96%
rename from Spigot-Server-Patches/0061-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0060-Add-velocity-warnings.patch
index 831da5324a..c1c50dc052 100644
--- a/Spigot-Server-Patches/0061-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0060-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From 836675371c732b2c7d7977874436f4f5b20dece0 Mon Sep 17 00:00:00 2001
+From e5d75fd43f1e772df59e499fced596ef2eefdb25 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 03bc0171b..c61752bc3 100644
+index cab671d68..28da39cbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -173,6 +173,7 @@ public final class CraftServer implements Server {
@@ -58,5 +58,5 @@ index 3ed983cc0..6384d50e7 100644
                  log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
                  dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch
similarity index 95%
rename from Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch
rename to Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch
index 06898a01c1..b44d2936d1 100644
--- a/Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From 6f8838ab5bd00cfbc8e1fd70316230c562c16838 Mon Sep 17 00:00:00 2001
+From fa4d2110a0ca3cc431097ca324b6e370212f8ac4 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -25,7 +25,7 @@ index 4cc74cd65..fa49397ea 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2bcf3976f..68ce11be8 100644
+index 0e7086da3..d72ff0af2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -579,7 +579,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -39,5 +39,5 @@ index 2bcf3976f..68ce11be8 100644
          return true;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-Server-Patches/0063-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
index b85be005bc..8233e276d4 100644
--- a/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From e809913b483eee57889389a0edc97d2d111d4232 Mon Sep 17 00:00:00 2001
+From 33f879767f8b9a6146f578e89282b711f5d1543d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -372,5 +372,5 @@ index 9952b64be..e30cfb7b7 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 94%
rename from Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 6746ba6ec8..84291798bc 100644
--- a/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From eb6be2b7c8be9fabd00b52ce3346948ada2bd67b Mon Sep 17 00:00:00 2001
+From 7c5e2edf7bd7a935b905f4ddd48137c861634f8d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -26,5 +26,5 @@ index 9fc83c4a3..b3b13ba11 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 96%
rename from Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
index 8eed8b35e6..b52b4590f6 100644
--- a/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 9a82d2a8a75df88e30be7f1bc1c7515e277a5f42 Mon Sep 17 00:00:00 2001
+From 94c3548d2ce0fa0ab60e04d21caf2c842eca3df3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -49,5 +49,5 @@ index 5b5e0e73c..be54c807b 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 95%
rename from Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 67a2f1ce70..34913fbf2a 100644
--- a/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From 1612683999cfcbc22c50e0c505bfa4355b70b03b Mon Sep 17 00:00:00 2001
+From 6d83a42776d8dcc58a966d6f8da8b5056c273026 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
@@ -43,5 +43,5 @@ index 61032eb2f..348a8c758 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0067-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0066-Complete-resource-pack-API.patch
index a4e8fa7da7..b5f29fafea 100644
--- a/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From 44dab017dbfb0913ce29eb02f54337766b9c38d6 Mon Sep 17 00:00:00 2001
+From db92fcc38686e0be97b3244eb5eae2e6da8966e1 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
@@ -71,5 +71,5 @@ index d72ff0af2..5fd5e39fa 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
index 01ba873b3a..eb4d40fdd7 100644
--- a/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From 240543e6e7c364a4513e4cd4ca8d2711c5d0f97d Mon Sep 17 00:00:00 2001
+From 30f567605c740413aa96168ce4eb60ab22ee1180 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -26,10 +26,10 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8c8bc4c86..b2fa32e41 100644
+index 9a6f87e59..873ffa77d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -203,4 +203,10 @@ public class PaperConfig {
+@@ -204,4 +204,10 @@ public class PaperConfig {
      private static void chunkLoadThreads() {
          minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
      }
@@ -177,5 +177,5 @@ index acfdd52dc..fdbaf5fbd 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch
similarity index 96%
rename from Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch
index 10bc4d4e05..b9f24a42cc 100644
--- a/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 989492b0a14f1acbcb387e31b74ed58829a2b496 Mon Sep 17 00:00:00 2001
+From 82e7c9b1c02794288a3242d11d2b62ee3c46369b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -42,5 +42,5 @@ index be13c1131..9cfc46bc2 100644
  
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
similarity index 92%
rename from Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
index e0c8f4a241..f5737e3b20 100644
--- a/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From d0e62de0df3e3803b64a74b42fdc74c54e608793 Mon Sep 17 00:00:00 2001
+From 2cbb25a2774f83799823fe7362f067609bdffc0c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b2fa32e41..078e0d989 100644
+index 873ffa77d..b5ff26c71 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -209,4 +209,9 @@ public class PaperConfig {
+@@ -210,4 +210,9 @@ public class PaperConfig {
          enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false);
          if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues");
      }
@@ -30,7 +30,7 @@ index b2fa32e41..078e0d989 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c61752bc3..e2afd9d93 100644
+index 28da39cbd..9df6c0ebb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -318,6 +318,7 @@ public final class CraftServer implements Server {
@@ -51,5 +51,5 @@ index c61752bc3..e2afd9d93 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
similarity index 92%
rename from Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
index afec32c612..c49e41e974 100644
--- a/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From 851ddaf3a91b416502beeb19aabbe3f495e1f580 Mon Sep 17 00:00:00 2001
+From c17904b073dbf431afdc19c4dc09f444ad6ecb6c Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9df6c0eb..e77307c3 100644
+index 9df6c0ebb..e77307c35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1827,4 +1827,21 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
similarity index 90%
rename from Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
index 2e8a4e7011..27c349a80b 100644
--- a/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From 18e4daa1e2ed77af8da88506c84d13f813eeebd2 Mon Sep 17 00:00:00 2001
+From ef440adcb9e263901028407fe1ad0d2e02f2435c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 40091231e..540d57855 100644
+index e77307c35..4d761d32a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -741,6 +741,14 @@ public final class CraftServer implements Server {
@@ -26,5 +26,5 @@ index 40091231e..540d57855 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0073-Undead-horse-leashing.patch b/Spigot-Server-Patches/0072-Undead-horse-leashing.patch
similarity index 95%
rename from Spigot-Server-Patches/0073-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0072-Undead-horse-leashing.patch
index c087c3c8d9..5c4cd757ce 100644
--- a/Spigot-Server-Patches/0073-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0072-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 8995c864c37aa0d3ea38ec7ea12313130b8f7dae Mon Sep 17 00:00:00 2001
+From 2c430290f17c86c477c2c7a7d267fd23ddfbba3f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -33,5 +33,5 @@ index d74ccd68d..3416c7a7d 100644
  
      protected void q(float f) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch
similarity index 93%
rename from Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch
rename to Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch
index d1c9d2d67a..cf4bac701f 100644
--- a/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From 57b6cb61523faf718c89c3ae42d5d0d6050c9d74 Mon Sep 17 00:00:00 2001
+From f9d6774c585cdc37c69b774d8afee693a95dda02 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:24:53 -0400
 Subject: [PATCH] Fix Furnace cook time bug
@@ -22,5 +22,5 @@ index 2f1f3edf5..e230d1608 100644
                  this.burn();
                  flag1 = true;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch
similarity index 99%
rename from Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch
index a868fadf74..7812bce2ba 100644
--- a/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From e8614aaf18b456255a31f0baa78651f6ad2b61ac Mon Sep 17 00:00:00 2001
+From 89011dc877a65af7754e98c4764d44c93e5772f2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -294,5 +294,5 @@ index ec5680633..9e7f9c661 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 7d977f4bf5..3bafafd76f 100644
--- a/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 9b1484edac9a42041e0eab60eb6f5e63ec64ccb7 Mon Sep 17 00:00:00 2001
+From ccd2974a83c4fae5d48a01486ab8b8dffe414363 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -37,5 +37,5 @@ index 65689f26d..8cda47518 100644
                  }
              }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0076-Add-World-Util-Methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0077-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0076-Add-World-Util-Methods.patch
index 78d4cf7a00..fa9710a215 100644
--- a/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0076-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From b37013963c8a497b39c9ed4362ce585f8c9e6602 Mon Sep 17 00:00:00 2001
+From cc98ddd19cc2afe5d8afcd704383ead8d44c36fd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -93,5 +93,5 @@ index cc7369e52..1d2d174e8 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch
similarity index 99%
rename from Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch
index e5a0d61579..0379be7100 100644
--- a/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From e34af1873ee3abd9f4754ab2eb52dee6dede22b2 Mon Sep 17 00:00:00 2001
+From f9f7cf2e61b9417615c1eec1229bb54569db0d0d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -131,5 +131,5 @@ index 897882c97..970fabf71 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch
index 87f99784e4..0ccf26d36d 100644
--- a/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From 6d7410d5cc715f3a78d2cae58868fdc4dc22c856 Mon Sep 17 00:00:00 2001
+From 2914df909b71dac220c18c9b220de90f2fce300c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation
@@ -32,5 +32,5 @@ index 2ab381d50..817c836c3 100644
          this.d = BlockPosition.ZERO;
          this.j = Maps.newHashMap();
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
similarity index 96%
rename from Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
index ff270c0d9e..70608f2819 100644
--- a/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From 7679dde826a395940efcd10cb8042a2d91dd0c5b Mon Sep 17 00:00:00 2001
+From 37773c2d575050daa8addd625bf40b28ee74a5a0 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
@@ -46,5 +46,5 @@ index 247224117..9cb3b22fb 100644
  
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0081-Set-health-before-death-event.patch b/Spigot-Server-Patches/0080-Set-health-before-death-event.patch
similarity index 92%
rename from Spigot-Server-Patches/0081-Set-health-before-death-event.patch
rename to Spigot-Server-Patches/0080-Set-health-before-death-event.patch
index a13a53007b..295892b195 100644
--- a/Spigot-Server-Patches/0081-Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/0080-Set-health-before-death-event.patch
@@ -1,14 +1,14 @@
-From 62f9ecf769955dd17317af05db2280aa386940e0 Mon Sep 17 00:00:00 2001
+From 376c4082cf93f2688de0d051a121f20b5c8ba326 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 078e0d989..a48f5cb51 100644
+index b5ff26c71..6907d4680 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -214,4 +214,9 @@ public class PaperConfig {
+@@ -215,4 +215,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }
@@ -45,5 +45,5 @@ index 348a8c758..c0103cb39 100644
  
      public double getMaxHealth() {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 96%
rename from Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index ee5f05c936..bb4e675b62 100644
--- a/Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From e3b383aa29dc343314f3fd834b7b8d3ecdfe41d9 Mon Sep 17 00:00:00 2001
+From 04de121f6f8d6af28cb652b11cd17feec668ce9e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
@@ -56,5 +56,5 @@ index 5fd5e39fa..80a6a0b41 100644
      }
  
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch
similarity index 91%
rename from Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch
index ce90b44c39..b4d23c424e 100644
--- a/Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,4 +1,4 @@
-From 32f6c5a12798ed212df901f65912a56b2ef70811 Mon Sep 17 00:00:00 2001
+From a5080daa55ef68c39c367086483795eb455cf451 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations
@@ -22,5 +22,5 @@ index 9012a63a0..5b27bd1c5 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch
similarity index 98%
rename from Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch
rename to Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch
index 888c55c1c7..ff4beb4abb 100644
--- a/Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,4 +1,4 @@
-From f7c86c61f7ef38864a71ab0a671930550953dbc3 Mon Sep 17 00:00:00 2001
+From 139e93117fa8452adb2be851e7dd957dd824d702 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
@@ -89,5 +89,5 @@ index c74d1d2be..0f4237db1 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch
similarity index 92%
rename from Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch
rename to Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch
index c9be7904f1..b3741f9043 100644
--- a/Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch
+++ b/Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch
@@ -1,4 +1,4 @@
-From 0b5537a8783083de5b42792af5f37352f2ef9d06 Mon Sep 17 00:00:00 2001
+From 41e002267b87e75db128ca73dec84b7636afde2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
@@ -18,5 +18,5 @@ index 91ca4a279..edd6fb69e 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0086-Waving-banner-workaround.patch b/Spigot-Server-Patches/0085-Waving-banner-workaround.patch
similarity index 94%
rename from Spigot-Server-Patches/0086-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0085-Waving-banner-workaround.patch
index 15a49adfe9..88f7957eb8 100644
--- a/Spigot-Server-Patches/0086-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0085-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From a6d01124186c189889cb98a3f25cde842fe6eaeb Mon Sep 17 00:00:00 2001
+From ba98d3629b53c82bc96d097c0ee3086345af2300 Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -34,5 +34,5 @@ index c5c3f40ce..6413f76e7 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch
index 9ac9f38998..6df31a9107 100644
--- a/Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From e2c35037b839ec84fb38debdbbc5437c66ec9f30 Mon Sep 17 00:00:00 2001
+From 7db79cee3f3587bced0e3d249bb50aa4ee3b1fef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -27,5 +27,5 @@ index be54c807b..42bd79b10 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
index 1077cd1970..9ba115e4cc 100644
--- a/Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From ab781f7781960c84d0caf220d208f3c514dc91f2 Mon Sep 17 00:00:00 2001
+From 978d5af9bceeb871be2b1cbfffb45f9de62b5636 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -20,5 +20,5 @@ index 42bd79b10..70a431a63 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch
similarity index 95%
rename from Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch
index fc513d132a..86cd49fb74 100644
--- a/Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 1def4d8dd01ad67f472db739eb8b2d917c54b5f6 Mon Sep 17 00:00:00 2001
+From 15890a007fe5797522d8b42f028835b2b2ff6d05 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
@@ -42,5 +42,5 @@ index b0a82e7ed..a7e8a3f7d 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 95%
rename from Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
index 206a90aa22..4149ebdd6b 100644
--- a/Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From 03d2a8cac0d4d45cf78e5f81039fe2f56dac91d5 Mon Sep 17 00:00:00 2001
+From 4bc32176e261712428bd91475ec9a4da500a582d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@@ -32,5 +32,5 @@ index ac8dc5f2f..39ed0d533 100644
  
                              entityhorseskeleton.p(true);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 99%
rename from Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 9364d86444..466555a9c6 100644
--- a/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From 2e211c0f0a5dbcf8ac99fdf6eb4368dcae14c4f1 Mon Sep 17 00:00:00 2001
+From 22e1661666d7e149b0fddf9a6f45cad52af4b917 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -255,5 +255,5 @@ index 1d2d174e8..9427fc080 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch
similarity index 93%
rename from Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch
rename to Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch
index 15bed1f743..e0154dcc50 100644
--- a/Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch
@@ -1,4 +1,4 @@
-From 808ddbb267bcde272fc8297a6bbc153e64836a95 Mon Sep 17 00:00:00 2001
+From c4390170763cc895adafa3fd63614c0423b6a761 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
@@ -18,5 +18,5 @@ index 87b82eb35..a7c71f406 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0093-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch
similarity index 96%
rename from Spigot-Server-Patches/0093-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch
index 0e37a9d118..4c55a3172f 100644
--- a/Spigot-Server-Patches/0093-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From 8e14d9745e779264b36de11905925262ea2c1cb4 Mon Sep 17 00:00:00 2001
+From 52393541b308a635b69f891b01eb41c1776e8f07 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
@@ -64,5 +64,5 @@ index 67c54899d..3f58c34e0 100644
 +    // Paper end
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0094-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
similarity index 93%
rename from Spigot-Server-Patches/0094-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
index 2127b42b5a..16bff70638 100644
--- a/Spigot-Server-Patches/0094-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
@@ -1,11 +1,11 @@
-From b62a735c3225762f282e00951b5351a786bcb853 Mon Sep 17 00:00:00 2001
+From 931dd1b6fbddd6576e436007a749078ceae64f1a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 27 Mar 2016 20:24:05 -0500
 Subject: [PATCH] Check async, remove unused vars, GH-159
 
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 29219ec7b..c95fb7f30 100644
+index c79fb7d57..8749a1879 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -40,6 +40,7 @@ public final class SpawnerCreature {
@@ -28,5 +28,5 @@ index 29219ec7b..c95fb7f30 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0095-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 98%
rename from Spigot-Server-Patches/0095-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 0610657c84..1e0fd7ebe4 100644
--- a/Spigot-Server-Patches/0095-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 230889bd4f8eb5a76b29db21486a2d8bcf90ab86 Mon Sep 17 00:00:00 2001
+From c80433172ca35367589f748c6ac3a0270f33b8f3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -67,5 +67,5 @@ index 39ed0d533..f969d2a72 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0096-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 92%
rename from Spigot-Server-Patches/0096-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch
index 7e6dc4aed0..7690888efe 100644
--- a/Spigot-Server-Patches/0096-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From 5ceed1d40f66d17831eafab8011bd93a78305a84 Mon Sep 17 00:00:00 2001
+From e87ca8c0409093b76e27c0077e2b3a86c26e045b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@@ -25,5 +25,5 @@ index 8cbdbda92..f86c64cb2 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0097-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch
similarity index 94%
rename from Spigot-Server-Patches/0097-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch
index acae698f45..d8eaf22d1a 100644
--- a/Spigot-Server-Patches/0097-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 0ea1c20ebdf134e47efb6aceb915590929ed4b9d Mon Sep 17 00:00:00 2001
+From 2f4d4c62f46ec42fef570d76224b5e12257eb95b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -36,5 +36,5 @@ index 736fa1f62..61d34fc37 100644
  
      public void c(long i) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0098-EntityPathfindEvent.patch b/Spigot-Server-Patches/0097-EntityPathfindEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0098-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0097-EntityPathfindEvent.patch
index a4c79d58ba..dc1e483d49 100644
--- a/Spigot-Server-Patches/0098-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0097-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From ed3b89ad69c48ebe4ee51a704b10e3f5ac4b17f9 Mon Sep 17 00:00:00 2001
+From 45f66cc197d1dcd2090286f05210c9acef78ca40 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -35,5 +35,5 @@ index 43b2be505..c0ef2400b 100644
                  float f = this.h();
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0099-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 97%
rename from Spigot-Server-Patches/0099-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index c89eb67f08..928b555b1b 100644
--- a/Spigot-Server-Patches/0099-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From 68a9bbc962a93f0689d95be191fae73489a5c2f7 Mon Sep 17 00:00:00 2001
+From 063a6b2a26bfabac382e663575b0a98e517346d9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 22:03:09 -0400
 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
@@ -48,5 +48,5 @@ index 0a2823686..8eba70b01 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0100-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 95%
rename from Spigot-Server-Patches/0100-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch
index a0eb9ff50e..18ee6f8d42 100644
--- a/Spigot-Server-Patches/0100-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 37db8b5f7d7fc19b87d5bc444491d60d1197aa0c Mon Sep 17 00:00:00 2001
+From 5fd361c508284348b1fe96835571b9d871da0ddc Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
@@ -49,5 +49,5 @@ index 9cfc46bc2..637e5baaf 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0101-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0101-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch
index 6f2cb88be8..61f928c687 100644
--- a/Spigot-Server-Patches/0101-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From 1c1d94fb02737c1c35d720dd430bfb0b04050f7c Mon Sep 17 00:00:00 2001
+From 61c14766f4cf6eb0ac45cfcd60aae9fdcba217e8 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a48f5cb51..6b694705b 100644
+index 6907d4680..c3ff47e00 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -219,4 +219,9 @@ public class PaperConfig {
+@@ -220,4 +220,9 @@ public class PaperConfig {
      private static void healthDeath() {
          setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
      }
@@ -77,5 +77,5 @@ index 19fbf9b4a..ad00c39ce 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0102-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0101-Use-Optimized-Collections.patch
similarity index 96%
rename from Spigot-Server-Patches/0102-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0101-Use-Optimized-Collections.patch
index 666b038512..793086bf92 100644
--- a/Spigot-Server-Patches/0102-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0101-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From 5f32bddc3d9678ab8844312b8773a3e108110851 Mon Sep 17 00:00:00 2001
+From 0d5d2097b72aa92d7199dd4b84adc080cb9df775 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@@ -47,5 +47,5 @@ index 419add5db..820c15278 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0103-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch
similarity index 92%
rename from Spigot-Server-Patches/0103-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch
index 9228ec163d..c4db3b2789 100644
--- a/Spigot-Server-Patches/0103-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 82762171170f5fa2efc679e390f59413dc496e7e Mon Sep 17 00:00:00 2001
+From 22757113dc8d4014c7fe8ef4fb3d8a734fddf9fe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@@ -19,5 +19,5 @@ index f86c64cb2..7e6459654 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0104-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0104-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch
index 4dbc6463c0..4813c52b9d 100644
--- a/Spigot-Server-Patches/0104-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From ae218e1dc8c65c8e474da62a4799a0b42a7ec276 Mon Sep 17 00:00:00 2001
+From a143c953207c29ed4c31626f8a19e2aaa5ef72c0 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -39,5 +39,5 @@ index b67837dd2..840448995 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0105-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 90%
rename from Spigot-Server-Patches/0105-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch
index fe6844a317..bf318a6fe6 100644
--- a/Spigot-Server-Patches/0105-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From d64ae353b75ee5abab8c33346297cedbd806d0f0 Mon Sep 17 00:00:00 2001
+From a93413a68948fca1c6565e2998d21c76031a7f04 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 4e35e9102..a55a6fca0 100644
+index d6a2bbc08..b8d48b45c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -154,6 +154,7 @@ public abstract class PlayerList {
@@ -17,5 +17,5 @@ index 4e35e9102..a55a6fca0 100644
          entityplayer.getStatisticManager().d();
          entityplayer.getStatisticManager().updateStatistics(entityplayer);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0106-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0106-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch
index 3092968bf5..2928d83bd5 100644
--- a/Spigot-Server-Patches/0106-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From ce7d0b024535acff9b1f9613aafee35d0560b7a5 Mon Sep 17 00:00:00 2001
+From 2239e93f9ca22ddb356ed4ee329aae51355d6a5d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
@@ -32,5 +32,5 @@ index 8b43e6070..5cbc95f7c 100644
              int lightLevel = -1; // Paper
              if (world.getType(blockposition.up()).c() > 2 && (lightLevel = world.getLightLevel(blockposition.up())) < 4) { // Paper - move light check to end to avoid unneeded light lookups
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 96%
rename from Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index bd35f74a1b..b323cea537 100644
--- a/Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 3c25ca03245aa817b01fc414d55019887bde034e Mon Sep 17 00:00:00 2001
+From 02aceb5c58c3c99427fbc68765cf7ce5340d477d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -21,7 +21,7 @@ index 74a49a5fb..3a942c763 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3b67ff52e..33d23f4b2 100644
+index e7c63a953..3aea41f76 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -356,8 +356,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -54,7 +54,7 @@ index 7e6459654..dba3fb167 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 540d57855..8cb8cbe2d 100644
+index 4d761d32a..a958ce998 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -952,7 +952,7 @@ public final class CraftServer implements Server {
@@ -83,5 +83,5 @@ index f65611a6a..9965235ab 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 91%
rename from Spigot-Server-Patches/0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index e114beeac4..ffad2997ae 100644
--- a/Spigot-Server-Patches/0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,4 +1,4 @@
-From 742f1c783e22b45da804858ae209f1098f5b287c Mon Sep 17 00:00:00 2001
+From a22863594140aa2beb47672cc81f2eeca3a4424c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
@@ -17,5 +17,5 @@ index dba3fb167..44108ab9a 100644
          this.a(blockposition.east(), block, blockposition);
          this.a(blockposition.down(), block, blockposition);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 93%
rename from Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index cfd279e4ab..65a3174398 100644
--- a/Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,4 +1,4 @@
-From a36884f63ccd005005d2ca4000ef1b31cf79cd03 Mon Sep 17 00:00:00 2001
+From b45bff5ab25d652697981a8e08b69d4d52edf888 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
@@ -29,5 +29,5 @@ index a27512c0f..4691b3d8f 100644
      }
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0110-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch
similarity index 95%
rename from Spigot-Server-Patches/0110-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch
index a9e55ade7c..25599d4a18 100644
--- a/Spigot-Server-Patches/0110-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From 64d38625dcef9c927f62fcda7a6de7e97f078c84 Mon Sep 17 00:00:00 2001
+From 09e2228c9837b20fdc95318fbe4e2a2d8a396f57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
@@ -42,5 +42,5 @@ index f3a6799a8..fa0fd8a9c 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 97%
rename from Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 14e91c209e..201587187b 100644
--- a/Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From e5561846f3f37b66f1140ab87113b267f45f7c5b Mon Sep 17 00:00:00 2001
+From 961fafdaceab970599d69a51dd78cb93a0d93a25 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -51,5 +51,5 @@ index 840448995..dfbae01f4 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0112-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0112-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch
index d56d71e016..efbb98a3c9 100644
--- a/Spigot-Server-Patches/0112-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From b17837a6de60969078250788da9e1aaed2c2cf99 Mon Sep 17 00:00:00 2001
+From 5fa0344f756b199b838d8addb7e3f50efe5a4f91 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b2fe1afc0..a74d6c768 100644
+index 80a6a0b41..5f6b182d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -589,6 +589,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,5 +28,5 @@ index b2fe1afc0..a74d6c768 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch
similarity index 97%
rename from Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch
index 36dd328e3a..c3873355a9 100644
--- a/Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 46779d2f2ca037a8800c901a4bb48d59d7d1cf24 Mon Sep 17 00:00:00 2001
+From dcfc848c896f88a21c47d10b8e5914bdeeda4321 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -67,5 +67,5 @@ index 9bc8ce64c..2f4728b0d 100644
              }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0114-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch
similarity index 90%
rename from Spigot-Server-Patches/0114-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch
index eeb8608a22..c0064af2b3 100644
--- a/Spigot-Server-Patches/0114-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From 46a6949ea4c98de6bc09f7bd6db7205afa027dcf Mon Sep 17 00:00:00 2001
+From 421db0871b70be8fbcee14ef32188a132e5e12d2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
@@ -18,5 +18,5 @@ index edd6fb69e..380373c0e 100644
      private int a;
      public int rotation;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch
similarity index 96%
rename from Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0114-Configurable-Player-Collision.patch
index 9e522e5961..4215fffaef 100644
--- a/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch
@@ -1,14 +1,14 @@
-From f6310cc6c324b8888a8ada2c71896f32c796fa36 Mon Sep 17 00:00:00 2001
+From 8947fc06b9c49517b322470cd569d158c05b4118 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6b694705..ee884ba5 100644
+index c3ff47e00..710c432d8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -224,4 +224,9 @@ public class PaperConfig {
+@@ -225,4 +225,9 @@ public class PaperConfig {
      private static void regionFileCacheSize() {
          regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
      }
@@ -19,7 +19,7 @@ index 6b694705..ee884ba5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index ab9aa132..f9f59e55 100644
+index ab9aa132a..f9f59e559 100644
 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java
 +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
 @@ -183,6 +183,13 @@ public class CommandScoreboard extends CommandAbstract {
@@ -37,7 +37,7 @@ index ab9aa132..f9f59e55 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3aea41f7..430168d2 100644
+index 3aea41f76..430168d21 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -331,6 +331,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -62,7 +62,7 @@ index 3aea41f7..430168d2 100644
  
      protected void l() {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index d8ec5045..eb45d3cf 100644
+index d8ec50455..eb45d3cf2 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -96,7 +96,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -75,7 +75,7 @@ index d8ec5045..eb45d3cf 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b8d48b45..50a3dfe4 100644
+index b8d48b45c..50a3dfe44 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -71,6 +71,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 97%
rename from Spigot-Server-Patches/0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 90ab448ebd..9197eaab21 100644
--- a/Spigot-Server-Patches/0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From b2f15a25ca3ae5d38b30c5ee1519b94a2780a7fa Mon Sep 17 00:00:00 2001
+From 3112e052aea6a52a5959ddef046c307f09443bbd Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -45,5 +45,5 @@ index a46df4b7f..f02263c34 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0117-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 93%
rename from Spigot-Server-Patches/0117-Water-mobs-should-only-spawn-in-the-water.patch
rename to Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch
index 8887322b91..ba2f7fa0bc 100644
--- a/Spigot-Server-Patches/0117-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From 6eae39ef9e948ea60c2d6c4f0912822b6f43300b Mon Sep 17 00:00:00 2001
+From b5d0b73e9f5dc13affbd3c6fa857fe45deeaaa19 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
@@ -26,5 +26,5 @@ index 90d33af95..251555713 100644
  
      public boolean canSpawn() {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
similarity index 96%
rename from Spigot-Server-Patches/0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
rename to Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index 953b1430d2..3edcec5827 100644
--- a/Spigot-Server-Patches/0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From 4a13aab793f8a1c300970852cb4fb20b8b97b963 Mon Sep 17 00:00:00 2001
+From 0e4f44dde4037101a88ba017da160589dbf53b9e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@@ -27,7 +27,7 @@ index 61d34fc37..a6cf1d83d 100644
          if (entity instanceof EntityItem) {
              itemCounts[i]--;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index c95fb7f30..0a7a31086 100644
+index 8749a1879..29d4c0866 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -23,6 +23,15 @@ public final class SpawnerCreature {
@@ -56,5 +56,5 @@ index c95fb7f30..0a7a31086 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0119-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch
similarity index 92%
rename from Spigot-Server-Patches/0119-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch
index ab4a281cae..527777a6f9 100644
--- a/Spigot-Server-Patches/0119-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From a6babfe8d967b40e520f64fb3df3ed6fe821b9a7 Mon Sep 17 00:00:00 2001
+From 3cc6bf088a830f76ece5e6bb0c607c16278258cc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -19,5 +19,5 @@ index a6a0d5a29..efcafe77f 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0120-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0120-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch
index a3753247c3..a41984480c 100644
--- a/Spigot-Server-Patches/0120-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 348b10de4d21bc63dc52260c2010805d14196b11 Mon Sep 17 00:00:00 2001
+From 73b1b9d098df385f6eaad2694a09d0ad1b967c06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -47,5 +47,5 @@ index 94cb9d462..dfc328850 100644
  
              return i;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
index 1b2ac3e88f..b54a9a5a5a 100644
--- a/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From 60222f6b6204b0319b337d3e109d5ee56ef58b35 Mon Sep 17 00:00:00 2001
+From c6514d3a10a21f812014901a8f530813fd10a66b Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
@@ -50,5 +50,5 @@ index 5f6b182d6..233903b5f 100644
  
          @Override
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0122-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0121-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0122-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0121-EntityRegainHealthEvent-isFastRegen-API.patch
index dc2a1dd885..a9ea4cd806 100644
--- a/Spigot-Server-Patches/0122-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0121-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From b65ee7ee42061f41da17f7751b3da166a3bc69ff Mon Sep 17 00:00:00 2001
+From aef8810f99eda6a4fd16bb1dfdb0b03100e36362 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -41,5 +41,5 @@ index b6e978668..8d95d148f 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0123-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 96%
rename from Spigot-Server-Patches/0123-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch
index 93b525539b..2276492ac2 100644
--- a/Spigot-Server-Patches/0123-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From cb5be4e330a54208ee57acc3be1ca69f3bee19f7 Mon Sep 17 00:00:00 2001
+From 4166ec0c617ad78d508f015a1d4da5199641c20f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
@@ -44,5 +44,5 @@ index 73855826e..f079c3389 100644
  
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0124-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch
similarity index 96%
rename from Spigot-Server-Patches/0124-Vehicle-Event-Cancellation-Changes.patch
rename to Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch
index c0d95d8cef..fe509deea6 100644
--- a/Spigot-Server-Patches/0124-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch
@@ -1,4 +1,4 @@
-From 250abb6d0ca791c9532957ddcc3d3b3fed90eab9 Mon Sep 17 00:00:00 2001
+From 49d999a37165c4441c7479b021a7768a2f2d0c31 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
@@ -41,5 +41,5 @@ index 8908d8b8d..0f4a1b66b 100644
              entity.j = 60;
          }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
similarity index 97%
rename from Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
rename to Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index 90f2a85e19..06e8b1b88a 100644
--- a/Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,4 +1,4 @@
-From 4e77c921e4c946cdf1a4a9ccf488470d409f0e4a Mon Sep 17 00:00:00 2001
+From fbebca9bf7a3e0aa8517e1009a3336ab8246e77c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
@@ -51,5 +51,5 @@ index 528005446..b0d03e408 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch
similarity index 98%
rename from Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch
rename to Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch
index a204879a2f..178841c220 100644
--- a/Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From aae8d45f695812234547659875185882576a8884 Mon Sep 17 00:00:00 2001
+From 3d13d3f46d166118a68be71adde74e57d7cb1d0f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Improve Minecraft Hopper Performance
@@ -86,5 +86,5 @@ index 6acce15e7..44b6ecc5d 100644
          return this.f > 0;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch
similarity index 94%
rename from Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch
index 69ec792604..c661ce95e5 100644
--- a/Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From caa7315a2610c58457ec85c91a9e6f971b73b1c2 Mon Sep 17 00:00:00 2001
+From 062ba076f982db42212697357f485aa5d920df0a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 988439a0a..410c9834b 100644
+index 430168d21..83b62da55 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -52,6 +52,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -35,5 +35,5 @@ index 988439a0a..410c9834b 100644
      // CraftBukkit end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 98%
rename from Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 45280c2622..ed4b9fff2d 100644
--- a/Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 2e5ebe21456932cc5b2acc66af5b6a877bfb61d6 Mon Sep 17 00:00:00 2001
+From 014e66039c805fb82717b0f6fe7c6b8d30f3699a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -145,5 +145,5 @@ index 256a13178..5768cd512 100644
  
      public RenderData() {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch
index 0d486ec3f8..711c5c35fc 100644
--- a/Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 70d33ab88ea2e9a120964de43059191a7ff6ce4d Mon Sep 17 00:00:00 2001
+From 7d61f1ae6c1042b230ece85761341c36ce482e6d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -782,5 +782,5 @@ index e9963e21c..acb4dee04 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch
similarity index 90%
rename from Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch
index 81396ff9b8..d9deb4a10f 100644
--- a/Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From 4d18d75affbc3688c2af0282c94606ac0579fdcb Mon Sep 17 00:00:00 2001
+From bd0317665aa18996d5e315cf993f1ee8c705efc8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index 08b986fd7..786d1dd22 100644
          }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch
index 6866db485a..1389f2d469 100644
--- a/Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 7047f1cc004e05f7ad7537010e631146a5aa9ee4 Mon Sep 17 00:00:00 2001
+From dfc386797ff567e4f4c54a63e24ddb8240df07d7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -99,5 +99,5 @@ index fbda70a39..c28b4bd44 100644
  
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 90%
rename from Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index f1036546e1..91db886b86 100644
--- a/Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,14 +1,14 @@
-From 1a355ce13efceaac09befef07ab6da6dbb1b3950 Mon Sep 17 00:00:00 2001
+From c08c205ecb62164eb4e00f5356319ced19481ab3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ee884ba57..5fbaa99e9 100644
+index 710c432d8..e009e5cf2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -229,4 +229,9 @@ public class PaperConfig {
+@@ -230,4 +230,9 @@ public class PaperConfig {
      private static void enablePlayerCollisions() {
          enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
      }
@@ -31,5 +31,5 @@ index 230004b4a..62752f816 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 97%
rename from Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 741e334b44..c1b64592a8 100644
--- a/Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From 7e64ee667c6453f0c1957fbb8ecb74ea1e98e28c Mon Sep 17 00:00:00 2001
+From 540962bdce2796a369838635bbb1f15eafeb414c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates
@@ -44,5 +44,5 @@ index a6cf1d83d..3db29161d 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 95%
rename from Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch
index 46f7ff0678..e69374207b 100644
--- a/Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 5f497d51aadf17988eb23ce59d233324b3628047 Mon Sep 17 00:00:00 2001
+From 9e02e7677c27c8b05f69b00620f98b3f6a583e31 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 02:03:56 -0400
 Subject: [PATCH] Fix Chunk Unload Queue Issues
@@ -34,5 +34,5 @@ index 54b454fe3..57ae50d2e 100644
                              continue;
                          }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch
similarity index 92%
rename from Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch
index ba01db1ef0..ae5f115c6a 100644
--- a/Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From f8e32d06d1110855c4ad68b681c4a0c3253dfbaa Mon Sep 17 00:00:00 2001
+From 922d126f9e81684c5ca795fbbf67a7c38aaf1c18 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
@@ -18,5 +18,5 @@ index 6384d50e7..cb1fcf0f4 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0136-Optimize-EAR.patch b/Spigot-Server-Patches/0135-Optimize-EAR.patch
similarity index 96%
rename from Spigot-Server-Patches/0136-Optimize-EAR.patch
rename to Spigot-Server-Patches/0135-Optimize-EAR.patch
index 6ff9f30dcb..e1e4c93b19 100644
--- a/Spigot-Server-Patches/0136-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0135-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From 6e175b1425a2ae869b13908042f22dba15b89dea Mon Sep 17 00:00:00 2001
+From 1dc6b412b3e0bed7ef8c58885a37931bd3467f06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
@@ -65,5 +65,5 @@ index c411ce886..c8a6ff3d4 100644
                  }
              }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch
similarity index 96%
rename from Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch
index 7eab1a9093..df0e2f3bd8 100644
--- a/Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From fcf5d25b497633a337c78b07a7030913aa7018b1 Mon Sep 17 00:00:00 2001
+From 9541bcf765a36a89596125b143980a9565b96454 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 410c9834b..f83cc7641 100644
+index 83b62da55..2349c3ade 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -527,7 +527,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -96,5 +96,5 @@ index ccfc755d2..989758cdf 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch
index e8fd80f22c..07c5715db9 100644
--- a/Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From fe36eb75f24899170fb0c73564e2e929c1a21561 Mon Sep 17 00:00:00 2001
+From 65e18c08092da1309dc93d0853d3e80e10395ea8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -43,5 +43,5 @@ index 6a71ebbd2..faf7b60af 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch
similarity index 99%
rename from Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch
rename to Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch
index 5dc2d755d6..62440326fa 100644
--- a/Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch
@@ -1,4 +1,4 @@
-From a4f2fa2373ffcb60638242223520705fee58d75b Mon Sep 17 00:00:00 2001
+From 82e8f7a4a44e9c66dfc85f545c4ce71cf719c1b8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional old TNT cannon behaviors
@@ -389,5 +389,5 @@ index d7bc6a0ed..f2785d86c 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 95%
rename from Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch
index 046467949e..e35c4bffcb 100644
--- a/Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 423558d9e117b9021b2b779379e1234e4529aac6 Mon Sep 17 00:00:00 2001
+From 8529869d620ac19136bca541423009322e9f3e3a Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -39,5 +39,5 @@ index 741236289..25a2a5d36 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch
index 326249b205..00733f4564 100644
--- a/Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 77b435e0e2ac9b2391e76d794630df60afab84d4 Mon Sep 17 00:00:00 2001
+From 0f1b139badcecfe47ada01bf5a643f6691154341 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -42,5 +42,5 @@ index b5efb9c3f..ef9529add 100644
              return;
          }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0142-Add-server-name-parameter.patch b/Spigot-Server-Patches/0141-Add-server-name-parameter.patch
similarity index 92%
rename from Spigot-Server-Patches/0142-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0141-Add-server-name-parameter.patch
index 7afa5e0066..2da74da40a 100644
--- a/Spigot-Server-Patches/0142-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0141-Add-server-name-parameter.patch
@@ -1,4 +1,4 @@
-From 87a15503b5a512ea355a426d0a5decd581bf4d9a Mon Sep 17 00:00:00 2001
+From b2f2babfb133493364ec75644bc1952350434355 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
@@ -24,5 +24,5 @@ index 4399faf69..59d4e2e6f 100644
          };
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 1286b2c580..efbfb96c24 100644
--- a/Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From 5143b0afa05419d7d268061e7e1834a718ae14cd Mon Sep 17 00:00:00 2001
+From c2807401573c8f0758a9ce02696466bc911439c2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -44,5 +44,5 @@ index 9af34ba60..031507574 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch
similarity index 98%
rename from Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch
rename to Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch
index a306acbe9d..ae258a96df 100644
--- a/Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From f478403d23570e7f7d119651fb8afba75f36ed3d Mon Sep 17 00:00:00 2001
+From 33ecb4b8cf5348bc04ebf70d86f3d0a82c06c00a Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences
@@ -102,5 +102,5 @@ index bb01929e8..8059e6dcd 100644
          Block block = this.block.getBlock();
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch
rename to Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch
index f94f692727..99d810654c 100644
--- a/Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From fef949da0a39778974de622940c54323e5053c39 Mon Sep 17 00:00:00 2001
+From 93a2af841f6352063d22593927b334434bae3383 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sat, 18 Jun 2016 01:01:37 -0500
 Subject: [PATCH] Make entities look for hoppers
@@ -378,5 +378,5 @@ index 44b6ecc5d..022e64520 100644
  
              if (!list.isEmpty()) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 98%
rename from Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 8ef94d9ada..e5cf53bf95 100644
--- a/Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From a2a8ba613f501d788f0a391e52906209e2b259d1 Mon Sep 17 00:00:00 2001
+From 47bc97578256db7c8dc522c0810655ebc94b512a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -140,5 +140,5 @@ index 9965235ab..3f8859a1f 100644
              }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch
similarity index 96%
rename from Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch
rename to Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch
index 8ce1eda352..be17bab921 100644
--- a/Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From 58d1a2e017efc84ff949c59e8c422535020ce4a7 Mon Sep 17 00:00:00 2001
+From bc29002b6c5ff86ac128aee61f9e8d08c20eeeb5 Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@@ -41,5 +41,5 @@ index ec901150d..b8ac99e5d 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch
similarity index 95%
rename from Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch
index 2574a99e7a..0e3dda835a 100644
--- a/Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 38d08d69b70dde46257938f6c9deba534619728d Mon Sep 17 00:00:00 2001
+From 8ed79f772341407250572ea3a08b13d46bafab63 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -33,5 +33,5 @@ index 7ed3a0677..7900fca57 100644
          int i = MathHelper.floor(entity.locX / 16.0D);
          int j = MathHelper.floor(entity.locZ / 16.0D);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch
similarity index 98%
rename from Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch
index 499f833c99..ac751f8a5f 100644
--- a/Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 5ef6284e1b13bf6060363f946e11282a99053c18 Mon Sep 17 00:00:00 2001
+From b186fced2094d441de37e5b76a68e2b8dd8f0bda Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@@ -67,5 +67,5 @@ index 34ade146c..242552c36 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 92%
rename from Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 617aa3942d..650466cb0b 100644
--- a/Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From 2c17fa95cfb703a465bae518e70103f03a8fec12 Mon Sep 17 00:00:00 2001
+From 9c9779271b3982365fb2e2cd4c779dc8f918ab04 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
@@ -18,5 +18,5 @@ index 989758cdf..1c619c596 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch
similarity index 92%
rename from Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch
index 819402d5b7..f720c1aea9 100644
--- a/Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,4 +1,4 @@
-From aaab3d867b510ec66c2dfdf7e418593c5f7d94a2 Mon Sep 17 00:00:00 2001
+From 8fa14bdc0cab3b0e51f4255fb748ba1a5305cf13 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
@@ -18,5 +18,5 @@ index dfbae01f4..4b79031f0 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch
similarity index 93%
rename from Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch
index c2787eeffc..8f5d435410 100644
--- a/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch
@@ -1,4 +1,4 @@
-From 4627eeb7a8f7e6c42eb3821f246044308c526c37 Mon Sep 17 00:00:00 2001
+From ce4e97796333e81052f7e5267af694d1ebb49f50 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
@@ -23,5 +23,5 @@ index cf12e51e4..acda1843d 100644
      }
  
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch
similarity index 92%
rename from Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch
index e4af9e1d18..3a4bd2be25 100644
--- a/Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch
@@ -1,14 +1,14 @@
-From 44efa70e5f28474993c7f5fa1ac98e9db8c25ecb Mon Sep 17 00:00:00 2001
+From cdcf33ebe123e94c1e5a9882232d064285482ab0 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5fbaa99e9..d1d50f0db 100644
+index e009e5cf2..276185d9a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -234,4 +234,9 @@ public class PaperConfig {
+@@ -235,4 +235,9 @@ public class PaperConfig {
      private static void saveEmptyScoreboardTeams() {
          saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
      }
@@ -33,7 +33,7 @@ index 2ff8a6da0..52e736080 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8cb8cbe2d..1bbce7a78 100644
+index a958ce998..8ade16865 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1336,7 +1336,8 @@ public final class CraftServer implements Server {
@@ -47,5 +47,5 @@ index 8cb8cbe2d..1bbce7a78 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 96%
rename from Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch
index e9abbec52f..80ac491d47 100644
--- a/Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From 090f996a8243c49f2a4273bcae8391e05352d990 Mon Sep 17 00:00:00 2001
+From 7293031a9dea2d01c59bc139f80b4a4f50b6c083 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals
@@ -58,5 +58,5 @@ index 288c52c55..66c459d83 100644
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch
similarity index 93%
rename from Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch
index 2cd020d0ed..1e93d97703 100644
--- a/Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From 28b204d655e85d71f2b53e4a2e178037a42e47bf Mon Sep 17 00:00:00 2001
+From a9215f422226e93bd492641c5ae02bb3b9fa0d10 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
@@ -34,5 +34,5 @@ index 8123d7295..b6765e5bc 100644
 +    //Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0156-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch
similarity index 92%
rename from Spigot-Server-Patches/0156-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch
index 2a10ade6f2..8325c597c4 100644
--- a/Spigot-Server-Patches/0156-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,4 +1,4 @@
-From e20323c602961501ee58642a9caa3b4813a70899 Mon Sep 17 00:00:00 2001
+From 7f2c080841b1462ac6e08fbd788aade8f8b4c23c Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
@@ -18,5 +18,5 @@ index 4b79031f0..060434f32 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0157-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch
similarity index 93%
rename from Spigot-Server-Patches/0157-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch
index cbdf869d2b..036c8eb0f5 100644
--- a/Spigot-Server-Patches/0157-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch
@@ -1,14 +1,14 @@
-From 75d4c57a672aeb08a882dd8335152afdaa3a5eaf Mon Sep 17 00:00:00 2001
+From 00dd9ebe392fba212ccd1dcae0f5585f65e9249b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d1d50f0db..2f17b9013 100644
+index 276185d9a..bb4114b8d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -239,4 +239,13 @@ public class PaperConfig {
+@@ -240,4 +240,13 @@ public class PaperConfig {
      private static void bungeeOnlineMode() {
          bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true);
      }
@@ -44,5 +44,5 @@ index 060434f32..6281fe4d5 100644
              limitedPackets = 0;
              return true;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0158-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch
similarity index 93%
rename from Spigot-Server-Patches/0158-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch
index 5b2e416a0c..3b4170c613 100644
--- a/Spigot-Server-Patches/0158-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch
@@ -1,14 +1,14 @@
-From c2e7d9be5b070dc9d1c43795ef78468d090c222c Mon Sep 17 00:00:00 2001
+From 88776c9c8191cc75cb70d2239b19bcd53ea8445f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2f17b9013..468095a44 100644
+index bb4114b8d..f86729724 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -248,4 +248,11 @@ public class PaperConfig {
+@@ -249,4 +249,11 @@ public class PaperConfig {
          }
          packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
      }
@@ -43,5 +43,5 @@ index 6281fe4d5..51d27351d 100644
                  }
              } else {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0159-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0158-Auto-Save-Improvements.patch
index deb536cd33..fe441428a2 100644
--- a/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 6a963250c50acbdd345eecbbfe9445080716c906 Mon Sep 17 00:00:00 2001
+From acd7a746b5bf9c66021066b91467f8f808772d3d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,10 +12,10 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 468095a4..ae69751c 100644
+index f86729724..009bf0c8b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -255,4 +255,9 @@ public class PaperConfig {
+@@ -256,4 +256,9 @@ public class PaperConfig {
          flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
          flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
      }
@@ -26,7 +26,7 @@ index 468095a4..ae69751c 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dc96bd7f..bcf24cb4 100644
+index dc96bd7f4..bcf24cb49 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -58,7 +58,7 @@ index dc96bd7f..bcf24cb4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 88437d77..9f7f32dc 100644
+index 88437d77a..9f7f32dc2 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -960,11 +960,9 @@ public class Chunk {
@@ -76,7 +76,7 @@ index 88437d77..9f7f32dc 100644
  
      public Random a(long i) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 0a8e09e5..ad668be6 100644
+index 0a8e09e5e..ad668be62 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1,5 +1,6 @@
@@ -96,7 +96,7 @@ index 0a8e09e5..ad668be6 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index acda1843..171ed25c 100644
+index acda1843d..171ed25c3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -108,7 +108,7 @@ index acda1843..171ed25c 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2349c3ad..8134501c 100644
+index 2349c3ade..8134501c7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -118,6 +118,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -155,7 +155,7 @@ index 2349c3ad..8134501c 100644
          this.methodProfiler.a("tallying");
          // Spigot start
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 50a3dfe4..185b5929 100644
+index 50a3dfe44..185b5929f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -330,6 +330,7 @@ public abstract class PlayerList {
@@ -192,7 +192,7 @@ index 50a3dfe4..185b5929 100644
      public void addWhitelist(GameProfile gameprofile) {
          this.whitelist.add(new WhiteListEntry(gameprofile));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f969d2a7..cc0e8d2c 100644
+index f969d2a72..cc0e8d2c8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1003,8 +1003,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0160-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0159-Chunk-registration-fixes.patch
similarity index 92%
rename from Spigot-Server-Patches/0160-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0159-Chunk-registration-fixes.patch
index b8f1da2f67..764bbcfb34 100644
--- a/Spigot-Server-Patches/0160-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0159-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 6fd275a5cf157c53695d8aa39a27a2d5cd2d2091 Mon Sep 17 00:00:00 2001
+From 65b94463de969e5f6657dd234d06e25f328a60c0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -21,5 +21,5 @@ index 7900fca57..ec0a28cff 100644
  
              if (!entity.aa || entity.ab != k || entity.ac != l || entity.ad != i1) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0161-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0160-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 91%
rename from Spigot-Server-Patches/0161-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0160-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index d3de7cde4a..be1521f5df 100644
--- a/Spigot-Server-Patches/0161-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0160-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From c41a285e116a82b9eb0b7281142706a9a7469fad Mon Sep 17 00:00:00 2001
+From 7c28aed99b9afe7c37d5f9f0b70013dffb1c8a2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
@@ -26,5 +26,5 @@ index ecfc316bb..3f909c174 100644
      public LivingEntity _INVALID_getShooter() {
          return (LivingEntity) getShooter();
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0162-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0161-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 90%
rename from Spigot-Server-Patches/0162-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0161-Auto-fix-bad-Y-levels-on-player-login.patch
index a8c3eb881c..d4afdd9546 100644
--- a/Spigot-Server-Patches/0162-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0161-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From bf0f03262b6ac784f59f36362f0ecd0d32ef1388 Mon Sep 17 00:00:00 2001
+From 8d7d278a44258fea1363df19c5e4e1868fb6e53c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -18,5 +18,5 @@ index 171ed25c3..32bce920b 100644
      }
  
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0163-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0162-Raise-string-limit-for-packet-serialization.patch
similarity index 93%
rename from Spigot-Server-Patches/0163-Raise-string-limit-for-packet-serialization.patch
rename to Spigot-Server-Patches/0162-Raise-string-limit-for-packet-serialization.patch
index 2a718f7ed0..d630fa5c1f 100644
--- a/Spigot-Server-Patches/0163-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0162-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From a6297ac50d38e7ad1e986135d64dffcc4af39b5f Mon Sep 17 00:00:00 2001
+From 392921840f177c1ab77c0ef174c08e1259ac174c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:54:20 -0400
 Subject: [PATCH] Raise string limit for packet serialization
@@ -23,5 +23,5 @@ index 7a6619595..68e8c4671 100644
              this.d(abyte.length);
              this.writeBytes(abyte);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0164-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0163-Disable-Vanilla-Chunk-GC.patch
similarity index 94%
rename from Spigot-Server-Patches/0164-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0163-Disable-Vanilla-Chunk-GC.patch
index 929ad9b669..00b91bfee5 100644
--- a/Spigot-Server-Patches/0164-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0163-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From c1bba0e6b2d4136987500182b01bb95f4c265597 Mon Sep 17 00:00:00 2001
+From e4a3829e997f8eed10c0d7be3796031c3789aef2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -29,5 +29,5 @@ index cc0e8d2c8..7a6d11f20 100644
          }
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0165-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch
similarity index 95%
rename from Spigot-Server-Patches/0165-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch
index 62cb8d2b8d..7707280fb1 100644
--- a/Spigot-Server-Patches/0165-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From d85c1336679a692f2bb96c0fa34574419830b77c Mon Sep 17 00:00:00 2001
+From b51be29b2da1afbb7de35723ba0dad769edee720 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
@@ -41,5 +41,5 @@ index 9f7f32dc2..d850dbfc3 100644
          if (this.j) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0165-Add-EntityZapEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0166-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0165-Add-EntityZapEvent.patch
index 84c72b67fe..8ba04db23f 100644
--- a/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0165-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From 5237545473b5f46a819a32109f64aac1d9cb0aaa Mon Sep 17 00:00:00 2001
+From 1eeb3eb2836dad8e57a9c72fc70284fad2856e0e Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -67,5 +67,5 @@ index 95b12331e..4d252aa47 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0167-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0166-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 95%
rename from Spigot-Server-Patches/0167-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0166-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index c47f460b9e..313ea5d400 100644
--- a/Spigot-Server-Patches/0167-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0166-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 0996378191511791820a385e381118da6dbaa326 Mon Sep 17 00:00:00 2001
+From a8c1693f11909a132dbe93641df6029626f45b08 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -32,5 +32,5 @@ index 9c4d1c938..dd1c1a39b 100644
                      if (block == this) {
                          if (this.e(world, blockposition1)) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0168-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 97%
rename from Spigot-Server-Patches/0168-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 0fc46209b1..3bd5a59ea8 100644
--- a/Spigot-Server-Patches/0168-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 4dfff3a56d96b1fb93a3dc5c9100317b0c17633e Mon Sep 17 00:00:00 2001
+From f3d367714519d31627c7ef374578b894060495cd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -63,5 +63,5 @@ index 19411212a..139f2799c 100644
          ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0169-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0168-Chunk-Save-Stats-Debug-Option.patch
similarity index 98%
rename from Spigot-Server-Patches/0169-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0168-Chunk-Save-Stats-Debug-Option.patch
index 34562e9b40..de1510b2ed 100644
--- a/Spigot-Server-Patches/0169-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0168-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From e9fe9d86d190fed0eba83a122092af50636cc0e1 Mon Sep 17 00:00:00 2001
+From beb15103f9456ab0f8e3df370a52048e13fd7cc3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
@@ -90,5 +90,5 @@ index 139f2799c..a10964b5b 100644
              boolean flag;
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0170-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0170-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index fd4cbad586..e423936831 100644
--- a/Spigot-Server-Patches/0170-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,4 +1,4 @@
-From 022c321aa2f4f286f4d927656105aea40f59aed5 Mon Sep 17 00:00:00 2001
+From b277f7f16147d91a04ac1708888225076084af68 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
@@ -61,5 +61,5 @@ index 1a01a57d2..f914ad417 100644
                  entity.f(nbttagcompound1);
              }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0171-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0170-Cache-user-authenticator-threads.patch
similarity index 97%
rename from Spigot-Server-Patches/0171-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0170-Cache-user-authenticator-threads.patch
index c579dd5246..3e91a6f9b5 100644
--- a/Spigot-Server-Patches/0171-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0170-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From 33e36f3a8933c7dfd55ccbda5c4bc6fe7a6eba40 Mon Sep 17 00:00:00 2001
+From 1bc16bd4b171e1b4ab7c48ebbe5c336b4f1eeae0 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
@@ -63,5 +63,5 @@ index fe390feb9..350ec0323 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0172-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0171-Optimize-Network-Queue.patch
similarity index 89%
rename from Spigot-Server-Patches/0172-Optimize-Network-Queue.patch
rename to Spigot-Server-Patches/0171-Optimize-Network-Queue.patch
index d9e1c50510..ef5e41e97e 100644
--- a/Spigot-Server-Patches/0172-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0171-Optimize-Network-Queue.patch
@@ -1,11 +1,11 @@
-From 2c00725d68ba2dc5915bee0032ef57ebbc299bad Mon Sep 17 00:00:00 2001
+From 65234da12571d96b72b7d55fb939a1a4b4c807d9 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d49a4ded0..044ae22d4 100644
+index 8134501c7..8df30e3d0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -103,7 +103,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -18,5 +18,5 @@ index d49a4ded0..044ae22d4 100644
      private long ab = aw();
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0173-Optimise-NetworkManager.patch b/Spigot-Server-Patches/0172-Optimise-NetworkManager.patch
similarity index 98%
rename from Spigot-Server-Patches/0173-Optimise-NetworkManager.patch
rename to Spigot-Server-Patches/0172-Optimise-NetworkManager.patch
index c40a994763..2f80e680e1 100644
--- a/Spigot-Server-Patches/0173-Optimise-NetworkManager.patch
+++ b/Spigot-Server-Patches/0172-Optimise-NetworkManager.patch
@@ -1,4 +1,4 @@
-From a969e2064661d379b717bb30ac305302bf3e4472 Mon Sep 17 00:00:00 2001
+From a8811a6944cbbac091d661b2ca406b18929456bc Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 20:35:05 +0000
 Subject: [PATCH] Optimise NetworkManager
@@ -121,5 +121,5 @@ index 184ef32a8..be14c0b25 100644
  
          }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0174-Optimise-removeQueue.patch b/Spigot-Server-Patches/0173-Optimise-removeQueue.patch
similarity index 96%
rename from Spigot-Server-Patches/0174-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0173-Optimise-removeQueue.patch
index 37e1d65980..440eacda00 100644
--- a/Spigot-Server-Patches/0174-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0173-Optimise-removeQueue.patch
@@ -1,4 +1,4 @@
-From 4430ecd04c3c11b7a8c19473114681789f915ac2 Mon Sep 17 00:00:00 2001
+From df2fd9ca4186acf80f5f3516d1d6473d29f4c2b2 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
@@ -61,5 +61,5 @@ index 32bce920b..56ce2554d 100644
  
      protected void a(MobEffect mobeffect) {
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0174-Allow-Reloading-of-Command-Aliases.patch
similarity index 93%
rename from Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0174-Allow-Reloading-of-Command-Aliases.patch
index 5bc0a5f3c5..0d7e053ef5 100644
--- a/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0174-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From d333a7c47ff1433c9ac3bfd965d118968c665904 Mon Sep 17 00:00:00 2001
+From 786974fe4d33dfbcac920900a7b06e00b4ba6791 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8ade1686..326196ce 100644
+index 8ade16865..326196ce4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1852,5 +1852,24 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0176-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0175-Add-source-to-PlayerExpChangeEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0176-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0175-Add-source-to-PlayerExpChangeEvent.patch
index 38571bb023..f21802ae52 100644
--- a/Spigot-Server-Patches/0176-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0175-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From 46b11f5745765523602355211fc2629c0e147335 Mon Sep 17 00:00:00 2001
+From 5dcc1c79bdd70bdae5d82c71da0de1ffcacd504f Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -48,5 +48,5 @@ index 4d252aa47..7e4982d93 100644
          Block block = world.getWorld().getBlockAt(x, y, z);
          CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0177-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0176-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 90%
rename from Spigot-Server-Patches/0177-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0176-Optimize-World.isLoaded-BlockPosition-Z.patch
index 465a21b134..5812c5a3e8 100644
--- a/Spigot-Server-Patches/0177-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0176-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 706f201ef2947eeefabeb9839069261a5cafb3e3 Mon Sep 17 00:00:00 2001
+From c277520b112c71aaacbe585cd1b6333b5ed6bf9e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -19,5 +19,5 @@ index ec0a28cff..2fa63a27f 100644
  
      public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0178-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0177-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 99%
rename from Spigot-Server-Patches/0178-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0177-Speedup-BlockPos-by-fixing-inlining.patch
index bb6c84dbe6..e1cbab6b6f 100644
--- a/Spigot-Server-Patches/0178-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0177-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 792635dc5837b9af24254dd5a9b23866d324d14f Mon Sep 17 00:00:00 2001
+From 5a54f793b0f84d651b28c65ee6fd45937eeb290b Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -177,5 +177,5 @@ index b3c1f550c..6a0b3a62d 100644
  
          public BlockPosition h() {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0179-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0178-Don-t-let-fishinghooks-use-portals.patch
similarity index 94%
rename from Spigot-Server-Patches/0179-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0178-Don-t-let-fishinghooks-use-portals.patch
index 96d1c33285..3120e1e3ad 100644
--- a/Spigot-Server-Patches/0179-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0178-Don-t-let-fishinghooks-use-portals.patch
@@ -1,4 +1,4 @@
-From edeba5ec3463fced1f0f8d10a145f8729a00be03 Mon Sep 17 00:00:00 2001
+From 07f94f25a8a5c20683c36e3abfacc7f91892b779 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
@@ -35,5 +35,5 @@ index 0c528c699..606160a17 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch
index 6f793245ea..04ccea1de1 100644
--- a/Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 4dd0ba8a60d9a18c1edc5042efbe5ead2465712c Mon Sep 17 00:00:00 2001
+From 3126a7e06fe1a789f090b648aeb41e4cd53006cb Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
@@ -107,5 +107,5 @@ index 7e4982d93..a850a9634 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0181-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch
similarity index 98%
rename from Spigot-Server-Patches/0181-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch
index fb77b8eb39..958e1566f4 100644
--- a/Spigot-Server-Patches/0181-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From 47642bdf46e5a33d83891f3b5fdac5e8096f914a Mon Sep 17 00:00:00 2001
+From d0f789b689a9098e7010653e23a7cfcec0a2aa37 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
@@ -96,5 +96,5 @@ index a850a9634..59942d9cb 100644
          return event;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0182-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0181-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 96%
rename from Spigot-Server-Patches/0182-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0181-Prevent-Pathfinding-out-of-World-Border.patch
index 12e2c59a6a..b6e02658d8 100644
--- a/Spigot-Server-Patches/0182-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0181-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From 42b7e54e8ce551b2cbdd475bf582d9b807587745 Mon Sep 17 00:00:00 2001
+From 42ba792fd1872a43fa70dacebb308dd7482f951d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -39,5 +39,5 @@ index 9038d52eb..632eb1c9d 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0183-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch b/Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
similarity index 94%
rename from Spigot-Server-Patches/0183-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
rename to Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
index 24158464c6..b1dcaae8c9 100644
--- a/Spigot-Server-Patches/0183-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
+++ b/Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
@@ -1,4 +1,4 @@
-From 89d07c5f1dd1050d332c3d2d84edefe27909242e Mon Sep 17 00:00:00 2001
+From 7a212ee9a8837cc5f3aca50aa2d80b24a6865d1e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:38:57 -0500
 Subject: [PATCH] Ignore invalid Marker Icon ID's in maps
@@ -23,5 +23,5 @@ index dbe6a80f2..dfd8e4d84 100644
                  }
              }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0184-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0183-Bound-Treasure-Maps-to-World-Border.patch
similarity index 96%
rename from Spigot-Server-Patches/0184-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0183-Bound-Treasure-Maps-to-World-Border.patch
index 3170cc5258..f0a58d2b92 100644
--- a/Spigot-Server-Patches/0184-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0183-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From 8908a3360e1050aecfc34e101fd866f55873bd93 Mon Sep 17 00:00:00 2001
+From 7ec221ebfaf5d25732b2ed77759dd5d0ff10b9f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -48,5 +48,5 @@ index 632eb1c9d..1bb172bbf 100644
          return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e();
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch
similarity index 96%
rename from Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch
index db079a6048..5aae616711 100644
--- a/Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 050363c48f3b9da488e55f8eeed6f6ab536e8a49 Mon Sep 17 00:00:00 2001
+From 5e25f419de976f60fc7e4c1362c3d18a53890bef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -42,5 +42,5 @@ index 4ad75468c..ac6e2a9aa 100644
              if (blockposition != null) {
                  ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0186-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0185-Optimize-ItemStack.isEmpty.patch
similarity index 94%
rename from Spigot-Server-Patches/0186-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0185-Optimize-ItemStack.isEmpty.patch
index 157a8417e3..859a7ffeba 100644
--- a/Spigot-Server-Patches/0186-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0185-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 43215a4d47506b61a0eafcda2a8e2d579cf7ffdb Mon Sep 17 00:00:00 2001
+From 853b37f21ca5ee4dcbd97bd2521e0ae9082f8ab3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -27,5 +27,5 @@ index 911bd879a..45ebd3f61 100644
      public static void a(DataConverterManager dataconvertermanager) {
          dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0187-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0186-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 95%
rename from Spigot-Server-Patches/0187-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0186-Add-API-methods-to-control-if-armour-stands-can-move.patch
index f5ab41ac4e..af981c79d6 100644
--- a/Spigot-Server-Patches/0187-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0186-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,4 +1,4 @@
-From 9fa46079deaa1b1399c59311eaadca06d861bc35 Mon Sep 17 00:00:00 2001
+From 646a6aff23796620fa4f75fb9a93d5537230d738 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
@@ -50,5 +50,5 @@ index 2b66a08ad..8a06cb165 100644
 +    }
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0188-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 94%
rename from Spigot-Server-Patches/0188-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 3afd29c217..7e7c7c5987 100644
--- a/Spigot-Server-Patches/0188-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From c4b61fd5c1fe64765528dffee1dd902643786577 Mon Sep 17 00:00:00 2001
+From d858ceb94345c3486318007140f3da54c5f6949f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@@ -31,5 +31,5 @@ index 7af76e14c..2028cf81e 100644
  
              for (int i = 0; i < list.size(); ++i) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0189-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch
similarity index 93%
rename from Spigot-Server-Patches/0189-Add-option-to-remove-invalid-statistics.patch
rename to Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch
index 85662c6a7c..495c8852ec 100644
--- a/Spigot-Server-Patches/0189-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch
@@ -1,14 +1,14 @@
-From 5570eaceb50f606c5fa7bb040e8d159eb43d0b4e Mon Sep 17 00:00:00 2001
+From e9c26ebbca617b1eb4856800b106a7a708e8bffc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ae69751c3..687c9d5ad 100644
+index 009bf0c8b..a901cd85c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -260,4 +260,13 @@ public class PaperConfig {
+@@ -261,4 +261,13 @@ public class PaperConfig {
      private static void playerAutoSaveRate() {
          playerAutoSaveRate = getInt("settings.player-auto-save-rate", -1);
      }
@@ -53,5 +53,5 @@ index 99466dbde..d1bee0257 100644
          }
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0190-IllegalPacketEvent.patch b/Spigot-Server-Patches/0189-IllegalPacketEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0190-IllegalPacketEvent.patch
rename to Spigot-Server-Patches/0189-IllegalPacketEvent.patch
index 121604d8d6..fe258a7ca6 100644
--- a/Spigot-Server-Patches/0190-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0189-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From 8d415cbbc51eca2c8d6e90646606cca8326d13ec Mon Sep 17 00:00:00 2001
+From 725bc47a62a7a31ea5246a767641048e0ac7d71f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
@@ -67,5 +67,5 @@ index 51d27351d..437575003 100644
                      }
                      // CraftBukkit start
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch
similarity index 94%
rename from Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch
index 489ac41007..b4613323b2 100644
--- a/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 7f420a068ba59888256fc5a56073b27c1c0d5878 Mon Sep 17 00:00:00 2001
+From 692ea609955c5f4e1c0ec7ca7eaf6ee2e37f85c7 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -31,5 +31,5 @@ index 437575003..7c2d43ac2 100644
      }
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0192-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0192-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch
index f6ecf491ea..381bbb29f1 100644
--- a/Spigot-Server-Patches/0192-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch
@@ -1,4 +1,4 @@
-From 16864f64eaabb8d6333f5cd014a0895c077bbea4 Mon Sep 17 00:00:00 2001
+From e3e0fdeda8bebc5968613647f0af4b064d5713b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
@@ -62,7 +62,7 @@ index 1159eea1a..38359517c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a2fb7d2be..2d8018a7c 100644
+index 233903b5f..a57034471 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -165,6 +165,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -85,5 +85,5 @@ index a2fb7d2be..2d8018a7c 100644
          PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
          packet.header = header;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0193-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0192-Activation-Range-Improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0193-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0192-Activation-Range-Improvements.patch
index ec35537c42..1ff5e06853 100644
--- a/Spigot-Server-Patches/0193-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0192-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 95406a3c5c374c2bd0e0323822e74cd2f504254b Mon Sep 17 00:00:00 2001
+From 171b99c956c4ae9aa6a3ce852561388db8f4cf72 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@@ -155,5 +155,5 @@ index c8a6ff3d4..428912cbc 100644
              {
                  EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0194-Firework-API-s.patch b/Spigot-Server-Patches/0193-Firework-API-s.patch
similarity index 98%
rename from Spigot-Server-Patches/0194-Firework-API-s.patch
rename to Spigot-Server-Patches/0193-Firework-API-s.patch
index e659adca88..6f1e23b92a 100644
--- a/Spigot-Server-Patches/0194-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0193-Firework-API-s.patch
@@ -1,4 +1,4 @@
-From d18c5cd56caac6060bf87849a11cce4455aded3a Mon Sep 17 00:00:00 2001
+From cbae9aff5739ca9a45c3831f54abde0d88e70286 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
@@ -129,5 +129,5 @@ index 99746b3c2..d4fbe31d6 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0195-Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
similarity index 93%
rename from Spigot-Server-Patches/0195-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
rename to Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
index 28343a5b31..f802c0a493 100644
--- a/Spigot-Server-Patches/0195-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
+++ b/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
@@ -1,4 +1,4 @@
-From f4eb95784c1a4c41365e9bab5782146f76732130 Mon Sep 17 00:00:00 2001
+From dc1da7f09f8739925aaf3b3854e1be1077d441af Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 29 Dec 2016 00:56:51 -0500
 Subject: [PATCH] Change Outdated Build Download URL to Paper CI
@@ -18,5 +18,5 @@ index 59d4e2e6f..e4ec213e4 100644
                          Thread.sleep(TimeUnit.SECONDS.toMillis(15));
                      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0196-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0195-PlayerTeleportEndGatewayEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0196-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0195-PlayerTeleportEndGatewayEvent.patch
index d4968c1554..7fddba7151 100644
--- a/Spigot-Server-Patches/0196-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0195-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 83a7785e676bb5c1957953ea2a21c2ec077b425a Mon Sep 17 00:00:00 2001
+From 3152003830f317031c01e7ef4cbff6993167271f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -19,5 +19,5 @@ index 065d0bbfc..ea8992d72 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch b/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
similarity index 94%
rename from Spigot-Server-Patches/0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
rename to Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
index 27a13440a7..0101bbbbb6 100644
--- a/Spigot-Server-Patches/0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
+++ b/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
@@ -1,4 +1,4 @@
-From 06bdb38dccc19befbe7f7545c8f9000f4a84f5d2 Mon Sep 17 00:00:00 2001
+From f41f9d51855c2523df6f131f9a1025458e064ca6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 02:07:24 -0500
 Subject: [PATCH] MC-111699: Ignore Improper Anvil Item Name Packets
@@ -24,5 +24,5 @@ index 7c2d43ac2..cbe5d36d0 100644
                              } else {
                                  containeranvil.a("");
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch b/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch
similarity index 93%
rename from Spigot-Server-Patches/0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch
rename to Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch
index d2db84e973..62c9967628 100644
--- a/Spigot-Server-Patches/0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch
+++ b/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch
@@ -1,4 +1,4 @@
-From 5e65f26bff62e97dbf079f330ef3d8746928273c Mon Sep 17 00:00:00 2001
+From c821a74573a8283b5ba28f8f09da5f539451b640 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 02:43:22 -0500
 Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names
@@ -18,5 +18,5 @@ index cbe5d36d0..70af4ebbb 100644
                                  }
                              } else {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0199-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0198-ShulkerBox-Dupe-Prevention.patch
similarity index 92%
rename from Spigot-Server-Patches/0199-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0198-ShulkerBox-Dupe-Prevention.patch
index 03f7cfa8ed..bd0dcc878b 100644
--- a/Spigot-Server-Patches/0199-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0198-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From 5fccf75d029069744d80408fba8892ab22a1b0ac Mon Sep 17 00:00:00 2001
+From 9e12095b8bd3a30cda0f159c8008193c1d29ec6d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@@ -19,5 +19,5 @@ index fcb1a6c66..12fb81635 100644
  
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0200-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0199-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 95%
rename from Spigot-Server-Patches/0200-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0199-Provide-E-TE-Chunk-count-stat-methods.patch
index 38a6cc0c39..e25f4a5422 100644
--- a/Spigot-Server-Patches/0200-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0199-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 153f27d0a7e38e8871f9b9eeb55e938d76df569e Mon Sep 17 00:00:00 2001
+From 10b5bace2998a5679912d098488f9662879e4cd6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -41,5 +41,5 @@ index 3f8859a1f..b42074706 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch
similarity index 91%
rename from Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch
index c2bdc959f2..78d49f15bc 100644
--- a/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 56afad7e112cc00b51a19785cf90268c748861fa Mon Sep 17 00:00:00 2001
+From 74cd9a5fe5f7233473c7270ec3ab99c228204628 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 185b5929..91a45a75 100644
+index 185b5929f..91a45a755 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1213,6 +1213,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0202-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0201-Enforce-Sync-Chunk-Unloads.patch
similarity index 94%
rename from Spigot-Server-Patches/0202-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0201-Enforce-Sync-Chunk-Unloads.patch
index c5f3941429..784459bf89 100644
--- a/Spigot-Server-Patches/0202-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0201-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 6f280955c6ebf8bab28e6265a6e2ed1179a2b21b Mon Sep 17 00:00:00 2001
+From 1ab1eeef8cf388f5954415e9989ee13079827b1b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -27,5 +27,5 @@ index b42074706..b837a921c 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0203-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 90%
rename from Spigot-Server-Patches/0203-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch
index 2c70007523..655c11e64b 100644
--- a/Spigot-Server-Patches/0203-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,4 +1,4 @@
-From 6cba786e1983475c052025b76fcb8a318f71032a Mon Sep 17 00:00:00 2001
+From cfe4d3ebc8948c00995082dd7ead69f8155ee75f Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
@@ -17,5 +17,5 @@ index 1e295432e..6fcced926 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0204-Fix-block-break-desync.patch b/Spigot-Server-Patches/0203-Fix-block-break-desync.patch
similarity index 91%
rename from Spigot-Server-Patches/0204-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0203-Fix-block-break-desync.patch
index 1febf98f56..c7861015fe 100644
--- a/Spigot-Server-Patches/0204-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0203-Fix-block-break-desync.patch
@@ -1,4 +1,4 @@
-From 3df0dc4ae609d6cce1381f9142ab279f6e5d404a Mon Sep 17 00:00:00 2001
+From 69fbed512f6d72e4b71b362d24a6bbe95f1a8679 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
@@ -17,5 +17,5 @@ index 70af4ebbb..0e2f43b96 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0205-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0204-Assign-the-World-in-WorldGenStronghold.patch
similarity index 90%
rename from Spigot-Server-Patches/0205-Assign-the-World-in-WorldGenStronghold.patch
rename to Spigot-Server-Patches/0204-Assign-the-World-in-WorldGenStronghold.patch
index bb383aac5c..e3dcf9eaf4 100644
--- a/Spigot-Server-Patches/0205-Assign-the-World-in-WorldGenStronghold.patch
+++ b/Spigot-Server-Patches/0204-Assign-the-World-in-WorldGenStronghold.patch
@@ -1,4 +1,4 @@
-From 56a7a06dfe74381bb456627d3cd566972788123d Mon Sep 17 00:00:00 2001
+From b20fb77c753ccf663d5604c5fc1003f45c201e31 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 14 Jan 2017 01:22:07 -0600
 Subject: [PATCH] Assign the World in WorldGenStronghold
@@ -17,5 +17,5 @@ index c93754704..a3b958e01 100644
              this.c();
              this.b = true;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch b/Spigot-Server-Patches/0205-Add-fromBottle-flag-to-Experience-Orbs.patch
similarity index 97%
rename from Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch
rename to Spigot-Server-Patches/0205-Add-fromBottle-flag-to-Experience-Orbs.patch
index a9fdcf976c..e95e70a2c4 100644
--- a/Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch
+++ b/Spigot-Server-Patches/0205-Add-fromBottle-flag-to-Experience-Orbs.patch
@@ -1,4 +1,4 @@
-From 0216ba1815505d1a5e7b700619e8bc211bd800bb Mon Sep 17 00:00:00 2001
+From c6f53e639421d71e3b58517e5b29300eb1dac94a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 14 Jan 2017 16:15:26 -0600
 Subject: [PATCH] Add fromBottle flag to Experience Orbs
@@ -68,5 +68,5 @@ index 3a09cab3d..61e3c6c3e 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0207-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0206-Remove-the-Vanilla-Method-Profiler.patch
similarity index 97%
rename from Spigot-Server-Patches/0207-Remove-the-Vanilla-Method-Profiler.patch
rename to Spigot-Server-Patches/0206-Remove-the-Vanilla-Method-Profiler.patch
index ee2becc15a..605be42fa5 100644
--- a/Spigot-Server-Patches/0207-Remove-the-Vanilla-Method-Profiler.patch
+++ b/Spigot-Server-Patches/0206-Remove-the-Vanilla-Method-Profiler.patch
@@ -1,4 +1,4 @@
-From 9c624e9a7b6cd47b466eefcb451d13877e37566e Mon Sep 17 00:00:00 2001
+From 9e8045ad1b42d3f5cfab491f4844299d853ffa4e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jan 2017 02:00:33 -0500
 Subject: [PATCH] Remove the Vanilla Method Profiler
@@ -79,5 +79,5 @@ index 654652916..276983485 100644
 +    }
 +}
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0208-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch
similarity index 97%
rename from Spigot-Server-Patches/0208-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch
index b4ba612e86..8c4ec50903 100644
--- a/Spigot-Server-Patches/0208-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 4ab50867b66e6519f63fa630467612d8c4361501 Mon Sep 17 00:00:00 2001
+From d378a0ea944732d41e4d3095add7fc25171b2b6e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -56,5 +56,5 @@ index 7242da9cc..53486e205 100644
                  this.C(entity);
              }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0209-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
similarity index 95%
rename from Spigot-Server-Patches/0209-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
rename to Spigot-Server-Patches/0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
index c24cb58ffc..68b86395bf 100644
--- a/Spigot-Server-Patches/0209-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
+++ b/Spigot-Server-Patches/0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
@@ -1,4 +1,4 @@
-From 1c9b317d249bcbfd09475773989974bb81061a60 Mon Sep 17 00:00:00 2001
+From 73fc939332153a40845637a3a06f3cbb0f43a678 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 23 Jan 2017 15:10:25 -0600
 Subject: [PATCH] Do not allow a zero max height in BiomeJungle
@@ -34,5 +34,5 @@ index 6a0b3a62d..38a7af58c 100644
          return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2);
      }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0210-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0209-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 97%
rename from Spigot-Server-Patches/0210-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0209-Remove-CraftScheduler-Async-Task-Debugger.patch
index cf2c57fd4a..65f69a54f9 100644
--- a/Spigot-Server-Patches/0210-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0209-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From bc80b8c2f38c42c23f6028b270d5c5690f9eab84 Mon Sep 17 00:00:00 2001
+From 8394a8f5806921572c00dabe6b02756318ee5836 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -58,5 +58,5 @@ index e30cfb7b7..448c27cc7 100644
  
      @Deprecated
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0211-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0210-Shame-on-you-Mojang.patch
similarity index 96%
rename from Spigot-Server-Patches/0211-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0210-Shame-on-you-Mojang.patch
index 5ef6a8bd96..ed284ca780 100644
--- a/Spigot-Server-Patches/0211-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0210-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From 5342f4a657419b01d019dcd51f7fdf91b96245b7 Mon Sep 17 00:00:00 2001
+From e2d75d281532b21019d76ef1b04dd0320caf67bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
@@ -55,5 +55,5 @@ index f44f05620..74c371179 100644
      }
  }
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0212-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0211-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 93%
rename from Spigot-Server-Patches/0212-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0211-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 726b175b39..85c5dcea1d 100644
--- a/Spigot-Server-Patches/0212-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0211-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,4 +1,4 @@
-From c5100f8b6c0f5bf7eb1e7f6358a6524c732c9a25 Mon Sep 17 00:00:00 2001
+From f68cbaa70b7d1afcaa4f105dcc0b8aa1b8760211 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
@@ -18,5 +18,5 @@ index 7006466b5..c32fb3ef5 100644
  
                  Iterator iterator = this.unloadQueue.iterator();
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0213-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0212-Do-not-let-armorstands-drown.patch
similarity index 95%
rename from Spigot-Server-Patches/0213-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0212-Do-not-let-armorstands-drown.patch
index 7446488376..10009427d6 100644
--- a/Spigot-Server-Patches/0213-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0212-Do-not-let-armorstands-drown.patch
@@ -1,4 +1,4 @@
-From 3fe282f11112bb0c3bb33616d1e58290896aeebe Mon Sep 17 00:00:00 2001
+From 376d55c29584c06cd6b5b4503b35fe6e544589f5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
@@ -41,5 +41,5 @@ index 53486e205..9b7159450 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0214-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0213-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
similarity index 92%
rename from Spigot-Server-Patches/0214-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
rename to Spigot-Server-Patches/0213-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
index a61f07898c..02040d7a6a 100644
--- a/Spigot-Server-Patches/0214-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
+++ b/Spigot-Server-Patches/0213-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
@@ -1,4 +1,4 @@
-From 872753265052c7e59cad78a66eba26adf9ab231f Mon Sep 17 00:00:00 2001
+From dcb65d22eb0e78a572a42148271143f8a012c813 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Sun, 9 Apr 2017 23:50:15 -0700
 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
@@ -19,5 +19,5 @@ index 45ebd3f61..cf204f41f 100644
          // CraftBukkit start - Route through setData for filtering
          // this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
 -- 
-2.12.1.windows.1
+2.12.2