Merge pull request #785 from electronicboy/master

2024-12-01 12:41:50 +01:00 · 2017-07-10 08:30:55 -05:00 · 2017-07-10 08:30:55 -05:00 · b093cd13ed
commit b093cd13ed
parent c860de53ec 18be9d24e4
17 changed files with 91 additions and 91 deletions
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@ -1,4 +1,4 @@
-From 9abf1bfaba8bf6b87b4d2c652a356b061764391c Mon Sep 17 00:00:00 2001
+From feb30e1e5157616d1a66269983609d6fa9dc3241 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@ -3504,7 +3504,7 @@ index bd2cc354..d2a78f56 100644
 
     @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index e13d27d2..b43ffd36 100644
+index a8b4db1c..de0ef125 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -292,7 +292,6 @@ public final class SimplePluginManager implements PluginManager {
@ -3543,7 +3543,7 @@ index e13d27d2..b43ffd36 100644
             getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
         } else {
             getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-@@ -714,7 +714,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -729,7 +729,7 @@ public final class SimplePluginManager implements PluginManager {
     }
 
     public boolean useTimings() {
@ -3552,7 +3552,7 @@ index e13d27d2..b43ffd36 100644
     }
 
     /**
-@@ -723,6 +723,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -738,6 +738,6 @@ public final class SimplePluginManager implements PluginManager {
      * @param use True if per event timing code should be used
      */
     public void useTimings(boolean use) {
@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
 -    }
 }
 -- 
-2.13.2.windows.1
+2.13.2

--- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
@ -1,4 +1,4 @@
-From 15936361399b2a1b2fb350651eb83510875f955c Mon Sep 17 00:00:00 2001
+From bac0e244d24ae13f16066fb8c866fea62ea88ad3 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@ -87,10 +87,10 @@ index c70d5129..040509c1 100644
 +
 }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index d68e3bee..7aece13e 100644
+index 9d7bdeef..21f898bf 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -747,4 +747,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -762,4 +762,13 @@ public final class SimplePluginManager implements PluginManager {
     public void useTimings(boolean use) {
         co.aikar.timings.Timings.setTimingsEnabled(use); // Spigot
     }
@ -105,5 +105,5 @@ index d68e3bee..7aece13e 100644
 +
 }
 -- 
-2.13.0
+2.13.2

--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@ -1,4 +1,4 @@
-From c5c9cf6015a8a80094fb69866fe12f432616f5fc Mon Sep 17 00:00:00 2001
+From df3579e7a0ea6ad85593e8632946767660f44554 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@ -311,7 +311,7 @@ index 000000000..621bf7051
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index f561f2b03..70fde368f 100644
+index 4f8eb0992..7fe2796fe 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -184,6 +184,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -326,7 +326,7 @@ index f561f2b03..70fde368f 100644
             DedicatedServer.LOGGER.info("Generating keypair");
             this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e68d9c9eb..41f0ac2bf 100644
