Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
85b16b8a Update to Minecraft 1.16.5

CraftBukkit Changes:
f3f30947 Update to Minecraft 1.16.5

Spigot Changes:
018b9a0d Update to Minecraft 1.16.5

Paper-MojangAPI/pom.xml

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

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

@@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
-             <version>19.0.0</version>
+             <version>20.1.0</version>
              <scope>provided</scope>
          </dependency>
 +        <!-- Paper - Add SLF4J -->

Spigot-API-Patches/POM-changes.patch

@@ -22,7 +22,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.16.4-R0.1-SNAPSHOT</version>
+     <version>1.16.5-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>

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

@@ -10,19 +10,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
-             <version>8.0.1</version>
+             <version>9.0</version>
              <scope>test</scope>
          </dependency>
 +        <!-- ASM -->
 +        <dependency>
 +            <groupId>org.ow2.asm</groupId>
 +            <artifactId>asm</artifactId>
-+            <version>8.0.1</version>
++            <version>9.0</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.ow2.asm</groupId>
 +            <artifactId>asm-commons</artifactId>
-+            <version>8.0.1</version>
++            <version>9.0</version>
 +        </dependency>
      </dependencies>
  

Spigot-Server-Patches/Configurable-fishing-time-ranges.patch

@@ -28,7 +28,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class EntityFishingHook extends IProjectile {
          entityhuman.hookedFish = this;
          this.an = Math.max(0, i);
-         this.ao = Math.max(0, j);
+         this.lureLevel = Math.max(0, j);
 +        // Paper start
 +        minWaitTime = world.paperConfig.fishingMinTicks;
 +        maxWaitTime = world.paperConfig.fishingMaxTicks;

Spigot-Server-Patches/Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch

@@ -11,9 +11,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
-     public Stream<Entity> cp() {
+     public Stream<Entity> recursiveStream() {
--        return Stream.concat(Stream.of(this), this.passengers.stream().flatMap(Entity::cp));
+-        return Stream.concat(Stream.of(this), this.passengers.stream().flatMap(Entity::recursiveStream));
-+        return Stream.concat(Stream.of(this), com.google.common.collect.ImmutableList.copyOf(this.passengers).stream().flatMap(Entity::cp)); // Paper
++        return Stream.concat(Stream.of(this), com.google.common.collect.ImmutableList.copyOf(this.passengers).stream().flatMap(Entity::recursiveStream)); // Paper
      }
  
      public boolean hasSinglePlayerPassenger() {

Spigot-Server-Patches/Fix-Per-World-Difficulty-Remembering-Difficulty.patch

@@ -47,17 +47,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
 -    public void a(EnumDifficulty enumdifficulty, boolean flag) {
--        if (flag || !this.saveData.isDifficultyLocked()) {
--            this.saveData.setDifficulty(this.saveData.isHardcore() ? EnumDifficulty.HARD : enumdifficulty);
--            this.bc();
--            this.getPlayerList().getPlayers().forEach(this::b);
 +    // Paper start - fix per world difficulty
 +    public void a(WorldServer world, EnumDifficulty enumdifficulty, boolean flag) {
 +        WorldDataServer worldData = world.worldDataServer;
-+        if (flag || !worldData.isDifficultyLocked()) {
+         if (flag || !this.saveData.isDifficultyLocked()) {
-+            worldData.setDifficulty(worldData.isHardcore() ? EnumDifficulty.HARD : enumdifficulty);
+             this.saveData.setDifficulty(this.saveData.isHardcore() ? EnumDifficulty.HARD : enumdifficulty);
+-            this.updateSpawnFlags();
+-            this.getPlayerList().getPlayers().forEach(this::b);
 +            world.setSpawnFlags(worldData.getDifficulty() != EnumDifficulty.PEACEFUL && ((DedicatedServer)this).propertyManager.getProperties().spawnMonsters, this.getSpawnAnimals());
-+            //world.players.forEach(this::b);
++            //this.getPlayerList().getPlayers().forEach(this::b);
 +            // Paper end
          }
      }

Spigot-Server-Patches/Implement-CraftBlockSoundGroup.patch

@@ -54,35 +54,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/server/SoundEffectType.java
 @@ -0,0 +0,0 @@ public class SoundEffectType {
      public static final SoundEffectType U = new SoundEffectType(1.0F, 1.0F, SoundEffects.BLOCK_GILDED_BLACKSTONE_BREAK, SoundEffects.BLOCK_GILDED_BLACKSTONE_STEP, SoundEffects.BLOCK_GILDED_BLACKSTONE_PLACE, SoundEffects.BLOCK_GILDED_BLACKSTONE_HIT, SoundEffects.BLOCK_GILDED_BLACKSTONE_FALL);
-     public final float V;
+     public final float volume;
-     public final float W;
+     public final float pitch;
--    public final SoundEffect X; // PAIL private -> public, rename breakSound
+-    public final SoundEffect breakSound;
-+    public final SoundEffect X; public final SoundEffect getBreakSound() { return this.X; } // Paper - OBFHELPER // PAIL private -> public, rename breakSound
++    public final SoundEffect breakSound; public final SoundEffect getBreakSound() { return this.breakSound; } // Paper - OBFHELPER // PAIL private -> public, rename breakSound
-     private final SoundEffect Y;
+     private final SoundEffect stepSound;
-     private final SoundEffect Z;
+     private final SoundEffect placeSound;
--    public final SoundEffect aa; // PAIL private -> public, rename hitSound
+-    public final SoundEffect hitSound;
-+    public final SoundEffect aa; public final SoundEffect getHitSound() { return this.aa; } // Paper - OBFHELPER // PAIL private -> public, rename hitSound
++    public final SoundEffect hitSound; public final SoundEffect getHitSound() { return this.hitSound; } // Paper - OBFHELPER // PAIL private -> public, rename hitSound
-     private final SoundEffect ab;
+     private final SoundEffect fallSound;
  
      public SoundEffectType(float f, float f1, SoundEffect soundeffect, SoundEffect soundeffect1, SoundEffect soundeffect2, SoundEffect soundeffect3, SoundEffect soundeffect4) {
-@@ -0,0 +0,0 @@ public class SoundEffectType {
-         return this.W;
-     }
- 
-+    public final SoundEffect getStepSound() { return this.d(); } // Paper - OBFHELPER
-     public SoundEffect d() {
-         return this.Y;
-     }
- 
-+    public final SoundEffect getPlaceSound() { return this.e(); } // Paper - OBFHELPER
-     public SoundEffect e() {
-         return this.Z;
-     }
- 
-+    public final SoundEffect getFallSound() { return this.g(); } // Paper - OBFHELPER
-     public SoundEffect g() {
-         return this.ab;
-     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java

Spigot-Server-Patches/Increase-Light-Queue-Size.patch

@@ -38,5 +38,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        chunkproviderserver.getLightEngine().a(5);
 +        chunkproviderserver.getLightEngine().a(worldserver.paperConfig.lightQueueSize); // Paper - increase light queue size
          // CraftBukkit start
-         // this.bc();
+         // this.updateSpawnFlags();
          worldserver.setSpawnFlags(this.getSpawnMonsters(), this.getSpawnAnimals());

Spigot-Server-Patches/POM-Changes.patch

@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <artifactId>spigot</artifactId>
 +    <artifactId>paper</artifactId>
      <packaging>jar</packaging>
-     <version>1.16.4-R0.1-SNAPSHOT</version>
+     <version>1.16.5-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 +    <name>Paper</name>
@@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <api.version>unknown</api.version>
-         <minecraft.version>1.16.4</minecraft.version>
+         <bt.name>git</bt.name>
 @@ -0,0 +0,0 @@
      </properties>
  
@@ -62,7 +62,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              <version>${minecraft.version}-SNAPSHOT</version>
              <scope>compile</scope>
 @@ -0,0 +0,0 @@
-             <version>8.0.1</version>
+             <version>9.0</version>
              <scope>compile</scope>
          </dependency>
 +        <dependency>
@@ -101,7 +101,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      <execution>
 -                        <id>ex-spigot</id>
 -                        <configuration>
--                            <format>git-Spigot-%s</format>
+-                            <format>${bt.name}-Spigot-%s</format>
 -                            <scmDirectory>../</scmDirectory>
 -                            <descriptionProperty>spigot.desc</descriptionProperty>
 -                        </configuration>
@@ -153,7 +153,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                              <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
                              <filters>
                                  <filter>
-@@ -0,0 +0,0 @@
+-                                    <artifact>org.spigotmc:minecraft-server</artifact>
++                                    <artifact>io.papermc:minecraft-server</artifact>
+                                     <excludes>
                                          <exclude>com/google/common/**</exclude>
                                          <exclude>com/google/gson/**</exclude>
                                          <exclude>com/google/thirdparty/**</exclude>
@@ -202,7 +204,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class Main {
                  }
  
-                 if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 -                    Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L);
 +                    Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  

Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -325,7 +325,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  
-                 if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 @@ -0,0 +0,0 @@ public class Main {
                      System.out.println("Unable to read system info");
                  }

Spigot-Server-Patches/Use-asynchronous-Log4j-2-loggers.patch

@@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
-             <version>2.8.1</version>
+                 </exclusion>
-             <scope>compile</scope>
+             </exclusions>
          </dependency>
 +        <!-- Paper - Async loggers -->
 +        <dependency>

work/BuildData

@@ -1 +1 @@
-Subproject commit 501ea060743c7bba4436878207e4f1232298efce
+Subproject commit 656df5e622bba97efb4e858e8cd3ec428a0b2d71

work/Bukkit

@@ -1 +1 @@
-Subproject commit 0958895aefcccb79abb4d703d5a8694af7416e4a
+Subproject commit 85b16b8a5f044eb8d38375c23e8968641d18a933

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 7a6c3c9aa6e48de164aeeb78052a7775f3f81c30
+Subproject commit f3f30947e07c4ea07dcbf41129c2ca830a73fd4d

work/Spigot

@@ -1 +1 @@
-Subproject commit a93cbb1e986c59ffd888f072490db0afe4119093
+Subproject commit 018b9a0d5a7a03eeabe2b2d7d74bca56db2e9949