250 patches done

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

@@ -243,10 +243,10 @@ index 94ca0407303c4493ab4928b12ec6ecc75aaca549..a138e1b6b66d99f2035de054137a607a
 +    // 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 6abf043faf27d1385ad45c264822a9f49974863d..7be5b26b3d9e4d38838ecca8f65f8671c3c17ed2 100644
+index 75986a13b87c2024c96742fbbab960026b256837..3c76dd383ec0ba19eea19d12902833dc410f96c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2775,6 +2775,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2760,6 +2760,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  

patches/server/0203-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 139bc93411fb8bafedf283c92161bc5905e7e982..4c076428c85e66fae9bf658cc816c2f9ef6b47c4 100644
+index 04b2d2d917465898f919650d2346608390664bd2..9ceaf051ebc9d58b584b93832cc21ad43ac1a558 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1295,6 +1295,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1296,6 +1296,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      @VisibleForTesting
      public void resetWeatherCycle() {
          // CraftBukkit start
@@ -16,7 +16,7 @@ index 139bc93411fb8bafedf283c92161bc5905e7e982..4c076428c85e66fae9bf658cc816c2f9
          this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
          // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
          // Not that everyone ever manages to get the whole server to sleep at the same time....
-@@ -1302,6 +1303,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1303,6 +1304,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              this.serverLevelData.setRainTime(0);
          }
          // CraftBukkit end

patches/server/0204-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch

@@ -30,10 +30,10 @@ index affbbf6abc6bc09ecb652c1dee92aa297458bc39..febc05dc39741807127cba4a2a55aaad
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java
-index 66a07f7cbf1c1d6ecbe055cbf4f63eb07d93e90c..63d67d46d30ed8ed57cdc0e59b6cb6b75ab22c1f 100644
+index 9bafac9b2c7b487f745fb64354f4bbc6a7ded468..1c34691da51d7f7ba3d54e095a3b58b74a5f2263 100644
 --- a/src/main/java/net/minecraft/world/level/block/Blocks.java
 +++ b/src/main/java/net/minecraft/world/level/block/Blocks.java
