1.16.2 Release (#4123)

PaperMC believes that 1.16.2 is now ready for general release as we fixed the main issue plagueing the 1.16.x release, the MapLike data conversion issues.

Until now, it was not safe for a server to convert a world to 1.16.2 without data conversion issues around villages and potentially other things. If you did, those MapLike errors meant something went wrong.

This is now resolved.

Big thanks to all those that helped, notably @BillyGalbreath and @Proximyst who did large parts of the update process with me.

Please as always, backup your worlds and test before updating to 1.16.2!

If you update to 1.16.2, there is no going back to an older build than this.

---------------------------------

Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com>
Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
Co-authored-by: krolik-exe <69214078+krolik-exe@users.noreply.github.com>
Co-authored-by: BillyGalbreath <BillyGalbreath@users.noreply.github.com>
Co-authored-by: stonar96 <minecraft.stonar96@gmail.com>
Co-authored-by: Shane Freeder <theboyetronic@gmail.com>
Co-authored-by: Jason <jasonpenilla2@me.com>
Co-authored-by: kashike <kashike@vq.lc>
Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
Co-authored-by: KennyTV <kennytv@t-online.de>
Co-authored-by: commandblockguy <commandblockguy1@gmail.com>
Co-authored-by: DigitalRegent <misterwener@gmail.com>
Co-authored-by: ishland <ishlandmc@yeah.net>

.github/ISSUE_TEMPLATE/behavior-bug---plugin-incompatibility.md

@@ -4,6 +4,9 @@ about: Server Bug or Plugin Incompatibility
 
 ---
 
+<!-- Before reporting an issue here, please make sure you are on the latest version of Paper. -->
+<!-- Forks of Paper receive no support here. Please make sure that your issue is reproducable on Paper first.  -->
+
 ### What behaviour is expected:
 ___What you expected to see___
 
@@ -16,8 +19,8 @@ ___This may include a build schematic, a video, or detailed instructions to help
 ### Plugin list:
 ___A list of your plugins___
 
-### Paper build number:
-___This can be found by running `/version` on your server. `latest` is not a proper version number; we require the output of `/version` so we can properly track down the issue.___
+### Paper version:
+___Paste the output of running `/version` on your server WITH the Minecraft version. `latest` is not a version; we require the output of `/version` so we can properly track down the issue.___
 
 ### Anything else:
 ___Anything else you think may help us resolve the problem___

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,6 +4,8 @@ about: Suggest an idea for this project
 
 ---
 
+<!-- Before requesting a new feature, please make sure you are using the latest version and that the feature you are requesting is not already in Paper. -->
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 

.github/ISSUE_TEMPLATE/performance-problem.md

@@ -4,6 +4,9 @@ about: Report performance problems or areas of concern
 
 ---
 
+<!-- Before reporting performance problems here, please make sure you are on the latest version of Paper.  -->
+<!-- Forks of Paper receive no support here. Please make sure that this problem also affects Paper. -->
+
 ###  Timings or Profile link:
 ___We ask that all timings/profiles are a link, not a screenshot. Screenshots inhibit our ability to figure out the real cause of the issue.___
 
@@ -20,5 +23,5 @@ ___Gist/pastebin/hastebin links___
 ___The more information we receive, the quicker and more effective we can be at finding the solution to the
 issue.___
 
-### Paper build number:
-___This can be found by running `/version` on your server. `latest` is not a proper version number; we require the output of `/version` so we can properly track down the issue.___
+### Paper version:
+___Paste the output of running `/version` on your server WITH the Minecraft version. `latest` is not a version; we require the output of `/version` so we can properly track down the issue.___

.github/ISSUE_TEMPLATE/server-crash---stacktrace.md

@@ -4,6 +4,9 @@ about: Report server crashes and/or scary stacktraces
 
 ---
 
+<!-- Before reporting a crash here, please make sure you are on the latest version of Paper.  -->
+<!-- Forks of Paper receive no support here. Please make sure that this crash also happens when using Paper.  -->
+
 ### Link/paste of stack trace
 
     You can also simply just use code formatting in markdown!
@@ -18,5 +21,5 @@ ___A list of your plugins___
 ### Actions to reproduce (if known):
 ___This may include a build schematic, a video, or detailed instructions to help reconstruct the issue___
 
-### Paper build number:
-___This can be found by running `/version` on your server. `latest` is not a proper version number; we require the output of `/version` so we can properly track down the issue.___
+### Paper version:
+___Paste the output of running `/version` on your server WITH the Minecraft version. `latest` is not a version; we require the output of `/version` so we can properly track down the issue.___

.travis.yml

@@ -1,6 +1,6 @@
 language: java
-sudo: required
-dist: trusty
+dist: focal
+os: linux
 jdk:
   - oraclejdk8
   - openjdk11

Paper-MojangAPI/pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>com.destroystokyo.paper</groupId>
     <artifactId>paper-mojangapi</artifactId>
-    <version>1.16.1-R0.1-SNAPSHOT</version>
+    <version>1.16.2-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Paper-MojangAPI</name>

SHIT_TO_CHECK.md

@@ -6,3 +6,4 @@
 * Check DataBits foreach
 * lighting is bork (load chunk, fly away, come back, everything or parts are black)
 * chunk generation seems slow with a lot of it happening
+* Fix IDE Debug JVM Flag for new versions of minecraft

Spigot-API-Patches/0001-POM-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 10d59b211587b22f73e911fb2872df3d181a0f8a..5adaed556ff075e11ad76e70b8d7e6244e2ff405 100644
+index 96687472e8a7799d0b32032026a7fc3a08f23ecc..af19075e6768aef0dcd9f54dc41f44fdd6a0e9d2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -2,34 +2,28 @@
@@ -22,7 +22,7 @@ index 10d59b211587b22f73e911fb2872df3d181a0f8a..5adaed556ff075e11ad76e70b8d7e624
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.16.1-R0.1-SNAPSHOT</version>
+     <version>1.16.2-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>

Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/pom.xml b/pom.xml
-index 5adaed556ff075e11ad76e70b8d7e6244e2ff405..e81043213ca0b56c7306be5571f0f6e542695e95 100644
+index af19075e6768aef0dcd9f54dc41f44fdd6a0e9d2..d15efd747442f20f0f6a8c22bb3ba45abdcd399b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -49,6 +49,12 @@

Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index e81043213ca0b56c7306be5571f0f6e542695e95..08a1a70e2fe582e238fc9c87af69368359646231 100644
+index d15efd747442f20f0f6a8c22bb3ba45abdcd399b..f9ca0f2386049e48759646c1a38646db85c66492 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -128,6 +128,17 @@

Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -5,14 +5,13 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index beeba55d53c3f1b268460488d57520db73f78c48..6a854d7cf68553b30e5aceca435c0bec31eb2f7c 100644
+index e94ec567fbda93f4f5783f84b4b5136b309d0eab..fddc063798edc8084ca695578a47485204a7f3cd 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
-@@ -291,4 +291,22 @@ public interface ArmorStand extends LivingEntity {
-      * @param marker whether this is a marker
+@@ -344,4 +344,21 @@ public interface ArmorStand extends LivingEntity {
           */
-     void setMarker(boolean marker);
-+
+         ADDING;
+     }
 +    // Paper start
 +    /**
 +     * Tests if this armor stand can move.

Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -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/World.java b/src/main/java/org/bukkit/World.java
-index c79e083a97b849f9cdd3f9646c4f2892976b2a55..480386b2405953c3a06958a9728b38371d75662b 100644
+index d355453d5b166e8fa0c6a8c992169b0b54e5127b..fefbe857676bdab750379a9d6c120099817a83e8 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -40,6 +40,33 @@ import org.jetbrains.annotations.Nullable;

Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 480386b2405953c3a06958a9728b38371d75662b..55d114e3a17ea623ecc0d9fa87b14c3ffc65e6be 100644
+index fefbe857676bdab750379a9d6c120099817a83e8..833f4cb13e9d3d1d0daa1ac1202a70e2606c80b8 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2077,6 +2077,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2087,6 +2087,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -17,7 +17,7 @@ index 480386b2405953c3a06958a9728b38371d75662b..55d114e3a17ea623ecc0d9fa87b14c3f
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
  
-@@ -2093,6 +2094,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2103,6 +2104,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -25,7 +25,7 @@ index 480386b2405953c3a06958a9728b38371d75662b..55d114e3a17ea623ecc0d9fa87b14c3f
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
  
-@@ -2143,6 +2145,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2153,6 +2155,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -33,7 +33,7 @@ index 480386b2405953c3a06958a9728b38371d75662b..55d114e3a17ea623ecc0d9fa87b14c3f
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -2163,6 +2166,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2173,6 +2176,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -41,7 +41,7 @@ index 480386b2405953c3a06958a9728b38371d75662b..55d114e3a17ea623ecc0d9fa87b14c3f
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -2219,6 +2223,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2229,6 +2233,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -49,7 +49,7 @@ index 480386b2405953c3a06958a9728b38371d75662b..55d114e3a17ea623ecc0d9fa87b14c3f
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -2241,6 +2246,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2251,6 +2256,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -57,7 +57,7 @@ index 480386b2405953c3a06958a9728b38371d75662b..55d114e3a17ea623ecc0d9fa87b14c3f
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -2264,6 +2270,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2274,6 +2280,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -65,7 +65,7 @@ index 480386b2405953c3a06958a9728b38371d75662b..55d114e3a17ea623ecc0d9fa87b14c3f
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
  
-@@ -2289,6 +2296,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2299,6 +2306,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings

Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index abe3d91428c4a5f7e3c6fec51faf973b76896dc3..babda8f047ab134223651ddcc8e4eb8d6682a031 100644
+index 72178c3036f567ceaf15016978a9737eb9c4afc4..d212d5123b6294f7873d72f125505a006c290b05 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -300,6 +300,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make /plugins list alphabetical
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index e8a7f435fb30da3506b2b4fa8c5675c829edc105..ba399ee5ab33b4fd8741bce53509a17b1aabc84d 100644
+index bcb576a4271b1ec7b1cfe6f83cf161b7d89ed2e5..9b2e28d04be7a89bdd0fb27d1d1f3f71846edefb 100644
 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 @@ -3,6 +3,9 @@ package org.bukkit.command.defaults;
@@ -18,7 +18,7 @@ index e8a7f435fb30da3506b2b4fa8c5675c829edc105..ba399ee5ab33b4fd8741bce53509a17b
  import org.bukkit.Bukkit;
  import org.bukkit.ChatColor;
  import org.bukkit.command.CommandSender;
-@@ -49,34 +52,51 @@ public class PluginsCommand extends BukkitCommand {
+@@ -34,23 +37,33 @@ public class PluginsCommand extends BukkitCommand {
  
      @NotNull
      private String getPluginList() {
@@ -56,26 +56,5 @@ index e8a7f435fb30da3506b2b4fa8c5675c829edc105..ba399ee5ab33b4fd8741bce53509a17b
 +        return "(" + plugins.size() + "): " + pluginList.toString();
 +        // Paper end
      }
- 
-     // Spigot start
-     @NotNull
-     private BaseComponent[] getPluginListSpigot() {
--        Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
--        ComponentBuilder pluginList = new ComponentBuilder("Plugins (" + plugins.length + "): ");
-+        // Paper start
-+        TreeMap<String, Plugin> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-+        for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
-+            plugins.put(plugin.getDescription().getName(), plugin);
-+        }
-+        ComponentBuilder pluginList = new ComponentBuilder("Plugins (" + plugins.size() + "): ");
-+        // Paper end
- 
-         int index = 0;
--        for (Plugin plugin : plugins) {
-+        // Paper start
-+        for (Map.Entry<String, Plugin> entry : plugins.entrySet()) {
-+            Plugin plugin = entry.getValue();
-+            // Paper end
-             if (index++ > 0) {
-                 pluginList.append(", ", FormatRetention.NONE).color(net.md_5.bungee.api.ChatColor.WHITE);
++
  }

Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index 08a1a70e2fe582e238fc9c87af69368359646231..cb37aea9d7f60b54b95b5cf1798d5a6c5c0e7c14 100644
+index f9ca0f2386049e48759646c1a38646db85c66492..1a34f6880b45e3c46a8e29575b549f3a601721e7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -109,6 +109,13 @@

Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch

@@ -5,14 +5,13 @@ Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index babda8f047ab134223651ddcc8e4eb8d6682a031..dd7b08f985d8ac41fdce8241a3cd2c84c1555ab3 100644
+index d212d5123b6294f7873d72f125505a006c290b05..7430bc85301d0fcb34c6035fbe08ae245c76e043 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -461,4 +461,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -461,6 +461,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      @Deprecated
      public void setShoulderEntityRight(@Nullable Entity entity);
-+
 +    // Paper start - Add method to open already placed sign
 +    /**
 +     * Opens an editor window for the specified sign
@@ -21,4 +20,6 @@ index babda8f047ab134223651ddcc8e4eb8d6682a031..dd7b08f985d8ac41fdce8241a3cd2c84
 +     */
 +    void openSign(@NotNull org.bukkit.block.Sign sign);
 +    // Paper end
- }
+ 
+     /**
+      * Make the entity drop the item in their hand.

Spigot-API-Patches/0094-Additional-world.getNearbyEntities-API-s.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 55d114e3a17ea623ecc0d9fa87b14c3ffc65e6be..c422cfa1b599bc4c158dea178e5677c4b4545d99 100644
+index 833f4cb13e9d3d1d0daa1ac1202a70e2606c80b8..f36360e9dbfa6daa3450c275764ea1e90e446da6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@

Spigot-API-Patches/0096-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -515,10 +515,10 @@ index b32de827cf8d1780861c271b4215276fdaab7165..1020002ff7127877db2d7e096f2c5217
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c422cfa1b599bc4c158dea178e5677c4b4545d99..6e311dd8f1105c28be7259855e0b19ae182badfd 100644
+index f36360e9dbfa6daa3450c275764ea1e90e446da6..068eb8dbd31b3456a8ce48e045d98a4d291eba27 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2501,7 +2501,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2511,7 +2511,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */

Spigot-API-Patches/0111-Expand-Explosions-API.patch

@@ -106,10 +106,10 @@ index 4cf22afc3c1f1cc19b6e5350043431215908a612..af2ee43f2c5133668c18710f526a107d
       * Returns a list of entities within a bounding box centered around a Location.
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6e311dd8f1105c28be7259855e0b19ae182badfd..4cbea0cc7b2594ebbc555edb00a86dac6d293f91 100644
+index 068eb8dbd31b3456a8ce48e045d98a4d291eba27..1f02f9a96eac55e14383a8a381be6473c014442f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1354,6 +1354,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1364,6 +1364,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
  

Spigot-API-Patches/0115-Add-World.getEntity-UUID-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 4cbea0cc7b2594ebbc555edb00a86dac6d293f91..2e52059cdf2431baac09db521b02fbc4c594eb60 100644
+index 1f02f9a96eac55e14383a8a381be6473c014442f..79267ebf4fd0d5ea3fc37f62bf50c4064f62fc8d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -914,6 +914,17 @@ public interface World extends PluginMessageRecipient, Metadatable {

Spigot-API-Patches/0116-InventoryCloseEvent-Reason-API.patch

@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index dd7b08f985d8ac41fdce8241a3cd2c84c1555ab3..2668196e04a7de245c63b4b74f0d056784ef0736 100644
+index 7430bc85301d0fcb34c6035fbe08ae245c76e043..3418133d07250a7fd50caad8d97924b86fb30bad 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -153,6 +153,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

Spigot-API-Patches/0118-Add-an-asterisk-to-legacy-API-plugins.patch

@@ -23,10 +23,10 @@ index 1b6d737046646c102b0d519ab3f67c3fbd503979..541e28a9bece0beb0c2cf02c39030840
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index ba399ee5ab33b4fd8741bce53509a17b1aabc84d..cbcdca042b54531fdf45e8631c4bbe8c74f68341 100644
+index 9b2e28d04be7a89bdd0fb27d1d1f3f71846edefb..fd74512a2bbbb0f198192b450e09bdbb9bac248d 100644
 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-@@ -74,7 +74,13 @@ public class PluginsCommand extends BukkitCommand {
+@@ -59,7 +59,13 @@ public class PluginsCommand extends BukkitCommand {
  
  
              pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);

Spigot-API-Patches/0123-Allow-disabling-armour-stand-ticking.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 6a854d7cf68553b30e5aceca435c0bec31eb2f7c..c8c08f1f2cf875f3bab7548cebd3dd657a5bf3ec 100644
+index fddc063798edc8084ca695578a47485204a7f3cd..365d3a3c5fc4a47efe56225ef1eb87b5046034f4 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
-@@ -308,5 +308,21 @@ public interface ArmorStand extends LivingEntity {
+@@ -360,5 +360,21 @@ public interface ArmorStand extends LivingEntity {
       * @param move {@code true} if this armour stand can move, {@code false} otherwise
       */
      void setCanMove(boolean move);

Spigot-API-Patches/0126-Expand-ArmorStand-API.patch

@@ -8,18 +8,10 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index c8c08f1f2cf875f3bab7548cebd3dd657a5bf3ec..af70bac7921852b58629d671fe03ad0e23be9266 100644
+index 365d3a3c5fc4a47efe56225ef1eb87b5046034f4..8ca6c9eba926f436203af211c6e274a59ddb15e8 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
-@@ -1,6 +1,7 @@
- package org.bukkit.entity;
- 
- import org.bukkit.inventory.EntityEquipment;
-+import org.bukkit.inventory.EquipmentSlot;
- import org.bukkit.inventory.ItemStack;
- import org.bukkit.util.EulerAngle;
- import org.jetbrains.annotations.NotNull;
-@@ -12,7 +13,7 @@ public interface ArmorStand extends LivingEntity {
+@@ -13,7 +13,7 @@ public interface ArmorStand extends LivingEntity {
       * Returns the item the armor stand is currently holding.
       *
       * @return the held item
@@ -28,7 +20,7 @@ index c8c08f1f2cf875f3bab7548cebd3dd657a5bf3ec..af70bac7921852b58629d671fe03ad0e
       * @see #getEquipment()
       */
      @NotNull
-@@ -24,7 +25,7 @@ public interface ArmorStand extends LivingEntity {
+@@ -25,7 +25,7 @@ public interface ArmorStand extends LivingEntity {
       *
       * @param item the item to hold
       * @deprecated prefer
@@ -37,7 +29,7 @@ index c8c08f1f2cf875f3bab7548cebd3dd657a5bf3ec..af70bac7921852b58629d671fe03ad0e
       * @see #getEquipment()
       */
      @Deprecated
-@@ -324,5 +325,71 @@ public interface ArmorStand extends LivingEntity {
+@@ -376,5 +376,71 @@ public interface ArmorStand extends LivingEntity {
       * @param tick {@code true} if this armour stand can tick, {@code false} otherwise
       */
      void setCanTick(final boolean tick);

Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -44,7 +44,7 @@ index 95e485eea693e7648e63d198c8591d89e02e6755..0bbef14a9fc2a3ec03b4db59c8d8e1ee
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2e52059cdf2431baac09db521b02fbc4c594eb60..fe8b255aeb46e30d0a954dcd0e3e6ac29b4fd33d 100644
+index 79267ebf4fd0d5ea3fc37f62bf50c4064f62fc8d..ff132bd7677e384debf2399ba9b1ffdb932541e9 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -207,6 +207,22 @@ public interface World extends PluginMessageRecipient, Metadatable {

Spigot-API-Patches/0132-Async-Chunks-API.patch

@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fe8b255aeb46e30d0a954dcd0e3e6ac29b4fd33d..eef7750fdebb4fbd156d729e4cc87f7b3d0a2ad4 100644
+index ff132bd7677e384debf2399ba9b1ffdb932541e9..a260f31d1bc00b6bd87418526170054047977da4 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -221,6 +221,467 @@ public interface World extends PluginMessageRecipient, Metadatable {

Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch

@@ -48,7 +48,7 @@ index 369ce9ff6c8bb97a64a8e229115564412e6e7654..e700875beb76dadd55b585aca748338d
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index eef7750fdebb4fbd156d729e4cc87f7b3d0a2ad4..656615290c3378a853ea298d0a3b5f8d28c6a177 100644
+index a260f31d1bc00b6bd87418526170054047977da4..14555ceda572ba1f720fafaab12ea39df291fee6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -90,6 +90,38 @@ public interface World extends PluginMessageRecipient, Metadatable {

Spigot-API-Patches/0138-isChunkGenerated-API.patch

@@ -34,7 +34,7 @@ index e700875beb76dadd55b585aca748338def286908..9c91c49ed7302c12fcb1d8e9bc58712e
      /**
       * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 656615290c3378a853ea298d0a3b5f8d28c6a177..40dd88b538e9d9f7684f65415cf18e9b416e28de 100644
+index 14555ceda572ba1f720fafaab12ea39df291fee6..abce2ae7a861e28c5732593e163f172ebe8430ad 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -254,6 +254,17 @@ public interface World extends PluginMessageRecipient, Metadatable {

Spigot-API-Patches/0142-Inventory-removeItemAnySlot.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
-index 5a38d8f13b5ee38f9d1ec01ce10b2666f5883e37..01fe217dfa93c20bdec53eb981bd6e885a9f7a25 100644
+index 5576a6a8df8c95164bf2dde45d756ce8b7ec957a..9c6a5bdac8c3ab682bbfae04ff24b76a62bc2883 100644
 --- a/src/main/java/org/bukkit/inventory/Inventory.java
 +++ b/src/main/java/org/bukkit/inventory/Inventory.java
 @@ -125,6 +125,34 @@ public interface Inventory extends Iterable<ItemStack> {

Spigot-API-Patches/0152-Material-API-additions.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index cedb719856573a9284443626d8823201125c895d..3a8438fb674006a5cbfd977a1cd016117691f0ee 100644
+index f66cd342c2ec3e5d4f4ae5e68dda797c793c76a7..e203c5bfc1d1bf6b500ef8a4446d3aef182b8ecb 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -85,6 +85,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -86,6 +86,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * An enum of all material IDs accepted by the official server and client
   */
@@ -16,7 +16,7 @@ index cedb719856573a9284443626d8823201125c895d..3a8438fb674006a5cbfd977a1cd01611
  public enum Material implements Keyed {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -3563,6 +3564,22 @@ public enum Material implements Keyed {
+@@ -3565,6 +3566,22 @@ public enum Material implements Keyed {
          }
      }
  

Spigot-API-Patches/0152-Remove-Precondition-on-name-for-AttributeModifier.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 22 Sep 2018 18:41:01 -0400
-Subject: [PATCH] Remove Precondition on name for AttributeModifier
-
-Vanilla allows empty names
-
-diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index a97631474545bb51dfcbc769401f4f1ffede580d..f0dff145a8c5ae729de5e5f547fff60333c6501e 100644
---- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
-+++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-@@ -32,10 +32,10 @@ public class AttributeModifier implements ConfigurationSerializable {
- 
-     public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @Nullable EquipmentSlot slot) {
-         Validate.notNull(uuid, "UUID cannot be null");
--        Validate.notEmpty(name, "Name cannot be empty");
-+        //Validate.notEmpty(name, "Name cannot be empty"); // Paper
-         Validate.notNull(operation, "Operation cannot be null");
-         this.uuid = uuid;
--        this.name = name;
-+        this.name = name != null ? name : ""; // Paper
-         this.amount = amount;
-         this.operation = operation;
-         this.slot = slot;

Spigot-API-Patches/0153-Add-Material-Tags.patch

@@ -204,7 +204,7 @@ index 0000000000000000000000000000000000000000..c91ea2a0679a7f3a5627b5a008e0b39d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..af353bbdf8c2710d43d31237ea76eb9281aa463b
+index 0000000000000000000000000000000000000000..552ba6b90b6dc1ae586af10cd8a8d4833693dea9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 @@ -0,0 +1,511 @@
@@ -518,7 +518,7 @@ index 0000000000000000000000000000000000000000..af353bbdf8c2710d43d31237ea76eb92
 +     */
 +    public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
 +        .endsWith("_SPAWN_EGG")
-+        .ensureSize("SPAWN_EGGS", 63);
++        .ensureSize("SPAWN_EGGS", 64);
 +
 +    /**
 +     * Covers all colors of stained glass.

Spigot-API-Patches/0156-Add-sun-related-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 40dd88b538e9d9f7684f65415cf18e9b416e28de..8d951577c0797d299951f7fd2448121710f07e6b 100644
+index abce2ae7a861e28c5732593e163f172ebe8430ad..51b2b6d3f5de413391957a42d6a9ccb69688e0eb 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1755,6 +1755,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1765,6 +1765,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public void setFullTime(long time);
  

Spigot-API-Patches/0164-Add-more-Zombie-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index 6dcac979820b1460e8693b6a330876bc1ffdfffc..fa7a43c3517af455d197308d2e952ea40622349c 100644
+index a5b20b0454af5ea78e2bb7f16a56c38670c84efb..1217576e6f08abf0175ab800cfca058d5deda116 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
-@@ -86,4 +86,55 @@ public interface Zombie extends Monster {
+@@ -90,4 +90,55 @@ public interface Zombie extends Monster, Ageable {
       * @param time new conversion time
       */
      void setConversionTime(int time);

Spigot-API-Patches/0179-Add-Heightmap-API.patch

@@ -89,7 +89,7 @@ index d5d67b3d84cd88ed0f858497e68535ec0162c700..ec9eb042ee8354d17f8ad4230c4acc5f
       * Creates explosion at this location with given power
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8d951577c0797d299951f7fd2448121710f07e6b..90e41bead6a51ab1f272af806c396d8411a96eb7 100644
+index 51b2b6d3f5de413391957a42d6a9ccb69688e0eb..cbd39760fd6e18a9d21794c468d874ca8a10d988 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -160,6 +160,87 @@ public interface World extends PluginMessageRecipient, Metadatable {

Spigot-API-Patches/0200-Add-item-slot-convenience-methods.patch

@@ -177,6 +177,80 @@ index 4a0c43acc2714e095973eb78536041bb1a179ddc..acf2244f77133df53eb5f862c8e713c8
 +    }
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/inventory/SmithingInventory.java b/src/main/java/org/bukkit/inventory/SmithingInventory.java
+index 616495f8517a187a1eba4d03d5a25580fd0c8715..2b8f21cfce99b6caaedb48df4aa1e989644b88ff 100644
+--- a/src/main/java/org/bukkit/inventory/SmithingInventory.java
++++ b/src/main/java/org/bukkit/inventory/SmithingInventory.java
+@@ -1,6 +1,68 @@
+ package org.bukkit.inventory;
+ 
++import org.jetbrains.annotations.Nullable; // Paper
++
+ /**
+  * Interface to the inventory of a Smithing table.
+  */
+-public interface SmithingInventory extends Inventory { }
++public interface SmithingInventory extends Inventory {
++
++    // Paper start
++    /**
++     * Gets the input equipment (first slot).
++     *
++     * @return input equipment item
++     */
++    @Nullable
++    default ItemStack getInputEquipment() {
++        return getItem(0);
++    }
++
++    /**
++     * Sets the input equipment (first slot).
++     *
++     * @param itemStack item to set
++     */
++    default void setInputEquipment(@Nullable ItemStack itemStack) {
++        setItem(0, itemStack);
++    }
++
++    /**
++     * Gets the input mineral (second slot).
++     *
++     * @return input mineral item
++     */
++    @Nullable
++    default ItemStack getInputMineral() {
++        return getItem(1);
++    }
++
++    /**
++     * Sets the input mineral (second slot).
++     *
++     * @param itemStack item to set
++     */
++    default void setInputMineral(@Nullable ItemStack itemStack) {
++        setItem(1, itemStack);
++    }
++
++    /**
++     * Gets the result item.
++     *
++     * @return result
++     */
++    @Nullable
++    default ItemStack getResult() {
++        return getItem(2);
++    }
++
++    /**
++     * Sets the result item.
++     *
++     * @param itemStack item to set
++     */
++    default void setResult(@Nullable ItemStack itemStack) {
++        setItem(2, itemStack);
++    }
++    // Paper end
++}
 diff --git a/src/main/java/org/bukkit/inventory/StonecutterInventory.java b/src/main/java/org/bukkit/inventory/StonecutterInventory.java
 index dbb034fae3b8bfaf40e6341460e274c21e321a3b..e7a8e7188bf8b9840de56dc80c2b79d64a9389cb 100644
 --- a/src/main/java/org/bukkit/inventory/StonecutterInventory.java

Spigot-API-Patches/0201-Add-Mob-Goal-API.patch

@@ -227,10 +227,10 @@ index 0000000000000000000000000000000000000000..e21f7574763dd4f13794f91bbef192ef
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d7f1b2c84aebe8ed04084b9249ed08d5e52a6ecd
+index 0000000000000000000000000000000000000000..b42091752981a1f309ab350e9a394092cb334824
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -0,0 +1,208 @@
+@@ -0,0 +1,209 @@
 +package com.destroystokyo.paper.entity.ai;
 +
 +import com.destroystokyo.paper.entity.RangedEntity;
@@ -356,6 +356,7 @@ index 0000000000000000000000000000000000000000..d7f1b2c84aebe8ed04084b9249ed08d5
 +    GoalKey<Slime> SLIME_RANDOM_JUMP = GoalKey.of(Slime.class, NamespacedKey.minecraft("slime_random_jump"));
 +    GoalKey<Spider> SPIDER_MELEE_ATTACK = GoalKey.of(Spider.class, NamespacedKey.minecraft("spider_melee_attack"));
 +    GoalKey<Spider> SPIDER_NEAREST_ATTACKABLE_TARGET = GoalKey.of(Spider.class, NamespacedKey.minecraft("spider_nearest_attackable_target"));
++    GoalKey<Strider> STRIDER_GO_TO_LAVA = GoalKey.of(Strider.class, NamespacedKey.minecraft("strider_go_to_lava"));
 +    GoalKey<Squid> SQUID = GoalKey.of(Squid.class, NamespacedKey.minecraft("squid"));
 +    GoalKey<Squid> SQUID_FLEE = GoalKey.of(Squid.class, NamespacedKey.minecraft("squid_flee"));
 +    GoalKey<Turtle> TURTLE_BREED = GoalKey.of(Turtle.class, NamespacedKey.minecraft("turtle_breed"));

Spigot-API-Patches/0202-World-view-distance-api.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] World view distance api
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 90e41bead6a51ab1f272af806c396d8411a96eb7..71c1e93ea15f0a926a9ad822d09a076f8b800988 100644
+index cbd39760fd6e18a9d21794c468d874ca8a10d988..4511cb786a5618cc1b7ff5cbb97ef1fe8ff05e17 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3343,6 +3343,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3353,6 +3353,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
      int getViewDistance();
      // Spigot end
  

Spigot-API-Patches/0204-Spawn-Reason-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn Reason API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 71c1e93ea15f0a926a9ad822d09a076f8b800988..75c9225bd07b4c4b6dcd702c52294a7637eb6884 100644
+index 4511cb786a5618cc1b7ff5cbb97ef1fe8ff05e17..ba5e6cca028df293a939db37ecf5857059554291 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,8 @@
@@ -17,7 +17,7 @@ index 71c1e93ea15f0a926a9ad822d09a076f8b800988..75c9225bd07b4c4b6dcd702c52294a76
  import org.bukkit.generator.ChunkGenerator;
  
  import java.util.ArrayList;
-@@ -2146,6 +2148,12 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2156,6 +2158,12 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T> clazz) throws IllegalArgumentException;
  
@@ -30,7 +30,7 @@ index 71c1e93ea15f0a926a9ad822d09a076f8b800988..75c9225bd07b4c4b6dcd702c52294a76
      /**
       * Spawn an entity of a specific class at the given {@link Location}, with
       * the supplied function run before the entity is added to the world.
-@@ -2163,7 +2171,28 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2173,7 +2181,28 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *     {@link Entity} requested cannot be spawned
       */
      @NotNull

Spigot-API-Patches/0205-Potential-bed-API.patch

@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 2668196e04a7de245c63b4b74f0d056784ef0736..d3998c61af0c5fb1189ae7829e8cdfbef0cd3f97 100644
+index 3418133d07250a7fd50caad8d97924b86fb30bad..b09d12390d5f77330ac84452e0fee63a169bd01f 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -240,6 +240,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

Spigot-API-Patches/0209-Inventory-getHolder-method-without-block-snapshot.patch

@@ -28,10 +28,10 @@ index 83a4642119c3f33749e04c774cf2b39839f797e2..a39d2f1acbbd84ae0e2cf29f85594e09
      public Location getLocation() {
          return getInventory().getLocation();
 diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
-index 01fe217dfa93c20bdec53eb981bd6e885a9f7a25..753c052291afb0455df8298ea3a8209778ba400f 100644
+index 9c6a5bdac8c3ab682bbfae04ff24b76a62bc2883..6386206188e820206bb1a9f516b5e194fdc9d952 100644
 --- a/src/main/java/org/bukkit/inventory/Inventory.java
 +++ b/src/main/java/org/bukkit/inventory/Inventory.java
-@@ -376,6 +376,17 @@ public interface Inventory extends Iterable<ItemStack> {
+@@ -384,6 +384,17 @@ public interface Inventory extends Iterable<ItemStack> {
      @Nullable
      public InventoryHolder getHolder();
  

Spigot-API-Patches/0218-Add-setMaxPlayers-API.patch

@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mariell Hoversholm <proximyst@proximyst.com>
+Date: Sat, 22 Aug 2020 23:59:25 +0200
+Subject: [PATCH] Add #setMaxPlayers API
+
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 62cc1c74c11f56dcbd1e24e9c5478497742e6351..bfe842364ee0a4bf39dacdbb6972477d57a4ef8a 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -171,6 +171,17 @@ public final class Bukkit {
+         return server.getMaxPlayers();
+     }
+ 
++    // Paper start
++    /**
++     * Set the maximum amount of players which can login to this server.
++     *
++     * @param maxPlayers the amount of players this server allows
++     */
++    public static void setMaxPlayers(int maxPlayers) {
++        server.setMaxPlayers(maxPlayers);
++    }
++    // Paper end
++
+     /**
+      * Get the game port that the server runs on.
+      *
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 6e01bf2d52e8bb6de7395f50c12f16c64aef72ae..7c0a788900c93c29d14d8c45ac5ae3317cf4a94e 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -144,6 +144,15 @@ public interface Server extends PluginMessageRecipient {
+      */
+     public int getMaxPlayers();
+ 
++    // Paper start
++    /**
++     * Set the maximum amount of players which can login to this server.
++     *
++     * @param maxPlayers the amount of players this server allows
++     */
++    public void setMaxPlayers(int maxPlayers);
++    // Paper end
++
+     /**
+      * Get the game port that the server runs on.
+      *

Spigot-API-Patches/0219-Add-moon-phase-API.patch

@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sun, 23 Aug 2020 16:32:03 +0200
+Subject: [PATCH] Add moon phase API
+
+
+diff --git a/src/main/java/io/papermc/paper/world/MoonPhase.java b/src/main/java/io/papermc/paper/world/MoonPhase.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..df05153397b42930cd53d37b30824c7e5f008f7e
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/world/MoonPhase.java
+@@ -0,0 +1,36 @@
++package io.papermc.paper.world;
++
++import org.jetbrains.annotations.NotNull;
++
++import java.util.HashMap;
++import java.util.Map;
++
++public enum MoonPhase {
++    FULL_MOON(0L),
++    WANING_GIBBOUS(1L),
++    LAST_QUARTER(2L),
++    WANING_CRESCENT(3L),
++    NEW_MOON(4L),
++    WAXING_CRESCENT(5L),
++    FIRST_QUARTER(6L),
++    WAXING_GIBBOUS(7L);
++
++    private final long day;
++
++    MoonPhase(long day) {
++        this.day = day;
++    }
++
++    private static final Map<Long, MoonPhase> BY_DAY = new HashMap<>();
++
++    static {
++        for (MoonPhase phase : values()) {
++            BY_DAY.put(phase.day, phase);
++        }
++    }
++
++    @NotNull
++    public static MoonPhase getPhase(long day) {
++        return BY_DAY.get(day % 8L);
++    }
++}
+diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index ba5e6cca028df293a939db37ecf5857059554291..e827e1a6f5c0f8410ed32dda8f17aa769b469999 100644
+--- a/src/main/java/org/bukkit/World.java
++++ b/src/main/java/org/bukkit/World.java
+@@ -70,6 +70,12 @@ public interface World extends PluginMessageRecipient, Metadatable {
+      * @return The amount of Players in this world
+      */
+     int getPlayerCount();
++
++    /**
++     * @return the current moon phase at the current time in the world
++     */
++    @NotNull
++    io.papermc.paper.world.MoonPhase getMoonPhase();
+     // Paper end
+ 
+     /**