Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2914457 Allow seting custom podium location for ender dragon (#7695)
PaperMC/Paper@11e0dcd Fix NBT pieces overriding a block entity during worldgen deadlock (#7692)
PaperMC/Paper@2f16393 Updated Upstream (CraftBukkit)
PaperMC/Paper@4322c05 Use patched spigot decompiler (#7706)
PaperMC/Paper@f8e8d6c Strip enderpearl owners when they are no longer ticked (#7559)
PaperMC/Paper@e42d683 Fix StructureGrowEvent species for RED_MUSHROOM
PaperMC/Paper@a9ee104 Prevent tile entity copies loading chunks
PaperMC/Paper@d4a712d [CI-SKIP] Remove unused import from last patch

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.18.2-R0.1-SNAPSHOT
 
-paperCommit = 62dcff3e8d82b5782b5c1a2daee0eb45f6b2c649
+paperCommit = d4a712d957804a01eae35f3a970c134f69938731
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e74c13e7aaa144fcd07036de70e80bebf0be698a..b3459253bddd74ecda2b534d4bd6877b079a467f 100644
+index fd8675f74ea787906b83d863940959efbf8bfac9..773ed225c8611718a74648382eb2fbd6e72c32e2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -252,6 +252,7 @@ public class ServerPlayer extends Player {
@@ -17,10 +17,10 @@ index e74c13e7aaa144fcd07036de70e80bebf0be698a..b3459253bddd74ecda2b534d4bd6877b
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5bc9c51cdfd1f9d1f15d0717575899e2f038c95c..a4ea4ff317b71ed2e64a6036cbdb7291d248d982 100644
+index 0ccd1a4f90a39006de65c88416bd8c46ba7bb971..abf42afaa8ba3585d746e33220ca525b8858e4a6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3173,6 +3173,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3183,6 +3183,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
  
      private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
@@ -28,7 +28,7 @@ index 5bc9c51cdfd1f9d1f15d0717575899e2f038c95c..a4ea4ff317b71ed2e64a6036cbdb7291
  
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
-@@ -3197,6 +3198,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3207,6 +3208,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
                  this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
              }

patches/server/0006-Ridables.patch

@@ -34,7 +34,7 @@ index a6f29c00d6716b501d0f52db8670d81e1304b7c0..1b3784eaac409c86806b6deeffcb0848
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1b6d32d8720f66908b9f1b872115fcff081f5378..81bde8cd6c4a883bb10b2de5fb27634bba5cef6f 100644
+index c63ee396e990d11e2f613f3b5a478b486076ed56..ce247a8412d8adcac995d71c4a42bd9372da947e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -212,6 +212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -66,7 +66,7 @@ index ea7bbe0463858ebdf438f2aae40657f6682b7b06..3abb10c70b09c63462f0090a6b576ba2
  
      public void doTick() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a28f0f2c405a17bf57904a1a69f21f5c8243bbab..0944a2d84c6b7c2c85405823cbeb8deb25bd1459 100644
+index abf42afaa8ba3585d746e33220ca525b8858e4a6..009f4258731cb8053ddf1f8080db7401ac211589 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2475,6 +2475,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2566,18 +2566,18 @@ index 305a891e4b51d1031d9e9238ff00e2ea7de8d954..84625d09df800fcfd477fc493fb5f824
      protected void defineSynchedData() {
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 1eb76c456790b81b657090377dd5ea547898f9a5..24fb7e822ed91581f09e85ac92ad58088bd8980b 100644
+index 8c4db2f0e5158872879da52a96bc592145e52e13..114e5296645a06e222c5ed977e984f9611c27789 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -100,6 +100,7 @@ public class EnderDragon extends Mob implements Enemy {
-     private final int[] nodeAdjacency = new int[24];
-     private final BinaryHeap openSet = new BinaryHeap();
-     private Explosion explosionSource = new Explosion(null, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY); // CraftBukkit - reusable source for CraftTNTPrimed.getSource()
+@@ -104,6 +104,7 @@ public class EnderDragon extends Mob implements Enemy {
+     @Nullable
+     private BlockPos podium;
+     // Paper end
 +    private boolean hadRider; // Purpur
  
      public EnderDragon(EntityType<? extends EnderDragon> entitytypes, Level world) {
          super(EntityType.ENDER_DRAGON, world);
-@@ -114,8 +115,50 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -118,8 +119,50 @@ public class EnderDragon extends Mob implements Enemy {
          }
  
          this.phaseManager = new EnderDragonPhaseManager(this);
@@ -2628,7 +2628,7 @@ index 1eb76c456790b81b657090377dd5ea547898f9a5..24fb7e822ed91581f09e85ac92ad5808
      public static AttributeSupplier.Builder createAttributes() {
          return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
      }
-@@ -164,6 +207,37 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -181,6 +224,37 @@ public class EnderDragon extends Mob implements Enemy {
  
      @Override
      public void aiStep() {
@@ -2666,7 +2666,7 @@ index 1eb76c456790b81b657090377dd5ea547898f9a5..24fb7e822ed91581f09e85ac92ad5808
          this.processFlappingMovement();
          if (this.level.isClientSide) {
              this.setHealth(this.getHealth());
-@@ -177,6 +251,8 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -194,6 +268,8 @@ public class EnderDragon extends Mob implements Enemy {
          float f;
  
          if (this.isDeadOrDying()) {
@@ -2675,7 +2675,7 @@ index 1eb76c456790b81b657090377dd5ea547898f9a5..24fb7e822ed91581f09e85ac92ad5808
              float f1 = (this.random.nextFloat() - 0.5F) * 8.0F;
  
              f = (this.random.nextFloat() - 0.5F) * 4.0F;
-@@ -189,9 +265,9 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -206,9 +282,9 @@ public class EnderDragon extends Mob implements Enemy {
  
              f = 0.2F / ((float) vec3d.horizontalDistance() * 10.0F + 1.0F);
              f *= (float) Math.pow(2.0D, vec3d.y);
@@ -2687,7 +2687,7 @@ index 1eb76c456790b81b657090377dd5ea547898f9a5..24fb7e822ed91581f09e85ac92ad5808
                  this.flapTime += f * 0.5F;
              } else {
                  this.flapTime += f;
-@@ -236,7 +312,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -253,7 +329,7 @@ public class EnderDragon extends Mob implements Enemy {
                      }
  
                      this.phaseManager.getCurrentPhase().doClientTick();
@@ -2696,7 +2696,7 @@ index 1eb76c456790b81b657090377dd5ea547898f9a5..24fb7e822ed91581f09e85ac92ad5808
                      DragonPhaseInstance idragoncontroller = this.phaseManager.getCurrentPhase();
  
                      idragoncontroller.doServerTick();
-@@ -305,7 +381,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -322,7 +398,7 @@ public class EnderDragon extends Mob implements Enemy {
                  this.tickPart(this.body, (double) (f11 * 0.5F), 0.0D, (double) (-f12 * 0.5F));
                  this.tickPart(this.wing1, (double) (f12 * 4.5F), 2.0D, (double) (f11 * 4.5F));
                  this.tickPart(this.wing2, (double) (f12 * -4.5F), 2.0D, (double) (f11 * -4.5F));
@@ -2705,7 +2705,7 @@ index 1eb76c456790b81b657090377dd5ea547898f9a5..24fb7e822ed91581f09e85ac92ad5808
                      this.knockBack(this.level.getEntities((Entity) this, this.wing1.getBoundingBox().inflate(4.0D, 2.0D, 4.0D).move(0.0D, -2.0D, 0.0D), EntitySelector.NO_CREATIVE_OR_SPECTATOR));
                      this.knockBack(this.level.getEntities((Entity) this, this.wing2.getBoundingBox().inflate(4.0D, 2.0D, 4.0D).move(0.0D, -2.0D, 0.0D), EntitySelector.NO_CREATIVE_OR_SPECTATOR));
                      this.hurt(this.level.getEntities((Entity) this, this.head.getBoundingBox().inflate(1.0D), EntitySelector.NO_CREATIVE_OR_SPECTATOR));
-@@ -349,7 +425,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -366,7 +442,7 @@ public class EnderDragon extends Mob implements Enemy {
                  }
  
                  if (!this.level.isClientSide) {

patches/server/0007-Configurable-entity-base-attributes.patch

@@ -719,10 +719,10 @@ index 77d05979331af91a1fbe619d1c26fa883146add8..48b72eb4051d612648a1978b38299c0c
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 24fb7e822ed91581f09e85ac92ad58088bd8980b..8508c1ce86d9a16cdafaf93817789a78c7787d06 100644
+index 114e5296645a06e222c5ed977e984f9611c27789..63ba8083c4f4a7ead9fec21eb96584f192c5cade 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -157,6 +157,11 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -161,6 +161,11 @@ public class EnderDragon extends Mob implements Enemy {
      public double getMaxY() {
          return level.purpurConfig.enderDragonMaxY;
      }

patches/server/0021-Alternative-Keepalive-Handling.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cd2b66289bd3bfa62460923ce00883209451903d..97de6385d09e561f24fd4b80aa53c61829aa4d59 100644
+index f964dae53ee34a6bfc138211d1c279b7eebd9f0b..7690dd20ae88739a84d6525529ff1aefc04c674e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -227,6 +227,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -38,7 +38,7 @@ index cd2b66289bd3bfa62460923ce00883209451903d..97de6385d09e561f24fd4b80aa53c618
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3165,6 +3181,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3175,6 +3191,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {

patches/server/0042-Ender-dragon-always-drop-full-exp.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Ender dragon always drop full exp
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 8508c1ce86d9a16cdafaf93817789a78c7787d06..2c1381a2f0ba6d17f3d4a7c16e03fca263428cfb 100644
+index 63ba8083c4f4a7ead9fec21eb96584f192c5cade..1a454c782391ff906c58cdb71c4345bb15943649 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -711,7 +711,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -728,7 +728,7 @@ public class EnderDragon extends Mob implements Enemy {
          boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT);
          short short0 = 500;
  

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

@@ -79,7 +79,7 @@ index 5a062a19bb2fc427c9391bb4731f071719b72c52..001d252763a689351a4df2ef830b3abb
 +    // 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 a4c82bf1d8789adf255fd0fae09d90228cf81ef0..1a18c112674691a2e12eccdf5462d1d161e9eba1 100644
+index 3789a0db398766f0fbc9e5ac5bf4228a0a0dac88..475ff3c62796306694c76ca5315cd27d2cbe8fbe 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 @@ -661,4 +661,11 @@ public class FishingHook extends Projectile {
@@ -225,10 +225,10 @@ index 77941e3981e49cf5662b3e3c86a9c419080b17c8..8c6243aab556c993b43ab52e216bcb0a
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-index 834ba402decb556a5f77809b37fa00578b67432e..0686af29d4835b35dd6f9e6780437a7fd48bbd3f 100644
+index 23f77dfc6df93ef6a70e14a7e410263d39fae2cb..22d5f5aac2f4c7ce8f490d4851ef3d637a9c7d06 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -131,4 +131,11 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+@@ -121,4 +121,11 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
  
          return super.changeDimension(destination);
      }

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

@@ -118,7 +118,7 @@ index 8d44949c54f9cba0848b4f7b82c573325c134d9d..3e1f6392853f7770a3a3427444ecc9c5
                  }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 844de0207892b01259feb75d1b98397509e6d399..d87b5f8478bca172c233b84f4f4ac0b3b9a87692 100644
+index bb71b370856d4ec050e04be3ad6527cca5e6e521..cdd171238cf01ca08eccc99d07f99f8c4b97d5c0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -133,7 +133,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -131,10 +131,10 @@ index 844de0207892b01259feb75d1b98397509e6d399..d87b5f8478bca172c233b84f4f4ac0b3
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 2c1381a2f0ba6d17f3d4a7c16e03fca263428cfb..b22f3839107e80d4c802475d7d56d52c267046c6 100644
+index 1a454c782391ff906c58cdb71c4345bb15943649..716293b68ac1e9c8bd94780cbc3bdd361f445198 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -562,7 +562,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -579,7 +579,7 @@ public class EnderDragon extends Mob implements Enemy {
                      BlockState iblockdata = this.level.getBlockState(blockposition);
  
                      if (!iblockdata.isAir() && iblockdata.getMaterial() != Material.FIRE) {

patches/server/0138-Toggle-for-water-sensitive-mob-damage.patch

@@ -37,7 +37,7 @@ index 70b8698ef3863c957ac4639f113f235705da4667..d4dde82e28200df974b5a084f2d3d778
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index c77c9cb3445a9ec807db6f74331e6ee620dd3ff5..ff9ec34962cdcd018a56bd39310b345d0adaf5cd 100644
+index 3b272c0e3710885fa0a4ef9b39bfa8874a972e0d..1490c6d10824d556972a77aaa23eac3a8628dcaa 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -175,7 +175,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -62,7 +62,7 @@ index c77c9cb3445a9ec807db6f74331e6ee620dd3ff5..ff9ec34962cdcd018a56bd39310b345d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index b4e482a28b1c7f1f46f31faa6466fb54a7991835..44ce32655ce8dcf14b3c2c4d8772ad38b00d0be0 100644
+index 8091e7afb8cbf2285842f1d9ffa3c8d06bffacbe..803007e93efe4e36ef4e5843721e222df38da5b7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -157,6 +157,11 @@ public class Cat extends TamableAnimal {
@@ -126,7 +126,7 @@ index b063a74327e51b3cd27427426b92ef687c59c94b..00eec3f51e62858e7b85b3340e76bf66
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 4970823d6bed593a646b3b074fcaf53fd4afadb2..3cc3539f0664eeb048290f4d9b229a5d674fff3c 100644
+index 68f470d38cd0974a9c6cfc8fe252ca4469e54377..21789c981e3fd49a1029bd41a2de61c97f03474f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -162,6 +162,11 @@ public class Dolphin extends WaterAnimal {
@@ -334,7 +334,7 @@ index 86f398fc79dcc5dd24a61483d292e228dd6ab83b..4fa8e4a298a98b2a41ef7572d21ed50a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index d87b5f8478bca172c233b84f4f4ac0b3b9a87692..734b1314f148e0f92559be1dc1970613b313975f 100644
+index cdd171238cf01ca08eccc99d07f99f8c4b97d5c0..16ecfd25dc2b2e450410cff17e75354fec7dc4bc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -116,7 +116,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -395,7 +395,7 @@ index e3bf2c2bc16bc03c17d90f2ce1620c6b895e9bf7..3c38345b32d106a169d1e6abcae54f28
  
      public void setHomePos(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index b9567d4d6c03124d4eaa3194c97a170277c64bbe..8ca97562ef182a461b4dccdd2eb68dc919fc3634 100644
+index 5e8294b0eb7b06264d16ce6d8112aa30dc2bd09d..8a1fdb8e358be2730304b68813cd5fb2997dda6d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -207,6 +207,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -555,10 +555,10 @@ index b6d9ba8dd5694952ca2eba54726ac5e587175250..88da7a365c28e2d097d0a7bff30ea1ac
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index b22f3839107e80d4c802475d7d56d52c267046c6..e288eb271a40c7da9971c59131188eedd70d67c5 100644
+index 716293b68ac1e9c8bd94780cbc3bdd361f445198..d0cae88c3ccf5f9282f2e71525286f6625260374 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -162,6 +162,11 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -166,6 +166,11 @@ public class EnderDragon extends Mob implements Enemy {
      public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.enderDragonMaxHealth);
      }
@@ -625,7 +625,7 @@ index b9ee6fdaad09c92fdeea2e5be606818278a77c21..5347ba12f2a07601c9f044081e5e6ce6
  
      @Override
 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 a042155bd2075d861343760a5c61ab53795d29af..d3696a9182613d17188c5c01a554b26522a6e7e8 100644
+index f4aeaeef7d781a655e765993fb38a9d920c47109..614baf25654c770a6cdac02f8cd4301a3ccdfb23 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -151,6 +151,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -673,7 +673,7 @@ index 25fab7497a80a8fa65bd9cd9bdb0cd498f240bd1..2800594fea055d75268531d8ad3fef99
  
      public static AttributeSupplier.Builder createAttributes() {
 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 48fc2c978ffadbc3a3728adc60c35cc743d5b024..2c637e8e93c553d51b2467de64b9d0b9bf9b8381 100644
+index 28e293dd683b052782bb05d4523e908a6f4aa990..c768a6cf25f7f5fa0fab4b1fe5d7d1aad27b7b49 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -84,7 +84,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -727,7 +727,7 @@ index 281e8e6232c30cf5c20e9e2de4ac2ab4d0722ccf..912c594c2a5df21663b26da81cc3d78b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-index b5b47050c192f61f14aba01671160f6d51361d10..a8a1ae1689f03d9fb78395e3786d1bd7f5fcd569 100644
+index d9886e6831b3034781aded2b3ab6ab5e06ba9a1c..a79a7b178e0bb3aed1522d4f837bdc76ed1a3b8f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 @@ -81,6 +81,11 @@ public class Ghast extends FlyingMob implements Enemy {
@@ -989,7 +989,7 @@ index bec84c1dba34d61de9199b1b46cad49d46ee9731..5ff3373c9c73691d7f21c05b0f044c19
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-index 1614109a5492d46c26552f2f5e3a510d82e31dc1..429c960ef287e71974be5567374e44a44be09c88 100644
+index ca645932aff82c260f875dd11f373c1a282ff369..e34acf855b2c93801cd98a8e7d983a4145314747 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
 @@ -105,6 +105,11 @@ public class Vex extends Monster {
@@ -1133,7 +1133,7 @@ index 35e758e7630cbba6ff80307261cf1f84b278829e..5ac9a41daee27b305a68a91b13a20a1a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 7c231904032021201126243fd52dc0296f7b8f89..a28fad8627e5b95afe2b1ddb320e99f0b57ff158 100644
+index f35e5c9e85583c8f599460c0ccd23a0f3bb88d6a..2fc82bccca7ff0bd63212bdb1ea1bf4dbe7c0ded 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -116,6 +116,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento

patches/server/0141-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configs for if Wither/Ender Dragon can ride vehicles
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index e288eb271a40c7da9971c59131188eedd70d67c5..f8366a7bef18ab6dc201420ac4054be0b27f9f88 100644
+index d0cae88c3ccf5f9282f2e71525286f6625260374..fe742452cab6afd0db76072e8f5acffcf1ecce95 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -1116,6 +1116,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -1133,6 +1133,7 @@ public class EnderDragon extends Mob implements Enemy {
  
      @Override
      protected boolean canRide(Entity entity) {

patches/server/0242-Signs-allow-color-codes.patch

@@ -17,10 +17,10 @@ index a5617b0f34e842302e86be3c46479855a2d6d5e1..a8e5d4dff9ecd250a1d8991be9e4ee88
          this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 74edfa3738468feacfc7e82b4893a1efc9f3198f..bf635517f03d16003f951e80f19253ce99d4097d 100644
+index 99b78000f2fbdf1b84f0d4d806cf80108ef9cac0..868149c95340d72bbbb266e6cac5e59a76c13f21 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3189,11 +3189,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3199,11 +3199,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  }
                  // Paper end
  

patches/server/0258-Allow-void-trading.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4f8ece9d208fd2f325bf6c2093d09786de39cc96..07031278c70f1c739d9a24d60ab6c16b2cb0a061 100644
+index 603d68d01a8357d510f0cae81b399668e83f75d3..8066c874098039f75017e6bebd7981fd4804bcda 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2587,7 +2587,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2593,7 +2593,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  // Paper start
@@ -18,7 +18,7 @@ index 4f8ece9d208fd2f325bf6c2093d09786de39cc96..07031278c70f1c739d9a24d60ab6c16b
                  }
                  // Paper end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0f03c0e7c9b22f0144730153eb70f82fe8df4a35..e9b1fccdde19d543dd02a08889dd37c6a8ebcb60 100644
+index 87d0af46eaf49f88f56e50ea52fcbb8ac93f11a9..0193ed7024b0283366aa7597006a8188673fbc69 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -414,6 +414,7 @@ public class PurpurWorldConfig {