Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit
PaperMC/Paper@4fdda9e Keep newlines in outdated client/server message (#10042)
PaperMC/Paper@f483b38 fix NPE on EntityTeleportEvent getTo (#10016)
PaperMC/Paper@dc62150 Catch async usage of playsound (#10021)
PaperMC/Paper@0d6a0c3 Fix command block async message (again) (#10082)
PaperMC/Paper@d1f507f Don't fire 2 game events for certain cauldron interactions (#8904)
PaperMC/Paper@a401585 Fix campfire recipes not always outputting full result (#8754)
PaperMC/Paper@88d28d6 Fix long loading screen when refreshing skins (#10026)
PaperMC/Paper@c081104 Add experience points api (#9688)
PaperMC/Paper@8221b08 Fix global sound event gamerule not being respected (#8727)

gradle.properties

@@ -5,4 +5,4 @@ org.gradle.vfs.watch=false
 group=gg.pufferfish.pufferfish
 version=1.20.4-R0.1-SNAPSHOT
 mcVersion=1.20.4
-paperRef=61768e08e7cbfd40f9d909d7032df8796536c99c
+paperRef=8221b085f91a6ce65701b02fbb6a29e54bcc6023

patches/server/0009-Optimize-mob-spawning.patch

@@ -68,10 +68,10 @@ index c5d49461bf1c890352755eb5491e57d5c137bf64..3b8c810a228a59bf02a8557b229e5eca
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index caa73632aee15583c6b6ed12a668c8f49b794708..65e159d0a47b11cc8669351935ee2416ed069a7f 100644
+index d9cd497bc1b654030ff1a597f038b6a881df9f6b..ecd239aebf1384a01cca3374dbc10bf8a7962d93 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -244,7 +244,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -243,7 +243,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      // Paper end
      // Paper start - optimise chunk tick iteration
      public final it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<ChunkHolder> needsChangeBroadcasting = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>();

patches/server/0024-Config-to-disable-method-profiler.patch

@@ -34,10 +34,10 @@ index d19b2cbcb49a1d1351f039763738bbc16e90ee49..53d0a930ae5ec34c1f3a58e96e92f54d
      }
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a5fb7fb60f9da8b9ba72a19b6bba27980539d2f7..42cb7ea19702e7bcbc337bd69ec47f5e2cea13d9 100644
+index 2151d4497fcf946c7fe3df9f71eea009a4f9d600..82e40a8b1327f351ef3045f98773f25ed8606cc4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1801,6 +1801,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1795,6 +1795,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
 
      public ProfilerFiller getProfiler() {

patches/server/0030-Remove-streams-and-iterators-from-range-check.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove streams and iterators from range check
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 65e159d0a47b11cc8669351935ee2416ed069a7f..3abec84383a445d3ad0d3b5f613246b6ac7ee741 100644
+index ecd239aebf1384a01cca3374dbc10bf8a7962d93..da1dc26ce76cab20bb56d5a5d806410857f38ea6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1464,8 +1464,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1463,8 +1463,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
 
@@ -37,7 +37,7 @@ index 65e159d0a47b11cc8669351935ee2416ed069a7f..3abec84383a445d3ad0d3b5f613246b6
              Iterator iterator = this.entity.getIndirectPassengers().iterator();
 
              while (iterator.hasNext()) {
-@@ -1477,6 +1497,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1476,6 +1496,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      i = j;
                  }
              }

patches/server/0034-Remove-lambda-from-ticking-guard.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove lambda from ticking guard
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 00606b57c97a514fd1c518b2b00bd1279445f04d..66cbea2fd146bdabf1241dae72bd76dc256afe45 100644
+index 76c0c9b55797c52b9db105939471cbcde8ef6527..4a802588f58bdea30b58521cbc4f0d76743f732e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -915,7 +915,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -31,10 +31,10 @@ index 00606b57c97a514fd1c518b2b00bd1279445f04d..66cbea2fd146bdabf1241dae72bd76dc
                          }
                      }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 3f3220eea55a7e83a8bede8384a5cb19691553cd..527ece810f0bd16ba7d94c4576764902a044f216 100644
+index f057d54f41a456cd1346ae6aa493bb525e4c961d..2e14e03d01c97b9da97e8e15c663262d22b1b3fc 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1321,13 +1321,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1315,13 +1315,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
              MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick