From 72ccfbd343bd2af2df3456d43aa737d6cfe849db Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sun, 28 Jul 2024 01:19:27 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e1462a9 Bump MCUtils#asyncExecutor core size
PaperMC/Paper@645a677 Make max interaction range configurable (#11164)
PaperMC/Paper@66165f7 Fix PickupStatus getting reset (#11154)
---
 gradle.properties                                             | 2 +-
 patches/server/0070-Entity-lifespan.patch                     | 4 ++--
 .../0116-Add-mobGriefing-bypass-to-everything-affected.patch  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a5a4c8239..5ac9c119d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21-R0.1-SNAPSHOT
 
 mcVersion = 1.21
-paperCommit = 5a5035be964f3350b06264a31d8add2fa9d2994f
+paperCommit = 66165f712a99e02d383dc393b09aac565ea27540
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0070-Entity-lifespan.patch b/patches/server/0070-Entity-lifespan.patch
index 5ec2bd303..30549fbd3 100644
--- a/patches/server/0070-Entity-lifespan.patch
+++ b/patches/server/0070-Entity-lifespan.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 68c4e3d9a3f928a52357e25820ac73adbfb3332c..ce1901c683c44893780342f7a3914613abc44b0b 100644
+index 99d78eace196c5ad93d19c709862d8db7582f80b..600b8280c11032339c056b2b3ad371674072e2c2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2752,6 +2752,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              AABB axisalignedbb = entity.getBoundingBox();
  
-             if (this.player.canInteractWithEntity(axisalignedbb, 1.0D)) {
+             if (this.player.canInteractWithEntity(axisalignedbb, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(1.0D))) { // Paper - configurable lenience value for interact range
 +                if (entity instanceof Mob mob) mob.ticksSinceLastInteraction = 0; // Purpur
                  packet.dispatch(new ServerboundInteractPacket.Handler() {
                      private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
diff --git a/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch
index 1c17d4448..a6aa05cfd 100644
--- a/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -284,10 +284,10 @@ index 28a65f2a9ef441ae96a7a635e0695b14ce2ee367..7b6c58a31d37896daccb5f570d3cb924
              // CraftBukkit start - fire ExplosionPrimeEvent
              ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
 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 5f7d152f41eb85f17bcded4bc8099b998e5a338b..8a5baed3d82e49af55f4d58e8729f14c0cd466f2 100644
+index a01c0d9ae53d1b748c5da914069bd672cb1215c7..dcdca2374b4844d5ba06a01bd34b537c7d2a3339 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -355,7 +355,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -361,7 +361,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
      public boolean mayInteract(Level world, BlockPos pos) {
          Entity entity = this.getOwner();