-@@ -6465,6 +6465,7 @@ public class Blocks {
+@@ -6454,6 +6454,7 @@ public class Blocks {
          BlockBehaviour.Properties.of()
              .mapColor(MapColor.PLANT)
              .forceSolidOff()
@@ -41,7 +41,7 @@ index 66a07f7cbf1c1d6ecbe055cbf4f63eb07d93e90c..63d67d46d30ed8ed57cdc0e59b6cb6b7
              .instabreak()
              .sound(SoundType.AZALEA)
              .noOcclusion()
-@@ -6476,6 +6477,7 @@ public class Blocks {
+@@ -6465,6 +6466,7 @@ public class Blocks {
          BlockBehaviour.Properties.of()
              .mapColor(MapColor.PLANT)
              .forceSolidOff()

patches/server/0205-Shift-right-click-to-use-exp-for-mending.patch

@@ -36,17 +36,17 @@ index 7315e604a2f9cb068eb5bbca744e44eeabac09c9..88eb3774f688bcff383efa7f113bd0b1
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index abec164f413342bf1d2d25479ea8a42fce6a66c7..1e1b42f60679c8b8b27b3255feda4c6cf77d5536 100644
+index f993d33caa44a2d782780c8829a7785ed74b3dcc..3c98be45587f3f6ca6cdc53834ef7dae4962f58d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2094,6 +2094,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2152,6 +2152,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
-             boolean cancelled;
+                 boolean cancelled;
-             if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {
+                 if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {
 +                if (this.player.gameMode.shiftClickMended(itemstack)) return; // Purpur
-                 org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemstack, enumhand);
+                     org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemstack, enumhand);
-                 cancelled = event.useItemInHand() == Event.Result.DENY;
+                     cancelled = event.useItemInHand() == Event.Result.DENY;
-             } else {
+                 } else {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 index ea1314eb2ac0f8c1dd681b85951bcdd2cead1bf6..e351feee5916492edebb92f9af47c87e582b239d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

patches/server/0208-Option-for-beds-to-explode-on-villager-sleep.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Option for beds to explode on villager sleep
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index fd319cf5ac1a3aa8f3562bbab4bf2a8e15b10ae2..b2ea56e3e2a0b7534bd9e16106402c6581057e43 100644
+index 5a522d73d41f9aa3977807173d7e34c057a37c7a..373d00fce9e8bcb8d9a8d3e8a05987cf243d175a 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -1080,6 +1080,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

patches/server/0209-Halloween-options-and-optimizations.patch

@@ -26,10 +26,10 @@ index 29445156f8660d84bb9840c6ac85e0e2188f443d..7b773edc6fa661e75964a80dcb6820d1
          if (net.minecraft.server.MinecraftServer.currentTick - lastSpookyCheck > ONE_HOUR) {
          LocalDate localdate = LocalDate.now();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index bbe4c1cb4244ab813ef7d56c46c3ae62701c4824..2cadbc0d56908ca978e1735eff07f5e634548606 100644
+index d41ed97feabd5b37f1ffae2a7b12c10895404591..f90f3e3ad7c941e3222a8119d9b01d571eef4c1b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -138,11 +138,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -140,11 +140,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          this.reassessWeaponGoal();
          this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.skeletons || randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier()); // Paper - Add world settings for mobs picking up loot
          if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {

patches/server/0211-UPnP-Port-Forwarding.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f03d6ddaeda45fee69f19d765fbf1e23333b8de3..6111c300ea25e73cc8f840dfff94998d3b87dcf3 100644
+index 36fb238819e529fdecd8dd904c074d7a3a937db2..757cedd57b89a452832f2c9d9e5ed9fb495ca933 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -330,6 +330,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index f03d6ddaeda45fee69f19d765fbf1e23333b8de3..6111c300ea25e73cc8f840dfff94998d
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -1057,6 +1058,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1058,6 +1059,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing

patches/server/0212-Campfire-option-for-lit-when-placed.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Campfire option for lit when placed
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CampfireBlock.java b/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
-index 18d4020017d76303d3179fad8974574777ea6305..2ee2b1485f848ac5270bc3f7e1e5b1bc3029b0bb 100644
+index 1b94f26e78db062f80d806b82f714a815b4710ff..299d782c4e84d8548f2faddfb03712bab388de09 100644
 --- a/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
 @@ -140,7 +140,7 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB

patches/server/0213-options-to-extinguish-fire-blocks-with-snowballs.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] options to extinguish fire blocks with snowballs
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-index 8c853b6fbbc966ee6ba9ad3770d4e2e2a50ef388..0db58e7d63a5c1b43a2224c247979f23a1d3f899 100644
+index f712963fcd80535eee2bd04ec55ae1abdadef2bd..6fdacf2f6934521a0dd4b25aea35a6a14123da0a 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
 @@ -63,6 +63,36 @@ public class Snowball extends ThrowableItemProjectile {

patches/server/0214-Add-option-to-disable-zombie-villagers-cure.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable zombie villagers cure
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 623e8ef53d6336b3e3c83fd37eda13244a3b4ab6..3759f28c7f516a94ca8fe1b8f82230b9e8cfb9cb 100644
+index 811c5c4bc98401bc9314894eb5cb64bf31b03f63..624b19d415dab0c864b96edf4a7063470739a221 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -224,7 +224,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {

patches/server/0215-Persistent-BlockEntity-Lore-and-DisplayName.patch

@@ -7,7 +7,7 @@ Makes it so that when a BlockEntity is placed in the world and then broken,
 the dropped ItemStack retains any original custom display name/lore.
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index 33d9b5fb6897fefb0f7b9009df7339341cb42317..d58619d1d63a03598b8740dd789d4b6f2c93f8d0 100644
+index f8928d5ac2f107a904ecc636e6bdeee7edd8da45..3d7a09c81b10f7a34d55670b7f2cc50b80550380 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
 @@ -151,7 +151,16 @@ public class BlockItem extends Item {
@@ -29,7 +29,7 @@ index 33d9b5fb6897fefb0f7b9009df7339341cb42317..d58619d1d63a03598b8740dd789d4b6f
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index c35513d05bd70e296a0e5ffe92c36016a13173b4..d324eefa500c528776df698e7f9dcdeab76da167 100644
+index 17a157e2dcd977c9f7d886f8867056e88962c32e..b0fbadd0d6ec3e34e36c9f33ed89a3c315dc4289 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -303,7 +303,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -85,10 +85,10 @@ index c35513d05bd70e296a0e5ffe92c36016a13173b4..d324eefa500c528776df698e7f9dcdea
          double d0 = (double) EntityType.ITEM.getHeight() / 2.0D;
          double d1 = (double) pos.getX() + 0.5D + Mth.nextDouble(world.random, -0.25D, 0.25D);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 1f929b467a0ece3143af58a657cf5983c07a8d51..eaa6ece956f90632831f0558924eaf18680a252b 100644
+index 1f664c10138a6e19bdc0051fa80575516d5602e7..5c5cc77ff2e050e80dc9f6f62ede68d177a0015f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -95,6 +95,12 @@ public abstract class BlockEntity {
+@@ -94,6 +94,12 @@ public abstract class BlockEntity {
          if (persistentDataTag instanceof CompoundTag) {
              this.persistentDataContainer.putAll((CompoundTag) persistentDataTag);
          }
@@ -101,7 +101,7 @@ index 1f929b467a0ece3143af58a657cf5983c07a8d51..eaa6ece956f90632831f0558924eaf18
      }
      // CraftBukkit end
  
-@@ -111,6 +117,15 @@ public abstract class BlockEntity {
+@@ -110,6 +116,15 @@ public abstract class BlockEntity {
          this.loadAdditional(nbt, registries);
      }
  
@@ -117,7 +117,7 @@ index 1f929b467a0ece3143af58a657cf5983c07a8d51..eaa6ece956f90632831f0558924eaf18
      protected void saveAdditional(CompoundTag nbt, HolderLookup.Provider registries) {}
  
      public final CompoundTag saveWithFullMetadata(HolderLookup.Provider registries) {
-@@ -419,4 +434,16 @@ public abstract class BlockEntity {
+@@ -406,4 +421,16 @@ public abstract class BlockEntity {
  
          <T> T getOrDefault(DataComponentType<? extends T> type, T fallback);
      }

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 883317c9957c13049ff2c01ceb154fba1afe278b..323d474582cf796ae9d40f9d00f277496d3f2c0a 100644
+index ed1d75fdee29ac92d71f219af79eb7fc5ae99099..7e785394de3db56e5d0fd8bea5edf5df9fa129fa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1976,6 +1976,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -1959,6 +1959,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
  
      @Override
      public void openTextEdit(SignBlockEntity sign, boolean front) {
@@ -17,7 +17,7 @@ index 883317c9957c13049ff2c01ceb154fba1afe278b..323d474582cf796ae9d40f9d00f27749
          this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos(), front));
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 8ac19e1e052e73ff3fd09089bb8e3fd687390ee4..6da1eec98c08e4909ecbd48fe90b3fd62011e284 100644
+index 7a1d9a718dc57b5f630ca8e5358120cebaeefb9c..b51b0b0f48b1da6187387d6ec025681e10ed584d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -201,16 +201,31 @@ public class SignBlockEntity extends BlockEntity {

patches/server/0217-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Kelp, cave, weeping, and twisting vines configurable max
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
-index c4473c2a778116d48bc3e4796afd901f455070e6..e62217c0bfa6cc426c7d41154f3ccc34d8f242ca 100644
+index 81e572783157926383dd9baa58d30f5419c1616f..84d6ae4acf80f6ff4f418739a0228e740993f950 100644
 --- a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
 @@ -94,4 +94,11 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements CaveVines {

patches/server/0218-Mobs-always-drop-experience.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Mobs always drop experience
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index a83187312422b0e087785d89f4a49b4c67427b95..3283228d7ebf98ce98780725a0a412bea4200da5 100644
+index 52223ecfbc8a66ea3f79c60ef299d2d0e1808ac2..7f75b5485ca047829415cc1ffb0ec28614633707 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -53,6 +53,11 @@ public class GlowSquid extends Squid {
@@ -37,10 +37,10 @@ index 7b773edc6fa661e75964a80dcb6820d1b5def54d..c8ffbbccbf20ce911a3d75fa860d5a14
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
 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 8caee835f524d23d061ff73d9fb609482ed57505..db382cf32d215f1b98b960e0c1a8dfaf6e19422f 100644
+index ea5559e6f536ab823f987ce57fc01d6dab26314d..8e2b71d7fe766261cfa539e9f18fede83958408f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -501,6 +501,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -505,6 +505,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          return this.level().purpurConfig.beeTakeDamageFromWater;
      }
  
@@ -53,7 +53,7 @@ index 8caee835f524d23d061ff73d9fb609482ed57505..db382cf32d215f1b98b960e0c1a8dfaf
      public int getRemainingPersistentAngerTime() {
          return (Integer) this.entityData.get(Bee.DATA_REMAINING_ANGER_TIME);
 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 8f0a31c896340907aa8017c0a56fb58db48c2c65..4aad4fdc80070f4000e929fff126714fc67050b0 100644
+index 4d9b177dd640e1b569cfd5575ad795d5962ae7b8..a418ded306908ee9cb9e375104354a6e031305c9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -139,6 +139,11 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
@@ -133,7 +133,7 @@ index fad0b8157a9c30a0e9b35fe32b6a9f2e8a6dd43e..c1842894f96a567707992d8ff938dbf6
      @Override
      public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData entityData) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 85cb838e8b31880468b02671dd4d04a5e1909e69..ac044be03494c3d6bad6bbc22321445e04d430cc 100644
+index 6e70eb26c338c3b9293c217677b57d954f5b09ee..80b93d50650886a874a8b0b8a27e15b4d4e727f0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -198,6 +198,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
@@ -165,10 +165,10 @@ index c6e638cf4463db972a99054cb11b07991ca9eb2e..9a6471d2f1eb1c8af006b70b6bba0b66
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 9d85342439977d3ac72ef133733df4f57a68714a..6cbe80e13a590817d3ecf27d89202f10e2cd83dc 100644
+index 951f94da000587def4832a5fae68c1f5a6c9e2ea..4d05c34dcebc7582fd400066809b4997b2e8a86a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -97,6 +97,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+@@ -96,6 +96,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          return this.level().purpurConfig.mooshroomTakeDamageFromWater;
      }
  
@@ -213,10 +213,10 @@ index 95d70b140aaeddc771d05420347e5ce0cf0f5ad2..83372c86bd54eedd9b136ddfcbfc67d3
      protected boolean canDispenserEquipIntoSlot(EquipmentSlot slot) {
          return slot == EquipmentSlot.MAINHAND && this.canPickUpLoot();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index 00759f484cab0d7c8d4e8914dd9f27061c8b7d45..28a9d267099f6c24f71dc5a11179d59c27265a88 100644
+index 4a6137b3984a6a7c4bc0472ada4b61f948840b59..f14fe1c299e6ef5cf55bde617ff9fe6aca08702f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -204,6 +204,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -203,6 +203,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
          return this.level().purpurConfig.parrotTakeDamageFromWater;
      }
  
@@ -277,7 +277,7 @@ index be78d703bab323f0e64e120172c220d3b8684690..c5a39ea2ad0e5e5ac434d79c1a57e006
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 8e316da789cb7a8d4c630c71724a56d6159cf0ac..b3a0146ccfcda9fa33b91d33458086b510bb4d7b 100644
+index 16e9f6f2f66090d39f89188b74d3eceaa23f450b..a1e3331d73cc971b58efe9e0cb565ac9711e2ef1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -155,6 +155,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
@@ -293,10 +293,10 @@ index 8e316da789cb7a8d4c630c71724a56d6159cf0ac..b3a0146ccfcda9fa33b91d33458086b5
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Salmon.java b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
-index 486709c9701657c7aa93586f539c18e4157f8ef3..1a0c71ed6f3bd3d961f9b30ab29a62d683195355 100644
+index cd995f8ce3bfd76fa0f4ea3fda71101b09d64ce2..3716201b0889dfb0bacd0e223a29e80ee1f84e8e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
-@@ -54,6 +54,11 @@ public class Salmon extends AbstractSchoolingFish implements VariantHolder<Salmo
+@@ -57,6 +57,11 @@ public class Salmon extends AbstractSchoolingFish implements VariantHolder<Salmo
          return this.level().purpurConfig.salmonTakeDamageFromWater;
      }
  
@@ -309,10 +309,10 @@ index 486709c9701657c7aa93586f539c18e4157f8ef3..1a0c71ed6f3bd3d961f9b30ab29a62d6
      public int getMaxSchoolSize() {
          return 5;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 3f54b38a3182b116b80ef9ba53c160b343da855a..38f651ab5f8e25e6d653a86dcb9875990651542a 100644
+index 731df554fe64846869f18014e263e5dedc1dd18e..8ce4edbd7df3199133d9843780d028e8a8f020e2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -124,6 +124,11 @@ public class Sheep extends Animal implements Shearable {
+@@ -117,6 +117,11 @@ public class Sheep extends Animal implements Shearable {
          return this.level().purpurConfig.sheepTakeDamageFromWater;
      }
  
@@ -341,7 +341,7 @@ index f445a96eb3991410103225d1b9289261399182ff..13eecc676e33623e776d32495969f111
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 3cf9a511ae819ec92aac402c01c37c9015939d19..7cfd9e4e29b8f3cf277679f785bae3cb12d2bd20 100644
+index 34647054fe2fce16bc9b31d8af374079fd932c5c..da04ee901ad77637ee2c28a9a96f481affcce808 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -98,6 +98,11 @@ public class Squid extends AgeableWaterCreature {
@@ -389,7 +389,7 @@ index 96a6f13fe6ea02412974fd4c8cf015467ef8e02c..c9e307452a097329c26893673055cfb7
          this.entityData.set(Turtle.HOME_POS, 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 5fea6f7e9b7c5d2b4845effdd1b9d40b5b8033b3..420345f130a40c4f59a021a4bdce3e218dc87cde 100644
+index cbc28ca0d359f64bf583e9a1134bc18363e516ec..53c4a71d6611a7fab0920157d441e1c3cef69d07 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -223,6 +223,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
@@ -517,7 +517,7 @@ index 516cf0042eff8b7c74449cd4dbd8f42fb6a1e2d9..9307c07b8f75caacbde6839893f54700
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-index d1012e118cd07e374a483f07adf46e354b1b5723..1d765ad53a9d8dd388106bc0cb02f4919a1f8173 100644
+index 84e0e3c309d45a1e2490884b2e102bff6175988e..cb881211f948b21ea03364373376e894cd6ed5cc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
 @@ -80,6 +80,11 @@ public class TraderLlama extends Llama {
@@ -549,7 +549,7 @@ index 5ffb2ca8dd4cd1d32f7d239a767ac68d01ab3d3a..2b7b0d766ceba4b2261be2d8308170ae
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index a1be1d02bfd8155752e5ea66aa2aaa29361a213a..5e134b3cf939fe396c060797883613812ad73c31 100644
+index 6a85049919f0cdc7051d1789a951d9e36162dfb9..a671d18a354421f197e5248a16bfe9a12c5befe4 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -135,6 +135,11 @@ public class WitherBoss extends Monster implements RangedAttackMob {
@@ -613,10 +613,10 @@ index d2de324f024d0a83790e2b86dc765b0115081461..38cbe2fce9c36195aa9bea2af26d1436
      protected SoundEvent getHurtSound(DamageSource source) {
          return SoundEvents.CREEPER_HURT;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index ec00c6b2a8b6a5e0ef030d65f86d4a7d72dbeb21..949207eda199c874f2f14074b5a4fff5462b86b9 100644
+index 44f6949166cdf78e2d197ab5a5affae6eb649ec7..a28a4cd9544ffa58bd03ac901a761c797044629a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -120,6 +120,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -123,6 +123,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
          return level().purpurConfig.drownedJockeyTryExistingChickens;
      }
  
@@ -645,10 +645,10 @@ index a0c76ffa16edffdfa75fd539e58282d3115f473b..a000304e3ac4c34b020f7457aa2589c8
          return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
      }
 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 5d2ac5334899935e032f7c882710914906ddc94d..476aaa0d9899eb56ea29b1fcf15565b58f78479d 100644
+index 2681153860b37d49eb8b12ae08198e56b9fd5cf6..881b85506cbff22febe0c1cd0d30822be5c2a517 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -118,6 +118,11 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -117,6 +117,11 @@ public class EnderMan extends Monster implements NeutralMob {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.endermanScale);
      }
  
@@ -677,7 +677,7 @@ index 806719a3673f3c333bfc720a7ccf07f7ba5cffc2..f8373fc9839fccb31e3dd090de70e2cd
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index 2a0561d0e0cfc6e732c2342e12a1af4dfa73befe..e231bb33b7e6a00d7c1a6c3540b4b48cfd4c15e3 100644
+index 2c9c4de193ae92e8e2639b33dd8db6fa37ab1ee1..9454a2eccc1f405f2013a18d56e65a1e6a4bb8f7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 @@ -81,6 +81,11 @@ public class Evoker extends SpellcasterIllager {
@@ -789,7 +789,7 @@ index 0dde6fb0fbf85d1b5afe0fe25941c0c05e821290..63caf20256a3deae98b9cd9f54650def
          return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index cc84fbab113f5633df274deb48de2484b05bb3ff..1aba4ebc1ea3d6782098f2c9aebfb38363e7ab95 100644
+index 58318fcd78022eae68637e83d29498591a0387ad..3104b76d98a2b3870535ea5e776fb8fb6e5d3680 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -143,6 +143,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -805,10 +805,10 @@ index cc84fbab113f5633df274deb48de2484b05bb3ff..1aba4ebc1ea3d6782098f2c9aebfb383
      public boolean isFlapping() {
          return (this.getUniqueFlapTickOffset() + this.tickCount) % Phantom.TICKS_PER_FLAP == 0;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-index b85579065ac006589120d4d7ed83d355a517b46d..85d5c84a8861905e4546901aa6707078571eb402 100644
+index d7e67efed76401afbafc19285984a1175fbf250d..588da64f4137a9f13f41875b3f5c47b485398782 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-@@ -92,6 +92,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
+@@ -95,6 +95,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
          return this.level().purpurConfig.pillagerTakeDamageFromWater;
      }
  
@@ -821,10 +821,10 @@ index b85579065ac006589120d4d7ed83d355a517b46d..85d5c84a8861905e4546901aa6707078
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 94f5b153627eca433905106a90e1bbdfb73e4e2d..1c8cb19a8b25593d16518006247bdf0e71e16ab1 100644
+index af91726d482156a7687355f0409eb18b3c6242a1..5688f6ff0c1d9d1fbca548dcff8d8dfa5b42b8fd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -111,6 +111,11 @@ public class Ravager extends Raider {
+@@ -109,6 +109,11 @@ public class Ravager extends Raider {
          return this.level().purpurConfig.ravagerTakeDamageFromWater;
      }
  
@@ -837,7 +837,7 @@ index 94f5b153627eca433905106a90e1bbdfb73e4e2d..1c8cb19a8b25593d16518006247bdf0e
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 131c7d7e85a3d9ac0e485fd8e56bd419a775289d..e3fefd52c83079fe3eab1a96dd81a183f718192b 100644
+index 837a251afd68b68c5f5f6ab940d62332cb80fe6f..b940cb26de3852e2127ccdd1f6c067123a909c25 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -139,6 +139,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -933,7 +933,7 @@ index e2d3aefdb245da136d10053be40a6121cd7889d2..bb6984d82e6c0a83f456e725b20e0f21
          EntityType<Stray> type, ServerLevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random
      ) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index 6c7b3b306b69c5b0526e48e4e636ed24d5c96820..c3b5b34a54de945071692293645b8a8865aed961 100644
+index cdb8d5c625e18a2a4cf6b5d2da923f63127b6e9c..779ae2e63202c1f189b1f5647218a07c21a84ccd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
 @@ -125,6 +125,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -997,10 +997,10 @@ index 151169d76276409d6a042945b05ae680d1f5fd1e..313228811d1eff478887511f99b49706
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-index 4c426f87fe2833382f48e353b27f381b48774fd9..23fc36780a3e15260f8cb1001c8d676464a9df3a 100644
+index 5f2e9d87c410551b9858c60fa2ca7ff66e23cb2f..80968050fa7680a8d9b379ef7a8db5e91a4b3a8f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-@@ -61,6 +61,11 @@ public class WitherSkeleton extends AbstractSkeleton {
+@@ -64,6 +64,11 @@ public class WitherSkeleton extends AbstractSkeleton {
          return this.level().purpurConfig.witherSkeletonTakeDamageFromWater;
      }
  
@@ -1045,7 +1045,7 @@ index 98e7b57a45ae3cae704c65ec6db5f715f9af99a4..85b03e0bf7436cb846df13c575ad78ac
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 3759f28c7f516a94ca8fe1b8f82230b9e8cfb9cb..6f6b32bf7f68d05e4173c31f2e631a409b858a05 100644
+index 624b19d415dab0c864b96edf4a7063470739a221..cd66ef1d99f3ce4533c2423fd12b2fcadf481a66 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -132,6 +132,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -1093,10 +1093,10 @@ index 1103274ba096b0cab3c89f0bdfeba15f8954a0de..6144613e834236ec0ebb12872ef9e472
      public boolean canBeLeashed() {
          return true;
 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 39cf09e03cd178471757e51334b07b4daffb43be..20608fb46a0af85739e3c0caa843c1a9d45c9659 100644
+index 570af47cd176dfa56c0920a8d41400aa1ade5fd0..a2d29cf854be6f0bc5b5bb99e7002e07ccc4cae9 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
-@@ -124,6 +124,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -127,6 +127,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
          return this.level().purpurConfig.piglinTakeDamageFromWater;
      }
  
@@ -1125,7 +1125,7 @@ index 9c196b0cf49cb6f69bd17748fd13ce5960094f88..bc3b0eb21200eae7e419b2571871b36f
          return Monster.createMonsterAttributes()
              .add(Attributes.MAX_HEALTH, 50.0)
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index b2ea56e3e2a0b7534bd9e16106402c6581057e43..32479bf58040ee980b20e99bb384bb84ef92624f 100644
+index 373d00fce9e8bcb8d9a8d3e8a05987cf243d175a..dfb1b887df63197eab5969dcc3eed2ff68d71911 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -198,6 +198,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

patches/server/0220-Ability-for-hoe-to-replant-crops-and-nether-warts.patch

@@ -34,7 +34,7 @@ index eb324fda54ada3ed7941713a784ed2d686ec8c4b..09cc76f3fee4a767c9ec3fa592f2c3c6
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-index 3f7440eb164ea7593844de6c496ee1a998759347..33c27909290ff3ab483226cf65b1a1bc2e983cbc 100644
+index c1707b502911d76d0c3a706e44bfdc3a12eb8f97..7f6f7a114e9930e7655c9695a5737739503999de 100644
 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
 @@ -216,4 +216,15 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
@@ -54,7 +54,7 @@ index 3f7440eb164ea7593844de6c496ee1a998759347..33c27909290ff3ab483226cf65b1a1bc
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java b/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
-index acbd60a2f162fe0e254e36d0e8e7face3fc8a7b3..da1c7999ca64199387054de46489d3ff4a299289 100644
+index 7bb4994d6474c8ea59c102009253552020691b8f..b571bca4375ca7caf9b75dbf84009cb0604b66ad 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
 @@ -68,4 +68,15 @@ public class NetherWartBlock extends BushBlock {

patches/server/0222-Mob-head-visibility-percent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Mob head visibility percent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c23ca02f9adbbbf32b0bf9f8a82f55781468aade..19cc0ba32472384bf10662d41fecf23ebfc9876c 100644
+index 0af3e463971697626f847cb96f8a431857c1261e..8c2c14769ae32c9a92bc043f9e753abf7e32e1c3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1082,9 +1082,20 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0224-Stop-bees-from-dying-after-stinging.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop bees from dying after stinging
 
 
 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 db382cf32d215f1b98b960e0c1a8dfaf6e19422f..4b32a783cabf05f5bae0dba22eea8ac7ba2cd285 100644
+index 8e2b71d7fe766261cfa539e9f18fede83958408f..5ca5f128e5614146e76935e6d674e0699c65dfdb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -461,6 +461,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -465,6 +465,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
              this.hurtServer(world, this.damageSources().drown(), 1.0F);
          }
  

patches/server/0225-Give-bee-counts-in-beehives-to-Purpur-clients.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Give bee counts in beehives to Purpur clients
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6111c300ea25e73cc8f840dfff94998d3b87dcf3..284b96cd1e9eaad4600c820a504c12d953961019 100644
+index 757cedd57b89a452832f2c9d9e5ed9fb495ca933..74d4bb12d70cbfd8365337c8fbcdbdfe6d70e970 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1170,6 +1170,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1171,6 +1171,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
          org.purpurmc.purpur.task.BossBarTask.stopAll(); // Purpur

patches/server/0227-Configurable-player-pickup-exp-delay.patch

@@ -9,10 +9,10 @@ players still only pick up one orb every tick. However, setting this
 to any negative number will pick up all orbs instantly.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 6db9a3ea4c0dc1f0629bc8bf6466aeab00c498f6..32a0db7e8f974712bd8a05f16f3bd48ac66142d5 100644
+index f1eb74a43881400f23f3750c909f999b35c2f5ce..ba4fe614e2a3378f17b544c78c92a271523e8d37 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -333,7 +333,7 @@ public class ExperienceOrb extends Entity {
+@@ -335,7 +335,7 @@ public class ExperienceOrb extends Entity {
      public void playerTouch(Player player) {
          if (player instanceof ServerPlayer entityplayer) {
              if (player.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(entityplayer.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper - PlayerPickupExperienceEvent
@@ -22,10 +22,10 @@ index 6db9a3ea4c0dc1f0629bc8bf6466aeab00c498f6..32a0db7e8f974712bd8a05f16f3bd48a
                  int i = this.repairPlayerItems(entityplayer, this.value);
  
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d7d5ce7ea223248ebda0a3e4b104baed47378ce1..c1d068fa99ec0fd5685bbb627a775e4d1587feab 100644
+index 2b3ec55bdc652bb432f9747d6215992fd3d710a5..d19b1e127a1018a798eed181d8060a781b589f90 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -662,7 +662,7 @@ public abstract class Player extends LivingEntity {
+@@ -665,7 +665,7 @@ public abstract class Player extends LivingEntity {
              while (iterator.hasNext()) {
                  Entity entity = (Entity) iterator.next();
  

patches/server/0228-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 d3b551fd9ce54492f9612937f0184cf36afbddba..6a359f1ed07aa7b9c78e470fb00661ea03eaec03 100644
+index 9ceaf051ebc9d58b584b93832cc21ad43ac1a558..48d6b3d45d73c8f235f51a9652f33c81b3472a12 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2844,7 +2844,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2850,7 +2850,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              // 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 - Fix merchant inventory not closing on entity removal

patches/server/0229-Configurable-phantom-size.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable phantom size
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 1aba4ebc1ea3d6782098f2c9aebfb38363e7ab95..cda6cb5b10b895bab48d2212f259ba4ca40e1ed6 100644
+index 3104b76d98a2b3870535ea5e776fb8fb6e5d3680..23ca324c5379f9735232a9f74071117da23c2290 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -261,7 +261,11 @@ public class Phantom extends FlyingMob implements Enemy {

patches/server/0230-Max-joins-per-second.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Max joins per second
 When this option is set to true the `max-joins-per-tick` setting in paper.yml will be used per second instead of per tick
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index e693a003ea8f022eef8b49e4332025b769333b30..44a31f6f44885598ee06e88b940b84b1e89e5430 100644
+index 3c866432c8a938c677a315612f3e159bda67a2a2..8661c1b1cfe2b3db000e1f08814fd4409c4b7fab 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -617,11 +617,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {

patches/server/0231-Configurable-minimum-demand-for-trades.patch

@@ -9,7 +9,7 @@ This patch adds a config option to allow the minimum demand to instead
 be configurable.
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 32479bf58040ee980b20e99bb384bb84ef92624f..5943b0c059b41ab84d7841a764ff2ace6e6ca89b 100644
+index dfb1b887df63197eab5969dcc3eed2ff68d71911..c5e67489ba4a60ead3490f8c9468833f913af1a0 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -547,7 +547,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

patches/server/0232-Lobotomize-stuck-villagers.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 5943b0c059b41ab84d7841a764ff2ace6e6ca89b..ca5504ba8a10a3ed384cb9f5a3c550466c2688f1 100644
+index c5e67489ba4a60ead3490f8c9468833f913af1a0..a191fb8563c01413dc4119e3adf81e23aacb824b 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -141,6 +141,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

patches/server/0235-Config-for-mob-last-hurt-by-player-time.patch

@@ -5,27 +5,27 @@ Subject: [PATCH] Config for mob last hurt by player time
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 19cc0ba32472384bf10662d41fecf23ebfc9876c..71f735d2c91d08ab652ddc8f3fe37bbb3b425ba4 100644
+index 8c2c14769ae32c9a92bc043f9e753abf7e32e1c3..239046ab467f499107d1e30ca183d79661a380f0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1614,13 +1614,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1708,13 +1708,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                 if (entity1 instanceof net.minecraft.world.entity.player.Player) {
+         Entity entity = damageSource.getEntity();
-                     net.minecraft.world.entity.player.Player entityhuman = (net.minecraft.world.entity.player.Player) entity1;
  
+         if (entity instanceof net.minecraft.world.entity.player.Player entityhuman) {
+-            this.lastHurtByPlayerTime = 100;
++            this.lastHurtByPlayerTime = this.level().purpurConfig.mobLastHurtByPlayerTime; // Purpur
+             this.lastHurtByPlayer = entityhuman;
+             return entityhuman;
+         } else {
+             if (entity instanceof Wolf entitywolf) {
+                 if (entitywolf.isTame()) {
 -                    this.lastHurtByPlayerTime = 100;
 +                    this.lastHurtByPlayerTime = this.level().purpurConfig.mobLastHurtByPlayerTime; // Purpur
-                     this.lastHurtByPlayer = entityhuman;
+                     LivingEntity entityliving = entitywolf.getOwner();
-                 } else if (entity1 instanceof Wolf) {
-                     Wolf entitywolf = (Wolf) entity1;
  
-                     if (entitywolf.isTame()) {
+                     if (entityliving instanceof net.minecraft.world.entity.player.Player) {
--                        this.lastHurtByPlayerTime = 100;
-+                        this.lastHurtByPlayerTime = this.level().purpurConfig.mobLastHurtByPlayerTime; // Purpur
-                         LivingEntity entityliving2 = entitywolf.getOwner();
- 
-                         if (entityliving2 instanceof net.minecraft.world.entity.player.Player) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index bf84c9664ca6d6c3d862e592c39bcc59374b63fe..051ffc663317fe5a4fafe0750c89fafdece4d316 100644
+index 7ccc40555964b906be6987532de1f319e38741ce..72498e233ece886941cca268e729336d66042402 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -523,7 +523,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0238-Add-toggle-for-enchant-level-clamping.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for enchant level clamping
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 90ca25c4aaf92a5639839a7cdaee2ffcdb75efa7..463eb4844e467c5c7018087e4f21d7d41e1c9063 100644
+index 300a044bb0f0e377133f24469cea1a9669de6e58..978c0d7296f400fe2ebda89e4f61386e6e87fe0c 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -120,6 +120,11 @@ public class Main {
+@@ -122,6 +122,11 @@ public class Main {
                  JvmProfiler.INSTANCE.start(Environment.SERVER);
              }
  

patches/server/0240-Implement-configurable-search-radius-for-villagers-t.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index ca5504ba8a10a3ed384cb9f5a3c550466c2688f1..0ee456972923e90905732ffc5d77bb027cf6c0fc 100644
+index a191fb8563c01413dc4119e3adf81e23aacb824b..15ddc44bb266b4cdb1036c92dd60f1379832b501 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -1073,6 +1073,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

patches/server/0241-Stonecutter-damage.patch

@@ -83,10 +83,10 @@ index 61e906fb47b242e86789dca1a210473c76863166..d343fd5c9f31073f1b3a0f91b8ea61a6
  
      public DamageSource inFire() {
 diff --git a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-index e61644241f24b42bb4f702d3eef5b590b4d107c8..0bf6503819b02e5ba2c346d9d563a93f2946d89b 100644
+index f1366aea49206afcd64bf058ee673d6a562315c5..ff655401c7aecba5acd8d241e844d77364f09f35 100644
 --- a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-@@ -98,4 +98,14 @@ public class StonecutterBlock extends Block {
+@@ -93,4 +93,14 @@ public class StonecutterBlock extends Block {
      protected boolean isPathfindable(BlockState state, PathComputationType type) {
          return false;
      }

patches/server/0245-Enchantment-Table-Persists-Lapis.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Enchantment Table Persists Lapis
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-index 50a735dd97daab4fb9579f922a4c63de60204f29..5b8ad051347f73553acb65c5ddc690d2b7eaa754 100644
+index bb9b17a058273ee1519b2abbefba97cad7feb51b..29996864b35711b29629e9071d28493ac27fbde6 100644
 --- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-@@ -42,6 +42,12 @@ import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
+@@ -41,6 +41,12 @@ import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
  import org.bukkit.entity.Player;
  // CraftBukkit end
  
@@ -20,8 +20,8 @@ index 50a735dd97daab4fb9579f922a4c63de60204f29..5b8ad051347f73553acb65c5ddc690d2
 +
  public class EnchantmentMenu extends AbstractContainerMenu {
  
-     static final ResourceLocation EMPTY_SLOT_LAPIS_LAZULI = ResourceLocation.withDefaultNamespace("item/empty_slot_lapis_lazuli");
+     static final ResourceLocation EMPTY_SLOT_LAPIS_LAZULI = ResourceLocation.withDefaultNamespace("container/slot/lapis_lazuli");
-@@ -76,6 +82,22 @@ public class EnchantmentMenu extends AbstractContainerMenu {
+@@ -75,6 +81,22 @@ public class EnchantmentMenu extends AbstractContainerMenu {
                  return context.getLocation();
              }
              // CraftBukkit end
@@ -44,8 +44,8 @@ index 50a735dd97daab4fb9579f922a4c63de60204f29..5b8ad051347f73553acb65c5ddc690d2
          };
          this.random = RandomSource.create();
          this.enchantmentSeed = DataSlot.standalone();
-@@ -100,6 +122,16 @@ public class EnchantmentMenu extends AbstractContainerMenu {
+@@ -99,6 +121,16 @@ public class EnchantmentMenu extends AbstractContainerMenu {
-                 return Pair.of(InventoryMenu.BLOCK_ATLAS, EnchantmentMenu.EMPTY_SLOT_LAPIS_LAZULI);
+                 return EnchantmentMenu.EMPTY_SLOT_LAPIS_LAZULI;
              }
          });
 +        // Purpur start
@@ -61,7 +61,7 @@ index 50a735dd97daab4fb9579f922a4c63de60204f29..5b8ad051347f73553acb65c5ddc690d2
          this.addStandardInventorySlots(playerInventory, 8, 84);
          this.addDataSlot(DataSlot.shared(this.costs, 0));
          this.addDataSlot(DataSlot.shared(this.costs, 1));
-@@ -329,6 +361,7 @@ public class EnchantmentMenu extends AbstractContainerMenu {
+@@ -328,6 +360,7 @@ public class EnchantmentMenu extends AbstractContainerMenu {
      public void removed(net.minecraft.world.entity.player.Player player) {
          super.removed(player);
          this.access.execute((world, blockposition) -> {
@@ -70,10 +70,10 @@ index 50a735dd97daab4fb9579f922a4c63de60204f29..5b8ad051347f73553acb65c5ddc690d2
          });
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java b/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java
-index a7fb500d950687743d1fc0b3ad3e6d10dcc6e31a..ce6a9e15ae0114623e79b5d8c244c2c490a3f74e 100644
+index 4c4e6290035710480cd5c1d7399f2443df01a5a6..248039ac7eab85b29ae3c525a986d91aa8d177fe 100644
 --- a/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java
-@@ -123,4 +123,18 @@ public class EnchantingTableBlock extends BaseEntityBlock {
+@@ -118,4 +118,18 @@ public class EnchantingTableBlock extends BaseEntityBlock {
      protected boolean isPathfindable(BlockState state, PathComputationType type) {
          return false;
      }

patches/server/0247-Config-for-sculk-shrieker-can_summon-state.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Config for sculk shrieker can_summon state
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SculkShriekerBlock.java b/src/main/java/net/minecraft/world/level/block/SculkShriekerBlock.java
-index 0e05bfef55dcacb50766bba8328ffeb8a5394c31..e00fcea07e74de647c26ff9eb32bc682738c15b7 100644
+index 7990a6c225c27845ccada0df91cf5ed7e4315a88..db2b21d5842fafa48dbde25a461505d03aa9b955 100644
 --- a/src/main/java/net/minecraft/world/level/block/SculkShriekerBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SculkShriekerBlock.java
-@@ -135,7 +135,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo
+@@ -130,7 +130,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo
      @Nullable
      @Override
      public BlockState getStateForPlacement(BlockPlaceContext ctx) {

patches/server/0249-Add-local-difficulty-api.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 57da11c0da7322e74810e7108e9c8000b0c36520..868bf852a9ed6ea2a48a238608f47405da1296f4 100644
+index a9f7ac8d1f5e184687d53ab3e8b348bb7f4f2ba0..5d0f4395617bcd59aad7cea221f6009d08dc0913 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2384,6 +2384,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0250-Add-toggle-for-RNG-manipulation.patch

@@ -7,7 +7,7 @@ Paper patches RNG maniplulation by using a shared (and locked) random source.
 This comes with a performance gain, but technical players may prefer the ability to manipulate RNG.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c1ba5eab15bb4b7599c1e5e23b90dfb361af93b6..2b612bfe6da7cc6d6447c60aa6f4b72b2616b72d 100644
+index 433dbe3c9350cd55ff22d490e077bf1a31ae83be..7435ff1996e0a6db2f98f1218bf7d2b73a3e2b1d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -602,7 +602,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -20,7 +20,7 @@ index c1ba5eab15bb4b7599c1e5e23b90dfb361af93b6..2b612bfe6da7cc6d6447c60aa6f4b72b
          this.fluidHeight = new Object2DoubleArrayMap(2);
          this.fluidOnEyes = new HashSet();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 7cfd9e4e29b8f3cf277679f785bae3cb12d2bd20..36a56553702fa6e4a2ac92b3639c210c94faee73 100644
+index da04ee901ad77637ee2c28a9a96f481affcce808..32d694b61e56431baeeb3feb32f57062bb6c5765 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -46,7 +46,7 @@ public class Squid extends AgeableWaterCreature {