+index f5d387511..fd204ad7a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -127,6 +127,8 @@ public abstract class World implements IBlockAccess {
@ -347,10 +347,10 @@ index e68d9c9eb..41f0ac2bf 100644
         this.world = new CraftWorld((WorldServer) this, gen, env);
         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index af8e4a81e..83a4692af 100644
+index 67ee8c55e..51981c386 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -695,6 +695,7 @@ public final class CraftServer implements Server {
+@@ -696,6 +696,7 @@ public final class CraftServer implements Server {
         }
 
         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -358,7 +358,7 @@ index af8e4a81e..83a4692af 100644
         for (WorldServer world : console.worlds) {
             world.worldData.setDifficulty(difficulty);
             world.setSpawnFlags(monsters, animals);
-@@ -710,6 +711,7 @@ public final class CraftServer implements Server {
+@@ -711,6 +712,7 @@ public final class CraftServer implements Server {
                 world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
             }
             world.spigotConfig.init(); // Spigot
@ -366,7 +366,7 @@ index af8e4a81e..83a4692af 100644
         }
 
         pluginManager.clearPlugins();
-@@ -717,6 +719,7 @@ public final class CraftServer implements Server {
+@@ -718,6 +720,7 @@ public final class CraftServer implements Server {
         resetRecipes();
         reloadData();
         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@ -375,7 +375,7 @@ index af8e4a81e..83a4692af 100644
 
         int pollCount = 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 21170f377..30b6f3477 100644
+index a151451d5..0c5862a3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -126,6 +126,14 @@ public class Main {
@ -435,5 +435,5 @@ index 01e73eb89..0b66f5e35 100644
         config.addDefault( "world-settings.default." + path, def );
         return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
 -- 
-2.13.0.windows.1
+2.13.2

--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@ -1,4 +1,4 @@
-From 35ea7e4784570de2a846da831771238800f715d0 Mon Sep 17 00:00:00 2001
+From 68acbbb74a75c739a22d11fb34865fee7056d0e4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@ -1073,7 +1073,7 @@ index f74b06794..1fc632e0c 100644
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 788e0e1b5..b7ebbc9ff 100644
+index 2df545ec7..38ac3b272 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
@ -1399,10 +1399,10 @@ index 8afe1d3d3..00b093976 100644
 
     // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 83a4692af..5c05ae407 100644
+index 51981c386..25a11a69d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1743,6 +1743,7 @@ public final class CraftServer implements Server {
+@@ -1744,6 +1744,7 @@ public final class CraftServer implements Server {
     private final Spigot spigot = new Spigot()
     {
 
@ -1410,7 +1410,7 @@ index 83a4692af..5c05ae407 100644
         @Override
         public YamlConfiguration getConfig()
         {
-@@ -1750,6 +1751,24 @@ public final class CraftServer implements Server {
+@@ -1751,6 +1752,24 @@ public final class CraftServer implements Server {
         }
 
         @Override
@ -1918,5 +1918,5 @@ index 2bd690fdf..38be7ed71 100644
     }
 }
 -- 
-2.13.0
+2.13.2

--- a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
@ -1,4 +1,4 @@
-From 26af014929529ab50947fe07c921db5e1d94f4f3 Mon Sep 17 00:00:00 2001
+From 09d7a738f298a3c235f4953104deffc6b412537c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 476d1a23e..35e824287 100644
+index 024218a1d..9d2f3b834 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -113,16 +113,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -147,10 +147,10 @@ index 476d1a23e..35e824287 100644
                     }
                     lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bfc42b12f..42b3df58e 100644
+index e2e57084c..1b27ee67b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1740,6 +1740,17 @@ public final class CraftServer implements Server {
+@@ -1741,6 +1741,17 @@ public final class CraftServer implements Server {
         return CraftMagicNumbers.INSTANCE;
     }
 
@ -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.13.0.windows.1
+2.13.2

--- a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
@ -1,4 +1,4 @@
-From 16bfa6e0fdd0da9269469690c4f2bd0193350299 Mon Sep 17 00:00:00 2001
+From 565286cb530147390d6a34dd63326d1ba28ac4c3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4c08373ba..a8c10d3b0 100644
+index 42b05bee8..125c52614 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1299,6 +1299,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -48,10 +48,10 @@ index 4c08373ba..a8c10d3b0 100644
         } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
             // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 42b3df58e..37de0d907 100644
+index 1b27ee67b..589c67a6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -641,6 +641,29 @@ public final class CraftServer implements Server {
+@@ -642,6 +642,29 @@ public final class CraftServer implements Server {
         Validate.notNull(sender, "Sender cannot be null");
         Validate.notNull(commandLine, "CommandLine cannot be null");
 
@ -82,5 +82,5 @@ index 42b3df58e..37de0d907 100644
             return true;
         }
 -- 
-2.13.0
+2.13.2

--- a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
@ -1,14 +1,14 @@
-From 5f57ef162f3d7123b9f866c412948abbafdd8a8a Mon Sep 17 00:00:00 2001
+From ef145db068f267aab4ff3186a61977f2b236aa9c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 37de0d907..1381d234e 100644
+index 589c67a6c..8af41ea66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1551,6 +1551,7 @@ public final class CraftServer implements Server {
+@@ -1552,6 +1552,7 @@ public final class CraftServer implements Server {
         return helpMap;
     }
 
@ -17,5 +17,5 @@ index 37de0d907..1381d234e 100644
         return commandMap;
     }
 -- 
-2.13.0.windows.1
+2.13.2

--- a/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
@ -1,4 +1,4 @@
-From 06bd3ad9186f8ab23b250d60f4c04cadd05fb4af Mon Sep 17 00:00:00 2001
+From 5c366d6ec121cf3a8a4380fc4a39e3fae3cc443c Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@ -6,10 +6,10 @@ 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 2fc92f308..e564af396 100644
+index 0f6038972..b8f907038 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1829,4 +1829,21 @@ public final class CraftServer implements Server {
+@@ -1830,4 +1830,21 @@ public final class CraftServer implements Server {
     {
         return spigot;
     }
@ -32,5 +32,5 @@ index 2fc92f308..e564af396 100644
 +    // Paper end
 }
 -- 
-2.13.0.windows.1
+2.13.2

--- a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
@ -1,4 +1,4 @@
-From f4bb9495fc2831462a5977f76f1f16ff6eda3fdd Mon Sep 17 00:00:00 2001
+From 536719157e98b638ededac2d4783d28c71c713a3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@ -7,10 +7,10 @@ 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 e564af396..522936568 100644
+index b8f907038..f7aa5fb8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -739,6 +739,14 @@ public final class CraftServer implements Server {
+@@ -740,6 +740,14 @@ public final class CraftServer implements Server {
             world.paperConfig.init(); // Paper
         }
 
@ -26,5 +26,5 @@ index e564af396..522936568 100644
         commandMap.clearCommands();
         resetRecipes();
 -- 
-2.13.0.windows.1
+2.13.2

--- a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -1,4 +1,4 @@
-From b23a445e2c33927e5ea376614dc0054e231d158c Mon Sep 17 00:00:00 2001
+From bc1bd2b258d075727eeb9f44efa05655e2c83ca1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 74a49a5f..3a942c76 100644
+index 74a49a5fb..3a942c763 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -284,4 +284,10 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 74a49a5f..3a942c76 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6e11ba5b..71b66bbd 100644
+index 6e11ba5b6..71b66bbdf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -356,8 +356,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -39,7 +39,7 @@ index 6e11ba5b..71b66bbd 100644
 
                     if (i1 - j > 1000L) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 553d9724..e9446b9c 100644
+index 553d9724b..e9446b9ce 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -3208,8 +3208,9 @@ public abstract class World implements IBlockAccess {
@ -54,10 +54,10 @@ index 553d9724..e9446b9c 100644
 
     public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 52293656..a7dd7988 100644
+index f7aa5fb8a..d77a43e8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -955,7 +955,7 @@ public final class CraftServer implements Server {
+@@ -956,7 +956,7 @@ public final class CraftServer implements Server {
         System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
 
         if (internal.getWorld().getKeepSpawnInMemory()) {
@ -67,7 +67,7 @@ index 52293656..a7dd7988 100644
             for (int j = -short1; j <= short1; j += 16) {
                 for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 843a3415..24b4a7ea 100644
+index 843a3415f..24b4a7ea7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1275,8 +1275,9 @@ public class CraftWorld implements World {
@ -83,5 +83,5 @@ index 843a3415..24b4a7ea 100644
                     loadChunk(chunkCoordX + x, chunkCoordZ + z);
                 } else {
 -- 
-2.13.1.windows.2
+2.13.2

--- a/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
@ -1,11 +1,11 @@
-From 6344f261b109116cea5afeed0a2d06cc1ae0b57f Mon Sep 17 00:00:00 2001
+From 05b5ca2521bedfd517b8b9db8acb1c9a6ea49b61 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 011cbf5e..cf06f8ac 100644
+index 011cbf5e3..cf06f8ac3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -230,4 +230,9 @@ public class PaperConfig {
@ -19,7 +19,7 @@ index 011cbf5e..cf06f8ac 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index b943a9b2..8f3b93dc 100644
+index b943a9b20..8f3b93dc1 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
@@ -66,7 +66,8 @@ public class NameReferencingFileConverter {
@ -33,10 +33,10 @@ index b943a9b2..8f3b93dc 100644
         } else {
             String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a7dd7988..4d841436 100644
+index d77a43e8f..40ca66d7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1320,7 +1320,8 @@ public final class CraftServer implements Server {
+@@ -1321,7 +1321,8 @@ public final class CraftServer implements Server {
             // Spigot Start
             GameProfile profile = null;
             // Only fetch an online UUID in online mode
@ -47,5 +47,5 @@ index a7dd7988..4d841436 100644
                 profile = console.getUserCache().getProfile( name );
             }
 -- 
-2.13.1.windows.2
+2.13.2

--- a/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From 86e5bfc086d6d012f44007295e07199cd741384e Mon Sep 17 00:00:00 2001
+From 81074d51eae9926f704a4facbea5f98280898746 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4d841436..d515ef0f 100644
+index 40ca66d7a..93fbb306e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1854,5 +1854,24 @@ public final class CraftServer implements Server {
+@@ -1855,5 +1855,24 @@ public final class CraftServer implements Server {
             });
         }
     }
@ -35,5 +35,5 @@ index 4d841436..d515ef0f 100644
     // Paper end
 }
 -- 
-2.13.1.windows.2
+2.13.2

--- a/Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
@ -1,4 +1,4 @@
-From 7f65b687a6ab597daaf4fbc9a2f3c12c109bd7d4 Mon Sep 17 00:00:00 2001
+From 8982d7162a827470fa89bb9fe0154bb3a10ce7f8 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 28917f63..f4b23703 100644
+index 28917f63d..f4b237034 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -265,4 +265,9 @@ public class PaperConfig {
@ -20,10 +20,10 @@ index 28917f63..f4b23703 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d515ef0f..463f5890 100644
+index 93fbb306e..d079de0fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1873,5 +1873,10 @@ public final class CraftServer implements Server {
+@@ -1874,5 +1874,10 @@ public final class CraftServer implements Server {
         commandMap.registerServerAliases();
         return true;
     }
@ -35,5 +35,5 @@ index d515ef0f..463f5890 100644
     // Paper end
 }
 -- 
-2.13.1.windows.2
+2.13.2

--- a/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
@ -1,4 +1,4 @@
-From 7a4bad77469763f9abade2275bb39ebead905f67 Mon Sep 17 00:00:00 2001
+From 96eae4e755730fed1cfb3a9de9e02102c83c00c8 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -20,7 +20,7 @@ Other changes:
    configuration

 diff --git a/pom.xml b/pom.xml
-index cf00ee13..96f87cb6 100644
+index 1ddfe7f4b..63a1ae2b0 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -47,12 +47,6 @@
@ -96,7 +96,7 @@ index cf00ee13..96f87cb6 100644
                 <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 00000000..685deaa0
+index 000000000..685deaa0e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
@@ -0,0 +1,17 @@
@ -119,7 +119,7 @@ index 00000000..685deaa0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java
 new file mode 100644
-index 00000000..d5bc6149
+index 000000000..d5bc61490
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java
@@ -0,0 +1,60 @@
@ -184,7 +184,7 @@ index 00000000..d5bc6149
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 2feeb855..3266df1f 100644
+index 2feeb855b..3266df1f5 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -237,7 +237,7 @@ index 2feeb855..3266df1f 100644
         System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
         System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d84f59da..8ca8fdce 100644
+index d84f59da1..8ca8fdceb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -41,7 +41,6 @@ import org.apache.commons.lang3.Validate;
@ -296,7 +296,7 @@ index d84f59da..8ca8fdce 100644
 
     public boolean a(int i, String s) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0c328782..ed0a749e 100644
+index c3c82f1f1..9a4357d19 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -76,8 +76,7 @@ public abstract class PlayerList {
@ -310,7 +310,7 @@ index 0c328782..ed0a749e 100644
 
         this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 463f5890..df6a75b0 100644
+index d079de0fe..a4b6f4be1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -127,7 +127,6 @@ import io.netty.buffer.ByteBuf;
@ -321,7 +321,7 @@ index 463f5890..df6a75b0 100644
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.NamespacedKey;
 import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-@@ -1088,9 +1087,13 @@ public final class CraftServer implements Server {
+@@ -1089,9 +1088,13 @@ public final class CraftServer implements Server {
         return logger;
     }
 
@ -336,7 +336,7 @@ index 463f5890..df6a75b0 100644
     @Override
     public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 634cde14..ff805c9a 100644
+index ec9508e90..d3d848f8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -14,7 +14,7 @@ import java.util.logging.Logger;
@ -378,7 +378,7 @@ index 634cde14..ff805c9a 100644
                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index 26a2fb89..00000000
+index 26a2fb894..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
@@ -1,74 +0,0 @@
@ -457,7 +457,7 @@ index 26a2fb89..00000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 33e8ea02..1e3aae3b 100644
+index 33e8ea02c..1e3aae3b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
@@ -8,17 +8,27 @@ import java.util.logging.Level;
@ -536,7 +536,7 @@ index 33e8ea02..1e3aae3b 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index a0cdd231..0a181288 100644
+index a0cdd2317..0a1812883 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
@@ -19,7 +19,7 @@ public class ServerShutdownThread extends Thread {
@ -550,7 +550,7 @@ index a0cdd231..0a181288 100644
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index b6409711..00000000
+index b64097113..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
@@ -1,54 +0,0 @@
@ -609,7 +609,7 @@ index b6409711..00000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 5cee8f00..08b6bb7f 100644
+index 5cee8f00e..08b6bb7f9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
@@ -1,12 +1,11 @@
@ -639,5 +639,5 @@ index 5cee8f00..08b6bb7f 100644
             <AppenderRef ref="TerminalConsole" level="info"/>
         </Root>
 -- 
-2.13.1
+2.13.2

--- a/Spigot-Server-Patches/0217-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0217-Add-UnknownCommandEvent.patch
@ -1,11 +1,11 @@
-From 65bc93a0ebe12135a0888fabbccb08bdb38f5d50 Mon Sep 17 00:00:00 2001
+From 5b83d8d65fe182f3e28b833fade0fb9213668110 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index df6a75b0..2a5107f6 100644
+index a4b6f4be1..6ff57c0e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@ -16,7 +16,7 @@ index df6a75b0..2a5107f6 100644
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerChatTabCompleteEvent;
 import org.bukkit.event.world.WorldInitEvent;
-@@ -671,7 +672,13 @@ public final class CraftServer implements Server {
+@@ -672,7 +673,13 @@ public final class CraftServer implements Server {
 
         // Spigot start
         if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) {
@ -32,5 +32,5 @@ index df6a75b0..2a5107f6 100644
         // Spigot end
 
 -- 
-2.13.1.windows.2
+2.13.2

--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit d01a9a06ad79797315c75c9f64f65b9982356e30
+Subproject commit c86a051a8ee61331cf827c429030ba056fb3aa0d
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 50b75cd65dd241a01d160d1a4e31de4e643be36e
+Subproject commit af1c0139f56e444dbcaf191664829a33eb4dfd59