Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d714682 Add more entity api (#7564)
PaperMC/Paper@1790528 More projectile API (#5731)
PaperMC/Paper@ea1efef Remove Patches (#7541)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.18.2-R0.1-SNAPSHOT
 
-paperCommit = 657d163740cce1ff53494438e42cc215d30891f0
+paperCommit = ea1efef1164aa7653119eb4be000749930e5b4da
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0004-Purpur-client-support.patch

@@ -43,10 +43,10 @@ index bc67e1a997d59408b00c333184d9f8dcc6cb262a..353848667006bc386fe5d3fceb61ac58
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 603e9234294c01f1cde4bfc0b0053e69b99861d9..57458fb9049518e568d22af7c53fa8074001361e 100644
+index 6feeadad9aecb7d63e24d5daae115a93e39aeb3d..e83d1abd9602a8b460a21d10d5edcb75f1de0883 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2714,4 +2714,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2703,4 +2703,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0011-AFK-API.patch

@@ -213,7 +213,7 @@ index 1f4b72a0aca200b2e0860449c718e6e607d2fc47..e1dd8932594780b07db13f68efa117eb
                  if (range < 0.0D || d < range * range) {
                      return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 57458fb9049518e568d22af7c53fa8074001361e..b1b3852fd65a6de0ebf55d121d34a63b8fffacbc 100644
+index e83d1abd9602a8b460a21d10d5edcb75f1de0883..a95b245ca2fa333085b0fc47f2cc5c5e96dcd075 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -435,10 +435,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -233,7 +233,7 @@ index 57458fb9049518e568d22af7c53fa8074001361e..b1b3852fd65a6de0ebf55d121d34a63b
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2720,5 +2725,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2709,5 +2714,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }

patches/server/0018-Player-invulnerabilities.patch

@@ -121,10 +121,10 @@ index a2af387c671f344d1b302e5aceab0be42c80756f..6ad2ccf91a384bf431e3716d374f0eb4
          return entityplayer1;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b1b3852fd65a6de0ebf55d121d34a63b8fffacbc..ee935e3a3379f059031ded780ea59f2f8915c843 100644
+index a95b245ca2fa333085b0fc47f2cc5c5e96dcd075..d017e5a7f509659cdd11c10d76030f34f0c87319 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2740,5 +2740,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2729,5 +2729,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }

patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index a3ac467faac85f3c5a20b6f1cbeeec6d67eb6ac8..0d6bc9dddca21b19835af06f6fd5d4e91f247c6f 100644
+index e51bcd5158d17db613311e38f2810b650d522cf4..f486b722ef0c82b449238effc045fa9f68860193 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -349,7 +349,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -18,10 +18,10 @@ index a3ac467faac85f3c5a20b6f1cbeeec6d67eb6ac8..0d6bc9dddca21b19835af06f6fd5d4e9
  
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index cd35be1b3bf6056315c901243777115e2e13e5a9..b5fce127d74ac5958758bfa39551e3e1f33cbc85 100644
+index 5d2dc22c920c61d4afb7b61c863f2facf8d6ec10..f3ea85978b5714e82b7722d1cf03d136d383824d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -509,6 +509,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -519,6 +519,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
          @Override
          public boolean canUse() {
@@ -29,7 +29,7 @@ index cd35be1b3bf6056315c901243777115e2e13e5a9..b5fce127d74ac5958758bfa39551e3e1
              return this.enderman.getCarriedBlock() == null ? false : (!this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0);
          }
  
-@@ -556,6 +557,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -566,6 +567,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
          @Override
          public boolean canUse() {

patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch

@@ -63,7 +63,7 @@ index 6afe37e42d88701af38df5793a9ea9d7d2cda5c5..1de27407c92d496715899fcafb3794df
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
-index 9930f7a0681899017329bd2c599db7308310b395..df43997aef63b5afbd0b9402491652cc4555f8e5 100644
+index 5a062a19bb2fc427c9391bb4731f071719b72c52..001d252763a689351a4df2ef830b3abb85a09e16 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
 @@ -358,4 +358,11 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
@@ -79,10 +79,10 @@ index 9930f7a0681899017329bd2c599db7308310b395..df43997aef63b5afbd0b9402491652cc
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index cc288174b22f959e8ef11e43f0ea4008bae7bdc5..67e11fd3b012d74652baf5875b6bd77e6e997d9d 100644
+index a4c82bf1d8789adf255fd0fae09d90228cf81ef0..1a18c112674691a2e12eccdf5462d1d161e9eba1 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-@@ -666,4 +666,11 @@ public class FishingHook extends Projectile {
+@@ -661,4 +661,11 @@ public class FishingHook extends Projectile {
  
          private OpenWaterType() {}
      }

patches/server/0114-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch

@@ -8,10 +8,10 @@ This should help to reduce the amount of dirt, gravel, grass, and etc.
 that Endermen like to randomly place all over the world.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index c4f5d033e381aa501fd689a297fb40c713f12c2a..086d98da914ca958f91ce1a1d7aea7af9e0e5a03 100644
+index 7b41dc359ae3ba49511717172619d2f7b58f02bf..018d94c3540bf6241d57fe915b5037978601dc2d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -463,7 +463,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -473,7 +473,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
      @Override
      public boolean requiresCustomPersistence() {

patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch

@@ -46,10 +46,10 @@ index fe5191550b0472a33122f3378142cdef83c89ce5..4701f86c3ef5ccf0bc5e9a748f80d3aa
  
      public void broadcastAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ee935e3a3379f059031ded780ea59f2f8915c843..43a764402662169b0b099b795e30169e8d7950d4 100644
+index d017e5a7f509659cdd11c10d76030f34f0c87319..02a237153090b27ce6b2e734812348a02f90d088 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1654,7 +1654,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1643,7 +1643,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {

patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch

@@ -18,7 +18,7 @@ index e39d333c10d74be81da173622b5e033bfde9cf3a..dace52b3cae2ce20c10080612bf6d6b0
                      BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index eacba5f8e426076b4b438b9ebc5bb8c937a786fa..a7cb8255cfda572ba77d3350703c03c08d4eaf42 100644
+index 23e6a4f6a510cfcb80678446d7b371a23c5de6a3..baf011a492e9c4ccb42c769c74181da804046622 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -658,7 +658,7 @@ public abstract class Mob extends LivingEntity {
@@ -166,7 +166,7 @@ index a8698975b368b27c0bb1cab4e0b83d69e773fc6b..87aaad12386b0ad79b1017100c83ca04
                      j = Mth.floor(this.getX());
                      int i1 = Mth.floor(this.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 0d6bc9dddca21b19835af06f6fd5d4e91f247c6f..a042155bd2075d861343760a5c61ab53795d29af 100644
+index f486b722ef0c82b449238effc045fa9f68860193..f4aeaeef7d781a655e765993fb38a9d920c47109 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -349,7 +349,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -179,10 +179,10 @@ index 0d6bc9dddca21b19835af06f6fd5d4e91f247c6f..a042155bd2075d861343760a5c61ab53
  
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 086d98da914ca958f91ce1a1d7aea7af9e0e5a03..48fc2c978ffadbc3a3728adc60c35cc743d5b024 100644
+index 018d94c3540bf6241d57fe915b5037978601dc2d..28e293dd683b052782bb05d4523e908a6f4aa990 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -511,7 +511,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -521,7 +521,7 @@ public class EnderMan extends Monster implements NeutralMob {
          @Override
          public boolean canUse() {
              if (!enderman.level.purpurConfig.endermanAllowGriefing) return false; // Purpur
@@ -191,7 +191,7 @@ index 086d98da914ca958f91ce1a1d7aea7af9e0e5a03..48fc2c978ffadbc3a3728adc60c35cc7
          }
  
          @Override
-@@ -559,7 +559,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -569,7 +569,7 @@ public class EnderMan extends Monster implements NeutralMob {
          @Override
          public boolean canUse() {
              if (!enderman.level.purpurConfig.endermanAllowGriefing) return false; // Purpur
@@ -290,7 +290,7 @@ index e69213b43c8aa5a7c04add7a87482d531fbf52d2..f51ea103238b4a50439f5162a248cd9a
              // 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 97609bedb82dee6a200ff8b825622c427d7dcf73..39422e7fb1e04c007ec136ea709af22a558ff066 100644
+index 73d18318afff5eac5966ddaeadf014524d06ec66..90f6a355e345f409ad7702ddc2b6c81ef4e7b933 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -320,6 +320,6 @@ public abstract class Projectile extends Entity {

patches/server/0192-Flying-Fall-Damage-API.patch

@@ -26,10 +26,10 @@ index 99e75679acfe2c9d8583590008c14aad8d73d203..001317b9c196390dac8fe16d2aadf7e1
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 20b42ea8b055ad37417ca73dbd616e1ace761c45..95bdd555f13f4d75b93d77cd11080e7b9f9ef028 100644
+index 2cf93ddb6a061fb4361f72a2df629d90f1bf27d1..ef501f2af9056ccecb861f4c916dedc08c1faafb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2765,5 +2765,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2754,5 +2754,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }

patches/server/0227-Extended-OfflinePlayer-API.patch

@@ -223,10 +223,10 @@ index 1f2bc88d4570c6ef00e67a772b745e0b0c98e051..f505e871a9836503377f168c31c1f09f
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6c6b60119aa89637c822746b77e440f97a186b95..85daead2568eb2bc09843f7841652b7ea8dc161d 100644
+index ef501f2af9056ccecb861f4c916dedc08c1faafb..e8be878dd0893300b6834531e418705f2268c01d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2028,6 +2028,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2017,6 +2017,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }