Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@afa16e6 Modify offline mode warning to include Velocity line (#8812)
PaperMC/Paper@de38a45 Add projectile hit simulation API (#8816)
PaperMC/Paper@7e7e6b4 More Win Screen API (#8805)
PaperMC/Paper@bd77b78 Fix desync of honeycomb when the event is canceled (#8713)
PaperMC/Paper@bb05fcf Add missing isFuel Material entries (#8843)
PaperMC/Paper@8d1acf6 Call PlayerReadyArrowEvent for when items in the offhand are used (#8842)
PaperMC/Paper@f2f9e8c Remove patch that was made obsolete by vanilla (#8847)

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d5d49bb2b47c889e12d17dc87b8c439a60b3fe67..5752339f2d081c36944d568e0b29ec4fe24f37f9 100644
+index 781609605d25283009e5f3e61649ecde9ea9a4cb..80f9b35413552c4aba3ba01a95290c55f4e77106 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,8 +7,12 @@ plugins {
@@ -1533,7 +1533,7 @@ index 710ca7d3a5659953f64bc6dccdd93b43300961cc..68d16efaf9c2d997afabadcf1ee24c5d
      }
  
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 51b3db0b6c2cede95b584268e035c0fb36d38094..673fb3955291407be37dc78be4eec9bf2018128b 100644
+index a7e133f3495e9132a5fdae2c24f225e7b026295a..ad4fdbdcf09f30d10e61ccf47f8fb9ce6bd92e73 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -221,6 +221,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -1545,7 +1545,7 @@ index 51b3db0b6c2cede95b584268e035c0fb36d38094..673fb3955291407be37dc78be4eec9bf
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
-@@ -332,6 +334,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -339,6 +341,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  DedicatedServer.LOGGER.info("JMX monitoring enabled");
              }
  
@@ -1787,7 +1787,7 @@ index 54c2b7fba83d6f06dba95b1bb5b487a02048d6e6..53198ebfa30273c5ddc1bb4324f5174f
              this.getRandomBlockPosition(j, 0, k, 15, blockposition);
              int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 50d8d16b1856c0c875ccabbcfc240379a7669559..c89e430cfddb431ee1d20e59f8bd60e3a3a952b9 100644
+index 9b0b42add71172bd154226e51d62cebd8de3542e..d04a30ee940a785b848240ae6b1aa9705deb7902 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1204,6 +1204,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1919,7 +1919,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
      int LARGE_MAX_STACK_SIZE = 64;
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7555b04dcf274bb624b89f2eb9ff80da0056de4e..6a9c0f0b4b749c5907a274d6a83254284d8763bb 100644
+index 1eaab1f6923e6aa34b643293347348e5cc19af3c..3073b34a0e0281b6b0330721bb0440147de28511 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2113,7 +2113,7 @@ index 7555b04dcf274bb624b89f2eb9ff80da0056de4e..6a9c0f0b4b749c5907a274d6a8325428
              if (vec3d.length() > 0.0D) {
                  if (k1 > 0) {
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index e5cd4b7609243669c9d84ff8a4988c209e6101aa..4f3708f5f5dcb6af8225bda1cc9204a6d974665f 100644
+index 41ff954010c11d524ffb90abd22c29a1d8d8f5a0..ac7ee31f2bfe5d4139b793a698317db50b39fe40 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -293,6 +293,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -2126,7 +2126,7 @@ index e5cd4b7609243669c9d84ff8a4988c209e6101aa..4f3708f5f5dcb6af8225bda1cc9204a6
      private String descriptionId;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 529ea9094c0c7b6263c13b3b7a2d1e652f7bc29e..120c0804010fd5b38a5f806ca580962ff8b47339 100644
+index 42eb78830855d7282b7f3f1bdbe85e632d489784..413652284e229a51e3eefe47f239e8fa9a09ccb2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2622,7 +2622,7 @@ index 5bc033bf59d49eda1f8f2574165bbcbeab7faa0f..004091f2026f3c58d9bce49f1b07f644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 66476b33cede1e44db5ec166a0cea81f82ffe47a..5ccd7dc0a093277d3ea09c0fe8be03c0073ee1a8 100644
+index 893975e8587b9036f622e2088c302e33004496d2..a000834c4ea8645a2fcd697e6396f797c42c8fa3 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -43,6 +43,36 @@ public abstract class Projectile extends Entity {
@@ -2663,7 +2663,7 @@ index 66476b33cede1e44db5ec166a0cea81f82ffe47a..5ccd7dc0a093277d3ea09c0fe8be03c0
          if (entity != null) {
              this.ownerUUID = entity.getUUID();
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index b8fb7b5a347298ada16bc8b818edf1863e3f6040..43b4c4f9630bfa451d135139236ac6fce034ec15 100644
+index cc74eeb45913fab03e85969957215d2811252a83..086feb19f11a6c646b5a1a06aef4df05a4beae8b 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 @@ -27,7 +27,10 @@ import org.bukkit.inventory.InventoryHolder;
@@ -3581,7 +3581,7 @@ index f7ea77dd82d978ad307f99c743efacfb34478b3d..009ab06182359862b8f543030ec4fe4e
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 17336102d37a5ab05c3b3c93fcf46961d0ffa7e2..a3c6b3dd87022e2def1f12da7c44c8d529191d1e 100644
+index daeaa30cdd64f5cb775304e82f2390684c02a9d3..637564f7b662d8b86772f5ba96c0cb6bc6c5fa43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -433,7 +433,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -3607,7 +3607,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..80553face9c70c2a3d897681e7761df8
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 1b42c98956342832c37f0aa266f85271daa4ba5b..b87756d9a7b04ea2613208984b2583eca3f32af6 100644
+index e881584d38dc354204479863f004e974a0ac6c07..63d3fcc45be732a4cd2dc8b5347d860fd6577bdd 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings;