Update upstream B/CB/S

2024-11-22 10:35:38 +01:00 · 2017-05-15 11:25:20 -05:00 · 2017-05-15 11:25:20 -05:00 · baf762a2c1
commit baf762a2c1
parent 8e610af635
26 changed files with 123 additions and 120 deletions
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@ -1,4 +1,4 @@
-From 260383c321c8e1b9a321cdfff94f535287739b91 Mon Sep 17 00:00:00 2001
+From 0ffc8e7433517a74d77068bc0e6abf9f48611aae 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
@ -2932,7 +2932,7 @@ index 00000000..3a288d2a
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ab3f6c0b..e1898343 100644
+index 5649aaf7..b7c939a2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -523,7 +523,6 @@ public final class Bukkit {
@ -2944,11 +2944,11 @@ index ab3f6c0b..e1898343 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d3fdd638..30b99241 100644
+index 7a08fd1e..7dd895a0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -936,12 +936,27 @@ public interface Server extends PluginMessageRecipient {
- 
+@@ -945,12 +945,27 @@ public interface Server extends PluginMessageRecipient {
+     // Spigot start
     public class Spigot
     {
 -
@ -3054,10 +3054,10 @@ index 3f07d7f4..f89ad075 100644
     }
 diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
 new file mode 100644
-index 00000000..66232339
+index 00000000..5527e7c8
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,105 @@
 +package org.bukkit.command;
 +
 +import org.apache.commons.lang.NotImplementedException;
@ -3156,6 +3156,12 @@ index 00000000..66232339
 +    default Set<PermissionAttachmentInfo> getEffectivePermissions() {
 +        throw new NotImplementedException();
 +    }
+
+    @Override
+    default Spigot spigot() {
+        throw new NotImplementedException();
+    }
+
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 index cdf838eb..39b275cb 100644
@ -3451,10 +3457,10 @@ index a8f61f2d..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b57c81c1..d24ef805 100644
+index 9764caa4..266181aa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1507,6 +1507,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1499,6 +1499,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
         public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
@ -3465,7 +3471,7 @@ index b57c81c1..d24ef805 100644
 +        }
     }
 
-     Spigot spigot();
+     @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
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@ -3829,5 +3835,5 @@ index 8d982974..7e89b97b 100644
 -    }
 }
 -- 
-2.11.0
+2.13.0

--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@ -1,17 +1,17 @@
-From 9255c7c4f217118a550d9492fa7aa6e33a921841 Mon Sep 17 00:00:00 2001
+From bafc92cd32e071029e7b2737dbff78255953084d Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API


 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 69bdb460..c0b7426d 100644
+index 0144bef9..fbff9860 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -486,4 +486,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
- 
+@@ -487,4 +487,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+     @Override
     Spigot spigot();
