Switch to a bStats based Metrics system

210 files changed, 1549 insertions, 495 deletions

diff --git a/Spigot-Server-Patches/0004-Paper-Metrics.patch b/Spigot-Server-Patches/0004-Paper-Metrics.patch
new file mode 100644
index 0000000000..1aa756788c
--- /dev/null
+++ b/Spigot-Server-Patches/0004-Paper-Metrics.patch
@@ -0,0 +1,1054 @@
+From ea94e6568f1ff9bef562641eaab57d42f586e927 Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+Date: Fri, 24 Mar 2017 23:56:01 -0500
+Subject: [PATCH] Paper Metrics
+
+Removes Spigot's mcstats metrics in favor of a system using bStats
+
+To disable for privacy or other reasons go to the bStats folder in your plugins folder
+and edit the config.yml file present there.
+
+Please keep in mind the data collected is anonymous and collection should have no
+tangible effect on server performance. The data is used to allow the authors of
+PaperMC to track version and platform usage so that we can make better management
+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..3084096c0
+--- /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
++ */
++
++package com.destroystokyo.paper;
++
++import net.minecraft.server.MinecraftServer;
++import org.bukkit.Bukkit;
++import org.bukkit.configuration.file.YamlConfiguration;
++import org.json.simple.JSONArray;
++import org.json.simple.JSONObject;
++
++import javax.net.ssl.HttpsURLConnection;
++import java.io.*;
++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.Timer;
++import java.util.TimerTask;
++import java.util.UUID;
++import java.util.logging.Level;
++import java.util.zip.GZIPOutputStream;
++
++/**
++ * bStats collects some data for plugin authors.
++ *
++ * Check out https://bStats.org/ to learn more about bStats!
++ */
++public 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!");
++        }
++    }
++
++    // 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";
++
++    // Should failed requests be logged?
++    private static boolean logFailedRequests;
++
++    // The uuid of the server
++    private static String serverUUID;
++
++    // A list with all custom charts
++    private final List<CustomChart> charts = new ArrayList<>();
++
++    /**
++     * Class constructor.
++     */
++    public Metrics() {
++
++        // 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();
++        }
++    }
++
++    /**
++     * Adds a custom chart.
++     *
++     * @param chart The chart to add.
++     */
++    public void addCustomChart(CustomChart chart) {
++        if (chart == null) {
++            throw new IllegalArgumentException("Chart cannot be null!");
++        }
++        charts.add(chart);
++    }
++
++    /**
++     * Starts the Scheduler which submits our data every 30 minutes.
++     */
++    private void startSubmitting() {
++        final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
++        timer.scheduleAtFixedRate(new TimerTask() {
++            @Override
++            public void run() {
++                // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
++                // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
++                MinecraftServer.getServer().postToMainThread(() -> 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!
++    }
++
++    /**
++     * Gets the plugin specific data.
++     *
++     * @return The plugin specific data.
++     */
++    public 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
++        JSONArray customCharts = new JSONArray();
++        for (CustomChart customChart : charts) {
++            // Add the data of the custom charts
++            JSONObject chart = customChart.getRequestJsonObject();
++            if (chart == null) { // If the chart is null, we skip it
++                continue;
++            }
++            customCharts.add(chart);
++        }
++        data.put("customCharts", customCharts);
++
++        return data;
++    }
++
++    /**
++     * Gets the server specific data.
++     *
++     * @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");
++        String osName = System.getProperty("os.name");
++        String osArch = System.getProperty("os.arch");
++        String osVersion = System.getProperty("os.version");
++        int coreCount = Runtime.getRuntime().availableProcessors();
++
++        JSONObject data = new JSONObject();
++
++        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);
++        data.put("coreCount", coreCount);
++
++        return data;
++    }
++
++    /**
++     * Collects the data and sends it afterwards.
++     */
++    private void submitData() {
++        final JSONObject data = getServerData();
++
++        JSONArray pluginData = new JSONArray();
++        pluginData.add(this.getPluginData());
++        data.put("plugins", pluginData);
++
++        // Create a new thread for the connection to the bStats server
++        new Thread(() -> {
++            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);
++                }
++            }
++        }, "Paper Metrics Submission Thread").start();
++    }
++
++    /**
++     * Sends the data to the bStats server.
++     *
++     * @param data The data to send.
++     * @throws Exception If the request failed.
++     */
++    private static void sendData(JSONObject data) throws Exception {
++        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
++        byte[] compressedData = compress(data.toString());
++
++        // Add headers
++        connection.setRequestMethod("POST");
++        connection.addRequestProperty("Accept", "application/json");
++        connection.addRequestProperty("Connection", "close");
++        connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
++        connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
++        connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
++        connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
++
++        // Send data
++        connection.setDoOutput(true);
++        DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
++        outputStream.write(compressedData);
++        outputStream.flush();
++        outputStream.close();
++
++        connection.getInputStream().close(); // We don't care about the response - Just send our data :)
++    }
++
++    /**
++     * Gzips the given String.
++     *
++     * @param str The string to gzip.
++     * @return The gzipped String.
++     * @throws IOException If the compression failed.
++     */
++    private static byte[] compress(final String str) throws IOException {
++        if (str == null) {
++            return null;
++        }
++        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
++        GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
++        gzip.write(str.getBytes("UTF-8"));
++        gzip.close();
++        return outputStream.toByteArray();
++    }
++
++    /**
++     * Represents a custom chart.
++     */
++    public static abstract class CustomChart {
++
++        // The id of the chart
++        protected final String chartId;
++
++        /**
++         * Class constructor.
++         *
++         * @param chartId The id of the chart.
++         */
++        public CustomChart(String chartId) {
++            if (chartId == null || chartId.isEmpty()) {
++                throw new IllegalArgumentException("ChartId cannot be null or empty!");
++            }
++            this.chartId = chartId;
++        }
++
++        protected JSONObject getRequestJsonObject() {
++            JSONObject chart = new JSONObject();
++            chart.put("chartId", chartId);
++            try {
++                JSONObject data = getChartData();
++                if (data == null) {
++                    // If the data is null we don't send the chart.
++                    return null;
++                }
++                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);
++                }
++                return null;
++            }
++            return chart;
++        }
++
++        protected abstract JSONObject getChartData();
++
++    }
++
++    /**
++     * Represents a custom simple pie.
++     */
++    public static abstract class SimplePie extends CustomChart {
++
++        /**
++         * Class constructor.
++         *
++         * @param chartId The id of the chart.
++         */
++        public SimplePie(String chartId) {
++            super(chartId);
++        }
++
++        /**
++         * Gets the value of the pie.
++         *
++         * @return The value of the pie.
++         */
++        public abstract String getValue();
++
++        @Override
++        protected JSONObject getChartData() {
++            JSONObject data = new JSONObject();
++            String value = getValue();
++            if (value == null || value.isEmpty()) {
++                // Null = skip the chart
++                return null;
++            }
++            data.put("value", value);
++            return data;
++        }
++    }
++
++    /**
++     * Represents a custom advanced pie.
++     */
++    public static abstract class AdvancedPie extends CustomChart {
++
++        /**
++         * Class constructor.
++         *
++         * @param chartId The id of the chart.
++         */
++        public AdvancedPie(String chartId) {
++            super(chartId);
++        }
++
++        /**
++         * 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() {
++            JSONObject data = new JSONObject();
++            JSONObject values = new JSONObject();
++            HashMap<String, Integer> map = getValues(new HashMap<String, Integer>());
++            if (map == null || map.isEmpty()) {
++                // Null = skip the chart
++                return null;
++            }
++            boolean allSkipped = true;
++            for (Map.Entry<String, Integer> entry : map.entrySet()) {
++                if (entry.getValue() == 0) {
++                    continue; // Skip this invalid
++                }
++                allSkipped = false;
++                values.put(entry.getKey(), entry.getValue());
++            }
++            if (allSkipped) {
++                // Null = skip the chart
++                return null;
++            }
++            data.put("values", values);
++            return data;
++        }
++    }
++
++    /**
++     * Represents a custom single line chart.
++     */
++    public static abstract class SingleLineChart extends CustomChart {
++
++        /**
++         * Class constructor.
++         *
++         * @param chartId The id of the chart.
++         */
++        public SingleLineChart(String chartId) {
++            super(chartId);
++        }
++
++        /**
++         * Gets the value of the chart.
++         *
++         * @return The value of the chart.
++         */
++        public abstract int getValue();
++
++        @Override
++        protected JSONObject getChartData() {
++            JSONObject data = new JSONObject();
++            int value = getValue();
++            if (value == 0) {
++                // Null = skip the chart
++                return null;
++            }
++            data.put("value", value);
++            return data;
++        }
++
++    }
++
++    /**
++     * Represents a custom multi line chart.
++     */
++    public static abstract class MultiLineChart extends CustomChart {
++
++        /**
++         * Class constructor.
++         *
++         * @param chartId The id of the chart.
++         */
++        public MultiLineChart(String chartId) {
++            super(chartId);
++        }
++
++        /**
++         * 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() {
++            JSONObject data = new JSONObject();
++            JSONObject values = new JSONObject();
++            HashMap<String, Integer> map = getValues(new HashMap<String, Integer>());
++            if (map == null || map.isEmpty()) {
++                // Null = skip the chart
++                return null;
++            }
++            boolean allSkipped = true;
++            for (Map.Entry<String, Integer> entry : map.entrySet()) {
++                if (entry.getValue() == 0) {
++                    continue; // Skip this invalid
++                }
++                allSkipped = false;
++                values.put(entry.getKey(), entry.getValue());
++            }
++            if (allSkipped) {
++                // Null = skip the chart
++                return null;
++            }
++            data.put("values", values);
++            return data;
++        }
++
++    }
++
++    /**
++     * Represents a custom simple bar chart.
++     */
++    public static abstract class SimpleBarChart extends CustomChart {
++
++        /**
++         * Class constructor.
++         *
++         * @param chartId The id of the chart.
++         */
++        public SimpleBarChart(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<String, Integer> getValues(HashMap<String, Integer> valueMap);
++
++        @Override
++        protected JSONObject getChartData() {
++            JSONObject data = new JSONObject();
++            JSONObject values = new JSONObject();
++            HashMap<String, Integer> map = getValues(new HashMap<String, Integer>());
++            if (map == null || map.isEmpty()) {
++                // Null = skip the chart
++                return null;
++            }
++            for (Map.Entry<String, Integer> entry : map.entrySet()) {
++                JSONArray categoryValues = new JSONArray();
++                categoryValues.add(entry.getValue());
++                values.put(entry.getKey(), categoryValues);
++            }
++            data.put("values", values);
++            return data;
++        }
++
++    }
++
++    /**
++     * Represents a custom advanced bar chart.
++     */
++    public static abstract class AdvancedBarChart extends CustomChart {
++
++        /**
++         * Class constructor.
++         *
++         * @param chartId The id of the chart.
++         */
++        public AdvancedBarChart(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<String, int[]> getValues(HashMap<String, int[]> valueMap);
++
++        @Override
++        protected JSONObject getChartData() {
++            JSONObject data = new JSONObject();
++            JSONObject values = new JSONObject();
++            HashMap<String, int[]> map = getValues(new HashMap<String, int[]>());
++            if (map == null || map.isEmpty()) {
++                // Null = skip the chart
++                return null;
++            }
++            boolean allSkipped = true;
++            for (Map.Entry<String, int[]> entry : map.entrySet()) {
++                if (entry.getValue().length == 0) {
++                    continue; // Skip this invalid
++                }
++                allSkipped = false;
++                JSONArray categoryValues = new JSONArray();
++                for (int categoryValue : entry.getValue()) {
++                    categoryValues.add(categoryValue);
++                }
++                values.put(entry.getKey(), categoryValues);
++            }
++            if (allSkipped) {
++                // Null = skip the chart
++                return null;
++            }
++            data.put("values", values);
++            return data;
++        }
++
++    }
++
++    /**
++     * Represents a custom simple map chart.
++     */
++    public static abstract class SimpleMapChart extends CustomChart {
++
++        /**
++         * Class constructor.
++         *
++         * @param chartId The id of the chart.
++         */
++        public SimpleMapChart(String chartId) {
++            super(chartId);
++        }
++
++        /**
++         * Gets the value of the chart.
++         *
++         * @return The value of the chart.
++         */
++        public abstract Country getValue();
++
++        @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;
++                }
++            }
++            return null;
++        }
++
++        /**
++         * 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());
++        }
++
++    }
++
++}
+diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+index 328ff012b..75d4048a9 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 {
+     static Map<String, Command> commands;
+     private static boolean verbose;
+     /*========================================================================*/
+-
++    private static Metrics metrics;
++    
+     public static void init(File configFile) {
+         CONFIG_FILE = configFile;
+         config = new YamlConfiguration();
+@@ -72,6 +73,10 @@ 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();
++        }
+     }
+ 
+     static void readConfig(Class<?> clazz, Object instance) {
+diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
+index d386a876b..ba51303b2 100644
+--- a/src/main/java/org/spigotmc/SpigotConfig.java
++++ b/src/main/java/org/spigotmc/SpigotConfig.java
+@@ -82,6 +82,7 @@ public class SpigotConfig
+             MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() );
+         }
+ 
++        /* // Paper - Replace with our own
+         if ( metrics == null )
+         {
+             try
+@@ -93,6 +94,7 @@ public class SpigotConfig
+                 Bukkit.getServer().getLogger().log( Level.SEVERE, "Could not start metrics service", ex );
+             }
+         }
++        */ // Paper end
+     }
+ 
+     static void readConfig(Class<?> clazz, Object instance)
+-- 
+2.12.0.windows.1
+
diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0005-MC-Utils.patch
index aefef821f0..d2fc54a83e 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0005-MC-Utils.patch
@@ -1,4 +1,4 @@
-From 11d2df695af8ab5f3f0d65c71cff3e0af8259cea Mon Sep 17 00:00:00 2001
+From a703dc3147918196659551ad173b9072f80e983c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -252,5 +252,5 @@ index 370203b2d..ae7498c03 100644
  
      public NBTTagList() {}
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index 6c3cee6f08..d3ce39135f 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,4 +1,4 @@
-From a8603339050a20775e8fe0d8b4ab72979ec40ca8 Mon Sep 17 00:00:00 2001
+From b2b5b98b2f544ee0afcceab0224a86eb75055b84 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -391,7 +391,7 @@ index 000000000..e7789117b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 328ff012b..0a6f9b256 100644
+index 75d4048a9..1ea799d59 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 328ff012b..0a6f9b256 100644
  
  public class PaperConfig {
  
-@@ -170,4 +173,24 @@ public class PaperConfig {
+@@ -175,4 +178,24 @@ public class PaperConfig {
          config.addDefault(path, def);
          return config.getString(path, config.getString(path));
      }
diff --git a/Spigot-Server-Patches/0006-Configurable-squid-spawn-ranges.patch b/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
index ea0bbedf22..32de5f6428 100644
--- a/Spigot-Server-Patches/0006-Configurable-squid-spawn-ranges.patch
+++ b/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
@@ -1,4 +1,4 @@
-From de528a5f3327325979e9c922f947a68d8f6a05f3 Mon Sep 17 00:00:00 2001
+From ffac25bb34932ef90c85baca9c77303e9ccf3702 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 12:45:11 -0600
 Subject: [PATCH] Configurable squid spawn ranges
diff --git a/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch
index 77fbe21253..99df807c18 100644
--- a/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch
+++ b/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch
@@ -1,4 +1,4 @@
-From 9d3232a2cbd15f79ee0f7e152ef02dc867d1840f Mon Sep 17 00:00:00 2001
+From 2df13908f2a9a16aedcfb2d7c56fa578181ffb97 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 13:02:51 -0600
 Subject: [PATCH] Configurable cactus and reed natural growth heights
diff --git a/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch
index 965f8efe50..dc122be552 100644
--- a/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch
+++ b/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch
@@ -1,4 +1,4 @@
-From 790816c05478aaff9ca2e42497b728d335eac504 Mon Sep 17 00:00:00 2001
+From 4f7e02a3e570583d2510848d700901e72de644c8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 13:09:16 -0600
 Subject: [PATCH] Configurable baby zombie movement speed
diff --git a/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch
index 7e4333f74c..b71e559dcc 100644
--- a/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch
+++ b/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch
@@ -1,4 +1,4 @@
-From 54a3c63aa8ce0d58f434036ef58d29e25d0ea9b8 Mon Sep 17 00:00:00 2001
+From 16212de7e01256c4ac01f0e1fab71bcee9e1c7e8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 13:14:11 -0600
 Subject: [PATCH] Configurable fishing time ranges
diff --git a/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
index b0a099aedb..4555fb4d9d 100644
--- a/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch
+++ b/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
@@ -1,4 +1,4 @@
-From 7fc4d230818cf9b8303ce829b2c45bc5bf8621c1 Mon Sep 17 00:00:00 2001
+From baef57831bfe28a7f0187a69bdb48b1f03ec8bde Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump
diff --git a/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch
index d8ddc238ec..641b556a0a 100644
--- a/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch
@@ -1,4 +1,4 @@
-From 8454fb258664baf7b6c6d257c4d36b328aa9c60f Mon Sep 17 00:00:00 2001
+From 8b4c81d464e94b495826f3cbc47d81d8da3f2c3b Mon Sep 17 00:00:00 2001
 From: Suddenly <[email protected]>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities
diff --git a/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
index b0e8f80b7e..e973efb720 100644
--- a/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
@@ -1,4 +1,4 @@
-From 97865c7e6e3ab14d911ee022f7538fba90a5f601 Mon Sep 17 00:00:00 2001
+From 93cedb6f2ccf3c12457a4f0662bfc01ba6aacdfb Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 3 Mar 2016 03:53:43 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks
diff --git a/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index dc8e861da9..56bf1e5c0b 100644
--- a/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,4 +1,4 @@
-From 0eada54aa2eee86bf693c1ac9f60195a38eb41ff Mon Sep 17 00:00:00 2001
+From c626ab09022ba5bd9efab830624989ecffdcc36a Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
diff --git a/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
index e59ed58dbe..8b020b012e 100644
--- a/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From 54abcccc1027dc80e9fd95a4fe70f473213b19b2 Mon Sep 17 00:00:00 2001
+From 16b591982a8417b9f551dd06a73d25cdf82842e1 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 14:27:13 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
diff --git a/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index ab3c145d96..02bf76a010 100644
--- a/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From 097fe2c890f1fcff2a79ab78b18f7924db2edca9 Mon Sep 17 00:00:00 2001
+From 8936094d98b21ebe52e725f7c1ac99e196a8822a Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -80,5 +80,5 @@ index 94a3d4237..3ed983cc0 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.11.0.windows.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
index af8614c619..5ec6f1d5eb 100644
--- a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
@@ -1,4 +1,4 @@
-From 90a7f499e10cfa5104a1a22197a931454fef07c8 Mon Sep 17 00:00:00 2001
+From 18f6ba2999aa3d3d8175d9d660753847446cb5bf Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
diff --git a/Spigot-Server-Patches/0017-Metrics.patch b/Spigot-Server-Patches/0018-Metrics.patch
index e6a7c8ed31..5cfa88cc4b 100644
--- a/Spigot-Server-Patches/0017-Metrics.patch
+++ b/Spigot-Server-Patches/0018-Metrics.patch
@@ -1,11 +1,11 @@
-From ee38e5a5f229f8adad1383883452f365de3e1b6b Mon Sep 17 00:00:00 2001
+From 7ebf3a58079064072c7e0aa534b092ba412ed5c8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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 a5fd59d..680283c 100644
+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 {
@@ -18,5 +18,5 @@ index a5fd59d..680283c 100644
          String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
          String serverVersion = Bukkit.getVersion();
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch
index 9de6c6f77b..1794f20cd4 100644
--- a/Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,11 +1,11 @@
-From 6b1a51ebeb36d4d5f2b9e0a8816a4d7b3a7ddc02 Mon Sep 17 00:00:00 2001
+From 29afd8bc4380e527ae39018fde2d7842239bc4dc Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 15:08:03 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index bd3b160..1c0108e 100644
+index bd3b16025..1c0108ef1 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -722,6 +722,10 @@ public class Chunk {
@@ -20,5 +20,5 @@ index bd3b160..1c0108e 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.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch
index 23f54fa397..aa633495be 100644
--- a/Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch
@@ -1,11 +1,11 @@
-From 801f5693fe5379447940a29868132cd8f973ece1 Mon Sep 17 00:00:00 2001
+From 6ee4894cd7619d860ec2d48dc29031bf2bd0384b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 22:01:19 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 28a514a..60452e8 100644
+index 28a514a64..60452e83b 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -8,17 +8,17 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
@@ -117,7 +117,7 @@ index 28a514a..60452e8 100644
              this.world.applyPhysics(this.position, this.getBlock(), false);
  
 diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
-index 3d61c2d..586ceaa 100644
+index 3d61c2d68..586ceaa67 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 @@ -1,15 +1,17 @@
@@ -186,5 +186,5 @@ index 3d61c2d..586ceaa 100644
      }
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
index 6b68c79b2a..ebfc30f48c 100644
--- a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From f34109ceb110e7cc63f4d4d037245a64ff5a2449 Mon Sep 17 00:00:00 2001
+From 5a56db7a9f54088291795d52f2bde422119d5642 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -210,5 +210,5 @@ index be2e31dea..6d21c3269 100644
          return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                  + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
index d6660ea3e8..e7c0efe78f 100644
--- a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
@@ -1,4 +1,4 @@
-From 626b095ddadaefce16e25168f532b8152fe234e6 Mon Sep 17 00:00:00 2001
+From cf54a9e536799481ce0827ac26a2b10ef6f2b4f9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
diff --git a/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch
index dbb8ff4426..05b83c06c4 100644
--- a/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch
@@ -1,11 +1,11 @@
-From 38018a4a5db0023a7d170ac687428d5549785ae4 Mon Sep 17 00:00:00 2001
+From 066da232470e76f73ce6f5ac3bc9fba3f4e0d029 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 23:19:01 -0600
 Subject: [PATCH] Add async chunk load API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a15c129..110f655 100644
+index 822d73b9e..f65611a6a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -127,6 +127,26 @@ public class CraftWorld implements World {
@@ -36,5 +36,5 @@ index a15c129..110f655 100644
          return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
      }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0024-Entity-Origin-API.patch
index 44dcfe8f86..1bd70f67c7 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0024-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From a4ea505f84809c0f4168a71e10a6714484a4cc75 Mon Sep 17 00:00:00 2001
+From 16134083d0eea50c8ec22f6a7421d056d58d3292 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
diff --git a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch
index 8a9fc18874..9d25a3d07c 100644
--- a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,11 +1,11 @@
-From 7883878587bcd59f62d9a361ac68b1dc024a85c3 Mon Sep 17 00:00:00 2001
+From 555c9dbf56471528d900454f8556dcc19c7af2e3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index b3d3df4c..d0c0371f 100644
+index b3d3df4cf..d0c0371fc 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -175,7 +175,12 @@ public abstract class TileEntity {
@@ -23,7 +23,7 @@ index b3d3df4c..d0c0371f 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e39b966c..9cdc94be 100644
+index 39919ab1c..632d5c760 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1446,10 +1446,12 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch
index e805314b95..4ea3a1054b 100644
--- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch
@@ -1,4 +1,4 @@
-From f39ff351a0d3263158ec312e3cb0a3e0e54283ff Mon Sep 17 00:00:00 2001
+From 4769d44f5b85ef49a3bbd628be4e7e2f86fa7521 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
diff --git a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch
index 8789c88fc8..1e09592205 100644
--- a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -1,11 +1,11 @@
-From 383074be770112c2b2dc2e9810fa50658b8c3e33 Mon Sep 17 00:00:00 2001
+From 5b5459ca71a1bc441e5c57a852d70ecbdb24bd5d Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index caec568..30b54a5 100644
+index caec56824..30b54a50e 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -167,7 +167,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
@@ -18,5 +18,5 @@ index caec568..30b54a5 100644
                  file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                  if ( file.exists() )
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch
index 5f0869b2d2..63f8e68352 100644
--- a/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch
@@ -1,11 +1,11 @@
-From 84877410582d951108695a4d3d1d1951645022bb Mon Sep 17 00:00:00 2001
+From dfbba8355e51c337187a93a3db380b223f626892 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
 Subject: [PATCH] Always tick falling blocks
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 5c2fb00..c411ce8 100644
+index 5c2fb0058..c411ce886 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature;
@@ -25,5 +25,5 @@ index 5c2fb00..c411ce8 100644
                  || entity instanceof EntityFireworks )
          {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0028-Lighting-Queue.patch b/Spigot-Server-Patches/0029-Lighting-Queue.patch
index 65e0dbdf9c..84221c704a 100644
--- a/Spigot-Server-Patches/0028-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0029-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From 72852de2a09e0ead6ff570f9c063bcf6b3d24854 Mon Sep 17 00:00:00 2001
+From d13d53ab6bafe9851cb3a816ca64e42ab83d6d29 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
diff --git a/Spigot-Server-Patches/0029-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch
index 3b0b9e5830..a619fa78aa 100644
--- a/Spigot-Server-Patches/0029-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From 2d9ec51993b37973d282f321458d6faaf07bd49e Mon Sep 17 00:00:00 2001
+From b9ed456c56c03fd801daea418dc35ec4d8a0a2cb Mon Sep 17 00:00:00 2001
 From: DoctorDark <[email protected]>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
diff --git a/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
index d17ccf8e16..45136544f3 100644
--- a/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -1,11 +1,11 @@
-From 9878ca9652f24a660397d7e2291279a86ef7b54d Mon Sep 17 00:00:00 2001
+From cca16ca09a209720483d4fe88d1f2b8537ae7b75 Mon Sep 17 00:00:00 2001
 From: Iceee <[email protected]>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 904bee8..4e05bcd 100644
+index 904bee8b5..4e05bcdfa 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -104,7 +104,14 @@ public class Explosion {
@@ -25,5 +25,5 @@ index 904bee8..4e05bcd 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0031-Generator-Settings.patch b/Spigot-Server-Patches/0032-Generator-Settings.patch
index 274ed29554..21310b3783 100644
--- a/Spigot-Server-Patches/0031-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0032-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From 273bc543e9cd4c645049ec8e33d9eae4025ec4a5 Mon Sep 17 00:00:00 2001
+From 8890e82c87bc665f7532115c8e0eb088f0c1b2de Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0033-Optimize-explosions.patch
index c1b657c8ae..e7fd8eb256 100644
--- a/Spigot-Server-Patches/0032-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0033-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 04028ca0d3b4b0eb358a3118acc84b30a49248bc Mon Sep 17 00:00:00 2001
+From 9d5e09ca837a92224b403ec20930f9ad1e300ed8 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
diff --git a/Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch
index dcec872cca..ee75c30970 100644
--- a/Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch
@@ -1,11 +1,11 @@
-From b0f886b09b2d945d228d9929ad9483d9804423f2 Mon Sep 17 00:00:00 2001
+From 3c56dc7c870aa521f719c5109fde8f44f3158c22 Mon Sep 17 00:00:00 2001
 From: Iceee <[email protected]>
 Date: Wed, 2 Mar 2016 12:03:23 -0600
 Subject: [PATCH] Stop updating flowing block if material has changed
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index f4ac7ba..801b9cb 100644
+index f4ac7bafa..801b9cb7b 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -90,6 +90,7 @@ public class BlockFlowing extends BlockFluids {
@@ -17,5 +17,5 @@ index f4ac7ba..801b9cb 100644
          IBlockData iblockdata2 = world.getType(blockposition.down());
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0034-Fast-draining.patch b/Spigot-Server-Patches/0035-Fast-draining.patch
index 9bb0e71f86..a025783717 100644
--- a/Spigot-Server-Patches/0034-Fast-draining.patch
+++ b/Spigot-Server-Patches/0035-Fast-draining.patch
@@ -1,4 +1,4 @@
-From ec1e69e287a2211ad9f14bd15e3c2cf371fa6082 Mon Sep 17 00:00:00 2001
+From d20531320914b578667604dc1a7d557b1c61b0f8 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 12:20:52 -0600
 Subject: [PATCH] Fast draining
diff --git a/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch
index 7a286e0a2b..7778b73d71 100644
--- a/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch
@@ -1,4 +1,4 @@
-From c9cd7554a7447afb16a65d55ebf96a2c6ee3fd9f Mon Sep 17 00:00:00 2001
+From 915fe90596915de1e459fcb7965d62f72b9f9d4f Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed
diff --git a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch
index 97c0b722a5..f86d842aaa 100644
--- a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch
@@ -1,4 +1,4 @@
-From 34d326401bb597b21f6712b873d8b0e92d8475b5 Mon Sep 17 00:00:00 2001
+From a60f675dfc193a297f79e43764d1980322bb4fd4 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
diff --git a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0038-Disable-explosion-knockback.patch
index 5c0a3427af..bbaa6e987a 100644
--- a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0038-Disable-explosion-knockback.patch
@@ -1,4 +1,4 @@
-From b2beab2af3a84a6cd80b833cec20d43c3d699899 Mon Sep 17 00:00:00 2001
+From fbb70839f7188d6096dff42ca1b3fdcf8c715f90 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
diff --git a/Spigot-Server-Patches/0038-Disable-thunder.patch b/Spigot-Server-Patches/0039-Disable-thunder.patch
index 0e3ad6c102..f268b13067 100644
--- a/Spigot-Server-Patches/0038-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0039-Disable-thunder.patch
@@ -1,4 +1,4 @@
-From 4855da31c259635c9148c6eb7db94e696e810504 Mon Sep 17 00:00:00 2001
+From 4171809caf6057e84b0b1cf5ec03a259cde6c688 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
diff --git a/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0040-Disable-ice-and-snow.patch
index bfad17ad31..0eea5eb3ff 100644
--- a/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0040-Disable-ice-and-snow.patch
@@ -1,4 +1,4 @@
-From dd3197ca93e9529ee5559f5f4f1764a53865af9b Mon Sep 17 00:00:00 2001
+From 708e3b196dead7aa3871281f6922384c56c32257 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
diff --git a/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0041-Configurable-mob-spawner-tick-rate.patch
index ab9b5dca46..c9756fc1db 100644
--- a/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0041-Configurable-mob-spawner-tick-rate.patch
@@ -1,4 +1,4 @@
-From a4a8ef41f089714d6077958ed2931b4a9eedb92b Mon Sep 17 00:00:00 2001
+From e483c2457d3eec68120dc6058950d391e6f54455 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
diff --git a/Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0042-Send-absolute-position-the-first-time-an-entity-is-s.patch
index a40346a90a..5c533a99ff 100644
--- a/Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0042-Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -1,11 +1,11 @@
-From 6e4bf10e4048b6989928b12e4df3d237dbb44a4c Mon Sep 17 00:00:00 2001
+From a66312a6f87feb99a654ae23975f5130db7c5b26 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index b688e99..370cb9c 100644
+index 1493f9ab3..f542bf491 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -41,7 +41,12 @@ public class EntityTrackerEntry {
@@ -76,5 +76,5 @@ index b688e99..370cb9c 100644
  
                      entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0043-Add-BeaconEffectEvent.patch
index 383a873071..4b23565614 100644
--- a/Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0043-Add-BeaconEffectEvent.patch
@@ -1,11 +1,11 @@
-From f2e99545394c0006dcd8d1499aeaed4a7e8e9ce4 Mon Sep 17 00:00:00 2001
+From 1f602d61011394e08fb6e7511fac2ed306e188a2 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
-index 6f2fcd2..71ecc54 100644
+index 6f2fcd22e..71ecc5493 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
 @@ -16,6 +16,14 @@ import org.bukkit.entity.HumanEntity;
@@ -69,5 +69,5 @@ index 6f2fcd2..71ecc54 100644
          }
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0044-Configurable-container-update-tick-rate.patch
index e6292518d1..36f9e2fb55 100644
--- a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0044-Configurable-container-update-tick-rate.patch
@@ -1,4 +1,4 @@
-From 07032dd31eb190fc5371f1b47a699d67e18597b4 Mon Sep 17 00:00:00 2001
+From 2e01d589aa09d046929f8d3cd70b1938c0978a3c Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
diff --git a/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0045-Use-UserCache-for-player-heads.patch
index 524ffd1c3e..b43e98210d 100644
--- a/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0045-Use-UserCache-for-player-heads.patch
@@ -1,11 +1,11 @@
-From 2087e0322bd2350d334b5292ab192c1be0814418 Mon Sep 17 00:00:00 2001
+From 9ebcc2f689753eb2c2ec33864e05450f9cee2fa3 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index f07eb2f..18cc746 100644
+index f07eb2f75..18cc74639 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer;
@@ -31,5 +31,5 @@ index f07eb2f..18cc746 100644
              // Spigot end
          }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0046-Disable-spigot-tick-limiters.patch
index 5c41e5ffcc..a17fc40644 100644
--- a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0046-Disable-spigot-tick-limiters.patch
@@ -1,11 +1,11 @@
-From 75cf51dbbbd0aa6c336f1a293dbc5a33daecb0f3 Mon Sep 17 00:00:00 2001
+From 85294ba8067c8ab43419b70379c53aaff9845630 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d2b90fda..3c5a3532 100644
+index 5f7590e11..a1cdcd71b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1423,10 +1423,10 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0047-Configurable-Chunk-IO-Thread-Base-Count.patch
index 1d52bd714f..1e38d981f1 100644
--- a/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch
+++ b/Spigot-Server-Patches/0047-Configurable-Chunk-IO-Thread-Base-Count.patch
@@ -1,14 +1,14 @@
-From 3a2a233551b5789414804e0694d2a665419d26b5 Mon Sep 17 00:00:00 2001
+From 4d33547c24567a2bedc35176c38b04c8f7320f38 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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 0a6f9b256..18cabc4f3 100644
+index 1ea799d59..8c8bc4c86 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -193,4 +193,9 @@ public class PaperConfig {
+@@ -198,4 +198,9 @@ public class PaperConfig {
                  " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
                  " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
      }
diff --git a/Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch b/Spigot-Server-Patches/0048-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
index 776676430c..c4b2515dc2 100644
--- a/Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
+++ b/Spigot-Server-Patches/0048-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
@@ -1,4 +1,4 @@
-From 06479b95dff55813423388c8af4a933ac5dda039 Mon Sep 17 00:00:00 2001
+From 8bd51ec6ce48f100cc32ac4268904c7bd54874ba Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 2 Mar 2016 23:51:51 -0600
 Subject: [PATCH] Don't create Region File's when checking if chunk exists
@@ -7,7 +7,7 @@ Plugins like Dynmap can end up creating tons of emtpy Region Files
 when using chunkExists.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index ca33899..8828275 100644
+index 4890023d7..79cb3953b 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -39,7 +39,10 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -23,7 +23,7 @@ index ca33899..8828275 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index f234298..933934f 100644
+index f23429898..933934fb6 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -12,7 +12,13 @@ public class RegionFileCache {
@@ -49,5 +49,5 @@ index f234298..933934f 100644
                  file1.mkdirs();
              }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch
index 85a229fe43..da90c58d39 100644
--- a/Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From bffea907537f9020197917bf12fd30854e784e30 Mon Sep 17 00:00:00 2001
+From cc53a532b798a31431e55027980618f421451d8b Mon Sep 17 00:00:00 2001
 From: Steve Anton <[email protected]>
 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 04d6355..954d035 100644
+index 676cc3f3e..4e35e9102 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 04d6355..954d035 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch
index 74055b0979..5f8de626d3 100644
--- a/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch
@@ -1,4 +1,4 @@
-From 122209091641313650c741bf1eb283ba4156a6cb Mon Sep 17 00:00:00 2001
+From 1410382d853ba361a079502d38568f4eb55113de Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
diff --git a/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
index 80b1f887fe..457aa012d7 100644
--- a/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From f53fc4b3d06bb6b236da8212307d9a9bc7c51eeb Mon Sep 17 00:00:00 2001
+From d94378d518cda98be6fc17c01200ed86b7ac3790 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
diff --git a/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
index b89661c973..c658917dde 100644
--- a/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,4 +1,4 @@
-From e1bfe5c5182260e5cef5c0e2b8fa851a516fe174 Mon Sep 17 00:00:00 2001
+From 6b32181201c024700da5cf0fd078deaa091230cd Mon Sep 17 00:00:00 2001
 From: vemacs <[email protected]>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
diff --git a/Spigot-Server-Patches/0052-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0053-Optimize-Pathfinding.patch
index 1bb26ed30b..16fb9457fc 100644
--- a/Spigot-Server-Patches/0052-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0053-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From fa3b82efa55cdcd8c7388ec868278b48be00961d Mon Sep 17 00:00:00 2001
+From c2e8208e724845d130dbf63019835d6ea9088f3a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as
 arrow attacks.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 4f28b88..43b2be5 100644
+index 4f28b8819..43b2be505 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -118,10 +118,26 @@ public abstract class NavigationAbstract {
@@ -47,5 +47,5 @@ index 4f28b88..43b2be5 100644
      }
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch
index efefb88b0c..4a500f7940 100644
--- a/Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From b17725413c3a4ad11af1df1d69c71dfd96350a29 Mon Sep 17 00:00:00 2001
+From b0c16e419f39727b2b51bc84b777dc9eb42a8131 Mon Sep 17 00:00:00 2001
 From: CullanP <[email protected]>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b80f951..e1fc4ea 100644
+index b80f95159..e1fc4ea6c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -47,6 +47,13 @@ public class Chunk {
@@ -95,5 +95,5 @@ index b80f951..e1fc4ea 100644
  
              while (iterator.hasNext()) {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch
index 1bb7fa56c6..df9f4dfb54 100644
--- a/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch
@@ -1,11 +1,11 @@
-From 93e2fc860b2110225b8015a067ed778281de507c Mon Sep 17 00:00:00 2001
+From 8eb9c58348a5373d07490079d2018313dfec3b64 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 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 a795a16..03bc017 100644
+index a795a165a..03bc0171b 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 a795a16..03bc017 100644
          return commandMap;
      }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch
index ad871e36b7..ae68c107fe 100644
--- a/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,11 +1,11 @@
-From 8df594dafa3d1db0eb68bdffcaa763b9e0c51072 Mon Sep 17 00:00:00 2001
+From e82e41369c3b18bf01ffa5a9ce73aceff5ea39a0 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c00260f67..5520c707e 100644
+index 27cd0d43d..61032eb2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -96,7 +96,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -21,5 +21,5 @@ index c00260f67..5520c707e 100644
  
          if (health == 0) {
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch
index 51283730a9..0df81de85d 100644
--- a/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch
@@ -1,11 +1,11 @@
-From dd279236b6887fe946ef41564b45801b2ba9edb1 Mon Sep 17 00:00:00 2001
+From 1cde879dc1017264aa0d84569843d35006fa3f63 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
-index 5f5b382..242efb0 100644
+index 5f5b3825d..242efb0b9 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
 @@ -4,6 +4,8 @@ import java.io.IOException;
@@ -40,7 +40,7 @@ index 5f5b382..242efb0 100644
  
      public void a(PacketListenerPlayOut packetlistenerplayout) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
-index 7bcafa8..4f6c1c2 100644
+index 7bcafa8bb..4f6c1c2e7 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 @@ -12,6 +12,18 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
@@ -78,7 +78,7 @@ index 7bcafa8..4f6c1c2 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 0bf3429..0e6e416 100644
+index cc26aa748..2bcf3976f 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 0bf3429..0e6e416 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch
index 9a1385201e..dd34c89d57 100644
--- a/Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch
@@ -1,11 +1,11 @@
-From d49248d0e6675ce7fc2b0d5b5a042e5dbf009366 Mon Sep 17 00:00:00 2001
+From b73de79664f1d4e137d6c4764881817d39bbcb1d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <[email protected]>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
 
 
 diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
-index 686250e..b826089 100644
+index 686250ea8..b826089d1 100644
 --- a/src/main/java/net/minecraft/server/Container.java
 +++ b/src/main/java/net/minecraft/server/Container.java
 @@ -141,7 +141,7 @@ public abstract class Container {
@@ -18,5 +18,5 @@ index 686250e..b826089 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.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch
index 0b57b779f3..fcb279f621 100644
--- a/Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,11 +1,11 @@
-From aef0d783f0c288be9a2cbb3d4d80f2fe8a765dc0 Mon Sep 17 00:00:00 2001
+From 7c794303b52022aca46e88ccf0dd466abd2700ab Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <[email protected]>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e851e78a..223b0512 100644
+index 7feed2995..5b5e0e73c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -121,10 +121,10 @@ public abstract class Entity implements ICommandListener {
@@ -24,7 +24,7 @@ index e851e78a..223b0512 100644
      public boolean impulse;
      public int portalCooldown;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3c5a3532..412854b6 100644
+index a1cdcd71b..354a7309b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
diff --git a/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch
index 89d7d1d7ca..abd4a22a08 100644
--- a/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch
@@ -1,4 +1,4 @@
-From e508319d553bebb9f1c0ebcae8066ff53d1dd132 Mon Sep 17 00:00:00 2001
+From adea9822f254f16ea903bfcf4a929946a6879cd0 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <[email protected]>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
diff --git a/Spigot-Server-Patches/0060-Add-velocity-warnings.patch b/Spigot-Server-Patches/0061-Add-velocity-warnings.patch
index 3c50e650de..831da5324a 100644
--- a/Spigot-Server-Patches/0060-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0061-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From 870573220f675aa66477ab57fdaa78cc0b1dc993 Mon Sep 17 00:00:00 2001
+From 836675371c732b2c7d7977874436f4f5b20dece0 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <[email protected]>
 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 03bc017..c61752b 100644
+index 03bc0171b..c61752bc3 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 {
@@ -17,7 +17,7 @@ index 03bc017..c61752b 100644
      private final class BooleanWrapper {
          private boolean value = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0167ed0..c094465 100644
+index 6497905b9..463289199 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -229,6 +229,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -33,7 +33,7 @@ index 0167ed0..c094465 100644
          entity.motY = vel.getY();
          entity.motZ = vel.getZ();
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 3ed983c..6384d50 100644
+index 3ed983cc0..6384d50e7 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -66,7 +66,19 @@ public class WatchdogThread extends Thread
@@ -58,5 +58,5 @@ index 3ed983c..6384d50 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.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch
index 2d956f8a8e..06898a01c1 100644
--- a/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From 6ebe6765d70174e67fbfbe3af0e445fadf03c301 Mon Sep 17 00:00:00 2001
+From 6f8838ab5bd00cfbc8e1fd70316230c562c16838 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
diff --git a/Spigot-Server-Patches/0062-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch
index 633f66dde3..942ec1be8b 100644
--- a/Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 63975534b050bf243aa688ce5210229565b23715 Mon Sep 17 00:00:00 2001
+From 1af338583cb34ab7e0569206f6b7e2eeec97135e Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <[email protected]>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 new file mode 100644
-index 00000000..93397188
+index 000000000..93397188b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 @@ -0,0 +1,38 @@
@@ -50,7 +50,7 @@ index 00000000..93397188
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e1fc4ea6..8f1a68d6 100644
+index e1fc4ea6c..8f1a68d67 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -89,7 +89,7 @@ index e1fc4ea6..8f1a68d6 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index f7f2d12c..b0a82e7e 100644
+index f7f2d12cf..b0a82e7ed 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -12,6 +12,7 @@ import java.util.Iterator;
@@ -144,7 +144,7 @@ index f7f2d12c..b0a82e7e 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 016c64e8..2ff8a6da 100644
+index 016c64e82..2ff8a6da0 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -1,5 +1,6 @@
@@ -171,7 +171,7 @@ index 016c64e8..2ff8a6da 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java
-index 936d6c64..50056f49 100644
+index 936d6c640..50056f49a 100644
 --- a/src/main/java/net/minecraft/server/PersistentCollection.java
 +++ b/src/main/java/net/minecraft/server/PersistentCollection.java
 @@ -1,5 +1,6 @@
@@ -198,7 +198,7 @@ index 936d6c64..50056f49 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index b0279ac3..be13c113 100644
+index b0279ac3e..be13c1131 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -1,5 +1,6 @@
@@ -225,7 +225,7 @@ index b0279ac3..be13c113 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 933934fb..19fbf9b4 100644
+index 933934fb6..19fbf9b4a 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -1,5 +1,6 @@
@@ -244,7 +244,7 @@ index 933934fb..19fbf9b4 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index a05fad54..29219ec7 100644
+index a05fad54f..29219ec7b 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -7,6 +7,7 @@ import java.util.Random;
@@ -272,7 +272,7 @@ index a05fad54..29219ec7 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 7af5b7dd..2b498024 100644
+index 7af5b7dd7..2b498024c 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -1,5 +1,7 @@
@@ -292,7 +292,7 @@ index 7af5b7dd..2b498024 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 412854b6..22e191ef 100644
+index 354a7309b..cc7369e52 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -328,7 +328,7 @@ index 412854b6..22e191ef 100644
                          this.tileEntityListTick.remove(tileTickPosition--);
                          continue;
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 9952b64b..e30cfb7b 100644
+index 9952b64be..e30cfb7b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -15,6 +15,9 @@ import java.util.concurrent.atomic.AtomicReference;
diff --git a/Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 6782f8cea8..6746ba6ec8 100644
--- a/Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From 1cff86b001e1cbea670acc16a55ce94ef54334cf Mon Sep 17 00:00:00 2001
+From eb6be2b7c8be9fabd00b52ce3346948ada2bd67b Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 9fc83c4..b3b13ba 100644
+index 9fc83c4a3..b3b13ba11 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -27,7 +27,14 @@ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
@@ -26,5 +26,5 @@ index 9fc83c4..b3b13ba 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch
index 6ee914e396..8eed8b35e6 100644
--- a/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From b241d53cbf704b2ef0edd30052700c8a4c42db3c Mon Sep 17 00:00:00 2001
+From 9a82d2a8a75df88e30be7f1bc1c7515e277a5f42 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
diff --git a/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 57ae148509..67a2f1ce70 100644
--- a/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,11 +1,11 @@
-From 694e45177f8e7253cd0dd865cc31d8bc3ca6a841 Mon Sep 17 00:00:00 2001
+From 1612683999cfcbc22c50e0c505bfa4355b70b03b Mon Sep 17 00:00:00 2001
 From: mrapple <[email protected]>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a2d4768..193dadf 100644
+index e5fa1c3ba..247224117 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1380,10 +1380,12 @@ public abstract class EntityLiving extends Entity {
@@ -22,7 +22,7 @@ index a2d4768..193dadf 100644
          this.datawatcher.set(EntityLiving.bq, Integer.valueOf(i));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 61032eb..348a8c7 100644
+index 61032eb2f..348a8c758 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -572,4 +572,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -43,5 +43,5 @@ index 61032eb..348a8c7 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch
index 3d2d29290d..2f89f2cd6f 100644
--- a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From b30d84f0462ba70f3d1a46b71b7068be22a03127 Mon Sep 17 00:00:00 2001
+From 3ff9b059851515b6222203624c8aa44b1bd73826 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
diff --git a/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch
index 5f9dd76281..01ba873b3a 100644
--- a/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From bc747b229be5a26b7dbb271ab1059394265750bf Mon Sep 17 00:00:00 2001
+From 240543e6e7c364a4513e4cd4ca8d2711c5d0f97d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 18cabc4f3..797f794de 100644
+index 8c8bc4c86..b2fa32e41 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -198,4 +198,10 @@ public class PaperConfig {
+@@ -203,4 +203,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
      }
diff --git a/Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch
index 476b1cf32b..10bc4d4e05 100644
--- a/Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 16847be93e8fcf69a05f8edf10ca923825a126ca Mon Sep 17 00:00:00 2001
+From 989492b0a14f1acbcb387e31b74ed58829a2b496 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index b189ee4..192705f 100644
+index 7f3e874ba..310ab96ab 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -182,11 +182,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -28,7 +28,7 @@ index b189ee4..192705f 100644
                  synchronized (lock) { if (this.b.get(chunkcoordintpair) == nbttagcompound) { this.b.remove(chunkcoordintpair); } }// Paper - This will not equal if a newer version is still pending
  
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index be13c11..9cfc46b 100644
+index be13c1131..9cfc46bc2 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -249,8 +249,7 @@ public class RegionFile {
@@ -42,5 +42,5 @@ index be13c11..9cfc46b 100644
  
      }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch
index e46f5613b7..e0c8f4a241 100644
--- a/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From c46e7e9b82220d05b4b3a3e8c33c1aaef69210fd Mon Sep 17 00:00:00 2001
+From d0e62de0df3e3803b64a74b42fdc74c54e608793 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 797f794de..7f02ac219 100644
+index b2fa32e41..078e0d989 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -204,4 +204,9 @@ public class PaperConfig {
+@@ -209,4 +209,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");
      }
diff --git a/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch
index ec535735be..dbd13cceba 100644
--- a/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From 49c23225c5302e693fdcbd6b3d139d75b0cf4509 Mon Sep 17 00:00:00 2001
+From 1fc605c65c74fb9aff47a23174518c1492b73496 Mon Sep 17 00:00:00 2001
 From: William <[email protected]>
 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 e2afd9d..4009123 100644
+index e2afd9d93..40091231e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1823,4 +1823,21 @@ public final class CraftServer implements Server {
@@ -32,5 +32,5 @@ index e2afd9d..4009123 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch
index 1954302a16..2e8a4e7011 100644
--- a/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From b84844e83f6e3e64ff5e9120560d52e0d01e80bb Mon Sep 17 00:00:00 2001
+From 18e4daa1e2ed77af8da88506c84d13f813eeebd2 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 4009123..540d578 100644
+index 40091231e..540d57855 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 4009123..540d578 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0072-Undead-horse-leashing.patch b/Spigot-Server-Patches/0073-Undead-horse-leashing.patch
index 143e693675..c087c3c8d9 100644
--- a/Spigot-Server-Patches/0072-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0073-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 95eb6bb990200c2bf1bdf929443034e3ab460f9c Mon Sep 17 00:00:00 2001
+From 8995c864c37aa0d3ea38ec7ea12313130b8f7dae Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
diff --git a/Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch
index 4cec8c71ae..d1c9d2d67a 100644
--- a/Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From e49637befcf851f200423f0349d749abe8ffe950 Mon Sep 17 00:00:00 2001
+From 57b6cb61523faf718c89c3ae42d5d0d6050c9d74 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 18 Mar 2016 14:24:53 -0400
 Subject: [PATCH] Fix Furnace cook time bug
diff --git a/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch
index 35a886a926..a868fadf74 100644
--- a/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 833390e11f3e2fe2e7d751e14e41fd1b335f0d69 Mon Sep 17 00:00:00 2001
+From e8614aaf18b456255a31f0baa78651f6ad2b61ac Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 6adbbd4..bd3dc02 100644
+index a54bc7c42..81ec8f69e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -144,7 +144,7 @@ index 6adbbd4..bd3dc02 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index ec56806..9e7f9c6 100644
+index ec5680633..9e7f9c661 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -6,13 +6,8 @@ import java.lang.annotation.RetentionPolicy;
@@ -294,5 +294,5 @@ index ec56806..9e7f9c6 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 44a6ae37bf..7d977f4bf5 100644
--- a/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 0f7207a38a3d9ac2b2c0a62696792a6c35256cc1 Mon Sep 17 00:00:00 2001
+From 9b1484edac9a42041e0eab60eb6f5e63ec64ccb7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
diff --git a/Spigot-Server-Patches/0076-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch
index 78e1b02d0e..78d4cf7a00 100644
--- a/Spigot-Server-Patches/0076-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From cc7e1be187d727327679ca18327de968873e14cf Mon Sep 17 00:00:00 2001
+From b37013963c8a497b39c9ed4362ce585f8c9e6602 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ceb0d71..e0e563c 100644
+index cc7369e52..1d2d174e8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess {
@@ -93,5 +93,5 @@ index ceb0d71..e0e563c 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch
index 44f1924cec..e5a0d61579 100644
--- a/Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From 2c91ef56fe5b0b2247685411e0c557e7c9166f16 Mon Sep 17 00:00:00 2001
+From e34af1873ee3abd9f4754ab2eb52dee6dede22b2 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -8,7 +8,7 @@ Use an optimized method to test if a block position meets a desired light level.
 This method benefits from returning as soon as the desired light level matches.
 
 diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
-index e9c5d14..9015aff 100644
+index e9c5d1465..9015affc5 100644
 --- a/src/main/java/net/minecraft/server/BlockCrops.java
 +++ b/src/main/java/net/minecraft/server/BlockCrops.java
 @@ -48,7 +48,7 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement
@@ -21,7 +21,7 @@ index e9c5d14..9015aff 100644
  
              if (i < this.g()) {
 diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
-index fb1bf80..8b43e60 100644
+index fb1bf80b8..8b43e6070 100644
 --- a/src/main/java/net/minecraft/server/BlockGrass.java
 +++ b/src/main/java/net/minecraft/server/BlockGrass.java
 @@ -29,7 +29,8 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement {
@@ -65,7 +65,7 @@ index fb1bf80..8b43e60 100644
                              // world.setTypeUpdate(blockposition1, Blocks.GRASS.getBlockData());
                              org.bukkit.World bworld = world.getWorld();
 diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
-index f463b71..89458cd 100644
+index f463b7113..89458cd77 100644
 --- a/src/main/java/net/minecraft/server/BlockSapling.java
 +++ b/src/main/java/net/minecraft/server/BlockSapling.java
 @@ -34,7 +34,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@@ -78,7 +78,7 @@ index f463b71..89458cd 100644
                  world.captureTreeGeneration = true;
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index c74b628..bb96e16 100644
+index c74b6284f..bb96e164e 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -48,7 +48,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
@@ -91,7 +91,7 @@ index c74b628..bb96e16 100644
  
              if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 3ee5213..59d8bb6 100644
+index 3ee52139c..59d8bb6e7 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -118,17 +118,17 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
@@ -118,7 +118,7 @@ index 3ee5213..59d8bb6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 897882c..970fabf 100644
+index 897882c97..970fabf71 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -178,7 +178,7 @@ public class EntityZombie extends EntityMonster {
@@ -131,5 +131,5 @@ index 897882c..970fabf 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.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch
index 4e8996ae6e..87f99784e4 100644
--- a/Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From 6b5bbe53cb6015924619ad76fb68c59ac1d3a14d Mon Sep 17 00:00:00 2001
+From 6d7410d5cc715f3a78d2cae58868fdc4dc22c856 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation
@@ -6,7 +6,7 @@ Subject: [PATCH] Pass world to Village creation
 fixes NPE bug #95
 
 diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
-index a5b79ec..01f7cee 100644
+index a5b79ecad..01f7cee38 100644
 --- a/src/main/java/net/minecraft/server/PersistentVillage.java
 +++ b/src/main/java/net/minecraft/server/PersistentVillage.java
 @@ -238,7 +238,7 @@ public class PersistentVillage extends PersistentBase {
@@ -19,7 +19,7 @@ index a5b79ec..01f7cee 100644
              village.a(nbttagcompound1);
              this.villages.add(village);
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index 2ab381d..817c836 100644
+index 2ab381d50..817c836c3 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -24,7 +24,7 @@ public class Village {
@@ -32,5 +32,5 @@ index 2ab381d..817c836 100644
          this.d = BlockPosition.ZERO;
          this.j = Maps.newHashMap();
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch
index 550d229fb2..ff270c0d9e 100644
--- a/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch
@@ -1,11 +1,11 @@
-From 0cff8c26c45dac3c873b16c4b6aea730439d8c7a Mon Sep 17 00:00:00 2001
+From 7679dde826a395940efcd10cb8042a2d91dd0c5b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 193dadf..ee177b2 100644
+index 247224117..9cb3b22fb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2323,12 +2323,13 @@ public abstract class EntityLiving extends Entity {
@@ -46,5 +46,5 @@ index 193dadf..ee177b2 100644
  
      }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0080-Set-health-before-death-event.patch b/Spigot-Server-Patches/0081-Set-health-before-death-event.patch
index 6b1f05f162..a13a53007b 100644
--- a/Spigot-Server-Patches/0080-Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/0081-Set-health-before-death-event.patch
@@ -1,14 +1,14 @@
-From 22251c19e0a10fa2073fa1e2d3c9e7641c652396 Mon Sep 17 00:00:00 2001
+From 62f9ecf769955dd17317af05db2280aa386940e0 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 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 7f02ac219..0b4468726 100644
+index 078e0d989..a48f5cb51 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 {
+@@ -214,4 +214,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }
diff --git a/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 43e0dec4a1..bae0a440a2 100644
--- a/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From e1edb49d9f186def10618afca0b8135bb2c4d326 Mon Sep 17 00:00:00 2001
+From 9eb7dd5d37830bc084265340fc125b0a8059e964 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
diff --git a/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch
index 4dab2ca328..ce90b44c39 100644
--- a/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,4 +1,4 @@
-From 62f5ab3a1a75ae8550464511ccc3ed520443c92b Mon Sep 17 00:00:00 2001
+From 32f6c5a12798ed212df901f65912a56b2ef70811 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <[email protected]>
 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.11.0.windows.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch
index 93ad89b24b..888c55c1c7 100644
--- a/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,11 +1,11 @@
-From d29f3b17dee0a6d823ebfc0debd4aaff105a339d Mon Sep 17 00:00:00 2001
+From f7c86c61f7ef38864a71ab0a671930550953dbc3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandWhitelist.java b/src/main/java/net/minecraft/server/CommandWhitelist.java
-index c74d1d2..0f4237d 100644
+index c74d1d2be..0f4237db1 100644
 --- a/src/main/java/net/minecraft/server/CommandWhitelist.java
 +++ b/src/main/java/net/minecraft/server/CommandWhitelist.java
 @@ -44,24 +44,35 @@ public class CommandWhitelist extends CommandAbstract {
@@ -89,5 +89,5 @@ index c74d1d2..0f4237d 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch
index 413b7ac44f..c9be7904f1 100644
--- a/Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch
+++ b/Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch
@@ -1,11 +1,11 @@
-From d3bda3ae7d53809fd81ce89d15389679d8ecc6f4 Mon Sep 17 00:00:00 2001
+From 0b5537a8783083de5b42792af5f37352f2ef9d06 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 91ca4a2..edd6fb6 100644
+index 91ca4a279..edd6fb69e 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -191,7 +191,7 @@ public class TileEntitySkull extends TileEntity implements ITickable {
@@ -18,5 +18,5 @@ index 91ca4a2..edd6fb6 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0085-Waving-banner-workaround.patch b/Spigot-Server-Patches/0086-Waving-banner-workaround.patch
index 3cd2baa647..15a49adfe9 100644
--- a/Spigot-Server-Patches/0085-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0086-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From c672f11a21481edf3e49ef4c09cf3b402350b29f Mon Sep 17 00:00:00 2001
+From a6d01124186c189889cb98a3f25cde842fe6eaeb Mon Sep 17 00:00:00 2001
 From: Gabscap <[email protected]>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround
 This patch is a workaround for MC-63720
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
-index c5c3f40..6413f76 100644
+index c5c3f40ce..6413f76e7 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 @@ -4,7 +4,13 @@ import java.io.IOException;
@@ -34,5 +34,5 @@ index c5c3f40..6413f76 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch
index 7f88dc9e71..9ac9f38998 100644
--- a/Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 519f8952226e95dde8e2083bb16103c81e35e4bc Mon Sep 17 00:00:00 2001
+From e2c35037b839ec84fb38debdbbc5437c66ec9f30 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 453efd4..64b682e 100644
+index be54c807b..42bd79b10 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -46,6 +46,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,5 +27,5 @@ index 453efd4..64b682e 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch
index 4d670ba20b..1077cd1970 100644
--- a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From a267b336205e376738ec0237266113100ab3a981 Mon Sep 17 00:00:00 2001
+From ab781f7781960c84d0caf220d208f3c514dc91f2 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
diff --git a/Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch
index 4c4ac8d9d3..fc513d132a 100644
--- a/Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 840d96d545551835d72adbdf512de70cf5a22b00 Mon Sep 17 00:00:00 2001
+From 1def4d8dd01ad67f472db739eb8b2d917c54b5f6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
@@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
 Optimize this look up by using a Last Access cache.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 54ca738..902f9ac 100644
+index b0a82e7ed..a7e8a3f7d 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -27,7 +27,27 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -42,5 +42,5 @@ index 54ca738..902f9ac 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch
index 92b3ddc339..206a90aa22 100644
--- a/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From ebd168135f9e0b79d5718dbacb5021290c813218 Mon Sep 17 00:00:00 2001
+From 03d2a8cac0d4d45cf78e5f81039fe2f56dac91d5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
diff --git a/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 752663b00b..9364d86444 100644
--- a/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From 4d9763586eab9522a87d6e37e6411695212ce774 Mon Sep 17 00:00:00 2001
+From 2e211c0f0a5dbcf8ac99fdf6eb4368dcae14c4f1 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
diff --git a/Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch
index 96f4ce2c43..15bed1f743 100644
--- a/Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch
@@ -1,11 +1,11 @@
-From e78b091f4fbf7ba12b78cb0bde720c17554d5578 Mon Sep 17 00:00:00 2001
+From 808ddbb267bcde272fc8297a6bbc153e64836a95 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
 
 
 diff --git a/src/main/java/net/minecraft/server/DataConverterMaterialId.java b/src/main/java/net/minecraft/server/DataConverterMaterialId.java
-index 87b82eb..a7c71f4 100644
+index 87b82eb35..a7c71f406 100644
 --- a/src/main/java/net/minecraft/server/DataConverterMaterialId.java
 +++ b/src/main/java/net/minecraft/server/DataConverterMaterialId.java
 @@ -261,7 +261,7 @@ public class DataConverterMaterialId implements IDataConverter {
@@ -18,5 +18,5 @@ index 87b82eb..a7c71f4 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0093-Access-items-by-EquipmentSlot.patch
index a512302ed7..1892e86ce1 100644
--- a/Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0093-Access-items-by-EquipmentSlot.patch
@@ -1,11 +1,11 @@
-From e2b0e859ad84a39b58e2b1299ffdd07896afde1e Mon Sep 17 00:00:00 2001
+From 5e5214b56e304a9e26c3d5ce2c106e1fe3f2ac5b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index d8c5364..120ec89 100644
+index d8c5364df..120ec897f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -271,4 +271,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
@@ -64,5 +64,5 @@ index d8c5364..120ec89 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0094-Check-async-remove-unused-vars-GH-159.patch
index d84f52153d..2127b42b5a 100644
--- a/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0094-Check-async-remove-unused-vars-GH-159.patch
@@ -1,11 +1,11 @@
-From 4ed00e05204021c2c1d17fd0f5b30812c6eebaf1 Mon Sep 17 00:00:00 2001
+From b62a735c3225762f282e00951b5351a786bcb853 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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 29219ec..c95fb7f 100644
+index 29219ec7b..c95fb7f30 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 29219ec..c95fb7f 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0095-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 68307dc463..0610657c84 100644
--- a/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0095-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 493bc62d5f87dc0fe5cbab3abe12a769733aaf4f Mon Sep 17 00:00:00 2001
+From 230889bd4f8eb5a76b29db21486a2d8bcf90ab86 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
diff --git a/Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0096-Entity-AddTo-RemoveFrom-World-Events.patch
index f146bfa717..7e6dc4aed0 100644
--- a/Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0096-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,11 +1,11 @@
-From eba67cd7c25447448c3fbeb37fc5a899108a23c4 Mon Sep 17 00:00:00 2001
+From 5ceed1d40f66d17831eafab8011bd93a78305a84 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 48cd4c39..ffa0d18b 100644
+index 8cbdbda92..f86c64cb2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1182,6 +1182,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0097-Configurable-Chunk-Inhabited-Timer.patch
index 99f28a3c41..acae698f45 100644
--- a/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0097-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 84cc380bde2c514ea83de852c8086d4da03a5c2d Mon Sep 17 00:00:00 2001
+From 0ea1c20ebdf134e47efb6aceb915590929ed4b9d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
diff --git a/Spigot-Server-Patches/0097-EntityPathfindEvent.patch b/Spigot-Server-Patches/0098-EntityPathfindEvent.patch
index d68d2ac426..a4c79d58ba 100644
--- a/Spigot-Server-Patches/0097-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0098-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 3dc7b052ab904452c72af7ec8494566f09c289dc Mon Sep 17 00:00:00 2001
+From ed3b89ad69c48ebe4ee51a704b10e3f5ac4b17f9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent
 Fires when an Entity decides to start moving to a location.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 43b2be5..c0ef240 100644
+index 43b2be505..c0ef2400b 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -4,7 +4,7 @@ import javax.annotation.Nullable;
@@ -35,5 +35,5 @@ index 43b2be5..c0ef240 100644
                  float f = this.h();
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0099-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index bf2881889e..c89eb67f08 100644
--- a/Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0099-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From eb71eace887b2e0a81bc89f494f250fc0a37a4f5 Mon Sep 17 00:00:00 2001
+From 68a9bbc962a93f0689d95be191fae73489a5c2f7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 22:03:09 -0400
 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
@@ -12,7 +12,7 @@ of unloaded chunks anyways.
 This keeps behavior consistent, vs inconsistent flowing based on plugin triggered loads.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 765a371..6939ac2 100644
+index 0a2823686..8eba70b01 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -96,6 +96,7 @@ public class BlockFlowing extends BlockFluids {
@@ -48,5 +48,5 @@ index 765a371..6939ac2 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0100-Reduce-IO-ops-opening-a-new-region-file.patch
index 0fff452015..a0eb9ff50e 100644
--- a/Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0100-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,11 +1,11 @@
-From dc00f1adf650e8c591f1c67718fb12cabcf1d18b Mon Sep 17 00:00:00 2001
+From 37db8b5f7d7fc19b87d5bc444491d60d1197aa0c Mon Sep 17 00:00:00 2001
 From: Antony Riley <[email protected]>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
 
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 9cfc46b..637e5ba 100644
+index 9cfc46bc2..637e5baaf 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -8,9 +8,12 @@ import java.io.ByteArrayInputStream;
@@ -49,5 +49,5 @@ index 9cfc46b..637e5ba 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0101-Sanitise-RegionFileCache-and-make-configurable.patch
index 6319d2ee8a..6f2cb88be8 100644
--- a/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0101-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From cf6994bcd2c15ead93ab8949c558846e981e0da1 Mon Sep 17 00:00:00 2001
+From 1c1d94fb02737c1c35d720dd430bfb0b04050f7c Mon Sep 17 00:00:00 2001
 From: Antony Riley <[email protected]>
 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 0b4468726..ab796a959 100644
+index a48f5cb51..6b694705b 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 {
+@@ -219,4 +219,9 @@ public class PaperConfig {
      private static void healthDeath() {
          setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
      }
diff --git a/Spigot-Server-Patches/0101-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0102-Use-Optimized-Collections.patch
index a5eee2f5e9..666b038512 100644
--- a/Spigot-Server-Patches/0101-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0102-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From e0d27bb673eb6aad7eecf10e54b49c097b42e4e2 Mon Sep 17 00:00:00 2001
+From 5f32bddc3d9678ab8844312b8773a3e108110851 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@@ -13,7 +13,7 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 902f9ac..a57bcaf 100644
+index a7e8a3f7d..54b454fe3 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -24,7 +24,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
@@ -26,7 +26,7 @@ index 902f9ac..a57bcaf 100644
      private final IChunkLoader chunkLoader;
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index 419add5..820c152 100644
+index 419add5db..820c15278 100644
 --- a/src/main/java/net/minecraft/server/DataWatcher.java
 +++ b/src/main/java/net/minecraft/server/DataWatcher.java
 @@ -12,6 +12,7 @@ import java.util.Map;
@@ -47,5 +47,5 @@ index 419add5..820c152 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0103-Do-not-load-chunks-for-light-checks.patch
index 2ef85bdda6..9228ec163d 100644
--- a/Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0103-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 82823ca3b1570c84492d9d40efaec6e7c18487b1 Mon Sep 17 00:00:00 2001
+From 82762171170f5fa2efc679e390f59413dc496e7e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 654f2ae..2d5f3d2 100644
+index f86c64cb2..7e6459654 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -759,6 +759,7 @@ public abstract class World implements IBlockAccess {
@@ -19,5 +19,5 @@ index 654f2ae..2d5f3d2 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0104-Add-PlayerUseUnknownEntityEvent.patch
index 833ecaede2..46440ccc97 100644
--- a/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0104-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From 7bf4fe352ceae35bf946e88ff95cda1953035997 Mon Sep 17 00:00:00 2001
+From 2b5c2ffb68f66bcde5c41dea234c760d72bf4e31 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
diff --git a/Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0105-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 6b7e3f8453..fe6844a317 100644
--- a/Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0105-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From f9e31f50a0528a18a24340d167ffaf6d2a7fd90f Mon Sep 17 00:00:00 2001
+From d64ae353b75ee5abab8c33346297cedbd806d0f0 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 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 54762ff..2af702c 100644
+index 4e35e9102..a55a6fca0 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 54762ff..2af702c 100644
          entityplayer.getStatisticManager().d();
          entityplayer.getStatisticManager().updateStatistics(entityplayer);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0106-Configurable-Grass-Spread-Tick-Rate.patch
index c35230cb34..3092968bf5 100644
--- a/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0106-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From 669d20a0f61682186a2e540b525f8c9974bd4261 Mon Sep 17 00:00:00 2001
+From ce7d0b024535acff9b1f9613aafee35d0560b7a5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
diff --git a/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index b40cbd386e..bd35f74a1b 100644
--- a/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 18820f409c629725e0c0bd5df067b8dc832a3330 Mon Sep 17 00:00:00 2001
+From 3c25ca03245aa817b01fc414d55019887bde034e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
diff --git a/Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index c091a0d4cc..e114beeac4 100644
--- a/Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,11 +1,11 @@
-From 811798ae6f012bbc184974770b5337d16857eb15 Mon Sep 17 00:00:00 2001
+From 742f1c783e22b45da804858ae209f1098f5b287c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9c36471..d348496 100644
+index dba3fb167..44108ab9a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -532,6 +532,7 @@ public abstract class World implements IBlockAccess {
@@ -17,5 +17,5 @@ index 9c36471..d348496 100644
          this.a(blockposition.east(), block, blockposition);
          this.a(blockposition.down(), block, blockposition);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 0cea03782b..cfd279e4ab 100644
--- a/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,4 +1,4 @@
-From 1ab32d14164cb542312813d5960c989c4e7eb7ed Mon Sep 17 00:00:00 2001
+From a36884f63ccd005005d2ca4000ef1b31cf79cd03 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
diff --git a/Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0110-Remove-Debug-checks-from-DataBits.patch
index b73d11307f..a9e55ade7c 100644
--- a/Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0110-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From f5252bd9356fc7cd5ae6f147731678d264b04da1 Mon Sep 17 00:00:00 2001
+From 64d38625dcef9c927f62fcda7a6de7e97f078c84 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
@@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png
 After: http://i.imgur.com/nJ46crB.png
 
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index f3a6799..fa0fd8a 100644
+index f3a6799a8..fa0fd8a9c 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -10,7 +10,7 @@ public class DataBits {
@@ -42,5 +42,5 @@ index f3a6799..fa0fd8a 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 6f17024569..594f7a270e 100644
--- a/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 5ef75a37faa4b05d824a5a032a82ea06c21459cc Mon Sep 17 00:00:00 2001
+From 43163c071565eedd53eb2ab74fb0bb58c52d2485 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
diff --git a/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0112-Workaround-for-setting-passengers-on-players.patch
index d9fa401b7c..d56d71e016 100644
--- a/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0112-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 608037c24e940c8fa6bb3e41abbca82cd46555a8 Mon Sep 17 00:00:00 2001
+From b17837a6de60969078250788da9e1aaed2c2cf99 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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 de8952e..3b91e46 100644
+index b2fe1afc0..a74d6c768 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 de8952e..3b91e46 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch
index d9d361cf4a..36dd328e3a 100644
--- a/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 34bd14616e9dc48f3dd5fc05a5067b9a40a74ae7 Mon Sep 17 00:00:00 2001
+From 46779d2f2ca037a8800c901a4bb48d59d7d1cf24 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
diff --git a/Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0114-Don-t-tick-Skulls-unused-code.patch
index f2b4e1dfbc..eeb8608a22 100644
--- a/Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0114-Don-t-tick-Skulls-unused-code.patch
@@ -1,11 +1,11 @@
-From ae5a116e0a0dfa68b6bf02991c4b3fc5a1e9a6b7 Mon Sep 17 00:00:00 2001
+From 46a6949ea4c98de6bc09f7bd6db7205afa027dcf Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index edd6fb6..380373c 100644
+index edd6fb69e..380373c0e 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -21,7 +21,7 @@ import com.mojang.authlib.Agent;
@@ -18,5 +18,5 @@ index edd6fb6..380373c 100644
      private int a;
      public int rotation;
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
index 08fc835519..adc6be6f4d 100644
--- a/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
@@ -1,14 +1,14 @@
-From b3febbc715ff0c9d2ba5e1cd6e3b64e90b60f9be Mon Sep 17 00:00:00 2001
+From fd4bdb80419297c9ba4b02f9f1f6aabe04e0665f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 ab796a959..e823f5979 100644
+index 6b694705b..ee884ba57 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 {
+@@ -224,4 +224,9 @@ public class PaperConfig {
      private static void regionFileCacheSize() {
          regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
      }
diff --git a/Spigot-Server-Patches/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index df6a766178..90ab448ebd 100644
--- a/Spigot-Server-Patches/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 484e0a0fa02ae5144f6a31ce2e53c0c3d986521a Mon Sep 17 00:00:00 2001
+From b2f15a25ca3ae5d38b30c5ee1519b94a2780a7fa Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index a46df4b..f02263c 100644
+index a46df4b7f..f02263c34 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -45,5 +45,5 @@ index a46df4b..f02263c 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0117-Water-mobs-should-only-spawn-in-the-water.patch
index 39919720d4..8887322b91 100644
--- a/Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0117-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,11 +1,11 @@
-From d153a3ef0f9c66361c449f0175123a8239fc9a32 Mon Sep 17 00:00:00 2001
+From 6eae39ef9e948ea60c2d6c4f0912822b6f43300b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWaterAnimal.java b/src/main/java/net/minecraft/server/EntityWaterAnimal.java
-index 90d33af..2515557 100644
+index 90d33af95..251555713 100644
 --- a/src/main/java/net/minecraft/server/EntityWaterAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityWaterAnimal.java
 @@ -11,7 +11,15 @@ public abstract class EntityWaterAnimal extends EntityInsentient implements IAni
@@ -26,5 +26,5 @@ index 90d33af..2515557 100644
  
      public boolean canSpawn() {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index e8d283a761..953b1430d2 100644
--- a/Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From 82a710b86ac776efc85ae57246a489a52f439582 Mon Sep 17 00:00:00 2001
+From 4a13aab793f8a1c300970852cb4fb20b8b97b963 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@@ -14,7 +14,7 @@ Specially with servers using smaller mob spawn ranges than view distance, as wel
 This patch returns mob counting to use all loaded chunks, and 17x17 division.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 61d34fc..a6cf1d8 100644
+index 61d34fc37..a6cf1d83d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -680,7 +680,7 @@ public class Chunk {
@@ -27,7 +27,7 @@ index 61d34fc..a6cf1d8 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 c95fb7f..0a7a310 100644
+index c95fb7f30..0a7a31086 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 c95fb7f..0a7a310 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0119-Configurable-RCON-IP-address.patch
index ef1be15450..ab4a281cae 100644
--- a/Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0119-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From f2a1633a862df24f5b75b0246e23429ad8e1b652 Mon Sep 17 00:00:00 2001
+From a6babfe8d967b40e520f64fb3df3ed6fe821b9a7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address
 For servers with multiple IP's, ability to bind to a specific interface.
 
 diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
-index a6a0d5a..efcafe7 100644
+index a6a0d5a29..efcafe77f 100644
 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
 @@ -24,7 +24,7 @@ public class RemoteControlListener extends RemoteConnectionThread {
@@ -19,5 +19,5 @@ index a6a0d5a..efcafe7 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0120-Prevent-Fire-from-loading-chunks.patch
index fe02354bba..a3753247c3 100644
--- a/Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0120-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From d2497d7d2334e93387915c5f82cbb9c68d72a8f1 Mon Sep 17 00:00:00 2001
+From 348b10de4d21bc63dc52260c2010805d14196b11 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall
 bad behavior.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 94cb9d46..dfc32885 100644
+index 94cb9d462..dfc328850 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -164,6 +164,7 @@ public class BlockFire extends Block {
diff --git a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
index 43ff689136..666052c363 100644
--- a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From 289c59814fb005e552bbd8df0f3bed5f88479bf4 Mon Sep 17 00:00:00 2001
+From 26e1ed0356b858d55a7bbad90ab7e8e0f835b8ab Mon Sep 17 00:00:00 2001
 From: Isaac Moore <[email protected]>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/Spigot-Server-Patches/0121-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0122-EntityRegainHealthEvent-isFastRegen-API.patch
index 1cb3d79c3b..dc2a1dd885 100644
--- a/Spigot-Server-Patches/0121-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0122-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 27b1fa9b5c21ee589a9ea23c5ea91e6724dc59e2 Mon Sep 17 00:00:00 2001
+From b65ee7ee42061f41da17f7751b3da166a3bc69ff Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f57a110..88bc7d8 100644
+index c70f14a15..ec901150d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -762,10 +762,16 @@ public abstract class EntityLiving extends Entity {
@@ -28,7 +28,7 @@ index f57a110..88bc7d8 100644
  
              if (!event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
-index b6e9786..8d95d14 100644
+index b6e978668..8d95d148f 100644
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
 @@ -65,7 +65,7 @@ public class FoodMetaData {
@@ -41,5 +41,5 @@ index b6e9786..8d95d14 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0123-Add-ability-to-configure-frosted_ice-properties.patch
index 7c9318edf4..93b525539b 100644
--- a/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0123-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From 13ba82e13961f9192690d82d07a566b48bae222e Mon Sep 17 00:00:00 2001
+From cb5be4e330a54208ee57acc3be1ca69f3bee19f7 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
diff --git a/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0124-Vehicle-Event-Cancellation-Changes.patch
index e3aabb05d7..c0d95d8cef 100644
--- a/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0124-Vehicle-Event-Cancellation-Changes.patch
@@ -1,4 +1,4 @@
-From 2ca1f747abed74dc85b59b9688dd3ef238d3774c Mon Sep 17 00:00:00 2001
+From 250abb6d0ca791c9532957ddcc3d3b3fed90eab9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
diff --git a/Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index e27500a5d9..90f2a85e19 100644
--- a/Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,11 +1,11 @@
-From c4e48dfab5565e8f6e68fec800d15b000c5e40d4 Mon Sep 17 00:00:00 2001
+From 4e77c921e4c946cdf1a4a9ccf488470d409f0e4a Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockDispenser.java b/src/main/java/net/minecraft/server/BlockDispenser.java
-index f8eaf2a..8e78844 100644
+index f8eaf2ac3..8e7884490 100644
 --- a/src/main/java/net/minecraft/server/BlockDispenser.java
 +++ b/src/main/java/net/minecraft/server/BlockDispenser.java
 @@ -20,6 +20,9 @@ public class BlockDispenser extends BlockTileEntity {
@@ -28,7 +28,7 @@ index f8eaf2a..8e78844 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) {
 diff --git a/src/main/java/net/minecraft/server/BlockFurnace.java b/src/main/java/net/minecraft/server/BlockFurnace.java
-index 5280054..b0d03e4 100644
+index 528005446..b0d03e408 100644
 --- a/src/main/java/net/minecraft/server/BlockFurnace.java
 +++ b/src/main/java/net/minecraft/server/BlockFurnace.java
 @@ -18,6 +18,9 @@ public class BlockFurnace extends BlockTileEntity {
@@ -51,5 +51,5 @@ index 5280054..b0d03e4 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.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch
index 6a73572424..a204879a2f 100644
--- a/Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From 29b179f996972a2d90483d041631ac3146f24e17 Mon Sep 17 00:00:00 2001
+From aae8d45f695812234547659875185882576a8884 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Improve Minecraft Hopper Performance
@@ -8,7 +8,7 @@ Also reset cooldown each hopper tick that a hopper is full.
 Also don't constantly clone ItemStacks without merit
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index d0c0371..d2662ae 100644
+index d0c0371fc..d2662ae14 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -33,6 +33,7 @@ public abstract class TileEntity {
@@ -28,7 +28,7 @@ index d0c0371..d2662ae 100644
  
              this.g = iblockdata.getBlock().toLegacyData(iblockdata);
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 6acce15..44b6ecc 100644
+index 6acce15e7..44b6ecc5d 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -220,11 +220,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -86,5 +86,5 @@ index 6acce15..44b6ecc 100644
          return this.f > 0;
      }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch
index 090a90e4ea..69ec792604 100644
--- a/Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 08c2f8c625e0849d50e2016a01f0e918f514ce05 Mon Sep 17 00:00:00 2001
+From caa7315a2610c58457ec85c91a9e6f971b73b1c2 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 b9d4d65a6..15e543368 100644
+index 988439a0a..410c9834b 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 b9d4d65a6..15e543368 100644
      // CraftBukkit end
  }
 -- 
-2.11.0.windows.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 6ef5fc4944..45280c2622 100644
--- a/Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From e92bcd0dd3c83f7542dce25ff719ef539afca847 Mon Sep 17 00:00:00 2001
+From 2e5ebe21456932cc5b2acc66af5b6a877bfb61d6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 43e28d61..af173a13 100644
+index 43e28d61c..af173a137 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -597,6 +597,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index 43e28d61..af173a13 100644
              ItemStack itemstack1 = this.a(entityitem);
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index f542bf49..fbda70a3 100644
+index f542bf491..fbda70a39 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -90,11 +90,11 @@ public class EntityTrackerEntry {
@@ -48,7 +48,7 @@ index f542bf49..fbda70a3 100644
                  Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0c44377f..64deb12d 100644
+index 2f4728b0d..7ed3a0677 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1219,6 +1219,7 @@ public abstract class World implements IBlockAccess {
@@ -60,7 +60,7 @@ index 0c44377f..64deb12d 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index dd5412e6..dbe6a80f 100644
+index dd5412e69..dbe6a80f2 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -28,6 +28,7 @@ public class WorldMap extends PersistentBase {
@@ -132,7 +132,7 @@ index dd5412e6..dbe6a80f 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-index 256a1317..5768cd51 100644
+index 256a13178..5768cd512 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
diff --git a/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch
index ae35de7207..0d486ec3f8 100644
--- a/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From ab7d2ed6e59a26fbeaa0b65451e7ae783824e610 Mon Sep 17 00:00:00 2001
+From 70d33ab88ea2e9a120964de43059191a7ff6ce4d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
diff --git a/Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch
index 2b3c3f4b88..81396ff9b8 100644
--- a/Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch
@@ -1,11 +1,11 @@
-From 1cc9fdf9a478f98633fb29dfb3250d16d95e00b8 Mon Sep 17 00:00:00 2001
+From 4d18d75affbc3688c2af0282c94606ac0579fdcb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
-index 08b986f..786d1dd 100644
+index 08b986fd7..786d1dd22 100644
 --- a/src/main/java/net/minecraft/server/ChunkCache.java
 +++ b/src/main/java/net/minecraft/server/ChunkCache.java
 @@ -25,7 +25,7 @@ public class ChunkCache implements IBlockAccess {
@@ -18,5 +18,5 @@ index 08b986f..786d1dd 100644
          }
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch
index 1d9d38093d..6866db485a 100644
--- a/Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 410209083b060291fb23615857551f108eaa48ea Mon Sep 17 00:00:00 2001
+From 7047f1cc004e05f7ad7537010e631146a5aa9ee4 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d4fbc3c..340c24b 100644
+index 0f4a1b66b..96b1e9a78 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener {
@@ -19,7 +19,7 @@ index d4fbc3c..340c24b 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index fbda70a..c28b4bd 100644
+index fbda70a39..c28b4bd44 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -49,6 +49,7 @@ public class EntityTrackerEntry {
@@ -99,5 +99,5 @@ index fbda70a..c28b4bd 100644
  
      }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index fbfccb2672..f1036546e1 100644
--- a/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,14 +1,14 @@
-From 21d2326939519499425791960d09360897ea5178 Mon Sep 17 00:00:00 2001
+From 1a355ce13efceaac09befef07ab6da6dbb1b3950 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 e823f5979..923cc2b5c 100644
+index ee884ba57..5fbaa99e9 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 {
+@@ -229,4 +229,9 @@ public class PaperConfig {
      private static void enablePlayerCollisions() {
          enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
      }
diff --git a/Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 9eb282fd6e..741e334b44 100644
--- a/Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From b55a223ea8b714bb05ddbd0840ab53436d3095a5 Mon Sep 17 00:00:00 2001
+From 7e64ee667c6453f0c1957fbb8ecb74ea1e98e28c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates
@@ -6,7 +6,7 @@ Subject: [PATCH] Do not mark chunks as active for neighbor updates
 Fixes chunk unload issues
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a6cf1d8..3db2916 100644
+index a6cf1d83d..3db29161d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1004,25 +1004,25 @@ public class Chunk {
@@ -44,5 +44,5 @@ index a6cf1d8..3db2916 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch
index 045292c631..46f7ff0678 100644
--- a/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 30c09c852ad1aae23ece5182a9e4d06f89e79a53 Mon Sep 17 00:00:00 2001
+From 5f497d51aadf17988eb23ce59d233324b3628047 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch
index cf998a681f..ba01db1ef0 100644
--- a/Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch
@@ -1,11 +1,11 @@
-From bf0d781642cb2333a16b7025e3c8ae7fb74c1600 Mon Sep 17 00:00:00 2001
+From f8e32d06d1110855c4ad68b681c4a0c3253dfbaa Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
 
 
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 6384d50..cb1fcf0 100644
+index 6384d50e7..cb1fcf0f4 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -52,7 +52,7 @@ public class WatchdogThread extends Thread
@@ -18,5 +18,5 @@ index 6384d50..cb1fcf0 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0135-Optimize-EAR.patch b/Spigot-Server-Patches/0136-Optimize-EAR.patch
index f35245c87e..6ff9f30dcb 100644
--- a/Spigot-Server-Patches/0135-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0136-Optimize-EAR.patch
@@ -1,11 +1,11 @@
-From adc2e141ef85f2b1b0820981860ca7e48fe35f01 Mon Sep 17 00:00:00 2001
+From 6e175b1425a2ae869b13908042f22dba15b89dea Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c411ce8..c8a6ff3 100644
+index c411ce886..c8a6ff3d4 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -2,6 +2,8 @@ package org.spigotmc;
@@ -65,5 +65,5 @@ index c411ce8..c8a6ff3 100644
                  }
              }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch
index e2e75e5342..7eab1a9093 100644
--- a/Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From bd719bf59cf2a9071c52afa26605638b1d97100a Mon Sep 17 00:00:00 2001
+From fcf5d25b497633a337c78b07a7030913aa7018b1 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 15e543368..4078824f7 100644
+index 410c9834b..f83cc7641 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.11.0.windows.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch
index 13e9c8cbf2..e8fd80f22c 100644
--- a/Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From c7a2fa790e51dd5507b79a68f11de7e7e9c0228d Mon Sep 17 00:00:00 2001
+From fe36eb75f24899170fb0c73564e2e929c1a21561 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index 6a71ebb..faf7b60 100644
+index 6a71ebbd2..faf7b60af 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -60,6 +60,15 @@ public class ServerConnection {
@@ -43,5 +43,5 @@ index 6a71ebb..faf7b60 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch
index 46c7146ed9..5dc2d755d6 100644
--- a/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch
@@ -1,4 +1,4 @@
-From cefcffaa0aa6f5c4779e8ba54a5681a4a72078fc Mon Sep 17 00:00:00 2001
+From a4f2fa2373ffcb60638242223520705fee58d75b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional old TNT cannon behaviors
diff --git a/Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch
index 1cd0047395..046467949e 100644
--- a/Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 7c1b976cb4154ced9c6052b9f191549330636a4f Mon Sep 17 00:00:00 2001
+From 423558d9e117b9021b2b779379e1234e4529aac6 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <[email protected]>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
-index 7412362..25a2a5d 100644
+index 741236289..25a2a5d36 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 @@ -117,9 +117,17 @@ public class BlockRedstoneTorch extends BlockTorch {
@@ -39,5 +39,5 @@ index 7412362..25a2a5d 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch
index 578c520aef..326249b205 100644
--- a/Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 79f02a4a6ba06509cc09747cc68ff538db6d9a80 Mon Sep 17 00:00:00 2001
+From 77b435e0e2ac9b2391e76d794630df60afab84d4 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Chunks never ever load async
 Safely pushes the operation to main thread, then back to the posting thread
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 7b7a3d0..9aaca21 100644
+index 7b7a3d01b..9aaca21a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -4,6 +4,7 @@ import com.destroystokyo.paper.PaperConfig;
@@ -27,7 +27,7 @@ index 7b7a3d0..9aaca21 100644
  
      public static void queueChunkLoad(World world, ChunkRegionLoader loader, ChunkProviderServer provider, int x, int z, Runnable runnable) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index b5efb9c..ef9529a 100644
+index b5efb9c3f..ef9529add 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -35,8 +35,8 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
@@ -42,5 +42,5 @@ index b5efb9c..ef9529a 100644
              return;
          }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0141-Add-server-name-parameter.patch b/Spigot-Server-Patches/0142-Add-server-name-parameter.patch
index 175d1f2eb8..7afa5e0066 100644
--- a/Spigot-Server-Patches/0141-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0142-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From 774f095fbb45ffd6bee6fc48044376b5f2086437 Mon Sep 17 00:00:00 2001
+From 87a15503b5a512ea355a426d0a5decd581bf4d9a Mon Sep 17 00:00:00 2001
 From: Martin Panzer <[email protected]>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 788bf66..4ac4e6f 100644
+index 4399faf69..59d4e2e6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -134,6 +134,14 @@ public class Main {
@@ -24,5 +24,5 @@ index 788bf66..4ac4e6f 100644
          };
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 529ef70548..1286b2c580 100644
--- a/Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From 46d08dc68f5afa04850e55a0cffa4c9756d3b51a Mon Sep 17 00:00:00 2001
+From 5143b0afa05419d7d268061e7e1834a718ae14cd Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
 Also fix view distance lookup
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index e24be3c..e93819f 100644
+index e24be3ccd..e93819fc1 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -573,8 +573,12 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -25,7 +25,7 @@ index e24be3c..e93819f 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 9af34ba..0315075 100644
+index 9af34ba60..031507574 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -211,8 +211,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -44,5 +44,5 @@ index 9af34ba..0315075 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch
index 949f82abd7..a306acbe9d 100644
--- a/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From de89b530131780b4ecccb3f8487c45ae17a4bd86 Mon Sep 17 00:00:00 2001
+From f478403d23570e7f7d119651fb8afba75f36ed3d Mon Sep 17 00:00:00 2001
 From: Martin Panzer <[email protected]>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences
diff --git a/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch
index 141f565814..f94f692727 100644
--- a/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From 7d7ec51f359de7ade5327fee113f9bd54de7bc67 Mon Sep 17 00:00:00 2001
+From fef949da0a39778974de622940c54323e5053c39 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Sat, 18 Jun 2016 01:01:37 -0500
 Subject: [PATCH] Make entities look for hoppers
diff --git a/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 16defb95b1..8ef94d9ada 100644
--- a/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 8113b5b2e2807dba7b504fc77d2f3242facd8240 Mon Sep 17 00:00:00 2001
+From a2a8ba613f501d788f0a391e52906209e2b259d1 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
diff --git a/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch
index 3c952f9623..8ce1eda352 100644
--- a/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From 1898a57c9e314e3f567a4cdd40013c8c842bec94 Mon Sep 17 00:00:00 2001
+From 58d1a2e017efc84ff949c59e8c422535020ce4a7 Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <[email protected]>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
diff --git a/Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch
index a55775e209..2574a99e7a 100644
--- a/Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 985952221532bab551cae422a725f133de11dd84 Mon Sep 17 00:00:00 2001
+From 38d08d69b70dde46257938f6c9deba534619728d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 310ab96..1941121 100644
+index 310ab96ab..19411212a 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -525,7 +525,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -21,7 +21,7 @@ index 310ab96..1941121 100644
              Iterator iterator = entity.bx().iterator();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 651ab32..ae1edb0 100644
+index 7ed3a0677..7900fca57 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1098,6 +1098,7 @@ public abstract class World implements IBlockAccess {
@@ -33,5 +33,5 @@ index 651ab32..ae1edb0 100644
          int i = MathHelper.floor(entity.locX / 16.0D);
          int j = MathHelper.floor(entity.locZ / 16.0D);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch
index 65faf5e56a..499f833c99 100644
--- a/Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 9f815a6fe05004cce263fbba75560f027ed567d2 Mon Sep 17 00:00:00 2001
+From 5ef6284e1b13bf6060363f946e11282a99053c18 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion
    This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
 
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index a3dc6fe..8364634 100644
+index a3dc6fe31..83646341b 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -203,9 +203,11 @@ public class DefinedStructure {
@@ -34,7 +34,7 @@ index a3dc6fe..8364634 100644
  
          public Iterator<IBlockData> iterator() {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index d2662ae..e6b79a5 100644
+index d2662ae14..e6b79a571 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -11,6 +11,7 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit
@@ -46,7 +46,7 @@ index d2662ae..e6b79a5 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 34ade14..242552c 100644
+index 34ade146c..242552c36 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -93,13 +93,14 @@ public class TileEntitySign extends TileEntity {
@@ -67,5 +67,5 @@ index 34ade14..242552c 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 5ec2bcdb65..617aa3942d 100644
--- a/Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,11 +1,11 @@
-From adff16d07abcbe250ff393a019a98d260e69fef0 Mon Sep 17 00:00:00 2001
+From 2c17fa95cfb703a465bae518e70103f03a8fec12 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
 
 
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 989758c..1c619c5 100644
+index 989758cdf..1c619c596 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -86,7 +86,7 @@ public class UserCache {
@@ -18,5 +18,5 @@ index 989758c..1c619c5 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch
index c2eb945019..7bfa620292 100644
--- a/Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From 0bb7eaad940190ff5281172ebfdc2a54593e6f6b Mon Sep 17 00:00:00 2001
+From 6716df1f949c2de8b747ab4e1ffd8e88d2f0cb84 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f3876f6..968c039 100644
+index 6dfeb9be9..e01787021 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -342,7 +342,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index f3876f6..968c039 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
index 917bc0f2e8..21bcb6cb69 100644
--- a/Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
@@ -1,11 +1,11 @@
-From 9867dc6a07fb53c3bb37d274d0138d04b84580b6 Mon Sep 17 00:00:00 2001
+From 8fa8ea1454de05471873e81d8a6c806720b143f0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 548fa97..a52b562 100644
+index 80b313b47..93c4babd9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -650,6 +650,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index 548fa97..a52b562 100644
      }
  
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch
index 2618a34990..e4af9e1d18 100644
--- a/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch
@@ -1,14 +1,14 @@
-From c12c1b6b1fd066616a0b895ade27aae62d5ae25a Mon Sep 17 00:00:00 2001
+From 44efa70e5f28474993c7f5fa1ac98e9db8c25ecb Mon Sep 17 00:00:00 2001
 From: Gabriele C <[email protected]>
 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 923cc2b5c..c0a83cccb 100644
+index 5fbaa99e9..d1d50f0db 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 {
+@@ -234,4 +234,9 @@ public class PaperConfig {
      private static void saveEmptyScoreboardTeams() {
          saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
      }
diff --git a/Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 969b95ee4a..e9abbec52f 100644
--- a/Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,11 +1,11 @@
-From 916d7c2c15e2de6a47e69b0f6ee3a22c54afcfc8 Mon Sep 17 00:00:00 2001
+From 090f996a8243c49f2a4273bcae8391e05352d990 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 288c52c..66c459d 100644
+index 288c52c55..66c459d83 100644
 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java
 +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
 @@ -16,6 +16,11 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
@@ -58,5 +58,5 @@ index 288c52c..66c459d 100644
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch
index 4d931ff351..2cd020d0ed 100644
--- a/Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch
@@ -1,11 +1,11 @@
-From 6ee16b4ee6ac964aaec0f126d5f8e32423e745e8 Mon Sep 17 00:00:00 2001
+From 28b204d655e85d71f2b53e4a2e178037a42e47bf Mon Sep 17 00:00:00 2001
 From: killme <[email protected]>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockSnowBlock.java b/src/main/java/net/minecraft/server/BlockSnowBlock.java
-index 8123d729..b6765e5b 100644
+index 8123d7295..b6765e5bc 100644
 --- a/src/main/java/net/minecraft/server/BlockSnowBlock.java
 +++ b/src/main/java/net/minecraft/server/BlockSnowBlock.java
 @@ -6,7 +6,7 @@ public class BlockSnowBlock extends Block {
diff --git a/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0156-Fix-AIOOBE-in-inventory-handling.patch
index 7bc54723a2..f6361ee1bd 100644
--- a/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0156-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,4 +1,4 @@
-From a9b75a383813f16c887bcccd04886b51f46bced3 Mon Sep 17 00:00:00 2001
+From 47ce11bab2409db675956daff0232adab29d0080 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
diff --git a/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0157-Configurable-packet-in-spam-threshold.patch
index 51ac4aeae9..2f929c694b 100644
--- a/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0157-Configurable-packet-in-spam-threshold.patch
@@ -1,14 +1,14 @@
-From bd16bfc6491d83cc41d41f94e273f401a0cd2404 Mon Sep 17 00:00:00 2001
+From ff09c2d454cf4139e2f7851b893867c43cbe2cfa Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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 c0a83cccb..20f6742f4 100644
+index d1d50f0db..2f17b9013 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -234,4 +234,13 @@ public class PaperConfig {
+@@ -239,4 +239,13 @@ public class PaperConfig {
      private static void bungeeOnlineMode() {
          bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true);
      }
diff --git a/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0158-Configurable-flying-kick-messages.patch
index 20648d6009..58027785b8 100644
--- a/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0158-Configurable-flying-kick-messages.patch
@@ -1,14 +1,14 @@
-From 5b1efd4134b7c1b99d864787b7831fb09ffe61d5 Mon Sep 17 00:00:00 2001
+From 8558acf638ad270e7c80e9125a33db09b00c9389 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 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 20f6742f4..cc0ae9224 100644
+index 2f17b9013..468095a44 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -243,4 +243,11 @@ public class PaperConfig {
+@@ -248,4 +248,11 @@ public class PaperConfig {
          }
          packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
      }
diff --git a/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch
index 3f6dd66f2c..56d6b74bf3 100644
--- a/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 3a0addf1653cf2821958eeccea104b889a887798 Mon Sep 17 00:00:00 2001
+From 4901fdc6a2e285bd3c2e11164ece8b2c660ca26c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 cc0ae9224..17102d95d 100644
+index 468095a44..ae69751c3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -250,4 +250,9 @@ public class PaperConfig {
+@@ -255,4 +255,9 @@ public class PaperConfig {
          flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
          flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
      }
diff --git a/Spigot-Server-Patches/0159-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0160-Chunk-registration-fixes.patch
index f8f7cc36ce..b8f1da2f67 100644
--- a/Spigot-Server-Patches/0159-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0160-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From ec03d19d0058c6715aa40ce286a39874e91c7e3f Mon Sep 17 00:00:00 2001
+From 6fd275a5cf157c53695d8aa39a27a2d5cd2d2091 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
diff --git a/Spigot-Server-Patches/0160-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0161-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index c229a9d4f8..d3de7cde4a 100644
--- a/Spigot-Server-Patches/0160-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0161-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From 3d9463bc18a705c0db7d39ee52b12b52c5ecb4fe Mon Sep 17 00:00:00 2001
+From c41a285e116a82b9eb0b7281142706a9a7469fad Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0161-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0162-Auto-fix-bad-Y-levels-on-player-login.patch
index b9766d4c36..88333c7422 100644
--- a/Spigot-Server-Patches/0161-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0162-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 6628ec9e240ac8e81caf14c21b479c2586cb25b9 Mon Sep 17 00:00:00 2001
+From 992ba8eacd10adf4e6ba33bbd2d17a70c9c02b24 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d67493666..9576264f6 100644
+index 0cd350254..4da83a1bf 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -128,6 +128,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index d67493666..9576264f6 100644
      }
  
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0162-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0163-Raise-string-limit-for-packet-serialization.patch
index bef136157e..2a718f7ed0 100644
--- a/Spigot-Server-Patches/0162-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0163-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From 2b6337e1d5a45c92453d836b6081080dfc22e13d Mon Sep 17 00:00:00 2001
+From a6297ac50d38e7ad1e986135d64dffcc4af39b5f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0163-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0164-Disable-Vanilla-Chunk-GC.patch
index 8854bcffb4..929ad9b669 100644
--- a/Spigot-Server-Patches/0163-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0164-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From fd222183aa6a8d26fa588ea63e72b9e6373c28f4 Mon Sep 17 00:00:00 2001
+From c1bba0e6b2d4136987500182b01bb95f4c265597 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -29,5 +29,5 @@ index cc0e8d2c8..7a6d11f20 100644
          }
      }
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0165-Option-to-remove-corrupt-tile-entities.patch
index 709d6c5155..62cb8d2b8d 100644
--- a/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0165-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From 844a32e4b5c8098e11cffcf31b3ab38f8a07ab8d Mon Sep 17 00:00:00 2001
+From d85c1336679a692f2bb96c0fa34574419830b77c Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
diff --git a/Spigot-Server-Patches/0165-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch
index 6805357f2b..84c72b67fe 100644
--- a/Spigot-Server-Patches/0165-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From f53a6a32b2bb709e9373fedb593b6821e352f284 Mon Sep 17 00:00:00 2001
+From 5237545473b5f46a819a32109f64aac1d9cb0aaa Mon Sep 17 00:00:00 2001
 From: AlphaBlend <[email protected]>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 88bd674b..80ad25c1 100644
+index 88bd674ba..80ad25c1b 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -159,6 +159,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 88bd674b..80ad25c1 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ee11691b..4ad75468 100644
+index ee11691bf..4ad75468c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -616,6 +616,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,7 +48,7 @@ index ee11691b..4ad75468 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 95b12331..4d252aa4 100644
+index 95b12331e..4d252aa47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -673,6 +673,14 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0166-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0167-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index e5a4e3c9f2..c47f460b9e 100644
--- a/Spigot-Server-Patches/0166-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0167-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 56ad9b89139354596b878c072ac70d0821953537 Mon Sep 17 00:00:00 2001
+From 0996378191511791820a385e381118da6dbaa326 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0168-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 2e5323e924..0fc46209b1 100644
--- a/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0168-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 8b0b1e8d57a24165d619fe81b265c1c37bc364b0 Mon Sep 17 00:00:00 2001
+From 4dfff3a56d96b1fb93a3dc5c9100317b0c17633e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
diff --git a/Spigot-Server-Patches/0168-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0169-Chunk-Save-Stats-Debug-Option.patch
index 5281ab76b5..34562e9b40 100644
--- a/Spigot-Server-Patches/0168-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0169-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From 9ca9b1e8b6057785329ad750eb3a8c1ec25f46ac Mon Sep 17 00:00:00 2001
+From e9fe9d86d190fed0eba83a122092af50636cc0e1 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b7afcb204..3b82627eb 100644
+index 916bf53f4..7006466b5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -28,6 +28,11 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -90,5 +90,5 @@ index 139f2799c..a10964b5b 100644
              boolean flag;
  
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0170-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index b0d0188e65..fd4cbad586 100644
--- a/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0170-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,4 +1,4 @@
-From f66443a5a92b3c43d33dc57a78f3260712acdc18 Mon Sep 17 00:00:00 2001
+From 022c321aa2f4f286f4d927656105aea40f59aed5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
diff --git a/Spigot-Server-Patches/0170-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0171-Cache-user-authenticator-threads.patch
index 2cb91a233f..c579dd5246 100644
--- a/Spigot-Server-Patches/0170-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0171-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From ef01ba87037b167b8dc1535de3e3305c893fa2da Mon Sep 17 00:00:00 2001
+From 33e36f3a8933c7dfd55ccbda5c4bc6fe7a6eba40 Mon Sep 17 00:00:00 2001
 From: vemacs <[email protected]>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
@@ -63,5 +63,5 @@ index fe390feb9..350ec0323 100644
      }
  
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0171-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0172-Optimize-Network-Queue.patch
index cfa76ffac9..d9e1c50510 100644
--- a/Spigot-Server-Patches/0171-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0172-Optimize-Network-Queue.patch
@@ -1,11 +1,11 @@
-From be295f0f521ab777676a30a6873b199bd8fdba99 Mon Sep 17 00:00:00 2001
+From 2c00725d68ba2dc5915bee0032ef57ebbc299bad Mon Sep 17 00:00:00 2001
 From: vemacs <[email protected]>
 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 e04bade5b..fc5be09ad 100644
+index d49a4ded0..044ae22d4 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 e04bade5b..fc5be09ad 100644
      private long ab = aw();
  
 -- 
-2.11.0.windows.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0172-Optimise-NetworkManager.patch b/Spigot-Server-Patches/0173-Optimise-NetworkManager.patch
index be224e1872..c40a994763 100644
--- a/Spigot-Server-Patches/0172-Optimise-NetworkManager.patch
+++ b/Spigot-Server-Patches/0173-Optimise-NetworkManager.patch
@@ -1,4 +1,4 @@
-From 2ba3ed38b54f7ef5f82c89636e249abaefb730ff Mon Sep 17 00:00:00 2001
+From a969e2064661d379b717bb30ac305302bf3e4472 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Fri, 25 Nov 2016 20:35:05 +0000
 Subject: [PATCH] Optimise NetworkManager
@@ -121,5 +121,5 @@ index 184ef32a8..be14c0b25 100644
  
          }
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0173-Optimise-removeQueue.patch b/Spigot-Server-Patches/0174-Optimise-removeQueue.patch
index f62a8ec6e1..ff9a5a223f 100644
--- a/Spigot-Server-Patches/0173-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0174-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From 53bb3f57e7c93afff979876d20e05be67440cf1f Mon Sep 17 00:00:00 2001
+From 812cbc220dbd54319a06cb73cb47b38a4871221e Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9576264f6..cff21dd8d 100644
+index 4da83a1bf..a7a71242e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@@ -61,5 +61,5 @@ index 9576264f6..cff21dd8d 100644
  
      protected void a(MobEffect mobeffect) {
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0174-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch
index fa1ee5e690..96b2e44ae4 100644
--- a/Spigot-Server-Patches/0174-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 1a43c3c56d5e7aa343c4ead1342df0dc0546b656 Mon Sep 17 00:00:00 2001
+From 40e511425c81959832c85fb4926e86e83ec5a2d3 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -35,5 +35,5 @@ index 1bbce7a78..225e118dc 100644
      // Paper end
  }
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0175-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0176-Add-source-to-PlayerExpChangeEvent.patch
index 65d133eeb2..38571bb023 100644
--- a/Spigot-Server-Patches/0175-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0176-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From 9b170d015adf3f9c502c7d1c9b6b3ee26e9d2f31 Mon Sep 17 00:00:00 2001
+From 46b11f5745765523602355211fc2629c0e147335 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <[email protected]>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 4b381646..14431b8a 100644
+index 4b3816465..14431b8ad 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index 4b381646..14431b8a 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4d252aa4..7e4982d9 100644
+index 4d252aa47..7e4982d93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -45,6 +45,7 @@ import org.bukkit.entity.Player;
diff --git a/Spigot-Server-Patches/0176-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0177-Optimize-World.isLoaded-BlockPosition-Z.patch
index e2cf7512df..465a21b134 100644
--- a/Spigot-Server-Patches/0176-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0177-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 8f8ae838b4b4a42d433c5592e374319a6be5030c Mon Sep 17 00:00:00 2001
+From 706f201ef2947eeefabeb9839069261a5cafb3e3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ee3f14cca..5ea201ed9 100644
+index ec0a28cff..2fa63a27f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -286,7 +286,7 @@ public abstract class World implements IBlockAccess {
@@ -19,5 +19,5 @@ index ee3f14cca..5ea201ed9 100644
  
      public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0177-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0178-Speedup-BlockPos-by-fixing-inlining.patch
index 88b3c3db91..bb6c84dbe6 100644
--- a/Spigot-Server-Patches/0177-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0178-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 07c4afb7070f5bd81820e9cc50eac084e78f2e23 Mon Sep 17 00:00:00 2001
+From 792635dc5837b9af24254dd5a9b23866d324d14f Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0178-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0179-Don-t-let-fishinghooks-use-portals.patch
index 12efb7cacd..96d1c33285 100644
--- a/Spigot-Server-Patches/0178-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0179-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From 99ab310d8306e8ee1495804516c0a7fc7887400f Mon Sep 17 00:00:00 2001
+From edeba5ec3463fced1f0f8d10a145f8729a00be03 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a3685ec57..66563584f 100644
+index 0479b7551..44fdf92ff 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -143,7 +143,7 @@ public abstract class Entity implements ICommandListener {
@@ -35,5 +35,5 @@ index 0c528c699..606160a17 100644
      }
  
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch
index 3ee5b37eb3..6f793245ea 100644
--- a/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From c155f03d606fa1536e7a337990e7be51783ef5f3 Mon Sep 17 00:00:00 2001
+From 4dd0ba8a60d9a18c1edc5042efbe5ead2465712c Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 8cda4751..79ca071b 100644
+index 8cda47518..79ca071bc 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -25,7 +25,7 @@ index 8cda4751..79ca071b 100644
                  this.a(movingobjectposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 789de85d..d5c9d24c 100644
+index 789de85d1..d5c9d24cf 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -70,6 +70,15 @@ public abstract class EntityFireball extends Entity {
@@ -45,7 +45,7 @@ index 789de85d..d5c9d24c 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 606160a1..b78e0e49 100644
+index 606160a17..b78e0e49e 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -240,6 +240,16 @@ public class EntityFishingHook extends Entity {
@@ -66,7 +66,7 @@ index 606160a1..b78e0e49 100644
              vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 6fbc8455..a8b9d926 100644
+index 6fbc84559..a8b9d9263 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -160,6 +160,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -86,7 +86,7 @@ index 6fbc8455..a8b9d926 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.e(movingobjectposition.a());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7e4982d9..a850a963 100644
+index 7e4982d93..a850a9634 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -794,6 +794,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0181-Vanished-players-don-t-have-rights.patch
index eaa4c041f3..fb77b8eb39 100644
--- a/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0181-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From a72bb434e157947dc177914fa0e6fc4093e4b8fe Mon Sep 17 00:00:00 2001
+From 47642bdf46e5a33d83891f3b5fdac5e8096f914a Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
diff --git a/Spigot-Server-Patches/0181-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0182-Prevent-Pathfinding-out-of-World-Border.patch
index 44a9f5c970..12e2c59a6a 100644
--- a/Spigot-Server-Patches/0181-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0182-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From 4300024fa23214ce098427de2ac3a09f81495c60 Mon Sep 17 00:00:00 2001
+From 42b7e54e8ce551b2cbdd475bf582d9b807587745 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch b/Spigot-Server-Patches/0183-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
index fd532b2d92..24158464c6 100644
--- a/Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
+++ b/Spigot-Server-Patches/0183-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
@@ -1,4 +1,4 @@
-From f57435f3697430f8acb77b73146404753206f51e Mon Sep 17 00:00:00 2001
+From 89d07c5f1dd1050d332c3d2d84edefe27909242e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0183-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0184-Bound-Treasure-Maps-to-World-Border.patch
index 0080da1ab5..3170cc5258 100644
--- a/Spigot-Server-Patches/0183-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0184-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From c6dd309b98dd4efdd6fe84c4cfbc3e52f4199f79 Mon Sep 17 00:00:00 2001
+From 8908a3360e1050aecfc34e101fd866f55873bd93 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch
index 25b441b26a..db079a6048 100644
--- a/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 8c70834575a03151ad00f7f4598cafe929479dd9 Mon Sep 17 00:00:00 2001
+From 050363c48f3b9da488e55f8eeed6f6ab536e8a49 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
diff --git a/Spigot-Server-Patches/0185-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0186-Optimize-ItemStack.isEmpty.patch
index 4b8b65ff3e..157a8417e3 100644
--- a/Spigot-Server-Patches/0185-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0186-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From b89da7afca47aa4ee253252e9d0987ca47dacff7 Mon Sep 17 00:00:00 2001
+From 43215a4d47506b61a0eafcda2a8e2d579cf7ffdb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0186-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0187-Add-API-methods-to-control-if-armour-stands-can-move.patch
index cff56931a3..f5ab41ac4e 100644
--- a/Spigot-Server-Patches/0186-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0187-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,4 +1,4 @@
-From f7cab53501949e2eeb4837772ed75e6529553145 Mon Sep 17 00:00:00 2001
+From 9fa46079deaa1b1399c59311eaadca06d861bc35 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0188-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index e7246d6ac6..3afd29c217 100644
--- a/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0188-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From 5d95642195f6905c14eb5c58e2df32f9bf4bee10 Mon Sep 17 00:00:00 2001
+From c4b61fd5c1fe64765528dffee1dd902643786577 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
diff --git a/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0189-Add-option-to-remove-invalid-statistics.patch
index 377bd7f5df..85662c6a7c 100644
--- a/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0189-Add-option-to-remove-invalid-statistics.patch
@@ -1,14 +1,14 @@
-From 49af7d8211b0653c4c51e0a1bc092a2ea839d99c Mon Sep 17 00:00:00 2001
+From 5570eaceb50f606c5fa7bb040e8d159eb43d0b4e Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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 17102d95d..2c3d30364 100644
+index ae69751c3..687c9d5ad 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -255,4 +255,13 @@ public class PaperConfig {
+@@ -260,4 +260,13 @@ public class PaperConfig {
      private static void playerAutoSaveRate() {
          playerAutoSaveRate = getInt("settings.player-auto-save-rate", -1);
      }
diff --git a/Spigot-Server-Patches/0189-IllegalPacketEvent.patch b/Spigot-Server-Patches/0190-IllegalPacketEvent.patch
index 3d5c2fb55b..76110f729f 100644
--- a/Spigot-Server-Patches/0189-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0190-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From d6cecfa20754ae57df1245f130abd2ec860667db Mon Sep 17 00:00:00 2001
+From 80e120a3ad4e27aa1ae8e4ee664b4bf1f7349ebb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
diff --git a/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch
index d25d81208b..6c91401202 100644
--- a/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 8515465d18c5fc9d4efec8b2f42df99d779e3467 Mon Sep 17 00:00:00 2001
+From 2a7b019048cb66dd8fc16d2bdc6eda07a8acfaef Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
diff --git a/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0192-String-based-Action-Bar-API.patch
index d984f12a1c..f6ecf491ea 100644
--- a/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0192-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From 346c2e08ae20b6e9c24f10ccb78f6c8a4a095c94 Mon Sep 17 00:00:00 2001
+From 16864f64eaabb8d6333f5cd014a0895c077bbea4 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 1159eea..3835951 100644
+index 1159eea1a..38359517c 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,10 +1,13 @@
@@ -62,7 +62,7 @@ index 1159eea..3835951 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 84b2e54..62e70a8 100644
+index a2fb7d2be..2d8018a7c 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 84b2e54..62e70a8 100644
          PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
          packet.header = header;
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0192-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0193-Activation-Range-Improvements.patch
index fdf4a1e182..ec35537c42 100644
--- a/Spigot-Server-Patches/0192-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0193-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 80f5aaa2afda4fe90e9d9cd47710943a70ff78c7 Mon Sep 17 00:00:00 2001
+From 95406a3c5c374c2bd0e0323822e74cd2f504254b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@@ -18,7 +18,7 @@ index fdfe5b9ed..ce3907438 100644
      private float b;
      private float c;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4ec6bc972..07688b1ce 100644
+index b8ac99e5d..7242da9cc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity {
@@ -155,5 +155,5 @@ index c8a6ff3d4..428912cbc 100644
              {
                  EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0193-Firework-API-s.patch b/Spigot-Server-Patches/0194-Firework-API-s.patch
index fbd09886f6..e659adca88 100644
--- a/Spigot-Server-Patches/0193-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0194-Firework-API-s.patch
@@ -1,4 +1,4 @@
-From 5d2367ab09b48aab07a594c7623ad5b9ac35c2ce Mon Sep 17 00:00:00 2001
+From d18c5cd56caac6060bf87849a11cce4455aded3a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/0195-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
index fbb23bc1ae..28343a5b31 100644
--- a/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
+++ b/Spigot-Server-Patches/0195-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
@@ -1,4 +1,4 @@
-From 118950ef18b4a7c075dfeaa7c1a46b33b35564a3 Mon Sep 17 00:00:00 2001
+From f4eb95784c1a4c41365e9bab5782146f76732130 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0195-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0196-PlayerTeleportEndGatewayEvent.patch
index 4cfebbd6f3..d4968c1554 100644
--- a/Spigot-Server-Patches/0195-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0196-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 3331f90f88f72d43c0712d98934ee579fcbbee9b Mon Sep 17 00:00:00 2001
+From 83a7785e676bb5c1957953ea2a21c2ec077b425a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch b/Spigot-Server-Patches/0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
index ce26883133..c8f882c6a9 100644
--- a/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
+++ b/Spigot-Server-Patches/0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
@@ -1,4 +1,4 @@
-From 1916b522325da7e8f0b8bd7ef187d273dbf3c3fe Mon Sep 17 00:00:00 2001
+From 79e01e8729076dc628257287f9f4856ddd913c1c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 2 Jan 2017 02:07:24 -0500
 Subject: [PATCH] MC-111699: Ignore Improper Anvil Item Name Packets
diff --git a/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch b/Spigot-Server-Patches/0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch
index 727bb3e2af..96f35824e1 100644
--- a/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch
+++ b/Spigot-Server-Patches/0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch
@@ -1,4 +1,4 @@
-From 2e1a789f83071834c7d4846a07f04c6fa7610e42 Mon Sep 17 00:00:00 2001
+From fbb958e3fbfa9a3023d622749195be5c5bae9179 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 2 Jan 2017 02:43:22 -0500
 Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names
diff --git a/Spigot-Server-Patches/0198-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0199-ShulkerBox-Dupe-Prevention.patch
index e12b334ca6..03f7cfa8ed 100644
--- a/Spigot-Server-Patches/0198-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0199-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From a7cbc5919d8864382fea1849336260e011fdf4c8 Mon Sep 17 00:00:00 2001
+From 5fccf75d029069744d80408fba8892ab22a1b0ac Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0199-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0200-Provide-E-TE-Chunk-count-stat-methods.patch
index b6b623a330..38a6cc0c39 100644
--- a/Spigot-Server-Patches/0199-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0200-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 916402f157c1f616887deba4a577e0d19ad438a5 Mon Sep 17 00:00:00 2001
+From 153f27d0a7e38e8871f9b9eeb55e938d76df569e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5a44a9f38..da478ef81 100644
+index 3f8859a1f..b42074706 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -78,6 +78,29 @@ public class CraftWorld implements World {
@@ -41,5 +41,5 @@ index 5a44a9f38..da478ef81 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch
index 4af220a866..10ad859914 100644
--- a/Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From f8bc3dbb3e883bfae68fc44d2dfd9515b8eb43ff Mon Sep 17 00:00:00 2001
+From 23c858c8193322d1d433882ddc166349719842b1 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -27,5 +27,5 @@ index f675a7013..a9d59bbf5 100644
      // Paper end
  
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0201-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0202-Enforce-Sync-Chunk-Unloads.patch
index b5eda6f32c..c5f3941429 100644
--- a/Spigot-Server-Patches/0201-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0202-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From d4aa3c8deec9ddbaca22637b693f3328b90d4cd4 Mon Sep 17 00:00:00 2001
+From 6f280955c6ebf8bab28e6265a6e2ed1179a2b21b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index da478ef81..95dcb9f81 100644
+index b42074706..b837a921c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -238,6 +238,7 @@ public class CraftWorld implements World {
@@ -27,5 +27,5 @@ index da478ef81..95dcb9f81 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0203-Don-t-allow-entities-to-ride-themselves-572.patch
index d006a3830b..2c70007523 100644
--- a/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0203-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,4 +1,4 @@
-From cedb2ab2fe8a4fbaa13b4f1a9384aad56daaa763 Mon Sep 17 00:00:00 2001
+From 6cba786e1983475c052025b76fcb8a318f71032a Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
diff --git a/Spigot-Server-Patches/0203-Fix-block-break-desync.patch b/Spigot-Server-Patches/0204-Fix-block-break-desync.patch
index 340b92ff80..7991198a1a 100644
--- a/Spigot-Server-Patches/0203-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0204-Fix-block-break-desync.patch
@@ -1,4 +1,4 @@
-From 58a96ddb1fd5fe1a7658282ea788fc684c88eb44 Mon Sep 17 00:00:00 2001
+From 7f39a34c6406bad1fe92f339c500f21952c23bd9 Mon Sep 17 00:00:00 2001
 From: Michael Himing <[email protected]>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
diff --git a/Spigot-Server-Patches/0204-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0205-Assign-the-World-in-WorldGenStronghold.patch
index fba1e9b9ad..bb383aac5c 100644
--- a/Spigot-Server-Patches/0204-Assign-the-World-in-WorldGenStronghold.patch
+++ b/Spigot-Server-Patches/0205-Assign-the-World-in-WorldGenStronghold.patch
@@ -1,4 +1,4 @@
-From 006c3a5eb0cb49692f0a82fcc3308e1df00d16c7 Mon Sep 17 00:00:00 2001
+From 56a7a06dfe74381bb456627d3cd566972788123d Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0205-Add-fromBottle-flag-to-Experience-Orbs.patch b/Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch
index bf53d60a28..a9fdcf976c 100644
--- a/Spigot-Server-Patches/0205-Add-fromBottle-flag-to-Experience-Orbs.patch
+++ b/Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch
@@ -1,4 +1,4 @@
-From 092a5eb65aa2d8476d100478cde14681b15d27a7 Mon Sep 17 00:00:00 2001
+From 0216ba1815505d1a5e7b700619e8bc211bd800bb Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0206-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0207-Remove-the-Vanilla-Method-Profiler.patch
index 9fdc018b73..ee2becc15a 100644
--- a/Spigot-Server-Patches/0206-Remove-the-Vanilla-Method-Profiler.patch
+++ b/Spigot-Server-Patches/0207-Remove-the-Vanilla-Method-Profiler.patch
@@ -1,4 +1,4 @@
-From a8769808a533f8a7b2f715a05c1f574cc35fad4e Mon Sep 17 00:00:00 2001
+From 9c624e9a7b6cd47b466eefcb451d13877e37566e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0208-Cap-Entity-Collisions.patch
index f0f03a8d99..b4ba612e86 100644
--- a/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0208-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 23c17eaec5bdb4e6917aed2c4c4f39b603a07d5c Mon Sep 17 00:00:00 2001
+From 4ab50867b66e6519f63fa630467612d8c4361501 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
diff --git a/Spigot-Server-Patches/0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0209-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
index 8685bd2f02..c24cb58ffc 100644
--- a/Spigot-Server-Patches/0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
+++ b/Spigot-Server-Patches/0209-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
@@ -1,4 +1,4 @@
-From 72885fec95927895df4c2c778da04c078cfa9112 Mon Sep 17 00:00:00 2001
+From 1c9b317d249bcbfd09475773989974bb81061a60 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0209-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0210-Remove-CraftScheduler-Async-Task-Debugger.patch
index d4b64a8fb7..cf2c57fd4a 100644
--- a/Spigot-Server-Patches/0209-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0210-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 435ae1796a4182dbaafc61178e9b0a29f981f168 Mon Sep 17 00:00:00 2001
+From bc80b8c2f38c42c23f6028b270d5c5690f9eab84 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0210-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0211-Shame-on-you-Mojang.patch
index 315e71c4b1..5ef6a8bd96 100644
--- a/Spigot-Server-Patches/0210-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0211-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From b951de24deaad1aa60d6c8ec76b9788a6091fae0 Mon Sep 17 00:00:00 2001
+From 5342f4a657419b01d019dcd51f7fdf91b96245b7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
@@ -55,5 +55,5 @@ index f44f05620..74c371179 100644
      }
  }
 -- 
-2.11.0
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0211-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0212-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index cd9e9ea54e..726b175b39 100644
--- a/Spigot-Server-Patches/0211-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0212-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,4 +1,4 @@
-From dfc423da6ba14011716914b9def57dbccd9f1352 Mon Sep 17 00:00:00 2001
+From c5100f8b6c0f5bf7eb1e7f6358a6524c732c9a25 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 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.11.1.windows.1
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0212-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0213-Do-not-let-armorstands-drown.patch
index fb5ce25678..7446488376 100644
--- a/Spigot-Server-Patches/0212-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0213-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 5f475dbcb1673dd21d6632794127e29ff1a96f55 Mon Sep 17 00:00:00 2001
+From 3fe282f11112bb0c3bb33616d1e58290896aeebe Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 7738ca3..5818aa5 100644
+index 7738ca385..5818aa5e9 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -772,5 +772,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 7738ca3..5818aa5 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6ac6a40..9474b2a 100644
+index 53486e205..9b7159450 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -188,6 +188,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 6ac6a40..9474b2a 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.9.3
+2.12.0.windows.1