-     // Spigot End
+     // Spigot end
 +
 +    // Paper start
 +    /**
@ -61,5 +61,5 @@ index 3ce322d9..69df487b 100644
 +    public org.bukkit.Location getSourceLoc();
 }
 -- 
-2.12.0.windows.1
+2.13.0

--- a/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
@ -1,11 +1,11 @@
-From cbcb424cbb5b28efffe80c1fb6f641332954ba25 Mon Sep 17 00:00:00 2001
+From ee9faa9162c7b9f27b5b1072e016c288f54f8e6a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4f094f7b..5147cbda 100644
+index 89135b86..94ec8189 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@ -20,7 +20,7 @@ index 4f094f7b..5147cbda 100644
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
-@@ -1154,6 +1151,17 @@ public final class Bukkit {
+@@ -1164,6 +1161,17 @@ public final class Bukkit {
         return server.getUnsafe();
     }
 
@ -39,7 +39,7 @@ index 4f094f7b..5147cbda 100644
     {
         return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a503bb49..ed3a7197 100644
+index c81c073d..63624ff6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@ -70,5 +70,5 @@ index a503bb49..ed3a7197 100644
      * Get the advancement specified by this key.
      *
 -- 
-2.11.0
+2.13.0

--- a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@ -1,17 +1,17 @@
-From a619922d4911b32ce2aacbadd02478679af1b76e Mon Sep 17 00:00:00 2001
+From c90eb35aed8c00523955820c86367fbbe5e39b0c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 13:05:59 -0800
 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender


 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index 148756b9..4ad0028c 100644
+index abf68a2c..fcb03b83 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
-@@ -32,4 +32,30 @@ public interface CommandSender extends Permissible {
-      * @return Name of the sender
-      */
-     public String getName();
+@@ -58,4 +58,30 @@ public interface CommandSender extends Permissible {
+ 
+     Spigot spigot();
+     // Spigot end
 +
 +    // Paper start
 +    /**
@ -40,7 +40,7 @@ index 148756b9..4ad0028c 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d19a928d..54d05113 100644
+index 34a9d696..78f877d9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -400,6 +400,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -60,5 +60,5 @@ index d19a928d..54d05113 100644
         spigot().sendMessage(components);
     }
 -- 
-2.11.0
+2.13.0

--- 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 ecdc6512316f64881451b0359268c276a4888615 Mon Sep 17 00:00:00 2001
+From 15936361399b2a1b2fb350651eb83510875f955c 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
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9af61bad..43510bad 100644
+index 970d651b..4a725d79 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1180,6 +1180,13 @@ public final class Bukkit {
+@@ -1190,6 +1190,13 @@ public final class Bukkit {
     public static CommandMap getCommandMap() {
         return server.getCommandMap();
     }
@ -24,13 +24,13 @@ index 9af61bad..43510bad 100644
 
     public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a5750304..8922551f 100644
+index 9de7693a..3c550d06 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1018,4 +1018,6 @@ public interface Server extends PluginMessageRecipient {
-     }
+@@ -1028,4 +1028,6 @@ public interface Server extends PluginMessageRecipient {
 
     Spigot spigot();
+     // Spigot end
 +
 +    void reloadPermissions(); // Paper
 }
@ -105,5 +105,5 @@ index d68e3bee..7aece13e 100644
 +
 }
 -- 
-2.11.0
+2.13.0

--- a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
@ -1,17 +1,18 @@
-From 5f3ad3c3d105730323ea950c36892c1c548f4437 Mon Sep 17 00:00:00 2001
+From b3c6eea6591a465f977f69067e464599a533209b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API


 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 1ff09518..da4678d0 100644
+index 5850ab6c..a8d1826a 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -72,6 +72,40 @@ public interface Arrow extends Projectile {
-         CREATIVE_ONLY
-     }
- 
+@@ -90,4 +90,38 @@ public interface Arrow extends Projectile {
+     @Override
+     Spigot spigot();
+     // Spigot end
+
 +    // Paper start
 +    /**
 +     * Gets the {@link PickupRule} for this arrow.
@ -45,10 +46,7 @@ index 1ff09518..da4678d0 100644
 +        CREATIVE_ONLY;
 +    }
 +    // Paper end
-+
-     public class Spigot extends Entity.Spigot
-     {
- 
+ }
 -- 
-2.12.2
+2.13.0

--- a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From 17605bbb3704c5077bcf3a12aabe346de9684f78 Mon Sep 17 00:00:00 2001
+From 6007028122abaeec6ca165c81a0102105305f0b0 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 43510bad..76d250f7 100644
+index 4a725d79..4c20a1be 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1187,6 +1187,13 @@ public final class Bukkit {
+@@ -1197,6 +1197,13 @@ public final class Bukkit {
     public static void reloadPermissions() {
         server.reloadPermissions();
     }
@ -24,11 +24,11 @@ index 43510bad..76d250f7 100644
 
     public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8922551f..b04b796a 100644
+index 3c550d06..4f077b7c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1020,4 +1020,6 @@ public interface Server extends PluginMessageRecipient {
-     Spigot spigot();
+@@ -1030,4 +1030,6 @@ public interface Server extends PluginMessageRecipient {
+     // Spigot end
 
     void reloadPermissions(); // Paper
 +
@ -94,5 +94,5 @@ index 040509c1..0069bcc0 100644
                 confirmed = true;
             } else {
 -- 
-2.11.0
+2.13.0

--- a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
@ -1,11 +1,11 @@
-From 4ac089216d11037b15f9defa13570faa34f88a0c Mon Sep 17 00:00:00 2001
+From 035ce398f1135f3d6b47407cc30365e5c5afca09 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f9d24bfd..2f7c96ee 100644
+index 05b88e5b..5c76497f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -395,6 +395,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -47,7 +47,7 @@ index f9d24bfd..2f7c96ee 100644
     public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
         spigot().sendMessage(position, components);
     }
-@@ -1715,9 +1737,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1707,9 +1729,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
         /**
          * Sends the component to the specified screen position of this player
          *
@ -59,19 +59,18 @@ index f9d24bfd..2f7c96ee 100644
         public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
-@@ -1725,9 +1749,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1717,9 +1741,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
         /**
          * Sends an array of components as a single message to the specified screen position of this player
          *
 +         * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
          * @param position the screen position
-         * @param component the components to send
-+         * @param components the components to send
+          * @param components the components to send
          */
 +        @Deprecated
         public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 -- 
-2.11.0
+2.13.0

--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@ -1,4 +1,4 @@
-From 79288da44d41aa22fd80969a8ad4447b475f67c7 Mon Sep 17 00:00:00 2001
+From d5cf62b2b0d9fc6dc5ff86c8667cd033544cc3b0 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
@ -347,10 +347,10 @@ index b2cc418a7..a366b2d70 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 8a0043d3c..440b23cf5 100644
+index f18d6d75c..db23104bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -689,6 +689,7 @@ public final class CraftServer implements Server {
+@@ -690,6 +690,7 @@ public final class CraftServer implements Server {
         }
 
         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -358,7 +358,7 @@ index 8a0043d3c..440b23cf5 100644
         for (WorldServer world : console.worlds) {
             world.worldData.setDifficulty(difficulty);
             world.setSpawnFlags(monsters, animals);
-@@ -704,6 +705,7 @@ public final class CraftServer implements Server {
+@@ -705,6 +706,7 @@ public final class CraftServer implements Server {
                 world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
             }
             world.spigotConfig.init(); // Spigot
@ -366,7 +366,7 @@ index 8a0043d3c..440b23cf5 100644
         }
 
         pluginManager.clearPlugins();
-@@ -711,6 +713,7 @@ public final class CraftServer implements Server {
+@@ -712,6 +714,7 @@ public final class CraftServer implements Server {
         resetRecipes();
         reloadData();
         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@ -1,11 +1,11 @@
-From 52903d99be9e34ce9c9871eaecc2a371db5b4497 Mon Sep 17 00:00:00 2001
+From 0c6f1973af82e9c39ffe0242f525d1011bbeeff5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2


 diff --git a/pom.xml b/pom.xml
-index a833892e3..3090f79f3 100644
+index 33bbeb2bd..0cbe47cb6 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -65,6 +65,12 @@
@ -1282,7 +1282,7 @@ index a366b2d70..eafb76003 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c48a16682..6856aac64 100644
+index d91de898f..af722bd00 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -256,13 +256,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -1416,10 +1416,10 @@ index c48a16682..6856aac64 100644
 
     // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 440b23cf5..42d3dd542 100644
+index db23104bc..3114a6ecc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1727,6 +1727,7 @@ public final class CraftServer implements Server {
+@@ -1738,6 +1738,7 @@ public final class CraftServer implements Server {
     private final Spigot spigot = new Spigot()
     {
 
@ -1427,7 +1427,7 @@ index 440b23cf5..42d3dd542 100644
         @Override
         public YamlConfiguration getConfig()
         {
-@@ -1734,6 +1735,24 @@ public final class CraftServer implements Server {
+@@ -1745,6 +1746,24 @@ public final class CraftServer implements Server {
         }
 
         @Override
@ -1677,7 +1677,7 @@ index 3a95b4465..b5efb9c3f 100644
 
     public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e6dcddc64..433aafb33 100644
+index 39a6bc220..06f33f80e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -39,7 +39,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
--- a/Spigot-Server-Patches/0016-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 2648079c107410003372409a96c7ef61f035b661 Mon Sep 17 00:00:00 2001
+From 58ae4d06fe6ee83f7bdee497d5e12c9d0368592a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@ -33,10 +33,10 @@ index e847f3f1a..577a1b92a 100644
 
     public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 42d3dd542..a06b7f325 100644
+index 3114a6ecc..70c10f9bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -134,7 +134,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
+@@ -135,7 +135,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
 
 public final class CraftServer implements Server {
     private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
--- 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 46d88a1e4205ca1ee13725c24884d9ad9bf6b600 Mon Sep 17 00:00:00 2001
+From 8d31ccacf327e2e684d86d4172067573732297ed 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
@ -147,10 +147,10 @@ index 577a1b92a..995542ab9 100644
                     }
                     lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a06b7f325..e5dcd4094 100644
+index 70c10f9bb..637882f1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1724,6 +1724,17 @@ public final class CraftServer implements Server {
+@@ -1735,6 +1735,17 @@ public final class CraftServer implements Server {
         return CraftMagicNumbers.INSTANCE;
     }
 
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@ -1,4 +1,4 @@
-From c1ba97de870d45dada1e69a8d76ba8e4e0c12429 Mon Sep 17 00:00:00 2001
+From 44e197d767a13602fb903ab4dda171ea77898b29 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@ -118,10 +118,10 @@ index b87273aca..c6cf7754b 100644
             flag = true;
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a7fb58a9e..9cb05e067 100644
+index f849a8148..63154b647 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -728,4 +728,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -738,4 +738,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         return spigot;
     }
     // Spigot end
--- 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 9fc404dab5a61059531f51be43e3ea0a7811a554 Mon Sep 17 00:00:00 2001
+From cb3b208b6f0f2e6cdf717c41809422b39904827c 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
@ -48,10 +48,10 @@ index 63ea04fb4..65ab76cc5 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 e5dcd4094..374956d5e 100644
+index 637882f1f..ac7890a56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -639,6 +639,29 @@ public final class CraftServer implements Server {
+@@ -640,6 +640,29 @@ public final class CraftServer implements Server {
         Validate.notNull(sender, "Sender cannot be null");
         Validate.notNull(commandLine, "CommandLine cannot be null");
 
--- a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
@ -1,14 +1,14 @@
-From f8e285f87b4297e3d5db10f6192c59c69b44b9cd Mon Sep 17 00:00:00 2001
+From 2c11024174e60008b865bc4e1f8254eb448fabb3 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 374956d5e..01b1ef39f 100644
+index ac7890a56..b196b9911 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1545,6 +1545,7 @@ public final class CraftServer implements Server {
+@@ -1546,6 +1546,7 @@ public final class CraftServer implements Server {
         return helpMap;
     }
 
--- a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
@ -1,14 +1,14 @@
-From 3634e6fefd10b173ebb5bd2c4f66e21c42090fbb Mon Sep 17 00:00:00 2001
+From dc9f3d2376648206d728c2bbed0b0a28e4435e9d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 01b1ef39f..0b7c02d36 100644
+index b196b9911..b4cecab30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -172,6 +172,7 @@ public final class CraftServer implements Server {
+@@ -173,6 +173,7 @@ public final class CraftServer implements Server {
     private final UUID invalidUserUUID = UUID.nameUUIDFromBytes("InvalidUsername".getBytes(Charsets.UTF_8));
     private final List<CraftPlayer> playerView;
     public int reloadCount;
@ -17,7 +17,7 @@ index 01b1ef39f..0b7c02d36 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 9cb05e067..917fa3d21 100644
+index 63154b647..b2030e8a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -237,6 +237,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
--- a/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
@ -1,4 +1,4 @@
-From bd91198bc1c3e488aaa7eacedf84b180050fde59 Mon Sep 17 00:00:00 2001
+From 055ca738e6ed95d61904fb381923d5ff8f480463 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@ -16,7 +16,7 @@ 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 873ffa77d..b5ff26c71 100644
+index 3898ad8fa..2f6e169f5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -210,4 +210,9 @@ public class PaperConfig {
@ -30,10 +30,10 @@ index 873ffa77d..b5ff26c71 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0b7c02d36..e1ae5f878 100644
+index b4cecab30..2d78acf04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -317,6 +317,7 @@ public final class CraftServer implements Server {
+@@ -318,6 +318,7 @@ public final class CraftServer implements Server {
         if (type == PluginLoadOrder.STARTUP) {
             helpMap.clear();
             helpMap.initializeGeneralTopics();
@ -41,7 +41,7 @@ index 0b7c02d36..e1ae5f878 100644
         }
 
         Plugin[] plugins = pluginManager.getPlugins();
-@@ -334,7 +335,7 @@ public final class CraftServer implements Server {
+@@ -335,7 +336,7 @@ public final class CraftServer implements Server {
             setVanillaCommands(false);
             // Spigot end
             commandMap.registerServerAliases();
--- 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 5c4d9a3b11c3a72967d23e94299074761a4fce81 Mon Sep 17 00:00:00 2001
+From 6322e74a8bd36978f6f206bc1cbc5577ffc82e14 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 e1ae5f878..0dca774af 100644
+index 2d78acf04..71c6bca4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1813,4 +1813,21 @@ public final class CraftServer implements Server {
+@@ -1824,4 +1824,21 @@ public final class CraftServer implements Server {
     {
         return spigot;
     }
--- 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 d4673f5e5b1a04e2bef7bcbf696030a11d663625 Mon Sep 17 00:00:00 2001
+From 654c9d334784b78cfed1d09f6e1d2dc149fa5976 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 0dca774af..fcc20d28e 100644
+index 71c6bca4d..4d07817f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -733,6 +733,14 @@ public final class CraftServer implements Server {
+@@ -734,6 +734,14 @@ public final class CraftServer implements Server {
             world.paperConfig.init(); // Paper
         }
 
--- a/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -1,4 +1,4 @@
-From 3f5c4a27566f6700dec08348db62862580e22069 Mon Sep 17 00:00:00 2001
+From 1932f99dc02044ab955552ac7085246c3be60e2b 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
@ -54,10 +54,10 @@ index 036d96fa7..b3c580836 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 fcc20d28e..f4fd25c29 100644
+index 4d07817f3..488c58755 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -949,7 +949,7 @@ public final class CraftServer implements Server {
+@@ -950,7 +950,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()) {
--- a/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch
@ -1,11 +1,11 @@
-From 15f78808f7f1771e1ec4edd29f3fb17bbc2fbf64 Mon Sep 17 00:00:00 2001
+From 98fd00121d9e00520d1f469117a546d7125e26c1 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 0140d1981..c758bde3f 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 {
@ -33,10 +33,10 @@ index b943a9b20..8f3b93dc1 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 f4fd25c29..8f8f5e36f 100644
+index 488c58755..a1f0ef672 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1314,7 +1314,8 @@ public final class CraftServer implements Server {
+@@ -1315,7 +1315,8 @@ public final class CraftServer implements Server {
             // Spigot Start
             GameProfile profile = null;
             // Only fetch an online UUID in online mode
--- a/Spigot-Server-Patches/0171-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0171-Optimise-removeQueue.patch
@ -1,11 +1,11 @@
-From 900cbba0bf66c04a6f65d358b08f39f7c38f2896 Mon Sep 17 00:00:00 2001
+From 2a0980201b14be31b4fbb88b7a2bb139d0acb07d Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 57d21fc12..8d48d7c0c 100644
+index c8183de48..1aa2d2e0a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -3,8 +3,10 @@ package net.minecraft.server;
@ -50,7 +50,7 @@ index 57d21fc12..8d48d7c0c 100644
@@ -1097,7 +1106,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         this.lastHealthSent = -1.0F;
         this.ci = -1;
-         this.cs.a((RecipeBook) entityplayer.cs);
+         // this.cs.a((RecipeBook) entityplayer.cs); // CraftBukkit
 -        this.removeQueue.addAll(entityplayer.removeQueue);
 +        //this.removeQueue.addAll(entityplayer.removeQueue); // Paper
 +        if (this.removeQueue != entityplayer.removeQueue) {
--- a/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From ed2932c761272cd0ce798ba728fa65606a2817ab Mon Sep 17 00:00:00 2001
+From ae347d63d60c11864021ec3235b23be383682877 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 8f8f5e36f..8559d8200 100644
+index a1f0ef672..d9fd5429a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1838,5 +1838,24 @@ public final class CraftServer implements Server {
+@@ -1849,5 +1849,24 @@ public final class CraftServer implements Server {
             });
         }
     }
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit 5ad2ecf658276b8aae336b0e5bfb894a5151b578
+Subproject commit e0de402afc1c68da8a894427bc323d1c9f632ef8
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5
+Subproject commit 240f16d1ccf245a44947f75d965a9b688f8e5db3
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit 429b0e3b082cc23ac8c9813994c27b23262860e0
+Subproject commit 1ffab67d68300a10e9c01d0ae2f87fba30e82a92