diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 47f82e3e5..3ee723966 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -183,10 +183,10 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..b36e30fd4057a938e4d90cb42a2dca66
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
+diff --git a/net/minecraft/CrashReport.java b/net/minecraft/CrashReport.java
 index b24265573fdef5d9a964bcd76146f34542c420cf..710477ae27ebc5afdf0012ef0867d05efd293c24 100644
---- a/src/main/java/net/minecraft/CrashReport.java
-+++ b/src/main/java/net/minecraft/CrashReport.java
+--- a/net/minecraft/CrashReport.java
++++ b/net/minecraft/CrashReport.java
 @@ -32,6 +32,7 @@ public class CrashReport {
      private boolean trackingStackTrace = true;
      private StackTraceElement[] uncategorizedStackTrace = new StackTraceElement[0];
@@ -213,10 +213,10 @@ index b24265573fdef5d9a964bcd76146f34542c420cf..710477ae27ebc5afdf0012ef0867d05e
      }
  
      public SystemReport getSystemReport() {
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+diff --git a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 index e40665cead218502b44dd49051a53326ed94f061..a68f27288604b6f6755efe3c8ea612e295cb1656 100644
---- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+--- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
++++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 @@ -289,7 +289,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
  
      // Paper start
diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
index 1a0d459ac..290bce521 100644
--- a/patches/server/0002-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -36,10 +36,10 @@ index 8f62879582195d8ae4f64bd23f752fa133b1c973..be1bb14dca9367b9685841985b619837
  
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
-diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
+diff --git a/net/minecraft/commands/CommandSourceStack.java b/net/minecraft/commands/CommandSourceStack.java
 index 13bd145b1e8006a53c22f5dc0c78f29b540c7663..7b2daf47e411362a462019a1612a99c952170200 100644
---- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
-+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
+--- a/net/minecraft/commands/CommandSourceStack.java
++++ b/net/minecraft/commands/CommandSourceStack.java
 @@ -312,6 +312,30 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
          }
      }
@@ -71,10 +71,10 @@ index 13bd145b1e8006a53c22f5dc0c78f29b540c7663..7b2daf47e411362a462019a1612a99c9
      public void sendSuccess(Supplier<Component> feedbackSupplier, boolean broadcastToOps) {
          boolean flag1 = this.source.acceptsSuccess() && !this.silent;
          boolean flag2 = broadcastToOps && this.source.shouldInformAdmins() && !this.silent;
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
 index 17a158ff6ce6520b69a5a0032ba4c05449dd0cf8..cf63c64b8c2ac148b83325209940713a91b91bad 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -235,6 +235,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
          this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
@@ -91,10 +91,10 @@ index 17a158ff6ce6520b69a5a0032ba4c05449dd0cf8..cf63c64b8c2ac148b83325209940713a
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
 index 27f9d167b5ae9ce5117798ea44324107df59425f..f3c5e076558cd8d7b9d9b3212872f8675670b2dd 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
+--- a/net/minecraft/world/level/Level.java
++++ b/net/minecraft/world/level/Level.java
 @@ -175,6 +175,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      // Paper end - add paper world config
  
diff --git a/patches/server/0003-Purpur-client-support.patch b/patches/server/0003-Purpur-client-support.patch
index 3f727f26e..889611c09 100644
--- a/patches/server/0003-Purpur-client-support.patch
+++ b/patches/server/0003-Purpur-client-support.patch
@@ -4,10 +4,10 @@ Date: Fri, 30 Jul 2021 14:31:25 -0500
 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
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index fc7f7a34babd095a51b5321f600aef65a2a9d123..be20eed6e3bfab7a78228dfb42b50f80ad3d817c 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -327,6 +327,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
      public @Nullable String clientBrandName = null; // Paper - Brand support
@@ -16,10 +16,10 @@ index fc7f7a34babd095a51b5321f600aef65a2a9d123..be20eed6e3bfab7a78228dfb42b50f80
  
      // Paper start - rewrite chunk system
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 index b0bc66dc7248aae691dcab68b925b52a1695e63f..92749b57d3a2b2ffee79436319513248846296b6 100644
---- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -85,6 +85,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
diff --git a/patches/server/0005-Fix-decompile-errors.patch b/patches/server/0005-Fix-decompile-errors.patch
index f16d294f4..224ebe5e9 100644
--- a/patches/server/0005-Fix-decompile-errors.patch
+++ b/patches/server/0005-Fix-decompile-errors.patch
@@ -4,10 +4,10 @@ Date: Sun, 12 Jun 2022 06:20:21 -0500
 Subject: [PATCH] Fix decompile errors
 
 
-diff --git a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
+diff --git a/net/minecraft/commands/execution/tasks/BuildContexts.java b/net/minecraft/commands/execution/tasks/BuildContexts.java
 index b0d26b0eadb2a43924629424a6c13198aace8f69..9f5c3ec2eae9b30bdb8dbcb328d7f701cb7aeb9d 100644
---- a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
-+++ b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
+--- a/net/minecraft/commands/execution/tasks/BuildContexts.java
++++ b/net/minecraft/commands/execution/tasks/BuildContexts.java
 @@ -52,7 +52,7 @@ public class BuildContexts<T extends ExecutionCommandSource<T>> {
                      }
  
@@ -31,10 +31,10 @@ index b0d26b0eadb2a43924629424a6c13198aace8f69..9f5c3ec2eae9b30bdb8dbcb328d7f701
                  ExecutionControl<T> executionControl = ExecutionControl.create(context, frame);
  
                  for (T executionCommandSource2 : list) {
-diff --git a/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java b/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
+diff --git a/net/minecraft/commands/synchronization/ArgumentTypeInfos.java b/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
 index 7b118a92a6eb779f800ae8f5d8f6e3c861fc4f6a..057a038e8dcacd7496a0b2373de2c20255a5c297 100644
---- a/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
-+++ b/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
+--- a/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
++++ b/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
 @@ -119,10 +119,10 @@ public class ArgumentTypeInfos {
          register(registry, "dimension", DimensionArgument.class, SingletonArgumentInfo.contextFree(DimensionArgument::dimension));
          register(registry, "gamemode", GameModeArgument.class, SingletonArgumentInfo.contextFree(GameModeArgument::gameMode));
diff --git a/patches/server/0006-Component-related-conveniences.patch b/patches/server/0006-Component-related-conveniences.patch
index e463f84cc..bb7180794 100644
--- a/patches/server/0006-Component-related-conveniences.patch
+++ b/patches/server/0006-Component-related-conveniences.patch
@@ -4,10 +4,10 @@ Date: Tue, 29 Jun 2021 21:37:40 -0500
 Subject: [PATCH] Component related conveniences
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index be20eed6e3bfab7a78228dfb42b50f80ad3d817c..09a7809b89a4f302a1149850d4daeb471365d189 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -2236,6 +2236,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
@@ -56,10 +56,10 @@ index be20eed6e3bfab7a78228dfb42b50f80ad3d817c..09a7809b89a4f302a1149850d4daeb47
      public void sendSystemMessage(Component message) {
          this.sendSystemMessage(message, false);
      }
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
 index 9b71655a425356132afb786eff623f558e1e3498..98e803eaf5ce4c773f35fd752c21c7176707427c 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
 @@ -991,6 +991,20 @@ public abstract class PlayerList {
      }
      // CraftBukkit end
@@ -81,10 +81,10 @@ index 9b71655a425356132afb786eff623f558e1e3498..98e803eaf5ce4c773f35fd752c21c717
      public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
          Iterator iterator = this.players.iterator();
  
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+diff --git a/net/minecraft/world/damagesource/DamageSource.java b/net/minecraft/world/damagesource/DamageSource.java
 index bb1a60180e58c1333e7bb33e8acf1b0225eda8a8..ab0ba4406dcaa915435c3f53ac9ca06fb21c673b 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+--- a/net/minecraft/world/damagesource/DamageSource.java
++++ b/net/minecraft/world/damagesource/DamageSource.java
 @@ -198,6 +198,15 @@ public class DamageSource {
          }
      }
diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch
index 9ebf529d2..8c0ddf9c4 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0007-Ridables.patch
@@ -4,10 +4,10 @@ Date: Sun, 5 Jul 2020 22:19:49 -0500
 Subject: [PATCH] Ridables
 
 
-diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
+diff --git a/net/minecraft/core/BlockPos.java b/net/minecraft/core/BlockPos.java
 index faffd87c357511ef00646971a16acf1009362c59..6714b4a39180affd101f1cab0d587cf2d3e6886a 100644
---- a/src/main/java/net/minecraft/core/BlockPos.java
-+++ b/src/main/java/net/minecraft/core/BlockPos.java
+--- a/net/minecraft/core/BlockPos.java
++++ b/net/minecraft/core/BlockPos.java
 @@ -63,6 +63,12 @@ public class BlockPos extends Vec3i {
      public static final int MAX_HORIZONTAL_COORDINATE = 33554431;
      // Paper end - Optimize Bit Operations by inlining
@@ -21,10 +21,10 @@ index faffd87c357511ef00646971a16acf1009362c59..6714b4a39180affd101f1cab0d587cf2
      public BlockPos(int x, int y, int z) {
          super(x, y, z);
      }
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index ae4ebf509837e8d44255781c61d02873f8b74be8..ce4ce361061932162ace58070d44d1aa70189dbd 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -1857,6 +1857,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
@@ -33,10 +33,10 @@ index ae4ebf509837e8d44255781c61d02873f8b74be8..ce4ce361061932162ace58070d44d1aa
  
              gameprofilerfiller.push(() -> {
                  String s = String.valueOf(worldserver);
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
 index 1f898500d0e9b18a880645ceb0a8ff0fe75f4e48..4b9434b2d03cd24f5dac7098d2f1318fd12baddb 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
 @@ -232,6 +232,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      public boolean hasPhysicsEvent = true; // Paper - BlockPhysicsEvent
      public boolean hasEntityMoveEvent; // Paper - Add EntityMoveEvent
@@ -45,10 +45,10 @@ index 1f898500d0e9b18a880645ceb0a8ff0fe75f4e48..4b9434b2d03cd24f5dac7098d2f1318f
  
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 09a7809b89a4f302a1149850d4daeb471365d189..8207208d6fb3f982e9909add9e74a0dda69e8120 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -1030,6 +1030,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          this.trackEnteredOrExitedLavaOnVehicle();
          this.updatePlayerAttributes();
@@ -65,10 +65,10 @@ index 09a7809b89a4f302a1149850d4daeb471365d189..8207208d6fb3f982e9909add9e74a0dd
      }
  
      private void updatePlayerAttributes() {
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index 84fa24880d02dc7ba1ec8bda3575be38447fd4b2..fbc59503316d566e88b037851afd74e5469c281b 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2887,6 +2887,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                                  ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
@@ -78,10 +78,10 @@ index 84fa24880d02dc7ba1ec8bda3575be38447fd4b2..fbc59503316d566e88b037851afd74e5
                                  // Entity in bucket - SPIGOT-4048 and SPIGOT-6859a
                                  if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                                  entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index 7ac7d0729705cb02f22277be3c467aed4f69ec0e..5c14180d92e1baebe59b08311746418e7d9f6a24 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -340,7 +340,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      private final Set<String> tags;
      private final double[] pistonDeltas;
@@ -165,10 +165,10 @@ index 7ac7d0729705cb02f22277be3c467aed4f69ec0e..5c14180d92e1baebe59b08311746418e
 +    }
 +    // Purpur end - Ridables
  }
-diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
+diff --git a/net/minecraft/world/entity/GlowSquid.java b/net/minecraft/world/entity/GlowSquid.java
 index 397765b1547ae47b64963b3807b206c50a6650e1..293ffe990de70f4f8872f063388a3a50c60b68e6 100644
---- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
-+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
+--- a/net/minecraft/world/entity/GlowSquid.java
++++ b/net/minecraft/world/entity/GlowSquid.java
 @@ -25,6 +25,19 @@ public class GlowSquid extends Squid {
          super(type, world);
      }
@@ -189,10 +189,10 @@ index 397765b1547ae47b64963b3807b206c50a6650e1..293ffe990de70f4f8872f063388a3a50
      @Override
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index 96b4fbe4a4655777ff10b32e3257e2fac2aba12a..715b76bd0ccc0c29583a55f82a8ecd889ab49b56 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -246,9 +246,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
      protected float rotOffs;
      public float lastHurt;
@@ -258,10 +258,10 @@ index 96b4fbe4a4655777ff10b32e3257e2fac2aba12a..715b76bd0ccc0c29583a55f82a8ecd88
          }
          // Paper end - Add EntityMoveEvent
          world = this.level();
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
 index 5a0b51342f4a646101f4588697bcae7d1ca8a010..261288f51ed47b0eac80cc965c76683f3e13687f 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
+--- a/net/minecraft/world/entity/Mob.java
++++ b/net/minecraft/world/entity/Mob.java
 @@ -159,8 +159,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          this.restrictRadius = -1.0F;
          this.goalSelector = new GoalSelector();
@@ -341,10 +341,10 @@ index 5a0b51342f4a646101f4588697bcae7d1ca8a010..261288f51ed47b0eac80cc965c76683f
 +    }
 +    // Purpur end - Ridables
  }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+diff --git a/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 index fb967ac7b3e7828301f08a7fe9b039441cf7da30..d6c98612ca15e506657d85f6872c1278e0b73652 100644
---- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+--- a/net/minecraft/world/entity/ai/attributes/AttributeMap.java
++++ b/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 @@ -23,14 +23,21 @@ public class AttributeMap {
      private final Set<AttributeInstance> attributesToSync = new ObjectOpenHashSet<>();
      private final Set<AttributeInstance> attributesToUpdate = new ObjectOpenHashSet<>();
@@ -377,10 +377,10 @@ index fb967ac7b3e7828301f08a7fe9b039441cf7da30..d6c98612ca15e506657d85f6872c1278
      }
  
      @Nullable
-diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java b/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
+diff --git a/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java b/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
 index c76438d5ce2330eca16dc0b381f97e9506f84aef..8ccbf0386aa453e82fc0f82d2aefd1e08b6c3345 100644
---- a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
+--- a/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
++++ b/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
 @@ -131,7 +131,7 @@ public class DefaultAttributes {
          .put(EntityType.OCELOT, Ocelot.createAttributes().build())
          .put(EntityType.PANDA, Panda.createAttributes().build())
@@ -390,10 +390,10 @@ index c76438d5ce2330eca16dc0b381f97e9506f84aef..8ccbf0386aa453e82fc0f82d2aefd1e0
          .put(EntityType.PIG, Pig.createAttributes().build())
          .put(EntityType.PIGLIN, Piglin.createAttributes().build())
          .put(EntityType.PIGLIN_BRUTE, PiglinBrute.createAttributes().build())
-diff --git a/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java b/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java
+diff --git a/net/minecraft/world/entity/ai/control/MoveControl.java b/net/minecraft/world/entity/ai/control/MoveControl.java
 index c8fd5696de7c3623cdb4f498190a5c2708cf843e..2a6e5a9b35102ef540b561ec7ef5a5f119c564fe 100644
---- a/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java
+--- a/net/minecraft/world/entity/ai/control/MoveControl.java
++++ b/net/minecraft/world/entity/ai/control/MoveControl.java
 @@ -29,6 +29,20 @@ public class MoveControl implements Control {
          this.mob = entity;
      }
@@ -415,10 +415,10 @@ index c8fd5696de7c3623cdb4f498190a5c2708cf843e..2a6e5a9b35102ef540b561ec7ef5a5f1
      public boolean hasWanted() {
          return this.operation == MoveControl.Operation.MOVE_TO;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java b/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
+diff --git a/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java b/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
 index fbfc2f2515ad709b2c1212aef9521e795547d66b..ebe941aeb959fc34372bfc59bc3a13421167b4cf 100644
---- a/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
+--- a/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
++++ b/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
 @@ -3,7 +3,7 @@ package net.minecraft.world.entity.ai.control;
  import net.minecraft.util.Mth;
  import net.minecraft.world.entity.Mob;
@@ -437,10 +437,10 @@ index fbfc2f2515ad709b2c1212aef9521e795547d66b..ebe941aeb959fc34372bfc59bc3a1342
          if (this.lookAtCooldown > 0) {
              this.lookAtCooldown--;
              this.getYRotD().ifPresent(yaw -> this.mob.yHeadRot = this.rotateTowards(this.mob.yHeadRot, yaw + 20.0F, this.yMaxRotSpeed));
-diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+diff --git a/net/minecraft/world/entity/ambient/Bat.java b/net/minecraft/world/entity/ambient/Bat.java
 index 60c2868f255d372226e0c1389caaa5477bbef41e..add1c146cd7428547d9ef8810841b4cf39a6a05e 100644
---- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+--- a/net/minecraft/world/entity/ambient/Bat.java
++++ b/net/minecraft/world/entity/ambient/Bat.java
 @@ -47,12 +47,59 @@ public class Bat extends AmbientCreature {
  
      public Bat(EntityType<? extends Bat> type, Level world) {
@@ -525,10 +525,10 @@ index 60c2868f255d372226e0c1389caaa5477bbef41e..add1c146cd7428547d9ef8810841b4cf
          super.customServerAiStep(world);
          BlockPos blockposition = this.blockPosition();
          BlockPos blockposition1 = blockposition.above();
-diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
+diff --git a/net/minecraft/world/entity/animal/AbstractFish.java b/net/minecraft/world/entity/animal/AbstractFish.java
 index 9aedc62b1766f6a7db4da7eba55167d21d698791..d1fa6b6a18bd7a44e398eed17f2ff127b09f222a 100644
---- a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
+--- a/net/minecraft/world/entity/animal/AbstractFish.java
++++ b/net/minecraft/world/entity/animal/AbstractFish.java
 @@ -87,6 +87,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
      @Override
      protected void registerGoals() {
@@ -580,10 +580,10 @@ index 9aedc62b1766f6a7db4da7eba55167d21d698791..d1fa6b6a18bd7a44e398eed17f2ff127
                  this.fish.setSpeed(Mth.lerp(0.125F, this.fish.getSpeed(), f));
                  double d = this.wantedX - this.fish.getX();
                  double e = this.wantedY - this.fish.getY();
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
 index 0bafe14342c1acce131ad34717c18aed3718deed..13f6e4c83e1775daadb13e3532d7dfe6eef15aac 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+--- a/net/minecraft/world/entity/animal/Bee.java
++++ b/net/minecraft/world/entity/animal/Bee.java
 @@ -154,6 +154,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      public Bee(EntityType<? extends Bee> type, Level world) {
          super(type, world);
@@ -694,10 +694,10 @@ index 0bafe14342c1acce131ad34717c18aed3718deed..13f6e4c83e1775daadb13e3532d7dfe6
              }
          }
  
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java
 index 989b7be74eaeba7f40eac87c7ee7f252cb0c05c9..472bbf4c3f932e2b1c7d7fa3c74b41f5be11431f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+--- a/net/minecraft/world/entity/animal/Cat.java
++++ b/net/minecraft/world/entity/animal/Cat.java
 @@ -100,12 +100,38 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
          this.reassessTameGoals();
      }
@@ -753,10 +753,10 @@ index 989b7be74eaeba7f40eac87c7ee7f252cb0c05c9..472bbf4c3f932e2b1c7d7fa3c74b41f5
          ItemStack itemstack = player.getItemInHand(hand);
          Item item = itemstack.getItem();
          InteractionResult enuminteractionresult;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+diff --git a/net/minecraft/world/entity/animal/Chicken.java b/net/minecraft/world/entity/animal/Chicken.java
 index 919406f18bccec676adec133a60a938dc77f81c4..5eaa1d42ec72ff077d974db3284cae32a9809da7 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+--- a/net/minecraft/world/entity/animal/Chicken.java
++++ b/net/minecraft/world/entity/animal/Chicken.java
 @@ -53,9 +53,27 @@ public class Chicken extends Animal {
          this.setPathfindingMalus(PathType.WATER, 0.0F);
      }
@@ -785,10 +785,10 @@ index 919406f18bccec676adec133a60a938dc77f81c4..5eaa1d42ec72ff077d974db3284cae32
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.4D));
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
          this.goalSelector.addGoal(3, new TemptGoal(this, 1.0D, (itemstack) -> {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
+diff --git a/net/minecraft/world/entity/animal/Cod.java b/net/minecraft/world/entity/animal/Cod.java
 index 824e5e4fe7619ae46061c3c978c9a044db8c84ab..fcf7073dd2d79f1483bdc6e7fdc37c8c260ae418 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
+--- a/net/minecraft/world/entity/animal/Cod.java
++++ b/net/minecraft/world/entity/animal/Cod.java
 @@ -13,6 +13,18 @@ public class Cod extends AbstractSchoolingFish {
          super(type, world);
      }
@@ -808,10 +808,10 @@ index 824e5e4fe7619ae46061c3c978c9a044db8c84ab..fcf7073dd2d79f1483bdc6e7fdc37c8c
      @Override
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+diff --git a/net/minecraft/world/entity/animal/Cow.java b/net/minecraft/world/entity/animal/Cow.java
 index 3e00bbff266fc71b07014e7e047d77b7f809239f..dc7ccfe90a82892d65098a325fd71fbbc734da86 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+--- a/net/minecraft/world/entity/animal/Cow.java
++++ b/net/minecraft/world/entity/animal/Cow.java
 @@ -44,9 +44,27 @@ public class Cow extends Animal {
          super(type, world);
      }
@@ -857,10 +857,10 @@ index 3e00bbff266fc71b07014e7e047d77b7f809239f..dc7ccfe90a82892d65098a325fd71fbb
              }
              // CraftBukkit end
  
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+diff --git a/net/minecraft/world/entity/animal/Dolphin.java b/net/minecraft/world/entity/animal/Dolphin.java
 index 5af4d590a9b0f17ba53c6959d9c18bd1269878a4..af677b6581514a07e6455977ffc591538d43bbc6 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+--- a/net/minecraft/world/entity/animal/Dolphin.java
++++ b/net/minecraft/world/entity/animal/Dolphin.java
 @@ -85,14 +85,82 @@ public class Dolphin extends AgeableWaterCreature {
          return !entityitem.hasPickUpDelay() && entityitem.isAlive() && entityitem.isInWater();
      };
@@ -982,10 +982,10 @@ index 5af4d590a9b0f17ba53c6959d9c18bd1269878a4..af677b6581514a07e6455977ffc59153
          if (this.isNoAi()) {
              this.setAirSupply(this.getMaxAirSupply());
          } else {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java
 index d48c2bdb004c86e9e08680138fe51dc3b2975a64..ce5ac300582f61d0f3eeb1e94340cfefbdff1ba9 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+--- a/net/minecraft/world/entity/animal/Fox.java
++++ b/net/minecraft/world/entity/animal/Fox.java
 @@ -144,6 +144,44 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
          this.getNavigation().setRequiredPathLength(32.0F);
      }
@@ -1087,10 +1087,10 @@ index d48c2bdb004c86e9e08680138fe51dc3b2975a64..ce5ac300582f61d0f3eeb1e94340cfef
              }
  
          }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+diff --git a/net/minecraft/world/entity/animal/IronGolem.java b/net/minecraft/world/entity/animal/IronGolem.java
 index e07b79ef172095c1800c88342b3ac8dc7703aea2..938a0c6f7cfbb6cd459d5a2ec46f912d45fd2226 100644
---- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+--- a/net/minecraft/world/entity/animal/IronGolem.java
++++ b/net/minecraft/world/entity/animal/IronGolem.java
 @@ -62,8 +62,27 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
          super(type, world);
      }
@@ -1143,10 +1143,10 @@ index e07b79ef172095c1800c88342b3ac8dc7703aea2..938a0c6f7cfbb6cd459d5a2ec46f912d
              } else {
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
-diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+diff --git a/net/minecraft/world/entity/animal/MushroomCow.java b/net/minecraft/world/entity/animal/MushroomCow.java
 index b04532aa04aec6ebbff74d64abb73189c2e12016..f37c8efa34efcb289bbeed06ea2d3860ff2662ac 100644
---- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+--- a/net/minecraft/world/entity/animal/MushroomCow.java
++++ b/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -64,6 +64,23 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          super(type, world);
      }
@@ -1180,10 +1180,10 @@ index b04532aa04aec6ebbff74d64abb73189c2e12016..f37c8efa34efcb289bbeed06ea2d3860
                      }
                      drops = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getDrops());
                  // Paper end - custom shear drops
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+diff --git a/net/minecraft/world/entity/animal/Ocelot.java b/net/minecraft/world/entity/animal/Ocelot.java
 index 0554ee499c452db6c1e6852f5022b1f197adb024..5b045751c7302ef5c8b2b730677d02840441efa6 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+--- a/net/minecraft/world/entity/animal/Ocelot.java
++++ b/net/minecraft/world/entity/animal/Ocelot.java
 @@ -65,6 +65,23 @@ public class Ocelot extends Animal {
          this.reassessTrustingGoals();
      }
@@ -1223,10 +1223,10 @@ index 0554ee499c452db6c1e6852f5022b1f197adb024..5b045751c7302ef5c8b2b730677d0284
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Chicken.class, false));
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, false, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+diff --git a/net/minecraft/world/entity/animal/Panda.java b/net/minecraft/world/entity/animal/Panda.java
 index be753557d7ebd6f1e82b1bdb6d60ecc450f72eec..20d18f7bd8e9c1b3e3a6d06a11c9072456cd742f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+--- a/net/minecraft/world/entity/animal/Panda.java
++++ b/net/minecraft/world/entity/animal/Panda.java
 @@ -112,6 +112,32 @@ public class Panda extends Animal {
  
      }
@@ -1321,10 +1321,10 @@ index be753557d7ebd6f1e82b1bdb6d60ecc450f72eec..20d18f7bd8e9c1b3e3a6d06a11c90724
              }
          }
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java
 index a2f0b79599799ad2aa85aff821d8ac76a8e650bd..872f2406531bf71f378325441b7215c085f1a70d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+--- a/net/minecraft/world/entity/animal/Parrot.java
++++ b/net/minecraft/world/entity/animal/Parrot.java
 @@ -125,12 +125,68 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
  
      public Parrot(EntityType<? extends Parrot> type, Level world) {
@@ -1407,10 +1407,10 @@ index a2f0b79599799ad2aa85aff821d8ac76a8e650bd..872f2406531bf71f378325441b7215c0
          this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this));
          this.goalSelector.addGoal(2, new FollowOwnerGoal(this, 1.0D, 5.0F, 1.0F));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+diff --git a/net/minecraft/world/entity/animal/Pig.java b/net/minecraft/world/entity/animal/Pig.java
 index c39b2580a67c9b0bf8631f108e0628fa9732ada1..033da440c3f76248a2269ffc22d54e3966575cf6 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+--- a/net/minecraft/world/entity/animal/Pig.java
++++ b/net/minecraft/world/entity/animal/Pig.java
 @@ -65,9 +65,27 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
          this.steering = new ItemBasedSteering(this.entityData, Pig.DATA_BOOST_TIME, Pig.DATA_SADDLE_ID);
      }
@@ -1439,10 +1439,10 @@ index c39b2580a67c9b0bf8631f108e0628fa9732ada1..033da440c3f76248a2269ffc22d54e39
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.25D));
          this.goalSelector.addGoal(3, new BreedGoal(this, 1.0D));
          this.goalSelector.addGoal(4, new TemptGoal(this, 1.2D, (itemstack) -> {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+diff --git a/net/minecraft/world/entity/animal/PolarBear.java b/net/minecraft/world/entity/animal/PolarBear.java
 index cd72d8f766069796ce1fe4a83b8646692005ff8c..6f30cdc26054a4ed7c577cd4e9aa29ade1d2ede5 100644
---- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+--- a/net/minecraft/world/entity/animal/PolarBear.java
++++ b/net/minecraft/world/entity/animal/PolarBear.java
 @@ -59,11 +59,40 @@ public class PolarBear extends Animal implements NeutralMob {
      private int remainingPersistentAngerTime;
      @Nullable
@@ -1521,10 +1521,10 @@ index cd72d8f766069796ce1fe4a83b8646692005ff8c..6f30cdc26054a4ed7c577cd4e9aa29ad
      }
  
      public float getStandingAnimationScale(float tickDelta) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
+diff --git a/net/minecraft/world/entity/animal/Pufferfish.java b/net/minecraft/world/entity/animal/Pufferfish.java
 index cdb74f86ee92ee143af29962a85d45ca585cee44..93c1b945672a769ef6ee285efdcebd3717caf9f1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
+--- a/net/minecraft/world/entity/animal/Pufferfish.java
++++ b/net/minecraft/world/entity/animal/Pufferfish.java
 @@ -52,6 +52,18 @@ public class Pufferfish extends AbstractFish {
          this.refreshDimensions();
      }
@@ -1544,10 +1544,10 @@ index cdb74f86ee92ee143af29962a85d45ca585cee44..93c1b945672a769ef6ee285efdcebd37
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java
 index 53d60d62686f9b6bc98b6b25e4315b848600a99d..b5601b99401f2c3cf4ce0fef4497b09667083412 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+--- a/net/minecraft/world/entity/animal/Rabbit.java
++++ b/net/minecraft/world/entity/animal/Rabbit.java
 @@ -88,6 +88,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
      private boolean wasOnGround;
      private int jumpDelayTicks;
@@ -1666,10 +1666,10 @@ index 53d60d62686f9b6bc98b6b25e4315b848600a99d..b5601b99401f2c3cf4ce0fef4497b096
          }
  
          @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
+diff --git a/net/minecraft/world/entity/animal/Salmon.java b/net/minecraft/world/entity/animal/Salmon.java
 index 500259e6f297276fb3d6943c2bf88c844d4ec7e4..9bc58ca4556baf6f6bc494ae249c11c5c627f86c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
+--- a/net/minecraft/world/entity/animal/Salmon.java
++++ b/net/minecraft/world/entity/animal/Salmon.java
 @@ -35,6 +35,18 @@ public class Salmon extends AbstractSchoolingFish implements VariantHolder<Salmo
          this.refreshDimensions();
      }
@@ -1689,10 +1689,10 @@ index 500259e6f297276fb3d6943c2bf88c844d4ec7e4..9bc58ca4556baf6f6bc494ae249c11c5
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Sheep.java b/net/minecraft/world/entity/animal/Sheep.java
 index 344e739c77a2c54a6e0640fcee2b0f8f19a9b4b4..401cc474c280fe2cf28014aff75b01afdc0ec17a 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+--- a/net/minecraft/world/entity/animal/Sheep.java
++++ b/net/minecraft/world/entity/animal/Sheep.java
 @@ -84,10 +84,28 @@ public class Sheep extends Animal implements Shearable {
          super(type, world);
      }
@@ -1722,10 +1722,10 @@ index 344e739c77a2c54a6e0640fcee2b0f8f19a9b4b4..401cc474c280fe2cf28014aff75b01af
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.25D));
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
          this.goalSelector.addGoal(3, new TemptGoal(this, 1.1D, (itemstack) -> {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java
 index fd9f6c17448a4d87f940eb8f544ecb9669068582..0ba9aa45902cbad16ee0356cb3051b12923cfe10 100644
---- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+--- a/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -55,12 +55,31 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
          super(type, world);
      }
@@ -1784,10 +1784,10 @@ index fd9f6c17448a4d87f940eb8f544ecb9669068582..0ba9aa45902cbad16ee0356cb3051b12
          }
      }
  
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java
 index 97a3f0ab3dfca24991051395229dd4c601a66fa0..2d0ecae9625e08ecf5028ec62f71a5432c462712 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+--- a/net/minecraft/world/entity/animal/Squid.java
++++ b/net/minecraft/world/entity/animal/Squid.java
 @@ -50,9 +50,32 @@ public class Squid extends AgeableWaterCreature {
          this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
      }
@@ -1859,10 +1859,10 @@ index 97a3f0ab3dfca24991051395229dd4c601a66fa0..2d0ecae9625e08ecf5028ec62f71a543
              int i = this.squid.getNoActionTime();
              if (i > 100) {
                  this.squid.movementVector = Vec3.ZERO;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
+diff --git a/net/minecraft/world/entity/animal/TropicalFish.java b/net/minecraft/world/entity/animal/TropicalFish.java
 index 8d59d606bdaaea7c64389572b2810b65414a1533..df9d2d4d285f51d6e8e5bc781699c20fe1c2d00d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
+--- a/net/minecraft/world/entity/animal/TropicalFish.java
++++ b/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -67,6 +67,18 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
          super(type, world);
      }
@@ -1882,10 +1882,10 @@ index 8d59d606bdaaea7c64389572b2810b65414a1533..df9d2d4d285f51d6e8e5bc781699c20f
      public static String getPredefinedName(int variant) {
          return "entity.minecraft.tropical_fish.predefined." + variant;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+diff --git a/net/minecraft/world/entity/animal/Turtle.java b/net/minecraft/world/entity/animal/Turtle.java
 index d6605c15111dbdb6ee61a24822bc0a9aed7198d6..0fc805540305dd8d34b903d5b7769816578c19c3 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+--- a/net/minecraft/world/entity/animal/Turtle.java
++++ b/net/minecraft/world/entity/animal/Turtle.java
 @@ -86,6 +86,23 @@ public class Turtle extends Animal {
          this.moveControl = new Turtle.TurtleMoveControl(this);
      }
@@ -1953,10 +1953,10 @@ index d6605c15111dbdb6ee61a24822bc0a9aed7198d6..0fc805540305dd8d34b903d5b7769816
  
                      this.turtle.setSpeed(Mth.lerp(0.125F, this.turtle.getSpeed(), f1));
                      this.turtle.setDeltaMovement(this.turtle.getDeltaMovement().add(0.0D, (double) this.turtle.getSpeed() * d1 * 0.1D, 0.0D));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+diff --git a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java
 index c57fac6b5a17f39699298a58d9d25c12da929e64..5ac51a56c451a8fde4b98cec165143b2128fd9eb 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+--- a/net/minecraft/world/entity/animal/Wolf.java
++++ b/net/minecraft/world/entity/animal/Wolf.java
 @@ -124,9 +124,32 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          this.setPathfindingMalus(PathType.DANGER_POWDER_SNOW, -1.0F);
      }
@@ -1998,10 +1998,10 @@ index c57fac6b5a17f39699298a58d9d25c12da929e64..5ac51a56c451a8fde4b98cec165143b2
          this.targetSelector.addGoal(1, new OwnerHurtByTargetGoal(this));
          this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
          this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
-diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+diff --git a/net/minecraft/world/entity/animal/allay/Allay.java b/net/minecraft/world/entity/animal/allay/Allay.java
 index b86f638390d386c838318a4d9b6571ac5514df8f..76779074ceea0d79b01c6744e6cc0a50b8cf111d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+--- a/net/minecraft/world/entity/animal/allay/Allay.java
++++ b/net/minecraft/world/entity/animal/allay/Allay.java
 @@ -104,10 +104,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
      private float spinningAnimationTicks;
      private float spinningAnimationTicks0;
@@ -2064,10 +2064,10 @@ index b86f638390d386c838318a4d9b6571ac5514df8f..76779074ceea0d79b01c6744e6cc0a50
          this.getBrain().tick(world, this);
          gameprofilerfiller.pop();
          gameprofilerfiller.push("allayActivityUpdate");
-diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+diff --git a/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 index c1ef714096159608752d744b98f615cd45fe459a..4c9771725f9567790841094dae72c2bbf0d5ba62 100644
---- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+--- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java
++++ b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 @@ -82,6 +82,23 @@ public class Armadillo extends Animal {
          return Animal.createAnimalAttributes().add(Attributes.MAX_HEALTH, 12.0D).add(Attributes.MOVEMENT_SPEED, 0.14D);
      }
@@ -2092,10 +2092,10 @@ index c1ef714096159608752d744b98f615cd45fe459a..4c9771725f9567790841094dae72c2bb
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+diff --git a/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 index 31b10cd404b672d7ce21c2107d8f83e32de26ef4..b414edf515890066bd970f65c073964839851840 100644
---- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+--- a/net/minecraft/world/entity/animal/axolotl/Axolotl.java
++++ b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -100,6 +100,23 @@ public class Axolotl extends Animal implements VariantHolder<Axolotl.Variant>, B
          this.lookControl = new Axolotl.AxolotlLookControl(this, 20);
      }
@@ -2163,10 +2163,10 @@ index 31b10cd404b672d7ce21c2107d8f83e32de26ef4..b414edf515890066bd970f65c0739648
              }
  
          }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+diff --git a/net/minecraft/world/entity/animal/camel/Camel.java b/net/minecraft/world/entity/animal/camel/Camel.java
 index f3c884ab9c09f04dd01cabf2ee9de3b5b620563d..f794ac7af227d413ed030457cbe4cd68e6eca969 100644
---- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+--- a/net/minecraft/world/entity/animal/camel/Camel.java
++++ b/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -87,6 +87,13 @@ public class Camel extends AbstractHorse {
          navigation.setCanWalkOverFences(true);
      }
@@ -2181,10 +2181,10 @@ index f3c884ab9c09f04dd01cabf2ee9de3b5b620563d..f794ac7af227d413ed030457cbe4cd68
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+diff --git a/net/minecraft/world/entity/animal/frog/Frog.java b/net/minecraft/world/entity/animal/frog/Frog.java
 index ca04e5d829331551a2c2f44e223ff05c6ce04e76..b42e1e1749c9f18b3bf842517522e90ba60330ff 100644
---- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+--- a/net/minecraft/world/entity/animal/frog/Frog.java
++++ b/net/minecraft/world/entity/animal/frog/Frog.java
 @@ -106,6 +106,8 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
      public final AnimationState croakAnimationState = new AnimationState();
      public final AnimationState tongueAnimationState = new AnimationState();
@@ -2267,10 +2267,10 @@ index ca04e5d829331551a2c2f44e223ff05c6ce04e76..b42e1e1749c9f18b3bf842517522e90b
          FrogLookControl(final Mob entity) {
              super(entity);
          }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+diff --git a/net/minecraft/world/entity/animal/frog/Tadpole.java b/net/minecraft/world/entity/animal/frog/Tadpole.java
 index 48ac8c3f6e00c3c2dc67b6c994be7c0ac6dfcf81..87a2825d4e198e152a601f20105596a793695885 100644
---- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+--- a/net/minecraft/world/entity/animal/frog/Tadpole.java
++++ b/net/minecraft/world/entity/animal/frog/Tadpole.java
 @@ -51,13 +51,50 @@ public class Tadpole extends AbstractFish {
      protected static final ImmutableList<SensorType<? extends Sensor<? super Tadpole>>> SENSOR_TYPES = ImmutableList.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_PLAYERS, SensorType.HURT_BY, SensorType.FROG_TEMPTATIONS);
      protected static final ImmutableList<MemoryModuleType<?>> MEMORY_TYPES = ImmutableList.of(MemoryModuleType.LOOK_TARGET, MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.NEAREST_VISIBLE_ADULT, MemoryModuleType.TEMPTATION_COOLDOWN_TICKS, MemoryModuleType.IS_TEMPTED, MemoryModuleType.TEMPTING_PLAYER, MemoryModuleType.BREED_TARGET, MemoryModuleType.IS_PANICKING);
@@ -2331,10 +2331,10 @@ index 48ac8c3f6e00c3c2dc67b6c994be7c0ac6dfcf81..87a2825d4e198e152a601f20105596a7
          this.getBrain().tick(world, this);
          gameprofilerfiller.pop();
          gameprofilerfiller.push("tadpoleActivityUpdate");
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
 index 76aca47d8638d5c37c57d3a59fa7f8ceaa5a53b4..307d11e5ad6d0b47af36b1469a73ae1caa100232 100644
---- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+--- a/net/minecraft/world/entity/animal/goat/Goat.java
++++ b/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -93,6 +93,23 @@ public class Goat extends Animal {
          });
      }
@@ -2367,10 +2367,10 @@ index 76aca47d8638d5c37c57d3a59fa7f8ceaa5a53b4..307d11e5ad6d0b47af36b1469a73ae1c
          this.getBrain().tick(world, this);
          gameprofilerfiller.pop();
          gameprofilerfiller.push("goatActivityUpdate");
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 index 8aed30cdbbfdd42c20dcd4c8773c8a0ee21a980d..d9e4eb76209abffd0079ccdbbd2fc3f29bd67052 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+--- a/net/minecraft/world/entity/animal/horse/AbstractHorse.java
++++ b/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 @@ -228,11 +228,21 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
  
      protected AbstractHorse(EntityType<? extends AbstractHorse> type, Level world) {
@@ -2401,10 +2401,10 @@ index 8aed30cdbbfdd42c20dcd4c8773c8a0ee21a980d..d9e4eb76209abffd0079ccdbbd2fc3f2
  
          this.addBehaviourGoals();
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+diff --git a/net/minecraft/world/entity/animal/horse/Donkey.java b/net/minecraft/world/entity/animal/horse/Donkey.java
 index 5cafdde956d7a5b00cd5aec5c44849639307363d..f4ef46c6cf40993b878ee965a0af397894231ba6 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+--- a/net/minecraft/world/entity/animal/horse/Donkey.java
++++ b/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -16,6 +16,13 @@ public class Donkey extends AbstractChestedHorse {
          super(type, world);
      }
@@ -2419,10 +2419,10 @@ index 5cafdde956d7a5b00cd5aec5c44849639307363d..f4ef46c6cf40993b878ee965a0af3978
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+diff --git a/net/minecraft/world/entity/animal/horse/Horse.java b/net/minecraft/world/entity/animal/horse/Horse.java
 index b5ec7c8ad0e482930d1a54b590b26093f4e477ea..4505bcc6ab70ee2bc969ecfaecf7cff072f48ca1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+--- a/net/minecraft/world/entity/animal/horse/Horse.java
++++ b/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -43,6 +43,13 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
          super(type, world);
      }
@@ -2437,10 +2437,10 @@ index b5ec7c8ad0e482930d1a54b590b26093f4e477ea..4505bcc6ab70ee2bc969ecfaecf7cff0
      @Override
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
 index 18bd483fe46de3d9dc129bffbccfba9d4cab9550..0e15cb99cab5ed664dc265f3754b9da7fef8958f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+--- a/net/minecraft/world/entity/animal/horse/Llama.java
++++ b/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -77,7 +77,51 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          super(type, world);
          this.getNavigation().setRequiredPathLength(40.0F);
@@ -2509,10 +2509,10 @@ index 18bd483fe46de3d9dc129bffbccfba9d4cab9550..0e15cb99cab5ed664dc265f3754b9da7
          this.targetSelector.addGoal(1, new Llama.LlamaHurtByTargetGoal(this));
          this.targetSelector.addGoal(2, new Llama.LlamaAttackWolfGoal(this));
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+diff --git a/net/minecraft/world/entity/animal/horse/Mule.java b/net/minecraft/world/entity/animal/horse/Mule.java
 index b108f34393230c090c3e5797f52aa076135915e4..bee1a67ccf17e74afe5c9a2ed8de113b750da278 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+--- a/net/minecraft/world/entity/animal/horse/Mule.java
++++ b/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -15,6 +15,13 @@ public class Mule extends AbstractChestedHorse {
          super(type, world);
      }
@@ -2527,10 +2527,10 @@ index b108f34393230c090c3e5797f52aa076135915e4..bee1a67ccf17e74afe5c9a2ed8de113b
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 index 7d0197447990bb79b85a4f1529c3ac3eefb03c84..20ee4f81a0f2a5eb2ef378ae0a7e7089b8bcc024 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+--- a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
++++ b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 @@ -42,6 +42,13 @@ public class SkeletonHorse extends AbstractHorse {
          super(type, world);
      }
@@ -2556,10 +2556,10 @@ index 7d0197447990bb79b85a4f1529c3ac3eefb03c84..20ee4f81a0f2a5eb2ef378ae0a7e7089
  
      @Override
      protected SoundEvent getAmbientSound() {
-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
+diff --git a/net/minecraft/world/entity/animal/horse/TraderLlama.java b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 index 53a8d59681809da931d11ff76c202f950993a142..22c84d0f51df4c13e7a0a20f3c316bf0879b172f 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
+--- a/net/minecraft/world/entity/animal/horse/TraderLlama.java
++++ b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 @@ -33,6 +33,28 @@ public class TraderLlama extends Llama {
          super(type, world);
      }
@@ -2589,10 +2589,10 @@ index 53a8d59681809da931d11ff76c202f950993a142..22c84d0f51df4c13e7a0a20f3c316bf0
      @Override
      public boolean isTraderLlama() {
          return true;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 index e89638fc9c87b555651813f615b0ccba10d2a9d0..7a94f39097566e00f572043b937cba46a385af4f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+--- a/net/minecraft/world/entity/animal/horse/ZombieHorse.java
++++ b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 @@ -33,6 +33,18 @@ public class ZombieHorse extends AbstractHorse {
          super(type, world);
      }
@@ -2620,10 +2620,10 @@ index e89638fc9c87b555651813f615b0ccba10d2a9d0..7a94f39097566e00f572043b937cba46
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+diff --git a/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 index af2f6e690fc51d319b77d081466c2dc7a1d8fe19..0a6403c18d643e1b47e54097423c21bb3a147d66 100644
---- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+--- a/net/minecraft/world/entity/animal/sniffer/Sniffer.java
++++ b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -90,6 +90,23 @@ public class Sniffer extends Animal {
          this.setPathfindingMalus(PathType.DAMAGE_CAUTIOUS, -1.0F);
      }
@@ -2648,10 +2648,10 @@ index af2f6e690fc51d319b77d081466c2dc7a1d8fe19..0a6403c18d643e1b47e54097423c21bb
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java b/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java
+diff --git a/net/minecraft/world/entity/boss/EnderDragonPart.java b/net/minecraft/world/entity/boss/EnderDragonPart.java
 index 58f303ce22cba0840a577b09ec5c32b13717fa15..31b129472b7bfe5bfe67d115ab27c35e476e07ce 100644
---- a/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java
+--- a/net/minecraft/world/entity/boss/EnderDragonPart.java
++++ b/net/minecraft/world/entity/boss/EnderDragonPart.java
 @@ -27,6 +27,13 @@ public class EnderDragonPart extends Entity {
          this.name = name;
      }
@@ -2666,10 +2666,10 @@ index 58f303ce22cba0840a577b09ec5c32b13717fa15..31b129472b7bfe5bfe67d115ab27c35e
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
      }
-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
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 index d5fc74dbc2c5f6b65fee46e7797b151144c8fd41..d51675bb8660eb9d5e4d1263c28ada321b40470c 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
+--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
++++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -108,6 +108,7 @@ public class EnderDragon extends Mob implements Enemy {
      @Nullable
      private BlockPos podium;
@@ -2820,10 +2820,10 @@ index d5fc74dbc2c5f6b65fee46e7797b151144c8fd41..d51675bb8660eb9d5e4d1263c28ada32
                      if (this.dragonFight != null) {
                          this.dragonFight.updateDragon(this);
                      }
-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
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 index bd9e10f79eaf0d23908229b3ebc2227946a14843..236e8ea79119dcf21c066b7c250fe20e6752df9e 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
+--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -86,16 +86,30 @@ public class WitherBoss extends Monster implements RangedAttackMob {
          return !entityliving.getType().is(EntityTypeTags.WITHER_FRIENDS) && entityliving.attackable();
      };
@@ -3001,10 +3001,10 @@ index bd9e10f79eaf0d23908229b3ebc2227946a14843..236e8ea79119dcf21c066b7c250fe20e
      }
  
      public boolean isPowered() {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+diff --git a/net/minecraft/world/entity/monster/AbstractSkeleton.java b/net/minecraft/world/entity/monster/AbstractSkeleton.java
 index 90b6ed81dcfd4021c7e9509da5e8725034fa07e5..22b003a23b519bedc50bbcad0706aa2d7d7f4b3a 100644
---- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+--- a/net/minecraft/world/entity/monster/AbstractSkeleton.java
++++ b/net/minecraft/world/entity/monster/AbstractSkeleton.java
 @@ -74,12 +74,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
  
      @Override
@@ -3020,10 +3020,10 @@ index 90b6ed81dcfd4021c7e9509da5e8725034fa07e5..22b003a23b519bedc50bbcad0706aa2d
          this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+diff --git a/net/minecraft/world/entity/monster/Blaze.java b/net/minecraft/world/entity/monster/Blaze.java
 index e33fa82ca1332b95bb067fd621212d3026eee1b7..968af87ceeb1862738c5270c2aad85c7974cfdb3 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+--- a/net/minecraft/world/entity/monster/Blaze.java
++++ b/net/minecraft/world/entity/monster/Blaze.java
 @@ -33,6 +33,7 @@ public class Blaze extends Monster {
  
      public Blaze(EntityType<? extends Blaze> type, Level world) {
@@ -3103,10 +3103,10 @@ index e33fa82ca1332b95bb067fd621212d3026eee1b7..968af87ceeb1862738c5270c2aad85c7
          this.nextHeightOffsetChangeTick--;
          if (this.nextHeightOffsetChangeTick <= 0) {
              this.nextHeightOffsetChangeTick = 100;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Bogged.java b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
+diff --git a/net/minecraft/world/entity/monster/Bogged.java b/net/minecraft/world/entity/monster/Bogged.java
 index 975477663b6d76a69c006a89e440e21471b39b89..05848ad509461f3fd40d820098cf7cbfe6866b0c 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Bogged.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
+--- a/net/minecraft/world/entity/monster/Bogged.java
++++ b/net/minecraft/world/entity/monster/Bogged.java
 @@ -44,6 +44,23 @@ public class Bogged extends AbstractSkeleton implements Shearable {
          super(type, world);
      }
@@ -3131,10 +3131,10 @@ index 975477663b6d76a69c006a89e440e21471b39b89..05848ad509461f3fd40d820098cf7cbf
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
+diff --git a/net/minecraft/world/entity/monster/CaveSpider.java b/net/minecraft/world/entity/monster/CaveSpider.java
 index 4e621a7f36b3d718695434a2a4e3060283667bb2..a21a18e249dbfa0f1d3d6995b6810961ed5e084b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
+--- a/net/minecraft/world/entity/monster/CaveSpider.java
++++ b/net/minecraft/world/entity/monster/CaveSpider.java
 @@ -27,6 +27,23 @@ public class CaveSpider extends Spider {
          return Spider.createAttributes().add(Attributes.MAX_HEALTH, 12.0D);
      }
@@ -3159,10 +3159,10 @@ index 4e621a7f36b3d718695434a2a4e3060283667bb2..a21a18e249dbfa0f1d3d6995b6810961
      @Override
      public boolean doHurtTarget(ServerLevel world, Entity target) {
          if (super.doHurtTarget(world, target)) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
 index 1906dfc22af208d6e801ad4a8f2f9e9702432691..ff7ee3a07f0c84aaa36be3a324274b4ccb04fb0b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+--- a/net/minecraft/world/entity/monster/Creeper.java
++++ b/net/minecraft/world/entity/monster/Creeper.java
 @@ -60,21 +60,98 @@ public class Creeper extends Monster {
      public int explosionRadius = 3;
      private int droppedSkulls;
@@ -3270,10 +3270,10 @@ index 1906dfc22af208d6e801ad4a8f2f9e9702432691..ff7ee3a07f0c84aaa36be3a324274b4c
              }
          }
          // Paper end - CreeperIgniteEvent
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java
 index c6c86913c0a48501a9109a3838a3e56685d16d79..025133dff77df06e147defb70f920ee140b9881f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+--- a/net/minecraft/world/entity/monster/Drowned.java
++++ b/net/minecraft/world/entity/monster/Drowned.java
 @@ -75,6 +75,23 @@ public class Drowned extends Zombie implements RangedAttackMob {
          return Zombie.createAttributes().add(Attributes.STEP_HEIGHT, 1.0);
      }
@@ -3334,10 +3334,10 @@ index c6c86913c0a48501a9109a3838a3e56685d16d79..025133dff77df06e147defb70f920ee1
              }
          }
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
+diff --git a/net/minecraft/world/entity/monster/ElderGuardian.java b/net/minecraft/world/entity/monster/ElderGuardian.java
 index 378694a38115c012978e1fea59d049d1ebd04110..bff963a1a0d89b57a686ed06aa630e789a602d82 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
+--- a/net/minecraft/world/entity/monster/ElderGuardian.java
++++ b/net/minecraft/world/entity/monster/ElderGuardian.java
 @@ -33,6 +33,18 @@ public class ElderGuardian extends Guardian {
  
      }
@@ -3357,10 +3357,10 @@ index 378694a38115c012978e1fea59d049d1ebd04110..bff963a1a0d89b57a686ed06aa630e78
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index 2a394381a4ad46359359ba402b65c62b331480b4..f3013664d21f70c2650306f2406e93b21de8f9e0 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -94,9 +94,27 @@ public class EnderMan extends Monster implements NeutralMob {
          this.setPathfindingMalus(PathType.WATER, -1.0F);
      }
@@ -3414,10 +3414,10 @@ index 2a394381a4ad46359359ba402b65c62b331480b4..f3013664d21f70c2650306f2406e93b2
          } else {
              boolean flag = source.getDirectEntity() instanceof ThrownPotion;
              boolean flag1;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
 index 534e98dd7291e09dee1d0f77cbf221b15708590f..ac9116735d8ee4713fab8d90ef12e781b77b26c8 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+--- a/net/minecraft/world/entity/monster/Endermite.java
++++ b/net/minecraft/world/entity/monster/Endermite.java
 @@ -38,14 +38,33 @@ public class Endermite extends Monster {
          this.xpReward = 3;
      }
@@ -3452,10 +3452,10 @@ index 534e98dd7291e09dee1d0f77cbf221b15708590f..ac9116735d8ee4713fab8d90ef12e781
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+diff --git a/net/minecraft/world/entity/monster/Evoker.java b/net/minecraft/world/entity/monster/Evoker.java
 index 14f23c9a248760a57b3d6fe4f2824a4a456a6d37..69a37f88c7f05084007cc2f895c31650da6566f8 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+--- a/net/minecraft/world/entity/monster/Evoker.java
++++ b/net/minecraft/world/entity/monster/Evoker.java
 @@ -53,10 +53,28 @@ public class Evoker extends SpellcasterIllager {
          this.xpReward = 10;
      }
@@ -3493,10 +3493,10 @@ index 14f23c9a248760a57b3d6fe4f2824a4a456a6d37..69a37f88c7f05084007cc2f895c31650
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Raider.class})).setAlertOthers());
          this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
          this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)).setUnseenMemoryTicks(300));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java
 index a8c8c03e972aa6352843cf4c3e4aebfb8f493125..8cb7bdd96f9780ee5e2fa0876bc80d092e06b5f5 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+--- a/net/minecraft/world/entity/monster/Ghast.java
++++ b/net/minecraft/world/entity/monster/Ghast.java
 @@ -44,11 +44,47 @@ public class Ghast extends FlyingMob implements Enemy {
          this.moveControl = new Ghast.GhastMoveControl(this);
      }
@@ -3572,10 +3572,10 @@ index a8c8c03e972aa6352843cf4c3e4aebfb8f493125..8cb7bdd96f9780ee5e2fa0876bc80d09
              if (this.operation == MoveControl.Operation.MOVE_TO) {
                  if (this.floatDuration-- <= 0) {
                      this.floatDuration += this.ghast.getRandom().nextInt(5) + 2;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+diff --git a/net/minecraft/world/entity/monster/Giant.java b/net/minecraft/world/entity/monster/Giant.java
 index 118521ae54254b0a73bb7cba7b2871c9c26f89fc..64e4f78fd626c59e2957140af22993aa8e5c4f15 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+--- a/net/minecraft/world/entity/monster/Giant.java
++++ b/net/minecraft/world/entity/monster/Giant.java
 @@ -12,6 +12,29 @@ public class Giant extends Monster {
          super(type, world);
      }
@@ -3606,10 +3606,10 @@ index 118521ae54254b0a73bb7cba7b2871c9c26f89fc..64e4f78fd626c59e2957140af22993aa
      public static AttributeSupplier.Builder createAttributes() {
          return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.ATTACK_DAMAGE, 50.0);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java
 index 951f46684623582980901c1ebc1870aa5bcf25a1..bde5d88dcdb4f2305e2786842551c36da5ed9778 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+--- a/net/minecraft/world/entity/monster/Guardian.java
++++ b/net/minecraft/world/entity/monster/Guardian.java
 @@ -67,15 +67,36 @@ public class Guardian extends Monster {
          this.xpReward = 10;
          this.setPathfindingMalus(PathType.WATER, 0.0F);
@@ -3701,10 +3701,10 @@ index 951f46684623582980901c1ebc1870aa5bcf25a1..bde5d88dcdb4f2305e2786842551c36d
                  float f2 = Mth.lerp(0.125F, this.guardian.getSpeed(), f1);
  
                  this.guardian.setSpeed(f2);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+diff --git a/net/minecraft/world/entity/monster/Husk.java b/net/minecraft/world/entity/monster/Husk.java
 index 184fa759db065fb345f3623752229430816d8ad3..f396652fdc30ec5638b30a8b4189f05fb0eee12d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+--- a/net/minecraft/world/entity/monster/Husk.java
++++ b/net/minecraft/world/entity/monster/Husk.java
 @@ -23,6 +23,23 @@ public class Husk extends Zombie {
          super(type, world);
      }
@@ -3729,10 +3729,10 @@ index 184fa759db065fb345f3623752229430816d8ad3..f396652fdc30ec5638b30a8b4189f05f
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random) {
          return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (EntitySpawnReason.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
+diff --git a/net/minecraft/world/entity/monster/Illusioner.java b/net/minecraft/world/entity/monster/Illusioner.java
 index db3aac9ba711dcd18ffc35c4a745ecaec89d0166..8ff616fe05071bd2a197a465c7e17f35a3e72d44 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
+--- a/net/minecraft/world/entity/monster/Illusioner.java
++++ b/net/minecraft/world/entity/monster/Illusioner.java
 @@ -59,10 +59,28 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
  
      }
@@ -3770,10 +3770,10 @@ index db3aac9ba711dcd18ffc35c4a745ecaec89d0166..8ff616fe05071bd2a197a465c7e17f35
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Raider.class})).setAlertOthers());
          this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
          this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)).setUnseenMemoryTicks(300));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
+diff --git a/net/minecraft/world/entity/monster/MagmaCube.java b/net/minecraft/world/entity/monster/MagmaCube.java
 index ae710c3fffc7840a9ff2cbc5cdacef8a2e248253..4f7d99fadfa1ba31439ec02bfb107288a722e828 100644
---- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
+--- a/net/minecraft/world/entity/monster/MagmaCube.java
++++ b/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -24,6 +24,28 @@ public class MagmaCube extends Slime {
          super(type, world);
      }
@@ -3811,10 +3811,10 @@ index ae710c3fffc7840a9ff2cbc5cdacef8a2e248253..4f7d99fadfa1ba31439ec02bfb107288
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
 index 4ff75412452649ebf106ef591cb97dc7ac8175e7..afd00fd83e6c246afecf7042435ae119057b9e93 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+--- a/net/minecraft/world/entity/monster/Phantom.java
++++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -60,6 +60,64 @@ public class Phantom extends FlyingMob implements Enemy {
          this.lookControl = new Phantom.PhantomLookControl(this);
      }
@@ -3953,10 +3953,10 @@ index 4ff75412452649ebf106ef591cb97dc7ac8175e7..afd00fd83e6c246afecf7042435ae119
      }
  
      private class PhantomBodyRotationControl extends BodyRotationControl {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
+diff --git a/net/minecraft/world/entity/monster/Pillager.java b/net/minecraft/world/entity/monster/Pillager.java
 index 91edf8767541982b8cd1be83c33a7b287ffb62fe..a629e31e6ea0f49f88746856382fcec96918c490 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
+--- a/net/minecraft/world/entity/monster/Pillager.java
++++ b/net/minecraft/world/entity/monster/Pillager.java
 @@ -67,16 +67,35 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
          super(type, world);
      }
@@ -3993,10 +3993,10 @@ index 91edf8767541982b8cd1be83c33a7b287ffb62fe..a629e31e6ea0f49f88746856382fcec9
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Raider.class})).setAlertOthers());
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
 index cfc28828a5b81563a826ae6045553e7350f67986..6222ed8408096e0bb8e9572c07c0db6971fc8308 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+--- a/net/minecraft/world/entity/monster/Ravager.java
++++ b/net/minecraft/world/entity/monster/Ravager.java
 @@ -75,14 +75,39 @@ public class Ravager extends Raider {
          this.setPathfindingMalus(PathType.LEAVES, 0.0F);
      }
@@ -4046,10 +4046,10 @@ index cfc28828a5b81563a826ae6045553e7350f67986..6222ed8408096e0bb8e9572c07c0db69
              if (this.isImmobile()) {
                  this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.0D);
              } else {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
 index 64d99b8b576212f754bd316343562b1ba7f604fa..6541e1059ca16cfd01bf01aae2c56400cbe78132 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+--- a/net/minecraft/world/entity/monster/Shulker.java
++++ b/net/minecraft/world/entity/monster/Shulker.java
 @@ -98,12 +98,31 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
          this.lookControl = new Shulker.ShulkerLookControl(this);
      }
@@ -4091,10 +4091,10 @@ index 64d99b8b576212f754bd316343562b1ba7f604fa..6541e1059ca16cfd01bf01aae2c56400
  
          public ShulkerLookControl(final Mob entity) {
              super(entity);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+diff --git a/net/minecraft/world/entity/monster/Silverfish.java b/net/minecraft/world/entity/monster/Silverfish.java
 index ff65cb8ea5233f2dd159f42ad53bc9d300cd604f..6f1d59651552ef7443eb8274765614d5abc984df 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+--- a/net/minecraft/world/entity/monster/Silverfish.java
++++ b/net/minecraft/world/entity/monster/Silverfish.java
 @@ -44,14 +44,33 @@ public class Silverfish extends Monster {
          super(type, world);
      }
@@ -4129,10 +4129,10 @@ index ff65cb8ea5233f2dd159f42ad53bc9d300cd604f..6f1d59651552ef7443eb8274765614d5
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+diff --git a/net/minecraft/world/entity/monster/Skeleton.java b/net/minecraft/world/entity/monster/Skeleton.java
 index 3972e2ed0554e2550519e994888e068df0a151e5..78c8483da3c0ac7f93e236dd723fc6051427a50e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+--- a/net/minecraft/world/entity/monster/Skeleton.java
++++ b/net/minecraft/world/entity/monster/Skeleton.java
 @@ -29,6 +29,23 @@ public class Skeleton extends AbstractSkeleton {
          super(type, world);
      }
@@ -4157,10 +4157,10 @@ index 3972e2ed0554e2550519e994888e068df0a151e5..78c8483da3c0ac7f93e236dd723fc605
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
+diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
 index 72346a7e5269c91e3143933ac37e65ad9639b791..b7941230b082d4de9ab77c981bd396fa1184d78e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
+--- a/net/minecraft/world/entity/monster/Slime.java
++++ b/net/minecraft/world/entity/monster/Slime.java
 @@ -65,6 +65,7 @@ public class Slime extends Mob implements Enemy {
      public float squish;
      public float oSquish;
@@ -4281,10 +4281,10 @@ index 72346a7e5269c91e3143933ac37e65ad9639b791..b7941230b082d4de9ab77c981bd396fa
                  }
  
              }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+diff --git a/net/minecraft/world/entity/monster/Spider.java b/net/minecraft/world/entity/monster/Spider.java
 index 91e521414c3ea5722aac7506b7589fbb399e9636..d3eabdde9e9bf010cae7fc81165f0123adfcf958 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+--- a/net/minecraft/world/entity/monster/Spider.java
++++ b/net/minecraft/world/entity/monster/Spider.java
 @@ -51,9 +51,27 @@ public class Spider extends Monster {
          super(type, world);
      }
@@ -4321,10 +4321,10 @@ index 91e521414c3ea5722aac7506b7589fbb399e9636..d3eabdde9e9bf010cae7fc81165f0123
          this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
          this.targetSelector.addGoal(2, new Spider.SpiderTargetGoal<>(this, Player.class));
          this.targetSelector.addGoal(3, new Spider.SpiderTargetGoal<>(this, IronGolem.class));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
+diff --git a/net/minecraft/world/entity/monster/Stray.java b/net/minecraft/world/entity/monster/Stray.java
 index baaf17107584b253d7e268749849bf5b0d0c88ab..879748708e3fc8c0a3f126d265e99a7c054d2a10 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
+--- a/net/minecraft/world/entity/monster/Stray.java
++++ b/net/minecraft/world/entity/monster/Stray.java
 @@ -22,6 +22,23 @@ public class Stray extends AbstractSkeleton {
          super(type, world);
      }
@@ -4349,10 +4349,10 @@ index baaf17107584b253d7e268749849bf5b0d0c88ab..879748708e3fc8c0a3f126d265e99a7c
      public static boolean checkStraySpawnRules(
          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
+diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
 index 0a9246241985d2d97beb865b7163f1d2198f03b8..7b1525c6bc46d65660588d90c3121ad3d12cf077 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
+--- a/net/minecraft/world/entity/monster/Strider.java
++++ b/net/minecraft/world/entity/monster/Strider.java
 @@ -97,6 +97,23 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
          this.setPathfindingMalus(PathType.DAMAGE_FIRE, 0.0F);
      }
@@ -4394,10 +4394,10 @@ index 0a9246241985d2d97beb865b7163f1d2198f03b8..7b1525c6bc46d65660588d90c3121ad3
              } else {
                  if (flag && !this.isSilent()) {
                      this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.STRIDER_EAT, this.getSoundSource(), 1.0F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
+diff --git a/net/minecraft/world/entity/monster/Vex.java b/net/minecraft/world/entity/monster/Vex.java
 index 183a33b7d666d652b455baa7e8339e9c4a870a58..fba52457f85573f5918aeeb5f3b69b3f113cc9d5 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
+--- a/net/minecraft/world/entity/monster/Vex.java
++++ b/net/minecraft/world/entity/monster/Vex.java
 @@ -59,6 +59,50 @@ public class Vex extends Monster implements TraceableEntity {
          this.xpReward = 3;
      }
@@ -4505,10 +4505,10 @@ index 183a33b7d666d652b455baa7e8339e9c4a870a58..fba52457f85573f5918aeeb5f3b69b3f
                      if (Vex.this.getTarget() == null) {
                          Vec3 vec3d1 = Vex.this.getDeltaMovement();
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+diff --git a/net/minecraft/world/entity/monster/Vindicator.java b/net/minecraft/world/entity/monster/Vindicator.java
 index 96b105697c91314148fd1b783501389214b1a3f0..5bf2aad976be5d6149b8252c84cd870551a2aa8e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+--- a/net/minecraft/world/entity/monster/Vindicator.java
++++ b/net/minecraft/world/entity/monster/Vindicator.java
 @@ -55,15 +55,34 @@ public class Vindicator extends AbstractIllager {
          super(type, world);
      }
@@ -4544,10 +4544,10 @@ index 96b105697c91314148fd1b783501389214b1a3f0..5bf2aad976be5d6149b8252c84cd8705
          this.targetSelector.addGoal(1, new HurtByTargetGoal(this, Raider.class).setAlertOthers());
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
+diff --git a/net/minecraft/world/entity/monster/Witch.java b/net/minecraft/world/entity/monster/Witch.java
 index a03fa8a3e648532a7ffaaf523ca87c13e8af4c0a..5cba860f9ce81d90eec4c6bf45699d28cf8d93e6 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
+--- a/net/minecraft/world/entity/monster/Witch.java
++++ b/net/minecraft/world/entity/monster/Witch.java
 @@ -57,6 +57,23 @@ public class Witch extends Raider implements RangedAttackMob {
          super(type, world);
      }
@@ -4585,10 +4585,10 @@ index a03fa8a3e648532a7ffaaf523ca87c13e8af4c0a..5cba860f9ce81d90eec4c6bf45699d28
          this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[]{Raider.class}));
          this.targetSelector.addGoal(2, this.healRaidersGoal);
          this.targetSelector.addGoal(3, this.attackPlayersGoal);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
+diff --git a/net/minecraft/world/entity/monster/WitherSkeleton.java b/net/minecraft/world/entity/monster/WitherSkeleton.java
 index 557b4e225688416132281e9b1759d46a9b775ff9..626cab5a974d2c8736123cc23e535b5cf0e5349e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
+--- a/net/minecraft/world/entity/monster/WitherSkeleton.java
++++ b/net/minecraft/world/entity/monster/WitherSkeleton.java
 @@ -36,6 +36,23 @@ public class WitherSkeleton extends AbstractSkeleton {
          this.setPathfindingMalus(PathType.LAVA, 8.0F);
      }
@@ -4613,10 +4613,10 @@ index 557b4e225688416132281e9b1759d46a9b775ff9..626cab5a974d2c8736123cc23e535b5c
      @Override
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+diff --git a/net/minecraft/world/entity/monster/Zoglin.java b/net/minecraft/world/entity/monster/Zoglin.java
 index 35b0c5c322864e2f5ae5a412296072f268adcd05..2ac14783e7b5739a13c487d5028ecba38480980d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+--- a/net/minecraft/world/entity/monster/Zoglin.java
++++ b/net/minecraft/world/entity/monster/Zoglin.java
 @@ -85,6 +85,23 @@ public class Zoglin extends Monster implements HoglinBase {
          this.xpReward = 5;
      }
@@ -4649,10 +4649,10 @@ index 35b0c5c322864e2f5ae5a412296072f268adcd05..2ac14783e7b5739a13c487d5028ecba3
          this.getBrain().tick(world, this);
          profilerFiller.pop();
          this.updateActivity();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
 index a12461907278cfbfa3b1c0aa74b9f07a31768b8a..9b4b923117a7025bdbb6d222c6388aeae9bef8a2 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+--- a/net/minecraft/world/entity/monster/Zombie.java
++++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -110,11 +110,30 @@ public class Zombie extends Monster {
          this(EntityType.ZOMBIE, world);
      }
@@ -4684,10 +4684,10 @@ index a12461907278cfbfa3b1c0aa74b9f07a31768b8a..9b4b923117a7025bdbb6d222c6388aea
          this.addBehaviourGoals();
      }
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
 index 30bce56a70f923b0ec77c8e3f29e435a71c71510..9fafe05ef0ffc1120873727082290a8ea177d62f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+--- a/net/minecraft/world/entity/monster/ZombieVillager.java
++++ b/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -85,6 +85,23 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          });
      }
@@ -4712,10 +4712,10 @@ index 30bce56a70f923b0ec77c8e3f29e435a71c71510..9fafe05ef0ffc1120873727082290a8e
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+diff --git a/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 index 03e3cbe73119ca76417d4dd192e1560bdfc373ec..69c291c3347a3e3f454ecb8f418a310bbd688a43 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+--- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java
++++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -63,6 +63,23 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
          this.setPathfindingMalus(PathType.LAVA, 8.0F);
      }
@@ -4740,10 +4740,10 @@ index 03e3cbe73119ca76417d4dd192e1560bdfc373ec..69c291c3347a3e3f454ecb8f418a310b
      @Override
      public void setPersistentAngerTarget(@Nullable UUID angryAt) {
          this.persistentAngerTarget = angryAt;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/creaking/Creaking.java b/src/main/java/net/minecraft/world/entity/monster/creaking/Creaking.java
+diff --git a/net/minecraft/world/entity/monster/creaking/Creaking.java b/net/minecraft/world/entity/monster/creaking/Creaking.java
 index 6a7e725edece3043c8523d387e2929d5ba8932cb..6716bfa903be5ab34b80c963cc9d6a8a26272621 100644
---- a/src/main/java/net/minecraft/world/entity/monster/creaking/Creaking.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/creaking/Creaking.java
+--- a/net/minecraft/world/entity/monster/creaking/Creaking.java
++++ b/net/minecraft/world/entity/monster/creaking/Creaking.java
 @@ -106,6 +106,29 @@ public class Creaking extends Monster {
          return this.getHomePos() != null;
      }
@@ -4812,10 +4812,10 @@ index 6a7e725edece3043c8523d387e2929d5ba8932cb..6716bfa903be5ab34b80c963cc9d6a8a
              }
  
          }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 index 92270912ef26924f611a1df7cb3d5b485b0a262d..4ab971e86b48ce3010928fe9046e8f68224719ca 100644
---- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+--- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java
++++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -71,6 +71,23 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
          this.xpReward = 5;
      }
@@ -4848,10 +4848,10 @@ index 92270912ef26924f611a1df7cb3d5b485b0a262d..4ab971e86b48ce3010928fe9046e8f68
          this.getBrain().tick(world, this);
          gameprofilerfiller.pop();
          HoglinAi.updateActivity(this);
-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
+diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java
 index 2121d2a2e1aa1d0f0390cc515317096431f6dcb0..b19e3b442a650f773df462e32088648a2b7eafd4 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
+--- a/net/minecraft/world/entity/monster/piglin/Piglin.java
++++ b/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -99,6 +99,23 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
          this.xpReward = 5;
      }
@@ -4884,10 +4884,10 @@ index 2121d2a2e1aa1d0f0390cc515317096431f6dcb0..b19e3b442a650f773df462e32088648a
          this.getBrain().tick(world, this);
          gameprofilerfiller.pop();
          PiglinAi.updateActivity(this);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+diff --git a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 index 24eaeb93284fe1a573026b85818a93a34fd9e1ec..3dc234f8cea8769f715a4913ae4ecf7d47433577 100644
---- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+--- a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
++++ b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 @@ -65,6 +65,23 @@ public class PiglinBrute extends AbstractPiglin {
          this.xpReward = 20;
      }
@@ -4920,10 +4920,10 @@ index 24eaeb93284fe1a573026b85818a93a34fd9e1ec..3dc234f8cea8769f715a4913ae4ecf7d
          this.getBrain().tick(world, this);
          profilerFiller.pop();
          PiglinBruteAi.updateActivity(this);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
+diff --git a/net/minecraft/world/entity/monster/warden/Warden.java b/net/minecraft/world/entity/monster/warden/Warden.java
 index c47ed605f0822effd58df4f875297ed015e1e57e..19f7a6d55144adb5217fbea590d8f23d79ed05e0 100644
---- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
+--- a/net/minecraft/world/entity/monster/warden/Warden.java
++++ b/net/minecraft/world/entity/monster/warden/Warden.java
 @@ -127,8 +127,32 @@ public class Warden extends Monster implements VibrationSystem {
          this.setPathfindingMalus(PathType.LAVA, 8.0F);
          this.setPathfindingMalus(PathType.DAMAGE_FIRE, 0.0F);
@@ -4978,10 +4978,10 @@ index c47ed605f0822effd58df4f875297ed015e1e57e..19f7a6d55144adb5217fbea590d8f23d
      }
  
      public static void applyDarknessAround(ServerLevel world, Vec3 pos, @Nullable Entity entity, int range) {
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index 2d8ba55906c8da16fde850e3412f4a6bda3d56e7..066836e450ca8d104990c3c5fba5fe3dad2e136e 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -156,6 +156,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          this.setVillagerData(this.getVillagerData().setType(type).setProfession(VillagerProfession.NONE));
      }
@@ -5045,10 +5045,10 @@ index 2d8ba55906c8da16fde850e3412f4a6bda3d56e7..066836e450ca8d104990c3c5fba5fe3d
                      this.startTrading(player);
                  }
  
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
 index 1e77cce428d9e53142aaa2cf780b7f862d536eca..c5bef9f0ad2a0f57d8c37ea0833e899dc588d30f 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+--- a/net/minecraft/world/entity/npc/WanderingTrader.java
++++ b/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -72,6 +72,23 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          //this.setDespawnDelay(48000); // CraftBukkit - set default from MobSpawnerTrader // Paper - move back to MobSpawnerTrader - Vanilla behavior is that only traders spawned by it have this value set.
      }
@@ -5085,10 +5085,10 @@ index 1e77cce428d9e53142aaa2cf780b7f862d536eca..c5bef9f0ad2a0f57d8c37ea0833e899d
                  this.setTradingPlayer(player);
                  this.openTradingScreen(player, this.getDisplayName(), 1);
              }
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index 5b8b85a295a08ae495f729c595b3a78778965342..28a4cf814ec4b34dce883ba4f24ca55008c8f6c1 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -211,6 +211,19 @@ public abstract class Player extends LivingEntity {
      }
      // CraftBukkit end
@@ -5109,10 +5109,10 @@ index 5b8b85a295a08ae495f729c595b3a78778965342..28a4cf814ec4b34dce883ba4f24ca550
      public Player(Level world, BlockPos pos, float yaw, GameProfile gameProfile) {
          super(EntityType.PLAYER, world);
          this.lastItemInMainHand = ItemStack.EMPTY;
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/LlamaSpit.java b/src/main/java/net/minecraft/world/entity/projectile/LlamaSpit.java
+diff --git a/net/minecraft/world/entity/projectile/LlamaSpit.java b/net/minecraft/world/entity/projectile/LlamaSpit.java
 index 958ea103cc80da7366cc33dc385b76d4f5c809f2..f8ff53488d886bfd67ca3bfe4431b42010052d87 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/LlamaSpit.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/LlamaSpit.java
+--- a/net/minecraft/world/entity/projectile/LlamaSpit.java
++++ b/net/minecraft/world/entity/projectile/LlamaSpit.java
 @@ -33,6 +33,12 @@ public class LlamaSpit extends Projectile {
          this.setPos(owner.getX() - (double) (owner.getBbWidth() + 1.0F) * 0.5D * (double) Mth.sin(owner.yBodyRot * 0.017453292F), owner.getEyeY() - 0.10000000149011612D, owner.getZ() + (double) (owner.getBbWidth() + 1.0F) * 0.5D * (double) Mth.cos(owner.yBodyRot * 0.017453292F));
      }
@@ -5126,10 +5126,10 @@ index 958ea103cc80da7366cc33dc385b76d4f5c809f2..f8ff53488d886bfd67ca3bfe4431b420
      @Override
      protected double getDefaultGravity() {
          return 0.06D;
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
+diff --git a/net/minecraft/world/entity/projectile/WitherSkull.java b/net/minecraft/world/entity/projectile/WitherSkull.java
 index 4c47b30867e30d84908abf93dbefc252bc8c3453..8296765d8f63f1a9fd207b27d495d7c04646f134 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
+--- a/net/minecraft/world/entity/projectile/WitherSkull.java
++++ b/net/minecraft/world/entity/projectile/WitherSkull.java
 @@ -115,6 +115,14 @@ public class WitherSkull extends AbstractHurtingProjectile {
  
      }
diff --git a/patches/server/0008-Configurable-entity-base-attributes.patch b/patches/server/0008-Configurable-entity-base-attributes.patch
index f3e6124c0..b85e7164c 100644
--- a/patches/server/0008-Configurable-entity-base-attributes.patch
+++ b/patches/server/0008-Configurable-entity-base-attributes.patch
@@ -4,10 +4,10 @@ Date: Thu, 10 Dec 2020 16:44:54 -0600
 Subject: [PATCH] Configurable entity base attributes
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index 5c14180d92e1baebe59b08311746418e7d9f6a24..755861185bd8434027acca7f03ed0bfdf9fa2cde 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -177,7 +177,7 @@ import org.bukkit.plugin.PluginManager;
  // CraftBukkit end
  
@@ -17,10 +17,10 @@ index 5c14180d92e1baebe59b08311746418e7d9f6a24..755861185bd8434027acca7f03ed0bfd
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
      public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first setPositionRotation
-diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
+diff --git a/net/minecraft/world/entity/GlowSquid.java b/net/minecraft/world/entity/GlowSquid.java
 index 293ffe990de70f4f8872f063388a3a50c60b68e6..66a5c485ed2d29d0079ae714c2dd7b01aab11d86 100644
---- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
-+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
+--- a/net/minecraft/world/entity/GlowSquid.java
++++ b/net/minecraft/world/entity/GlowSquid.java
 @@ -38,6 +38,12 @@ public class GlowSquid extends Squid {
      }
      // Purpur end - Ridables
@@ -34,10 +34,10 @@ index 293ffe990de70f4f8872f063388a3a50c60b68e6..66a5c485ed2d29d0079ae714c2dd7b01
      @Override
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index 715b76bd0ccc0c29583a55f82a8ecd889ab49b56..6884475a5217acb8073dc38e5f7a7b341c8b1dd1 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -324,6 +324,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.activeLocationDependentEnchantments = new EnumMap(EquipmentSlot.class);
          this.appliedScale = 1.0F;
@@ -55,10 +55,10 @@ index 715b76bd0ccc0c29583a55f82a8ecd889ab49b56..6884475a5217acb8073dc38e5f7a7b34
      public Brain<?> getBrain() {
          return this.brain;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+diff --git a/net/minecraft/world/entity/ambient/Bat.java b/net/minecraft/world/entity/ambient/Bat.java
 index add1c146cd7428547d9ef8810841b4cf39a6a05e..5f11c687df87015261d1d39c957e241fbeb5476a 100644
---- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+--- a/net/minecraft/world/entity/ambient/Bat.java
++++ b/net/minecraft/world/entity/ambient/Bat.java
 @@ -100,6 +100,20 @@ public class Bat extends AmbientCreature {
      }
      // Purpur end - Ridables
@@ -80,10 +80,10 @@ index add1c146cd7428547d9ef8810841b4cf39a6a05e..5f11c687df87015261d1d39c957e241f
      @Override
      public boolean isFlapping() {
          return !this.isResting() && (float) this.tickCount % 10.0F == 0.0F;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
 index 13f6e4c83e1775daadb13e3532d7dfe6eef15aac..8751cc882f2dcbf6dfc10cebab9d9a4f95ebfb10 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+--- a/net/minecraft/world/entity/animal/Bee.java
++++ b/net/minecraft/world/entity/animal/Bee.java
 @@ -489,6 +489,13 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          return tileentitybeehive != null && tileentitybeehive.isFireNearby();
      }
@@ -98,10 +98,10 @@ index 13f6e4c83e1775daadb13e3532d7dfe6eef15aac..8751cc882f2dcbf6dfc10cebab9d9a4f
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java
 index 472bbf4c3f932e2b1c7d7fa3c74b41f5be11431f..b4f022093a52c1fe13ad67ad70d57fd0278a9d55 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+--- a/net/minecraft/world/entity/animal/Cat.java
++++ b/net/minecraft/world/entity/animal/Cat.java
 @@ -125,6 +125,13 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
      }
      // Purpur end - Ridables
@@ -116,10 +116,10 @@ index 472bbf4c3f932e2b1c7d7fa3c74b41f5be11431f..b4f022093a52c1fe13ad67ad70d57fd0
      @Override
      protected void registerGoals() {
          this.temptGoal = new Cat.CatTemptGoal(this, 0.6D, (itemstack) -> {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+diff --git a/net/minecraft/world/entity/animal/Chicken.java b/net/minecraft/world/entity/animal/Chicken.java
 index 5eaa1d42ec72ff077d974db3284cae32a9809da7..2f1518536e63dfd94db5c8a2076004319408409c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+--- a/net/minecraft/world/entity/animal/Chicken.java
++++ b/net/minecraft/world/entity/animal/Chicken.java
 @@ -70,6 +70,13 @@ public class Chicken extends Animal {
      }
      // Purpur end - Ridables
@@ -134,10 +134,10 @@ index 5eaa1d42ec72ff077d974db3284cae32a9809da7..2f1518536e63dfd94db5c8a207600431
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
+diff --git a/net/minecraft/world/entity/animal/Cod.java b/net/minecraft/world/entity/animal/Cod.java
 index fcf7073dd2d79f1483bdc6e7fdc37c8c260ae418..dad2dc77afead53e0fa7f2f797ac3850279d5d40 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
+--- a/net/minecraft/world/entity/animal/Cod.java
++++ b/net/minecraft/world/entity/animal/Cod.java
 @@ -25,6 +25,12 @@ public class Cod extends AbstractSchoolingFish {
      }
      // Purpur end - Ridables
@@ -151,10 +151,10 @@ index fcf7073dd2d79f1483bdc6e7fdc37c8c260ae418..dad2dc77afead53e0fa7f2f797ac3850
      @Override
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+diff --git a/net/minecraft/world/entity/animal/Cow.java b/net/minecraft/world/entity/animal/Cow.java
 index dc7ccfe90a82892d65098a325fd71fbbc734da86..064188a7032170ed16cf3b538efc444e54325036 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+--- a/net/minecraft/world/entity/animal/Cow.java
++++ b/net/minecraft/world/entity/animal/Cow.java
 @@ -61,6 +61,13 @@ public class Cow extends Animal {
      }
      // Purpur end - Ridables
@@ -169,10 +169,10 @@ index dc7ccfe90a82892d65098a325fd71fbbc734da86..064188a7032170ed16cf3b538efc444e
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+diff --git a/net/minecraft/world/entity/animal/Dolphin.java b/net/minecraft/world/entity/animal/Dolphin.java
 index af677b6581514a07e6455977ffc591538d43bbc6..2ee7de39712d67b593ff287a9ed17c28fa768b3c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+--- a/net/minecraft/world/entity/animal/Dolphin.java
++++ b/net/minecraft/world/entity/animal/Dolphin.java
 @@ -161,6 +161,13 @@ public class Dolphin extends AgeableWaterCreature {
      }
      // Purpur end - Ridables
@@ -187,10 +187,10 @@ index af677b6581514a07e6455977ffc591538d43bbc6..2ee7de39712d67b593ff287a9ed17c28
      @Nullable
      @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
+diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java
 index ce5ac300582f61d0f3eeb1e94340cfefbdff1ba9..584d08bca961f8b8487b844cd2412b773401296d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+--- a/net/minecraft/world/entity/animal/Fox.java
++++ b/net/minecraft/world/entity/animal/Fox.java
 @@ -182,6 +182,13 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
      }
      // Purpur end - Ridables
@@ -205,10 +205,10 @@ index ce5ac300582f61d0f3eeb1e94340cfefbdff1ba9..584d08bca961f8b8487b844cd2412b77
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+diff --git a/net/minecraft/world/entity/animal/IronGolem.java b/net/minecraft/world/entity/animal/IronGolem.java
 index 938a0c6f7cfbb6cd459d5a2ec46f912d45fd2226..124b7d6881964039829313c52427e332e1ac526b 100644
---- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+--- a/net/minecraft/world/entity/animal/IronGolem.java
++++ b/net/minecraft/world/entity/animal/IronGolem.java
 @@ -79,6 +79,13 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      }
      // Purpur end - Ridables
@@ -223,10 +223,10 @@ index 938a0c6f7cfbb6cd459d5a2ec46f912d45fd2226..124b7d6881964039829313c52427e332
      @Override
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+diff --git a/net/minecraft/world/entity/animal/MushroomCow.java b/net/minecraft/world/entity/animal/MushroomCow.java
 index f37c8efa34efcb289bbeed06ea2d3860ff2662ac..215ec83077a1d40fdcee5bf4cd1af0d46fdd695e 100644
---- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+--- a/net/minecraft/world/entity/animal/MushroomCow.java
++++ b/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -81,6 +81,12 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
      }
      // Purpur end - Ridables
@@ -240,10 +240,10 @@ index f37c8efa34efcb289bbeed06ea2d3860ff2662ac..215ec83077a1d40fdcee5bf4cd1af0d4
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+diff --git a/net/minecraft/world/entity/animal/Ocelot.java b/net/minecraft/world/entity/animal/Ocelot.java
 index 5b045751c7302ef5c8b2b730677d02840441efa6..c7acefca654c7a833da7c122634df5626cf208e5 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+--- a/net/minecraft/world/entity/animal/Ocelot.java
++++ b/net/minecraft/world/entity/animal/Ocelot.java
 @@ -82,6 +82,13 @@ public class Ocelot extends Animal {
      }
      // Purpur end - Ridables
@@ -258,10 +258,10 @@ index 5b045751c7302ef5c8b2b730677d02840441efa6..c7acefca654c7a833da7c122634df562
      public boolean isTrusting() {
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+diff --git a/net/minecraft/world/entity/animal/Panda.java b/net/minecraft/world/entity/animal/Panda.java
 index 20d18f7bd8e9c1b3e3a6d06a11c9072456cd742f..08114535138918dce26c6881194617028a5a258c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+--- a/net/minecraft/world/entity/animal/Panda.java
++++ b/net/minecraft/world/entity/animal/Panda.java
 @@ -138,6 +138,14 @@ public class Panda extends Animal {
      }
      // Purpur end - Ridables
@@ -289,10 +289,10 @@ index 20d18f7bd8e9c1b3e3a6d06a11c9072456cd742f..08114535138918dce26c688119461702
          }
  
          if (this.isLazy()) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java
 index 872f2406531bf71f378325441b7215c085f1a70d..cad1d66326837d88166eb3a7b5d871c3132b8b98 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+--- a/net/minecraft/world/entity/animal/Parrot.java
++++ b/net/minecraft/world/entity/animal/Parrot.java
 @@ -187,6 +187,13 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
      }
      // Purpur end - Ridables
@@ -307,10 +307,10 @@ index 872f2406531bf71f378325441b7215c085f1a70d..cad1d66326837d88166eb3a7b5d871c3
      @Nullable
      @Override
      public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData entityData) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+diff --git a/net/minecraft/world/entity/animal/Pig.java b/net/minecraft/world/entity/animal/Pig.java
 index 033da440c3f76248a2269ffc22d54e3966575cf6..b7e4e4bbb85a44e0f2cd49a1419216ca3c526cd7 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+--- a/net/minecraft/world/entity/animal/Pig.java
++++ b/net/minecraft/world/entity/animal/Pig.java
 @@ -82,6 +82,13 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
      }
      // Purpur end - Ridables
@@ -325,10 +325,10 @@ index 033da440c3f76248a2269ffc22d54e3966575cf6..b7e4e4bbb85a44e0f2cd49a1419216ca
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+diff --git a/net/minecraft/world/entity/animal/PolarBear.java b/net/minecraft/world/entity/animal/PolarBear.java
 index 6f30cdc26054a4ed7c577cd4e9aa29ade1d2ede5..1ec0f8a70e9e603def18fd90c84f4525f6985381 100644
---- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+--- a/net/minecraft/world/entity/animal/PolarBear.java
++++ b/net/minecraft/world/entity/animal/PolarBear.java
 @@ -93,6 +93,13 @@ public class PolarBear extends Animal implements NeutralMob {
      }
      // Purpur end - Ridables
@@ -343,10 +343,10 @@ index 6f30cdc26054a4ed7c577cd4e9aa29ade1d2ede5..1ec0f8a70e9e603def18fd90c84f4525
      @Nullable
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
+diff --git a/net/minecraft/world/entity/animal/Pufferfish.java b/net/minecraft/world/entity/animal/Pufferfish.java
 index 93c1b945672a769ef6ee285efdcebd3717caf9f1..27946024e1d0ed4f49b4e7c398f600aafae7f63c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
+--- a/net/minecraft/world/entity/animal/Pufferfish.java
++++ b/net/minecraft/world/entity/animal/Pufferfish.java
 @@ -64,6 +64,12 @@ public class Pufferfish extends AbstractFish {
      }
      // Purpur end - Ridables
@@ -360,10 +360,10 @@ index 93c1b945672a769ef6ee285efdcebd3717caf9f1..27946024e1d0ed4f49b4e7c398f600aa
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java
 index b5601b99401f2c3cf4ce0fef4497b09667083412..7ce438ad3083ff7f431c1f292d1c38d53c14672c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+--- a/net/minecraft/world/entity/animal/Rabbit.java
++++ b/net/minecraft/world/entity/animal/Rabbit.java
 @@ -141,6 +141,13 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
      }
      // Purpur end - Ridables
@@ -378,10 +378,10 @@ index b5601b99401f2c3cf4ce0fef4497b09667083412..7ce438ad3083ff7f431c1f292d1c38d5
      @Override
      public void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Salmon.java b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
+diff --git a/net/minecraft/world/entity/animal/Salmon.java b/net/minecraft/world/entity/animal/Salmon.java
 index 9bc58ca4556baf6f6bc494ae249c11c5c627f86c..88f0f9074db9a9afff55aa6bd17c38fa2e1e1f81 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
+--- a/net/minecraft/world/entity/animal/Salmon.java
++++ b/net/minecraft/world/entity/animal/Salmon.java
 @@ -47,6 +47,12 @@ public class Salmon extends AbstractSchoolingFish implements VariantHolder<Salmo
      }
      // Purpur end - Ridables
@@ -395,10 +395,10 @@ index 9bc58ca4556baf6f6bc494ae249c11c5c627f86c..88f0f9074db9a9afff55aa6bd17c38fa
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Sheep.java b/net/minecraft/world/entity/animal/Sheep.java
 index 401cc474c280fe2cf28014aff75b01afdc0ec17a..3fd84abe0889b224c7c8d5af06b384d2fb431eb4 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+--- a/net/minecraft/world/entity/animal/Sheep.java
++++ b/net/minecraft/world/entity/animal/Sheep.java
 @@ -101,6 +101,13 @@ public class Sheep extends Animal implements Shearable {
      }
      // Purpur end - Ridables
@@ -413,10 +413,10 @@ index 401cc474c280fe2cf28014aff75b01afdc0ec17a..3fd84abe0889b224c7c8d5af06b384d2
      @Override
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java
 index 0ba9aa45902cbad16ee0356cb3051b12923cfe10..0149071cc901beffd583c1ba7617e1355473fc77 100644
---- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+--- a/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -72,6 +72,13 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
      }
      // Purpur end - Ridables
@@ -431,10 +431,10 @@ index 0ba9aa45902cbad16ee0356cb3051b12923cfe10..0149071cc901beffd583c1ba7617e135
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java
 index 2d0ecae9625e08ecf5028ec62f71a5432c462712..bb63ad576731df34a90ab9b1b6165731a826ad7b 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+--- a/net/minecraft/world/entity/animal/Squid.java
++++ b/net/minecraft/world/entity/animal/Squid.java
 @@ -72,6 +72,13 @@ public class Squid extends AgeableWaterCreature {
      }
      // Purpur end - Ridables
@@ -449,10 +449,10 @@ index 2d0ecae9625e08ecf5028ec62f71a5432c462712..bb63ad576731df34a90ab9b1b6165731
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
+diff --git a/net/minecraft/world/entity/animal/TropicalFish.java b/net/minecraft/world/entity/animal/TropicalFish.java
 index df9d2d4d285f51d6e8e5bc781699c20fe1c2d00d..52b64100ec9b5624758264569da08dee4e710b60 100644
---- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
+--- a/net/minecraft/world/entity/animal/TropicalFish.java
++++ b/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -79,6 +79,12 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
      }
      // Purpur end - Ridables
@@ -466,10 +466,10 @@ index df9d2d4d285f51d6e8e5bc781699c20fe1c2d00d..52b64100ec9b5624758264569da08dee
      public static String getPredefinedName(int variant) {
          return "entity.minecraft.tropical_fish.predefined." + variant;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+diff --git a/net/minecraft/world/entity/animal/Turtle.java b/net/minecraft/world/entity/animal/Turtle.java
 index 0fc805540305dd8d34b903d5b7769816578c19c3..2133b8a2615be6502bf9d7b4d4c1bc75929b5022 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+--- a/net/minecraft/world/entity/animal/Turtle.java
++++ b/net/minecraft/world/entity/animal/Turtle.java
 @@ -103,6 +103,13 @@ public class Turtle extends Animal {
      }
      // Purpur end - Ridables
@@ -484,10 +484,10 @@ index 0fc805540305dd8d34b903d5b7769816578c19c3..2133b8a2615be6502bf9d7b4d4c1bc75
      public void setHomePos(BlockPos pos) {
          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
+diff --git a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java
 index 5ac51a56c451a8fde4b98cec165143b2128fd9eb..d86bad821e781d698cc2bf0b3179eb4d2ed065b1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+--- a/net/minecraft/world/entity/animal/Wolf.java
++++ b/net/minecraft/world/entity/animal/Wolf.java
 @@ -146,6 +146,13 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
      }
      // Purpur end - Ridables
@@ -502,10 +502,10 @@ index 5ac51a56c451a8fde4b98cec165143b2128fd9eb..d86bad821e781d698cc2bf0b3179eb4d
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+diff --git a/net/minecraft/world/entity/animal/allay/Allay.java b/net/minecraft/world/entity/animal/allay/Allay.java
 index 76779074ceea0d79b01c6744e6cc0a50b8cf111d..10e293dd38ad2c140e1ae0fd558989aa9eeff8dc 100644
---- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+--- a/net/minecraft/world/entity/animal/allay/Allay.java
++++ b/net/minecraft/world/entity/animal/allay/Allay.java
 @@ -156,6 +156,13 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
      }
      // Purpur end - Ridables
@@ -520,10 +520,10 @@ index 76779074ceea0d79b01c6744e6cc0a50b8cf111d..10e293dd38ad2c140e1ae0fd558989aa
      @Override
      protected Brain.Provider<Allay> brainProvider() {
          return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+diff --git a/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 index 4c9771725f9567790841094dae72c2bbf0d5ba62..1a6c88558a11066ec2a78d40e6a1b0f2fa546b88 100644
---- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+--- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java
++++ b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 @@ -99,6 +99,13 @@ public class Armadillo extends Animal {
      }
      // Purpur end - Ridables
@@ -538,10 +538,10 @@ index 4c9771725f9567790841094dae72c2bbf0d5ba62..1a6c88558a11066ec2a78d40e6a1b0f2
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+diff --git a/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 index b414edf515890066bd970f65c073964839851840..f95b9be60c3725fe279a07300f706abb25e152f1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+--- a/net/minecraft/world/entity/animal/axolotl/Axolotl.java
++++ b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -117,6 +117,13 @@ public class Axolotl extends Animal implements VariantHolder<Axolotl.Variant>, B
      }
      // Purpur end - Ridables
@@ -556,10 +556,10 @@ index b414edf515890066bd970f65c073964839851840..f95b9be60c3725fe279a07300f706abb
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return 0.0F;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+diff --git a/net/minecraft/world/entity/animal/camel/Camel.java b/net/minecraft/world/entity/animal/camel/Camel.java
 index f794ac7af227d413ed030457cbe4cd68e6eca969..ab0b90c300d0610e423abe7ac9e5b93305a21c5a 100644
---- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+--- a/net/minecraft/world/entity/animal/camel/Camel.java
++++ b/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -321,6 +321,22 @@ public class Camel extends AbstractHorse {
          return this.dashCooldown;
      }
@@ -583,10 +583,10 @@ index f794ac7af227d413ed030457cbe4cd68e6eca969..ab0b90c300d0610e423abe7ac9e5b933
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.CAMEL_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 index d9e4eb76209abffd0079ccdbbd2fc3f29bd67052..f58a0f50d04004587d342c1bb5f681cd485cf302 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+--- a/net/minecraft/world/entity/animal/horse/AbstractHorse.java
++++ b/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 @@ -240,6 +240,45 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
      }
      // Purpur end - Ridables
@@ -642,10 +642,10 @@ index d9e4eb76209abffd0079ccdbbd2fc3f29bd67052..f58a0f50d04004587d342c1bb5f681cd
          return super.finalizeSpawn(world, difficulty, spawnReason, (SpawnGroupData) entityData);
      }
  
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+diff --git a/net/minecraft/world/entity/animal/horse/Donkey.java b/net/minecraft/world/entity/animal/horse/Donkey.java
 index f4ef46c6cf40993b878ee965a0af397894231ba6..8fd709bcd4c7a5a875bdc65fd4dd1420ea618e3a 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+--- a/net/minecraft/world/entity/animal/horse/Donkey.java
++++ b/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -23,6 +23,22 @@ public class Donkey extends AbstractChestedHorse {
      }
      // Purpur end - Ridables
@@ -669,10 +669,10 @@ index f4ef46c6cf40993b878ee965a0af397894231ba6..8fd709bcd4c7a5a875bdc65fd4dd1420
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+diff --git a/net/minecraft/world/entity/animal/horse/Horse.java b/net/minecraft/world/entity/animal/horse/Horse.java
 index 4505bcc6ab70ee2bc969ecfaecf7cff072f48ca1..13056a0a13eeb3dcc164344b973e6ff656c0793d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+--- a/net/minecraft/world/entity/animal/horse/Horse.java
++++ b/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -50,6 +50,22 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
      }
      // Purpur end - Ridables
@@ -696,10 +696,10 @@ index 4505bcc6ab70ee2bc969ecfaecf7cff072f48ca1..13056a0a13eeb3dcc164344b973e6ff6
      @Override
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
 index 0e15cb99cab5ed664dc265f3754b9da7fef8958f..83fdbf55384a5c4429d65a88fcb788e449a8862a 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+--- a/net/minecraft/world/entity/animal/horse/Llama.java
++++ b/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -123,6 +123,22 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      }
      // Purpur end - Ridables
@@ -723,10 +723,10 @@ index 0e15cb99cab5ed664dc265f3754b9da7fef8958f..83fdbf55384a5c4429d65a88fcb788e4
      public boolean isTraderLlama() {
          return false;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+diff --git a/net/minecraft/world/entity/animal/horse/Mule.java b/net/minecraft/world/entity/animal/horse/Mule.java
 index bee1a67ccf17e74afe5c9a2ed8de113b750da278..f54df53412186a67efc8ef33b82e8756109059c3 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+--- a/net/minecraft/world/entity/animal/horse/Mule.java
++++ b/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -22,6 +22,22 @@ public class Mule extends AbstractChestedHorse {
      }
      // Purpur end - Ridables
@@ -750,10 +750,10 @@ index bee1a67ccf17e74afe5c9a2ed8de113b750da278..f54df53412186a67efc8ef33b82e8756
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 index 20ee4f81a0f2a5eb2ef378ae0a7e7089b8bcc024..133b1fdba0129ccbff146af6d44d8990f7598158 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+--- a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
++++ b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 @@ -49,6 +49,22 @@ public class SkeletonHorse extends AbstractHorse {
      }
      // Purpur end - Ridables
@@ -777,10 +777,10 @@ index 20ee4f81a0f2a5eb2ef378ae0a7e7089b8bcc024..133b1fdba0129ccbff146af6d44d8990
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/animal/horse/TraderLlama.java b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 index 22c84d0f51df4c13e7a0a20f3c316bf0879b172f..39ee4b850072ff27dc86857c5ce7ef66842a214d 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
+--- a/net/minecraft/world/entity/animal/horse/TraderLlama.java
++++ b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 @@ -55,6 +55,22 @@ public class TraderLlama extends Llama {
      }
      // Purpur end - Ridables
@@ -804,10 +804,10 @@ index 22c84d0f51df4c13e7a0a20f3c316bf0879b172f..39ee4b850072ff27dc86857c5ce7ef66
      @Override
      public boolean isTraderLlama() {
          return true;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 index 7a94f39097566e00f572043b937cba46a385af4f..6f910056aeed1b2fdf23c97ea706d062ae10bbfe 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+--- a/net/minecraft/world/entity/animal/horse/ZombieHorse.java
++++ b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 @@ -45,6 +45,22 @@ public class ZombieHorse extends AbstractHorse {
      }
      // Purpur end - Ridables
@@ -831,10 +831,10 @@ index 7a94f39097566e00f572043b937cba46a385af4f..6f910056aeed1b2fdf23c97ea706d062
      public static AttributeSupplier.Builder createAttributes() {
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+diff --git a/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 index 0a6403c18d643e1b47e54097423c21bb3a147d66..e1354ffd4fc3a9b5bf6b43ff5c17d2416918520b 100644
---- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+--- a/net/minecraft/world/entity/animal/sniffer/Sniffer.java
++++ b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -107,6 +107,13 @@ public class Sniffer extends Animal {
      }
      // Purpur end - Ridables
@@ -849,10 +849,10 @@ index 0a6403c18d643e1b47e54097423c21bb3a147d66..e1354ffd4fc3a9b5bf6b43ff5c17d241
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-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
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 index d51675bb8660eb9d5e4d1263c28ada321b40470c..1e1cd061203ab3ca2f1feb4a3f9fe2813d3d96aa 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
+--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
++++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -186,6 +186,12 @@ public class EnderDragon extends Mob implements Enemy {
      }
      // Purpur end - Ridables
@@ -874,10 +874,10 @@ index d51675bb8660eb9d5e4d1263c28ada321b40470c..1e1cd061203ab3ca2f1feb4a3f9fe281
 +        return 1.0F; // Purpur - Configurable entity base attributes
      }
  }
-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
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 index 236e8ea79119dcf21c066b7c250fe20e6752df9e..57cf253fc69c087cfa0270225166f926ce6829f7 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
+--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -113,7 +113,13 @@ public class WitherBoss extends Monster implements RangedAttackMob {
          this.setHealth(this.getMaxHealth());
          this.xpReward = 50;
@@ -902,10 +902,10 @@ index 236e8ea79119dcf21c066b7c250fe20e6752df9e..57cf253fc69c087cfa0270225166f926
              }
  
          } else {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+diff --git a/net/minecraft/world/entity/monster/Blaze.java b/net/minecraft/world/entity/monster/Blaze.java
 index 968af87ceeb1862738c5270c2aad85c7974cfdb3..edbe135484847979c76565229354e5963c84083c 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+--- a/net/minecraft/world/entity/monster/Blaze.java
++++ b/net/minecraft/world/entity/monster/Blaze.java
 @@ -75,6 +75,13 @@ public class Blaze extends Monster {
      }
      // Purpur end - Ridables
@@ -920,10 +920,10 @@ index 968af87ceeb1862738c5270c2aad85c7974cfdb3..edbe135484847979c76565229354e596
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Bogged.java b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
+diff --git a/net/minecraft/world/entity/monster/Bogged.java b/net/minecraft/world/entity/monster/Bogged.java
 index 05848ad509461f3fd40d820098cf7cbfe6866b0c..ab6e71f0e32070b67d65645981c71da675b1ae80 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Bogged.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
+--- a/net/minecraft/world/entity/monster/Bogged.java
++++ b/net/minecraft/world/entity/monster/Bogged.java
 @@ -61,6 +61,13 @@ public class Bogged extends AbstractSkeleton implements Shearable {
      }
      // Purpur end - Ridables
@@ -938,10 +938,10 @@ index 05848ad509461f3fd40d820098cf7cbfe6866b0c..ab6e71f0e32070b67d65645981c71da6
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
+diff --git a/net/minecraft/world/entity/monster/CaveSpider.java b/net/minecraft/world/entity/monster/CaveSpider.java
 index a21a18e249dbfa0f1d3d6995b6810961ed5e084b..9d8d836c93635f133a2ad6911cac9b8ac24f1f57 100644
---- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
+--- a/net/minecraft/world/entity/monster/CaveSpider.java
++++ b/net/minecraft/world/entity/monster/CaveSpider.java
 @@ -44,6 +44,13 @@ public class CaveSpider extends Spider {
      }
      // Purpur end - Ridables
@@ -956,10 +956,10 @@ index a21a18e249dbfa0f1d3d6995b6810961ed5e084b..9d8d836c93635f133a2ad6911cac9b8a
      @Override
      public boolean doHurtTarget(ServerLevel world, Entity target) {
          if (super.doHurtTarget(world, target)) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
 index ff7ee3a07f0c84aaa36be3a324274b4ccb04fb0b..a93b9bf974fdee49cf9fe814bfb86467971f2f53 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+--- a/net/minecraft/world/entity/monster/Creeper.java
++++ b/net/minecraft/world/entity/monster/Creeper.java
 @@ -140,6 +140,13 @@ public class Creeper extends Monster {
      }
      // Purpur end - Ridables
@@ -974,10 +974,10 @@ index ff7ee3a07f0c84aaa36be3a324274b4ccb04fb0b..a93b9bf974fdee49cf9fe814bfb86467
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java
 index 025133dff77df06e147defb70f920ee140b9881f..6675ccfe80cd3c4369ca3f5aec53d0cfa294432b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+--- a/net/minecraft/world/entity/monster/Drowned.java
++++ b/net/minecraft/world/entity/monster/Drowned.java
 @@ -92,6 +92,18 @@ public class Drowned extends Zombie implements RangedAttackMob {
      }
      // Purpur end - Ridables
@@ -997,10 +997,10 @@ index 025133dff77df06e147defb70f920ee140b9881f..6675ccfe80cd3c4369ca3f5aec53d0cf
      @Override
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(1, new Drowned.DrownedGoToWaterGoal(this, 1.0));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
+diff --git a/net/minecraft/world/entity/monster/ElderGuardian.java b/net/minecraft/world/entity/monster/ElderGuardian.java
 index bff963a1a0d89b57a686ed06aa630e789a602d82..011327ea9bf9ef3497f2183ef149f8ec9bb29fab 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
+--- a/net/minecraft/world/entity/monster/ElderGuardian.java
++++ b/net/minecraft/world/entity/monster/ElderGuardian.java
 @@ -45,6 +45,13 @@ public class ElderGuardian extends Guardian {
      }
      // Purpur end - Ridables
@@ -1015,10 +1015,10 @@ index bff963a1a0d89b57a686ed06aa630e789a602d82..011327ea9bf9ef3497f2183ef149f8ec
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index f3013664d21f70c2650306f2406e93b21de8f9e0..9f7261bd22803f0b094e2bfd4a0eb66ad727211e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -111,6 +111,13 @@ public class EnderMan extends Monster implements NeutralMob {
      }
      // Purpur end - Ridables
@@ -1033,10 +1033,10 @@ index f3013664d21f70c2650306f2406e93b21de8f9e0..9f7261bd22803f0b094e2bfd4a0eb66a
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
 index ac9116735d8ee4713fab8d90ef12e781b77b26c8..aeeb003cc43d6cff87a634099299ff30db7ed10b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+--- a/net/minecraft/world/entity/monster/Endermite.java
++++ b/net/minecraft/world/entity/monster/Endermite.java
 @@ -55,6 +55,13 @@ public class Endermite extends Monster {
      }
      // Purpur end - Ridables
@@ -1051,10 +1051,10 @@ index ac9116735d8ee4713fab8d90ef12e781b77b26c8..aeeb003cc43d6cff87a634099299ff30
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Evoker.java b/net/minecraft/world/entity/monster/Evoker.java
 index 69a37f88c7f05084007cc2f895c31650da6566f8..76ee60fc1df5846393a5d387a514dfaf22e20229 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+--- a/net/minecraft/world/entity/monster/Evoker.java
++++ b/net/minecraft/world/entity/monster/Evoker.java
 @@ -70,6 +70,13 @@ public class Evoker extends SpellcasterIllager {
      }
      // Purpur end - Ridables
@@ -1069,10 +1069,10 @@ index 69a37f88c7f05084007cc2f895c31650da6566f8..76ee60fc1df5846393a5d387a514dfaf
      @Override
      protected void registerGoals() {
          super.registerGoals();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java
 index 8cb7bdd96f9780ee5e2fa0876bc80d092e06b5f5..b0d7bbca3c3a34f329698ee70ec0bea60c76b12e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+--- a/net/minecraft/world/entity/monster/Ghast.java
++++ b/net/minecraft/world/entity/monster/Ghast.java
 @@ -78,6 +78,13 @@ public class Ghast extends FlyingMob implements Enemy {
      }
      // Purpur end - Ridables
@@ -1087,10 +1087,10 @@ index 8cb7bdd96f9780ee5e2fa0876bc80d092e06b5f5..b0d7bbca3c3a34f329698ee70ec0bea6
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+diff --git a/net/minecraft/world/entity/monster/Giant.java b/net/minecraft/world/entity/monster/Giant.java
 index 64e4f78fd626c59e2957140af22993aa8e5c4f15..4a13274a863345650ca0c3f98d6b2735221c778a 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+--- a/net/minecraft/world/entity/monster/Giant.java
++++ b/net/minecraft/world/entity/monster/Giant.java
 @@ -35,6 +35,15 @@ public class Giant extends Monster {
      }
      // Purpur end - Ridables
@@ -1107,10 +1107,10 @@ index 64e4f78fd626c59e2957140af22993aa8e5c4f15..4a13274a863345650ca0c3f98d6b2735
      public static AttributeSupplier.Builder createAttributes() {
          return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.ATTACK_DAMAGE, 50.0);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java
 index bde5d88dcdb4f2305e2786842551c36da5ed9778..210e9dacd001e2e0c1a95d41c6a31aea6eab893b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+--- a/net/minecraft/world/entity/monster/Guardian.java
++++ b/net/minecraft/world/entity/monster/Guardian.java
 @@ -91,6 +91,13 @@ public class Guardian extends Monster {
      }
      // Purpur end - Ridables
@@ -1125,10 +1125,10 @@ index bde5d88dcdb4f2305e2786842551c36da5ed9778..210e9dacd001e2e0c1a95d41c6a31aea
      @Override
      protected void registerGoals() {
          MoveTowardsRestrictionGoal pathfindergoalmovetowardsrestriction = new MoveTowardsRestrictionGoal(this, 1.0D);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+diff --git a/net/minecraft/world/entity/monster/Husk.java b/net/minecraft/world/entity/monster/Husk.java
 index f396652fdc30ec5638b30a8b4189f05fb0eee12d..5ad22d4041afcbd50bf5a6ebfbdcb232eb6d3fbe 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+--- a/net/minecraft/world/entity/monster/Husk.java
++++ b/net/minecraft/world/entity/monster/Husk.java
 @@ -40,6 +40,17 @@ public class Husk extends Zombie {
      }
      // Purpur end - Ridables
@@ -1147,10 +1147,10 @@ index f396652fdc30ec5638b30a8b4189f05fb0eee12d..5ad22d4041afcbd50bf5a6ebfbdcb232
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random) {
          return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (EntitySpawnReason.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
+diff --git a/net/minecraft/world/entity/monster/Illusioner.java b/net/minecraft/world/entity/monster/Illusioner.java
 index 8ff616fe05071bd2a197a465c7e17f35a3e72d44..6e3362324c81afacaaa0f9766e2d23a0a4f53ac3 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
+--- a/net/minecraft/world/entity/monster/Illusioner.java
++++ b/net/minecraft/world/entity/monster/Illusioner.java
 @@ -76,6 +76,15 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
      }
      // Purpur end - Ridables
@@ -1167,10 +1167,10 @@ index 8ff616fe05071bd2a197a465c7e17f35a3e72d44..6e3362324c81afacaaa0f9766e2d23a0
      @Override
      protected void registerGoals() {
          super.registerGoals();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
+diff --git a/net/minecraft/world/entity/monster/MagmaCube.java b/net/minecraft/world/entity/monster/MagmaCube.java
 index 4f7d99fadfa1ba31439ec02bfb107288a722e828..5ba64f9c653345b742624f18c4cf692d1e7880e1 100644
---- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
+--- a/net/minecraft/world/entity/monster/MagmaCube.java
++++ b/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -46,6 +46,27 @@ public class MagmaCube extends Slime {
      }
      // Purpur end - Ridables
@@ -1199,10 +1199,10 @@ index 4f7d99fadfa1ba31439ec02bfb107288a722e828..5ba64f9c653345b742624f18c4cf692d
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
 index afd00fd83e6c246afecf7042435ae119057b9e93..ee00c4c7a1e0f08cdeccab63a20c4b465fdeb549 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+--- a/net/minecraft/world/entity/monster/Phantom.java
++++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -150,7 +150,10 @@ public class Phantom extends FlyingMob implements Enemy {
  
      private void updatePhantomSizeInfo() {
@@ -1238,10 +1238,10 @@ index afd00fd83e6c246afecf7042435ae119057b9e93..ee00c4c7a1e0f08cdeccab63a20c4b46
      @Override
      public void tick() {
          super.tick();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
+diff --git a/net/minecraft/world/entity/monster/Pillager.java b/net/minecraft/world/entity/monster/Pillager.java
 index a629e31e6ea0f49f88746856382fcec96918c490..78c01f0be0cc6689f68e2fcf3111d79abb5a59fb 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
+--- a/net/minecraft/world/entity/monster/Pillager.java
++++ b/net/minecraft/world/entity/monster/Pillager.java
 @@ -84,6 +84,13 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
      }
      // Purpur end - Ridables
@@ -1256,10 +1256,10 @@ index a629e31e6ea0f49f88746856382fcec96918c490..78c01f0be0cc6689f68e2fcf3111d79a
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
 index 6222ed8408096e0bb8e9572c07c0db6971fc8308..ecf37a99fa5e8919146ba73c7313998855ea0d88 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+--- a/net/minecraft/world/entity/monster/Ravager.java
++++ b/net/minecraft/world/entity/monster/Ravager.java
 @@ -98,6 +98,13 @@ public class Ravager extends Raider {
      }
      // Purpur end - Ridables
@@ -1274,10 +1274,10 @@ index 6222ed8408096e0bb8e9572c07c0db6971fc8308..ecf37a99fa5e8919146ba73c73139988
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
 index 6541e1059ca16cfd01bf01aae2c56400cbe78132..c04d6a5190f3db06601c3a0ab0ddaede3a9f88ac 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+--- a/net/minecraft/world/entity/monster/Shulker.java
++++ b/net/minecraft/world/entity/monster/Shulker.java
 @@ -84,7 +84,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
  
          return new Vector3f((float) baseblockposition.getX(), (float) baseblockposition.getY(), (float) baseblockposition.getZ());
@@ -1309,10 +1309,10 @@ index 6541e1059ca16cfd01bf01aae2c56400cbe78132..c04d6a5190f3db06601c3a0ab0ddaede
      }
  
      public void setVariant(Optional<DyeColor> variant) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+diff --git a/net/minecraft/world/entity/monster/Silverfish.java b/net/minecraft/world/entity/monster/Silverfish.java
 index 6f1d59651552ef7443eb8274765614d5abc984df..191724aa48081017adf3db0b6ff99a77dd4ce68d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+--- a/net/minecraft/world/entity/monster/Silverfish.java
++++ b/net/minecraft/world/entity/monster/Silverfish.java
 @@ -61,6 +61,15 @@ public class Silverfish extends Monster {
      }
      // Purpur end - Ridables
@@ -1329,10 +1329,10 @@ index 6f1d59651552ef7443eb8274765614d5abc984df..191724aa48081017adf3db0b6ff99a77
      @Override
      protected void registerGoals() {
          this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+diff --git a/net/minecraft/world/entity/monster/Skeleton.java b/net/minecraft/world/entity/monster/Skeleton.java
 index 78c8483da3c0ac7f93e236dd723fc6051427a50e..8e93da5112cbb14af1ca755c40698740303717ee 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+--- a/net/minecraft/world/entity/monster/Skeleton.java
++++ b/net/minecraft/world/entity/monster/Skeleton.java
 @@ -46,6 +46,12 @@ public class Skeleton extends AbstractSkeleton {
      }
      // Purpur end - Ridables
@@ -1346,10 +1346,10 @@ index 78c8483da3c0ac7f93e236dd723fc6051427a50e..8e93da5112cbb14af1ca755c40698740
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
+diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
 index b7941230b082d4de9ab77c981bd396fa1184d78e..d2cdb2119cd6e0afd57e00b1b706d36342b8858d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
+--- a/net/minecraft/world/entity/monster/Slime.java
++++ b/net/minecraft/world/entity/monster/Slime.java
 @@ -107,6 +107,38 @@ public class Slime extends Mob implements Enemy {
      }
      // Purpur end - Ridables
@@ -1401,10 +1401,10 @@ index b7941230b082d4de9ab77c981bd396fa1184d78e..d2cdb2119cd6e0afd57e00b1b706d363
          if (heal) {
              this.setHealth(this.getMaxHealth());
          }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+diff --git a/net/minecraft/world/entity/monster/Spider.java b/net/minecraft/world/entity/monster/Spider.java
 index d3eabdde9e9bf010cae7fc81165f0123adfcf958..26ce5425d8217f8954ceef898b806d3b56c01027 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+--- a/net/minecraft/world/entity/monster/Spider.java
++++ b/net/minecraft/world/entity/monster/Spider.java
 @@ -68,6 +68,13 @@ public class Spider extends Monster {
      }
      // Purpur end - Ridables
@@ -1419,10 +1419,10 @@ index d3eabdde9e9bf010cae7fc81165f0123adfcf958..26ce5425d8217f8954ceef898b806d3b
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
+diff --git a/net/minecraft/world/entity/monster/Stray.java b/net/minecraft/world/entity/monster/Stray.java
 index 879748708e3fc8c0a3f126d265e99a7c054d2a10..4b4eced856ad68c38042b5368bf1b9433ec1e8b1 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
+--- a/net/minecraft/world/entity/monster/Stray.java
++++ b/net/minecraft/world/entity/monster/Stray.java
 @@ -39,6 +39,12 @@ public class Stray extends AbstractSkeleton {
      }
      // Purpur end - Ridables
@@ -1436,10 +1436,10 @@ index 879748708e3fc8c0a3f126d265e99a7c054d2a10..4b4eced856ad68c38042b5368bf1b943
      public static boolean checkStraySpawnRules(
          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
+diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
 index 7b1525c6bc46d65660588d90c3121ad3d12cf077..c66126f3a43e6e011e5f9a977ad481c96529d1d5 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
+--- a/net/minecraft/world/entity/monster/Strider.java
++++ b/net/minecraft/world/entity/monster/Strider.java
 @@ -114,6 +114,13 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
      }
      // Purpur end - Ridables
@@ -1454,10 +1454,10 @@ index 7b1525c6bc46d65660588d90c3121ad3d12cf077..c66126f3a43e6e011e5f9a977ad481c9
      public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random) {
          BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
+diff --git a/net/minecraft/world/entity/monster/Vex.java b/net/minecraft/world/entity/monster/Vex.java
 index fba52457f85573f5918aeeb5f3b69b3f113cc9d5..906934076dd721a39f8ee960fc7c0d1058b66ae2 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
+--- a/net/minecraft/world/entity/monster/Vex.java
++++ b/net/minecraft/world/entity/monster/Vex.java
 @@ -103,6 +103,13 @@ public class Vex extends Monster implements TraceableEntity {
      }
      // Purpur end - Ridables
@@ -1472,10 +1472,10 @@ index fba52457f85573f5918aeeb5f3b69b3f113cc9d5..906934076dd721a39f8ee960fc7c0d10
      @Override
      public boolean isFlapping() {
          return this.tickCount % Vex.TICKS_PER_FLAP == 0;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+diff --git a/net/minecraft/world/entity/monster/Vindicator.java b/net/minecraft/world/entity/monster/Vindicator.java
 index 5bf2aad976be5d6149b8252c84cd870551a2aa8e..065bd31afe948c1ffab4da6f2a236cd931e75259 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+--- a/net/minecraft/world/entity/monster/Vindicator.java
++++ b/net/minecraft/world/entity/monster/Vindicator.java
 @@ -72,6 +72,13 @@ public class Vindicator extends AbstractIllager {
      }
      // Purpur end - Ridables
@@ -1490,10 +1490,10 @@ index 5bf2aad976be5d6149b8252c84cd870551a2aa8e..065bd31afe948c1ffab4da6f2a236cd9
      @Override
      protected void registerGoals() {
          super.registerGoals();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
+diff --git a/net/minecraft/world/entity/monster/Witch.java b/net/minecraft/world/entity/monster/Witch.java
 index 5cba860f9ce81d90eec4c6bf45699d28cf8d93e6..9b2d76722385ccf9d0ace747339ca7705ca41f4f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
+--- a/net/minecraft/world/entity/monster/Witch.java
++++ b/net/minecraft/world/entity/monster/Witch.java
 @@ -74,6 +74,13 @@ public class Witch extends Raider implements RangedAttackMob {
      }
      // Purpur end - Ridables
@@ -1508,10 +1508,10 @@ index 5cba860f9ce81d90eec4c6bf45699d28cf8d93e6..9b2d76722385ccf9d0ace747339ca770
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/WitherSkeleton.java b/net/minecraft/world/entity/monster/WitherSkeleton.java
 index 626cab5a974d2c8736123cc23e535b5cf0e5349e..feb1b516c7ac7200e7cebeea739369426e87bf27 100644
---- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
+--- a/net/minecraft/world/entity/monster/WitherSkeleton.java
++++ b/net/minecraft/world/entity/monster/WitherSkeleton.java
 @@ -53,6 +53,13 @@ public class WitherSkeleton extends AbstractSkeleton {
      }
      // Purpur end - Ridables
@@ -1526,10 +1526,10 @@ index 626cab5a974d2c8736123cc23e535b5cf0e5349e..feb1b516c7ac7200e7cebeea73936942
      @Override
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+diff --git a/net/minecraft/world/entity/monster/Zoglin.java b/net/minecraft/world/entity/monster/Zoglin.java
 index 2ac14783e7b5739a13c487d5028ecba38480980d..b5c4e127298795567ea4f35aa5a209ee6e1629b3 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+--- a/net/minecraft/world/entity/monster/Zoglin.java
++++ b/net/minecraft/world/entity/monster/Zoglin.java
 @@ -102,6 +102,13 @@ public class Zoglin extends Monster implements HoglinBase {
      }
      // Purpur end - Ridables
@@ -1544,10 +1544,10 @@ index 2ac14783e7b5739a13c487d5028ecba38480980d..b5c4e127298795567ea4f35aa5a209ee
      @Override
      protected Brain.Provider<Zoglin> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
 index 9b4b923117a7025bdbb6d222c6388aeae9bef8a2..5763d259162750297e08acc51551489150dbc593 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+--- a/net/minecraft/world/entity/monster/Zombie.java
++++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -127,6 +127,13 @@ public class Zombie extends Monster {
      }
      // Purpur end - Ridables
@@ -1571,10 +1571,10 @@ index 9b4b923117a7025bdbb6d222c6388aeae9bef8a2..5763d259162750297e08acc515514891
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
 index 9fafe05ef0ffc1120873727082290a8ea177d62f..35d8cef3c84bfd1bbf8afe2885b4f303a4985cdd 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+--- a/net/minecraft/world/entity/monster/ZombieVillager.java
++++ b/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -102,6 +102,17 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
      }
      // Purpur end - Ridables
@@ -1593,10 +1593,10 @@ index 9fafe05ef0ffc1120873727082290a8ea177d62f..35d8cef3c84bfd1bbf8afe2885b4f303
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+diff --git a/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 index 69c291c3347a3e3f454ecb8f418a310bbd688a43..ca74450f13198fd7bf0190b4dc1df4288df5729d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+--- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java
++++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -80,6 +80,13 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
      }
      // Purpur end - Ridables
@@ -1620,10 +1620,10 @@ index 69c291c3347a3e3f454ecb8f418a310bbd688a43..ca74450f13198fd7bf0190b4dc1df428
      }
  
      @Nullable
-diff --git a/src/main/java/net/minecraft/world/entity/monster/creaking/Creaking.java b/src/main/java/net/minecraft/world/entity/monster/creaking/Creaking.java
+diff --git a/net/minecraft/world/entity/monster/creaking/Creaking.java b/net/minecraft/world/entity/monster/creaking/Creaking.java
 index 6716bfa903be5ab34b80c963cc9d6a8a26272621..1f37384368c26b4bdd69533887a8e9b8456f7096 100644
---- a/src/main/java/net/minecraft/world/entity/monster/creaking/Creaking.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/creaking/Creaking.java
+--- a/net/minecraft/world/entity/monster/creaking/Creaking.java
++++ b/net/minecraft/world/entity/monster/creaking/Creaking.java
 @@ -129,6 +129,13 @@ public class Creaking extends Monster {
      }
      // Purpur end - Ridables
@@ -1638,10 +1638,10 @@ index 6716bfa903be5ab34b80c963cc9d6a8a26272621..1f37384368c26b4bdd69533887a8e9b8
      @Override
      protected BodyRotationControl createBodyControl() {
          return new Creaking.CreakingBodyRotationControl(this);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 index 4ab971e86b48ce3010928fe9046e8f68224719ca..476dcc613f566d88273f195b847e6b4dec777e44 100644
---- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+--- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java
++++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -88,6 +88,13 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
      }
      // Purpur end - Ridables
@@ -1656,10 +1656,10 @@ index 4ab971e86b48ce3010928fe9046e8f68224719ca..476dcc613f566d88273f195b847e6b4d
      @VisibleForTesting
      public void setTimeInOverworld(int timeInOverworld) {
          this.timeInOverworld = timeInOverworld;
-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
+diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java
 index b19e3b442a650f773df462e32088648a2b7eafd4..1a40babc8f6b3f56377cb2af45e9d17d0028a77b 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
+--- a/net/minecraft/world/entity/monster/piglin/Piglin.java
++++ b/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -116,6 +116,13 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
      }
      // Purpur end - Ridables
@@ -1674,10 +1674,10 @@ index b19e3b442a650f773df462e32088648a2b7eafd4..1a40babc8f6b3f56377cb2af45e9d17d
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+diff --git a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 index 3dc234f8cea8769f715a4913ae4ecf7d47433577..a0fa32a1217bbdae2c91e5a51598d7bd555ca1eb 100644
---- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+--- a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
++++ b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 @@ -82,6 +82,13 @@ public class PiglinBrute extends AbstractPiglin {
      }
      // Purpur end - Ridables
@@ -1692,10 +1692,10 @@ index 3dc234f8cea8769f715a4913ae4ecf7d47433577..a0fa32a1217bbdae2c91e5a51598d7bd
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index 066836e450ca8d104990c3c5fba5fe3dad2e136e..39f2091391222bcd4ab0f2677f896c5ecdc6e86c 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -178,6 +178,13 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
      // Purpur end - Ridables
@@ -1710,10 +1710,10 @@ index 066836e450ca8d104990c3c5fba5fe3dad2e136e..39f2091391222bcd4ab0f2677f896c5e
      @Override
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
 index c5bef9f0ad2a0f57d8c37ea0833e899dc588d30f..8e12ae313c76d742b61aa83a35d41d83b92bded5 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+--- a/net/minecraft/world/entity/npc/WanderingTrader.java
++++ b/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -89,6 +89,12 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
      }
      // Purpur end - Ridables
diff --git a/patches/server/0009-Barrels-and-enderchests-6-rows.patch b/patches/server/0009-Barrels-and-enderchests-6-rows.patch
index 49b38c91d..93dda0eff 100644
--- a/patches/server/0009-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0009-Barrels-and-enderchests-6-rows.patch
@@ -4,10 +4,10 @@ Date: Thu, 23 May 2019 21:50:37 -0500
 Subject: [PATCH] Barrels and enderchests 6 rows
 
 
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
 index 98e803eaf5ce4c773f35fd752c21c7176707427c..b9136fcec3f36549ddd572cbb8cd01ecae45590f 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
 @@ -1116,6 +1116,27 @@ public abstract class PlayerList {
          player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
          this.server.getCommands().sendCommands(player);
@@ -36,10 +36,10 @@ index 98e803eaf5ce4c773f35fd752c21c7176707427c..b9136fcec3f36549ddd572cbb8cd01ec
      }
  
      public boolean isWhiteListed(GameProfile profile) {
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index 28a4cf814ec4b34dce883ba4f24ca55008c8f6c1..87c6378104ff47549c751e09afb6cfcd9b8dcf5d 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -200,6 +200,7 @@ public abstract class Player extends LivingEntity {
      private int currentImpulseContextResetGraceTime;
      public boolean affectsSpawning = true; // Paper - Affects Spawning API
@@ -48,10 +48,10 @@ index 28a4cf814ec4b34dce883ba4f24ca55008c8f6c1..87c6378104ff47549c751e09afb6cfcd
  
      // CraftBukkit start
      public boolean fauxSleeping;
-diff --git a/src/main/java/net/minecraft/world/inventory/ChestMenu.java b/src/main/java/net/minecraft/world/inventory/ChestMenu.java
+diff --git a/net/minecraft/world/inventory/ChestMenu.java b/net/minecraft/world/inventory/ChestMenu.java
 index 48a6b6136ac3414ca735f93a14b1a8d76210603c..27321b07cd04814bc1ff720c65770d7755625bb6 100644
---- a/src/main/java/net/minecraft/world/inventory/ChestMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/ChestMenu.java
+--- a/net/minecraft/world/inventory/ChestMenu.java
++++ b/net/minecraft/world/inventory/ChestMenu.java
 @@ -66,10 +66,30 @@ public class ChestMenu extends AbstractContainerMenu {
          return new ChestMenu(MenuType.GENERIC_9x6, syncId, playerInventory, 6);
      }
@@ -83,10 +83,10 @@ index 48a6b6136ac3414ca735f93a14b1a8d76210603c..27321b07cd04814bc1ff720c65770d77
      public static ChestMenu sixRows(int syncId, Inventory playerInventory, Container inventory) {
          return new ChestMenu(MenuType.GENERIC_9x6, syncId, playerInventory, inventory, 6);
      }
-diff --git a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
+diff --git a/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
 index a15d5ff872dbd77f3c3145e0328f3d02e431ff8c..1dcf36d502990d32fc4cd3ea69c3ea334baed69a 100644
---- a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-+++ b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
+--- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java
++++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
 @@ -31,11 +31,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
      }
  
@@ -107,10 +107,10 @@ index a15d5ff872dbd77f3c3145e0328f3d02e431ff8c..1dcf36d502990d32fc4cd3ea69c3ea33
      public void setActiveChest(EnderChestBlockEntity blockEntity) {
          this.activeChest = blockEntity;
      }
-diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
+diff --git a/net/minecraft/world/level/block/EnderChestBlock.java b/net/minecraft/world/level/block/EnderChestBlock.java
 index 9b6ab617ab7f503cf0b2d4e29333c706ffe95f46..bfe79431dc5707677671df5c0787817c6e14a676 100644
---- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
+--- a/net/minecraft/world/level/block/EnderChestBlock.java
++++ b/net/minecraft/world/level/block/EnderChestBlock.java
 @@ -84,7 +84,7 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
                  // Paper start - Fix InventoryOpenEvent cancellation - moved up;
                  playerEnderChestContainer.setActiveChest(enderChestBlockEntity); // Needs to happen before ChestMenu.threeRows as it is required for opening animations
@@ -156,10 +156,10 @@ index 9b6ab617ab7f503cf0b2d4e29333c706ffe95f46..bfe79431dc5707677671df5c0787817c
      @Override
      public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
          return new EnderChestBlockEntity(pos, state);
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
+diff --git a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
 index 618552afbdacc919c33b30a6bf4834fb71ab3d5b..7a059d20abdcc0073a314311d78f63ae4bd0365e 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
+--- a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
 @@ -68,7 +68,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
  
      public BarrelBlockEntity(BlockPos pos, BlockState state) {
diff --git a/patches/server/0010-Llama-API.patch b/patches/server/0010-Llama-API.patch
index 9f35a00ac..cb1ce9697 100644
--- a/patches/server/0010-Llama-API.patch
+++ b/patches/server/0010-Llama-API.patch
@@ -4,10 +4,10 @@ Date: Fri, 18 Oct 2019 22:50:12 -0500
 Subject: [PATCH] Llama API
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
+diff --git a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
 index df695b444fa2a993d381e2f197182c3e91a68502..eb0faf58fa1a408f294fc62120b140def97f998d 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
+--- a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
++++ b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
 @@ -22,6 +22,7 @@ public class LlamaFollowCaravanGoal extends Goal {
  
      @Override
@@ -24,10 +24,10 @@ index df695b444fa2a993d381e2f197182c3e91a68502..eb0faf58fa1a408f294fc62120b140de
          if (this.llama.inCaravan() && this.llama.getCaravanHead().isAlive() && this.firstIsLeashed(this.llama, 0)) {
              double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
              if (d > 676.0) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
 index 83fdbf55384a5c4429d65a88fcb788e449a8862a..cbab482bd44c0a0fa82a80f41fdfd8c124c58c43 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+--- a/net/minecraft/world/entity/animal/horse/Llama.java
++++ b/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -72,6 +72,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      private Llama caravanHead;
      @Nullable
diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0011-AFK-API.patch
index 9e886a4df..59a62d54b 100644
--- a/patches/server/0011-AFK-API.patch
+++ b/patches/server/0011-AFK-API.patch
@@ -4,10 +4,10 @@ Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] AFK API
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 8207208d6fb3f982e9909add9e74a0dda69e8120..5e8a5e8e4120420a170c4733ae217e7948cef46c 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -2621,8 +2621,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
  
      public void resetLastActionTime() {
@@ -77,10 +77,10 @@ index 8207208d6fb3f982e9909add9e74a0dda69e8120..5e8a5e8e4120420a170c4733ae217e79
      public ServerStatsCounter getStats() {
          return this.stats;
      }
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index fbc59503316d566e88b037851afd74e5469c281b..830e0705f3a3d45fcf0eab6b8eea403c3023f3f9 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -344,6 +344,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private boolean justTeleported = false;
      // CraftBukkit end
@@ -142,10 +142,10 @@ index fbc59503316d566e88b037851afd74e5469c281b..830e0705f3a3d45fcf0eab6b8eea403c
                                      Location oldTo = to.clone();
                                      PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
                                      this.cserver.getPluginManager().callEvent(event);
-diff --git a/src/main/java/net/minecraft/server/players/SleepStatus.java b/src/main/java/net/minecraft/server/players/SleepStatus.java
+diff --git a/net/minecraft/server/players/SleepStatus.java b/net/minecraft/server/players/SleepStatus.java
 index 823efad652d8ff9e96b99375b102fef6f017716e..bdf0240840d92bf95f94c6fb1125eeaa105e303b 100644
---- a/src/main/java/net/minecraft/server/players/SleepStatus.java
-+++ b/src/main/java/net/minecraft/server/players/SleepStatus.java
+--- a/net/minecraft/server/players/SleepStatus.java
++++ b/net/minecraft/server/players/SleepStatus.java
 @@ -19,7 +19,7 @@ public class SleepStatus {
  
      public boolean areEnoughDeepSleeping(int percentage, List<ServerPlayer> players) {
@@ -164,10 +164,10 @@ index 823efad652d8ff9e96b99375b102fef6f017716e..bdf0240840d92bf95f94c6fb1125eeaa
                      ++this.sleepingPlayers;
                  }
                  // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
+diff --git a/net/minecraft/world/entity/EntitySelector.java b/net/minecraft/world/entity/EntitySelector.java
 index 6bf691fcc6486bde73bae30eff09142802c29eda..d99b223be90f0c04bb9274228ad323a7c7f218b2 100644
---- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
-+++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
+--- a/net/minecraft/world/entity/EntitySelector.java
++++ b/net/minecraft/world/entity/EntitySelector.java
 @@ -39,6 +39,7 @@ public final class EntitySelector {
          return net.minecraft.util.Mth.clamp(serverPlayer.getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= playerInsomniaTicks;
      };
@@ -176,10 +176,10 @@ index 6bf691fcc6486bde73bae30eff09142802c29eda..d99b223be90f0c04bb9274228ad323a7
  
      private EntitySelector() {}
      // Paper start - Affects Spawning API
-diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
+diff --git a/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
 index 52982c1e6a4da36392569c791853279f5f9ac31a..ebb827e213a3ba5eeb2fe5b78f5dee99403097b6 100644
---- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
+--- a/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
++++ b/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
 @@ -64,6 +64,10 @@ public class TargetingConditions {
              return false;
          } else if (this.selector != null && !this.selector.test(target, world)) {
@@ -191,10 +191,10 @@ index 52982c1e6a4da36392569c791853279f5f9ac31a..ebb827e213a3ba5eeb2fe5b78f5dee99
          } else {
              if (tester == null) {
                  if (this.isCombat && (!target.canBeSeenAsEnemy() || world.getDifficulty() == Difficulty.PEACEFUL)) {
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index 87c6378104ff47549c751e09afb6cfcd9b8dcf5d..2f69a511db8d43fbd3a17387cded1d3573579fce 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -206,6 +206,13 @@ public abstract class Player extends LivingEntity {
      public boolean fauxSleeping;
      public int oldLevel = -1;
@@ -209,10 +209,10 @@ index 87c6378104ff47549c751e09afb6cfcd9b8dcf5d..2f69a511db8d43fbd3a17387cded1d35
      @Override
      public CraftHumanEntity getBukkitEntity() {
          return (CraftHumanEntity) super.getBukkitEntity();
-diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
+diff --git a/net/minecraft/world/level/EntityGetter.java b/net/minecraft/world/level/EntityGetter.java
 index 5d7a6e4b73f032db356e7ec369b150013e940ee6..e164833de0c29eed9025dd4af3f2bb74c92d2250 100644
---- a/src/main/java/net/minecraft/world/level/EntityGetter.java
-+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
+--- a/net/minecraft/world/level/EntityGetter.java
++++ b/net/minecraft/world/level/EntityGetter.java
 @@ -184,7 +184,7 @@ public interface EntityGetter extends ca.spottedleaf.moonrise.patches.chunk_syst
  
      default boolean hasNearbyAlivePlayer(double x, double y, double z, double range) {
diff --git a/patches/server/0012-Bring-back-server-name.patch b/patches/server/0012-Bring-back-server-name.patch
index 6ec709f89..22d803462 100644
--- a/patches/server/0012-Bring-back-server-name.patch
+++ b/patches/server/0012-Bring-back-server-name.patch
@@ -4,10 +4,10 @@ Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
 
 
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
+diff --git a/net/minecraft/server/dedicated/DedicatedServerProperties.java b/net/minecraft/server/dedicated/DedicatedServerProperties.java
 index c3ec370b83b895be0f03662e3884fa4a2442a2a6..05e16103af3fd276f0196ddf1a2e5b729b025c34 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
+--- a/net/minecraft/server/dedicated/DedicatedServerProperties.java
++++ b/net/minecraft/server/dedicated/DedicatedServerProperties.java
 @@ -56,6 +56,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
      public final boolean onlineMode = this.get("online-mode", true);
      public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
diff --git a/patches/server/0013-Configurable-server-mod-name.patch b/patches/server/0013-Configurable-server-mod-name.patch
index 4e51cbf80..0dfaf817d 100644
--- a/patches/server/0013-Configurable-server-mod-name.patch
+++ b/patches/server/0013-Configurable-server-mod-name.patch
@@ -4,10 +4,10 @@ Date: Sat, 21 Mar 2020 11:47:39 -0500
 Subject: [PATCH] Configurable server mod name
 
 
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index ce4ce361061932162ace58070d44d1aa70189dbd..d61f6cf5a5d3320516339a7078f2e9fb2ab59dfa 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -2013,7 +2013,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
diff --git a/patches/server/0014-Lagging-threshold.patch b/patches/server/0014-Lagging-threshold.patch
index 3842b43b0..c435cdb6d 100644
--- a/patches/server/0014-Lagging-threshold.patch
+++ b/patches/server/0014-Lagging-threshold.patch
@@ -4,10 +4,10 @@ Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Lagging threshold
 
 
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index d61f6cf5a5d3320516339a7078f2e9fb2ab59dfa..18dc66b78f91c0b9efdf9008c0a38c52fdfc93ad 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -329,6 +329,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
diff --git a/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
index ac3836a16..8d7a254db 100644
--- a/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -4,10 +4,10 @@ Date: Fri, 5 Jul 2019 18:21:00 -0500
 Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
+diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
 index d23914a3ab3723d532ae867db6b954c843030f75..426d47c14d137906ed70fc3082e3d77e7f48c8d7 100644
---- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
+--- a/net/minecraft/world/entity/EntityType.java
++++ b/net/minecraft/world/entity/EntityType.java
 @@ -404,6 +404,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          return EntityType.register(EntityType.vanillaEntityId(id), type);
      }
@@ -42,10 +42,10 @@ index d23914a3ab3723d532ae867db6b954c843030f75..426d47c14d137906ed70fc3082e3d77e
      public String getDescriptionId() {
          return this.descriptionId;
      }
-diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
+diff --git a/net/minecraft/world/item/SpawnEggItem.java b/net/minecraft/world/item/SpawnEggItem.java
 index cc7e9b87e919b4ef8cf77cd780c890fd9a9cfa50..a185d098175e504b7bb93d2cff03ca99eabc11eb 100644
---- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-+++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
+--- a/net/minecraft/world/item/SpawnEggItem.java
++++ b/net/minecraft/world/item/SpawnEggItem.java
 @@ -68,6 +68,23 @@ public class SpawnEggItem extends Item {
                  Spawner spawner = (Spawner) tileentity;
  
diff --git a/patches/server/0016-Anvil-API.patch b/patches/server/0016-Anvil-API.patch
index 7cea85286..114f1f954 100644
--- a/patches/server/0016-Anvil-API.patch
+++ b/patches/server/0016-Anvil-API.patch
@@ -4,10 +4,10 @@ Date: Sun, 19 Apr 2020 00:17:56 -0500
 Subject: [PATCH] Anvil API
 
 
-diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
+diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
 index 4680f77a275d8d2b226018db89a571ac25998dd8..bfc90524bd739ed1d91fe9912e38093b3c28928f 100644
---- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
+--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
++++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -80,6 +80,7 @@ public abstract class AbstractContainerMenu {
      @Nullable
      private ContainerSynchronizer synchronizer;
@@ -16,10 +16,10 @@ index 4680f77a275d8d2b226018db89a571ac25998dd8..bfc90524bd739ed1d91fe9912e38093b
  
      // CraftBukkit start
      public boolean checkReachable = true;
-diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+diff --git a/net/minecraft/world/inventory/AnvilMenu.java b/net/minecraft/world/inventory/AnvilMenu.java
 index 286ae002e1711ad9e800b7f2091988d66cd572a7..f8c0a4fd95f341cbf8f6a06dfae408d505b0f018 100644
---- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+--- a/net/minecraft/world/inventory/AnvilMenu.java
++++ b/net/minecraft/world/inventory/AnvilMenu.java
 @@ -25,6 +25,12 @@ import org.slf4j.Logger;
  import org.bukkit.craftbukkit.inventory.view.CraftAnvilView;
  // CraftBukkit end
@@ -121,10 +121,10 @@ index 286ae002e1711ad9e800b7f2091988d66cd572a7..f8c0a4fd95f341cbf8f6a06dfae408d5
          } else {
              org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(this.getBukkitView(), ItemStack.EMPTY); // CraftBukkit
              this.cost.set(AnvilMenu.DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item
-diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
+diff --git a/net/minecraft/world/inventory/ItemCombinerMenu.java b/net/minecraft/world/inventory/ItemCombinerMenu.java
 index a5d53a656513ae81cc3f9fc506caf6adaba62a8e..ac9df238ef0f3d009f25976b95e0b750e963e952 100644
---- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
+--- a/net/minecraft/world/inventory/ItemCombinerMenu.java
++++ b/net/minecraft/world/inventory/ItemCombinerMenu.java
 @@ -164,7 +164,9 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
                  return ItemStack.EMPTY;
              }
diff --git a/patches/server/0017-Alternative-Keepalive-Handling.patch b/patches/server/0017-Alternative-Keepalive-Handling.patch
index baa37cab7..28cbd5491 100644
--- a/patches/server/0017-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0017-Alternative-Keepalive-Handling.patch
@@ -4,10 +4,10 @@ Date: Fri, 11 Oct 2019 00:17:39 -0500
 Subject: [PATCH] Alternative Keepalive Handling
 
 
-diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 index 92749b57d3a2b2ffee79436319513248846296b6..df48c2754dc1ebd52addd8ae768cba5916ce3969 100644
---- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -80,6 +80,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      private long keepAliveChallenge;
      private long closedListenerTime;
diff --git a/patches/server/0018-Enchantment-convenience-methods.patch b/patches/server/0018-Enchantment-convenience-methods.patch
index 573bafb9b..7ff4c940e 100644
--- a/patches/server/0018-Enchantment-convenience-methods.patch
+++ b/patches/server/0018-Enchantment-convenience-methods.patch
@@ -4,10 +4,10 @@ Date: Sat, 15 Jun 2024 14:31:48 +0200
 Subject: [PATCH] Enchantment convenience methods
 
 
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
+diff --git a/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/net/minecraft/world/item/enchantment/EnchantmentHelper.java
 index 4dd074d04c9a535f6cf24420058fd68594c59edc..64c315372277300e58ce413210f47eed5b6e1d6c 100644
---- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
+--- a/net/minecraft/world/item/enchantment/EnchantmentHelper.java
++++ b/net/minecraft/world/item/enchantment/EnchantmentHelper.java
 @@ -578,4 +578,14 @@ public class EnchantmentHelper {
      interface EnchantmentVisitor {
          void accept(Holder<Enchantment> enchantment, int level);
diff --git a/patches/server/0019-Silk-touch-spawners.patch b/patches/server/0019-Silk-touch-spawners.patch
index d867ba596..d308ccf74 100644
--- a/patches/server/0019-Silk-touch-spawners.patch
+++ b/patches/server/0019-Silk-touch-spawners.patch
@@ -4,10 +4,10 @@ Date: Thu, 9 May 2019 14:27:37 -0500
 Subject: [PATCH] Silk touch spawners
 
 
-diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
 index 4377fa2400c4320e0023ece230090a2a3b4b2ab6..ac5dc472337cd9613db5fc03f64763245129dfd9 100644
---- a/src/main/java/net/minecraft/world/item/BlockItem.java
-+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
+--- a/net/minecraft/world/item/BlockItem.java
++++ b/net/minecraft/world/item/BlockItem.java
 @@ -223,6 +223,7 @@ public class BlockItem extends Item {
                      }
  
@@ -16,10 +16,10 @@ index 4377fa2400c4320e0023ece230090a2a3b4b2ab6..ac5dc472337cd9613db5fc03f6476324
                          return false;
                      }
  
-diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
+diff --git a/net/minecraft/world/item/Items.java b/net/minecraft/world/item/Items.java
 index 6d16b4433e79eca0ff8008941f0b9b807b1db9db..41fbe61268c0a16078b5f846ab12bde172872ff7 100644
---- a/src/main/java/net/minecraft/world/item/Items.java
-+++ b/src/main/java/net/minecraft/world/item/Items.java
+--- a/net/minecraft/world/item/Items.java
++++ b/net/minecraft/world/item/Items.java
 @@ -367,7 +367,7 @@ public class Items {
      public static final Item PURPUR_BLOCK = registerBlock(Blocks.PURPUR_BLOCK);
      public static final Item PURPUR_PILLAR = registerBlock(Blocks.PURPUR_PILLAR);
@@ -29,10 +29,10 @@ index 6d16b4433e79eca0ff8008941f0b9b807b1db9db..41fbe61268c0a16078b5f846ab12bde1
      public static final Item CREAKING_HEART = registerBlock(Blocks.CREAKING_HEART);
      public static final Item CHEST = registerBlock(Blocks.CHEST, settings -> settings.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY));
      public static final Item CRAFTING_TABLE = registerBlock(Blocks.CRAFTING_TABLE);
-diff --git a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
+diff --git a/net/minecraft/world/level/block/SpawnerBlock.java b/net/minecraft/world/level/block/SpawnerBlock.java
 index d751b280a8bf2066d458f8eb548d7aa123fa69c9..fb88b5c1d9e764bf1211d601527133ea8e8268b3 100644
---- a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
+--- a/net/minecraft/world/level/block/SpawnerBlock.java
++++ b/net/minecraft/world/level/block/SpawnerBlock.java
 @@ -42,6 +42,57 @@ public class SpawnerBlock extends BaseEntityBlock {
          return createTickerHelper(type, BlockEntityType.MOB_SPAWNER, world.isClientSide ? SpawnerBlockEntity::clientTick : SpawnerBlockEntity::serverTick);
      }
diff --git a/patches/server/0020-Add-turtle-egg-block-options.patch b/patches/server/0020-Add-turtle-egg-block-options.patch
index adc80aaa7..cb1136a81 100644
--- a/patches/server/0020-Add-turtle-egg-block-options.patch
+++ b/patches/server/0020-Add-turtle-egg-block-options.patch
@@ -4,10 +4,10 @@ Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] Add turtle egg block options
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
+diff --git a/net/minecraft/world/level/block/TurtleEggBlock.java b/net/minecraft/world/level/block/TurtleEggBlock.java
 index 953ddb2ea6fd48e57712e30a6addf23e188e5312..df2028f53fd07551f8aa7eeb49f99ac0676d5fe0 100644
---- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
+--- a/net/minecraft/world/level/block/TurtleEggBlock.java
++++ b/net/minecraft/world/level/block/TurtleEggBlock.java
 @@ -204,6 +204,25 @@ public class TurtleEggBlock extends Block {
      }
  
diff --git a/patches/server/0021-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0021-Logger-settings-suppressing-pointless-logs.patch
index a15b3bc8b..f8f011251 100644
--- a/patches/server/0021-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0021-Logger-settings-suppressing-pointless-logs.patch
@@ -4,10 +4,10 @@ Date: Sat, 19 Oct 2019 00:52:12 -0500
 Subject: [PATCH] Logger settings (suppressing pointless logs)
 
 
-diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
+diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
 index 8e2eb7b61421ceb063654826941f1a81f6f50bdf..0a16aa193ef24aa8f1716f9e089b8027fa3c0a3c 100644
---- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
-+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
+--- a/net/minecraft/server/PlayerAdvancements.java
++++ b/net/minecraft/server/PlayerAdvancements.java
 @@ -199,6 +199,7 @@ public class PlayerAdvancements {
  
              if (advancementholder == null) {
@@ -16,10 +16,10 @@ index 8e2eb7b61421ceb063654826941f1a81f6f50bdf..0a16aa193ef24aa8f1716f9e089b8027
                  PlayerAdvancements.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", minecraftkey, this.playerSavePath);
              } else {
                  this.startProgress(advancementholder, advancementprogress);
-diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
+diff --git a/net/minecraft/server/level/WorldGenRegion.java b/net/minecraft/server/level/WorldGenRegion.java
 index e4b0dc3121101d54394a0c3a413dabf8103b2ea6..a8484b9659f175cc20985bf66082616ceb31df4d 100644
---- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-+++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
+--- a/net/minecraft/server/level/WorldGenRegion.java
++++ b/net/minecraft/server/level/WorldGenRegion.java
 @@ -336,6 +336,7 @@ public class WorldGenRegion implements WorldGenLevel {
              return true;
          } else {
@@ -28,10 +28,10 @@ index e4b0dc3121101d54394a0c3a413dabf8103b2ea6..a8484b9659f175cc20985bf66082616c
              if (!hasSetFarWarned) {
              Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + String.valueOf(pos) + ", status: " + String.valueOf(this.generatingStep.targetStatus()) + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
                  hasSetFarWarned = true;
-diff --git a/src/main/java/net/minecraft/stats/ServerRecipeBook.java b/src/main/java/net/minecraft/stats/ServerRecipeBook.java
+diff --git a/net/minecraft/stats/ServerRecipeBook.java b/net/minecraft/stats/ServerRecipeBook.java
 index 5c7484ce2850a2eb698a2183b81134b89b0bbcc7..fef09e71f73f6f24a01289ef05c20a5ffc5fadb1 100644
---- a/src/main/java/net/minecraft/stats/ServerRecipeBook.java
-+++ b/src/main/java/net/minecraft/stats/ServerRecipeBook.java
+--- a/net/minecraft/stats/ServerRecipeBook.java
++++ b/net/minecraft/stats/ServerRecipeBook.java
 @@ -159,6 +159,7 @@ public class ServerRecipeBook extends RecipeBook {
                  ResourceKey<Recipe<?>> resourcekey = ResourceKey.create(Registries.RECIPE, ResourceLocation.parse(s));
  
diff --git a/patches/server/0023-Giants-AI-settings.patch b/patches/server/0023-Giants-AI-settings.patch
index 8bfa51d6e..d4b9fd95d 100644
--- a/patches/server/0023-Giants-AI-settings.patch
+++ b/patches/server/0023-Giants-AI-settings.patch
@@ -4,10 +4,10 @@ Date: Sun, 12 May 2019 00:43:12 -0500
 Subject: [PATCH] Giants AI settings
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+diff --git a/net/minecraft/world/entity/monster/Giant.java b/net/minecraft/world/entity/monster/Giant.java
 index 4a13274a863345650ca0c3f98d6b2735221c778a..adc90a306fc9023f4a1cdfe9f58c39726086c849 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+--- a/net/minecraft/world/entity/monster/Giant.java
++++ b/net/minecraft/world/entity/monster/Giant.java
 @@ -30,8 +30,23 @@ public class Giant extends Monster {
  
      @Override
diff --git a/patches/server/0024-Zombie-horse-naturally-spawn.patch b/patches/server/0024-Zombie-horse-naturally-spawn.patch
index d09ab0b2b..1ac95e344 100644
--- a/patches/server/0024-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0024-Zombie-horse-naturally-spawn.patch
@@ -4,10 +4,10 @@ Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Zombie horse naturally spawn
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
 index 4b9434b2d03cd24f5dac7098d2f1318fd12baddb..7ab130afddb0893016fb558ed624198316ca191d 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
 @@ -940,10 +940,18 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper - Configurable spawn chances for skeleton horses
  
diff --git a/patches/server/0025-Charged-creeper-naturally-spawn.patch b/patches/server/0025-Charged-creeper-naturally-spawn.patch
index d7c41946b..b456c743f 100644
--- a/patches/server/0025-Charged-creeper-naturally-spawn.patch
+++ b/patches/server/0025-Charged-creeper-naturally-spawn.patch
@@ -4,10 +4,10 @@ Date: Fri, 29 Nov 2019 22:37:44 -0600
 Subject: [PATCH] Charged creeper naturally spawn
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
 index a93b9bf974fdee49cf9fe814bfb86467971f2f53..d67136ccf5e23accb656f2532e2ced93669f2a8d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+--- a/net/minecraft/world/entity/monster/Creeper.java
++++ b/net/minecraft/world/entity/monster/Creeper.java
 @@ -258,6 +258,16 @@ public class Creeper extends Monster {
          }
      }
diff --git a/patches/server/0026-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0026-Rabbit-naturally-spawn-toast-and-killer.patch
index 2f26a42c5..6fda47fcb 100644
--- a/patches/server/0026-Rabbit-naturally-spawn-toast-and-killer.patch
+++ b/patches/server/0026-Rabbit-naturally-spawn-toast-and-killer.patch
@@ -4,10 +4,10 @@ Date: Sat, 31 Aug 2019 17:47:11 -0500
 Subject: [PATCH] Rabbit naturally spawn toast and killer
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java
 index 7ce438ad3083ff7f431c1f292d1c38d53c14672c..6448d4f44f948f08121302784e966bf58abd9be1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+--- a/net/minecraft/world/entity/animal/Rabbit.java
++++ b/net/minecraft/world/entity/animal/Rabbit.java
 @@ -470,10 +470,23 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          }
  
diff --git a/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
index 3e74f1413..c9fe1a90e 100644
--- a/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
  boots
 
 
-diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 index 532f09089b8d6798999cf3f83e852df7479e450e..43c63d203859eaa0999937e2f9254c22510139aa 100644
---- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 @@ -154,6 +154,7 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
              this.connection.send(new ClientboundStatusResponsePacket(ping));
              // CraftBukkit end
diff --git a/patches/server/0028-Tulips-change-fox-type.patch b/patches/server/0028-Tulips-change-fox-type.patch
index 595311534..e21ddc104 100644
--- a/patches/server/0028-Tulips-change-fox-type.patch
+++ b/patches/server/0028-Tulips-change-fox-type.patch
@@ -4,10 +4,10 @@ Date: Sat, 13 Jul 2019 15:56:22 -0500
 Subject: [PATCH] Tulips change fox type
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java
 index 584d08bca961f8b8487b844cd2412b773401296d..a0adc29bb09a3eaecdaf564fd992b8aefec69629 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+--- a/net/minecraft/world/entity/animal/Fox.java
++++ b/net/minecraft/world/entity/animal/Fox.java
 @@ -385,6 +385,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
      }
  
diff --git a/patches/server/0029-Breedable-Polar-Bears.patch b/patches/server/0029-Breedable-Polar-Bears.patch
index daf3e7da5..155ec0efd 100644
--- a/patches/server/0029-Breedable-Polar-Bears.patch
+++ b/patches/server/0029-Breedable-Polar-Bears.patch
@@ -4,10 +4,10 @@ Date: Fri, 12 Apr 2024 15:40:12 -0700
 Subject: [PATCH] Breedable Polar Bears
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+diff --git a/net/minecraft/world/entity/animal/PolarBear.java b/net/minecraft/world/entity/animal/PolarBear.java
 index 1ec0f8a70e9e603def18fd90c84f4525f6985381..09039a5a69ea582223d6ad06b1d99776742ec2e2 100644
---- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+--- a/net/minecraft/world/entity/animal/PolarBear.java
++++ b/net/minecraft/world/entity/animal/PolarBear.java
 @@ -100,6 +100,28 @@ public class PolarBear extends Animal implements NeutralMob {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.polarBearScale);
      }
diff --git a/patches/server/0030-Chickens-can-retaliate.patch b/patches/server/0030-Chickens-can-retaliate.patch
index 6ed0f6cee..d2b5dcc54 100644
--- a/patches/server/0030-Chickens-can-retaliate.patch
+++ b/patches/server/0030-Chickens-can-retaliate.patch
@@ -4,10 +4,10 @@ Date: Sun, 12 Apr 2020 13:19:34 -0500
 Subject: [PATCH] Chickens can retaliate
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+diff --git a/net/minecraft/world/entity/animal/Chicken.java b/net/minecraft/world/entity/animal/Chicken.java
 index 2f1518536e63dfd94db5c8a2076004319408409c..f6f7afc6a421022738f77e5eece193ad15de78ba 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+--- a/net/minecraft/world/entity/animal/Chicken.java
++++ b/net/minecraft/world/entity/animal/Chicken.java
 @@ -75,13 +75,18 @@ public class Chicken extends Animal {
      public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.chickenMaxHealth);
diff --git a/patches/server/0031-Add-option-to-set-armorstand-step-height.patch b/patches/server/0031-Add-option-to-set-armorstand-step-height.patch
index 70ee54153..6b19991b2 100644
--- a/patches/server/0031-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0031-Add-option-to-set-armorstand-step-height.patch
@@ -4,10 +4,10 @@ Date: Sun, 6 Oct 2019 12:46:35 -0500
 Subject: [PATCH] Add option to set armorstand step height
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index 755861185bd8434027acca7f03ed0bfdf9fa2cde..fe5e8009d16fe9292312e37538b02b92b9fea9ed 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -300,6 +300,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public double xOld;
      public double yOld;
@@ -25,10 +25,10 @@ index 755861185bd8434027acca7f03ed0bfdf9fa2cde..fe5e8009d16fe9292312e37538b02b92
      }
  
      public void onExplosionHit(@Nullable Entity entity) {}
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
 index 70b8023c3badc745f342d5b0ab54699e3923826a..edb0cd90e28016c44b0aaf5c9ed5d7bdbced5295 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+--- a/net/minecraft/world/entity/decoration/ArmorStand.java
++++ b/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -681,6 +681,7 @@ public class ArmorStand extends LivingEntity {
  
      @Override
diff --git a/patches/server/0032-Cat-spawning-options.patch b/patches/server/0032-Cat-spawning-options.patch
index 0c52801e5..146c2710c 100644
--- a/patches/server/0032-Cat-spawning-options.patch
+++ b/patches/server/0032-Cat-spawning-options.patch
@@ -4,10 +4,10 @@ Date: Thu, 26 Dec 2019 18:52:55 -0600
 Subject: [PATCH] Cat spawning options
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
+diff --git a/net/minecraft/world/entity/npc/CatSpawner.java b/net/minecraft/world/entity/npc/CatSpawner.java
 index b0236c7bf9441aa84d3795ffed05dd6099f29636..e9cbbcdcefe9acc24cf7972ae356fd590e128f56 100644
---- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
+--- a/net/minecraft/world/entity/npc/CatSpawner.java
++++ b/net/minecraft/world/entity/npc/CatSpawner.java
 @@ -27,7 +27,7 @@ public class CatSpawner implements CustomSpawner {
              if (this.nextTick > 0) {
                  return 0;
diff --git a/patches/server/0033-Cows-eat-mushrooms.patch b/patches/server/0033-Cows-eat-mushrooms.patch
index e14736833..7944abc0d 100644
--- a/patches/server/0033-Cows-eat-mushrooms.patch
+++ b/patches/server/0033-Cows-eat-mushrooms.patch
@@ -4,10 +4,10 @@ Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] Cows eat mushrooms
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+diff --git a/net/minecraft/world/entity/animal/Cow.java b/net/minecraft/world/entity/animal/Cow.java
 index 064188a7032170ed16cf3b538efc444e54325036..88dd147317e200a11eb6a7e496bfffee9079fd6f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+--- a/net/minecraft/world/entity/animal/Cow.java
++++ b/net/minecraft/world/entity/animal/Cow.java
 @@ -75,7 +75,7 @@ public class Cow extends Animal {
          this.goalSelector.addGoal(1, new PanicGoal(this, 2.0D));
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
diff --git a/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch
index d00087205..adb11c0ac 100644
--- a/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch
@@ -4,10 +4,10 @@ Date: Fri, 3 May 2019 23:53:16 -0500
 Subject: [PATCH] Fix cow rotation when shearing mooshroom
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+diff --git a/net/minecraft/world/entity/animal/MushroomCow.java b/net/minecraft/world/entity/animal/MushroomCow.java
 index 215ec83077a1d40fdcee5bf4cd1af0d46fdd695e..96078cf11f13c85a3f019f70fa02668c43dbc559 100644
---- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+--- a/net/minecraft/world/entity/animal/MushroomCow.java
++++ b/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -219,6 +219,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          world.playSound((Player) null, (Entity) this, SoundEvents.MOOSHROOM_SHEAR, shearedSoundCategory, 1.0F, 1.0F);
          this.convertTo(EntityType.COW, ConversionParams.single(this, false, false), (entitycow) -> {
diff --git a/patches/server/0035-Pigs-give-saddle-back.patch b/patches/server/0035-Pigs-give-saddle-back.patch
index 7d27a08ce..2215e3bbd 100644
--- a/patches/server/0035-Pigs-give-saddle-back.patch
+++ b/patches/server/0035-Pigs-give-saddle-back.patch
@@ -4,10 +4,10 @@ Date: Sun, 12 May 2019 01:14:46 -0500
 Subject: [PATCH] Pigs give saddle back
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+diff --git a/net/minecraft/world/entity/animal/Pig.java b/net/minecraft/world/entity/animal/Pig.java
 index b7e4e4bbb85a44e0f2cd49a1419216ca3c526cd7..f9efd4c1fc30f2bbb061d31ded6e45c546b0bfa8 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+--- a/net/minecraft/world/entity/animal/Pig.java
++++ b/net/minecraft/world/entity/animal/Pig.java
 @@ -181,6 +181,17 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
          boolean flag = this.isFood(player.getItemInHand(hand));
diff --git a/patches/server/0036-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0036-Snowman-drop-and-put-back-pumpkin.patch
index d2456957e..556f44f29 100644
--- a/patches/server/0036-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/server/0036-Snowman-drop-and-put-back-pumpkin.patch
@@ -4,10 +4,10 @@ Date: Fri, 3 May 2019 23:58:44 -0500
 Subject: [PATCH] Snowman drop and put back pumpkin
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java
 index 0149071cc901beffd583c1ba7617e1355473fc77..aaa581c5fa7a14958b2a7c20996cf70ad4efff04 100644
---- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+--- a/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -205,6 +205,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
              }
  
diff --git a/patches/server/0037-Ender-dragon-always-drop-full-exp.patch b/patches/server/0037-Ender-dragon-always-drop-full-exp.patch
index 908b522b7..e7da0e690 100644
--- a/patches/server/0037-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/server/0037-Ender-dragon-always-drop-full-exp.patch
@@ -4,10 +4,10 @@ Date: Sat, 24 Aug 2019 14:42:54 -0500
 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
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 index 1e1cd061203ab3ca2f1feb4a3f9fe2813d3d96aa..14feab288349f0fcd80b89466926b37d1087bf53 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
+--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
++++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -733,7 +733,7 @@ public class EnderDragon extends Mob implements Enemy {
          boolean flag = worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT);
          short short0 = 500;
diff --git a/patches/server/0038-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0038-Allow-soil-to-moisten-from-water-directly-under-it.patch
index ad5151bfc..b274ed734 100644
--- a/patches/server/0038-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/server/0038-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -4,10 +4,10 @@ Date: Fri, 21 Jun 2019 14:37:10 -0500
 Subject: [PATCH] Allow soil to moisten from water directly under it
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+diff --git a/net/minecraft/world/level/block/FarmBlock.java b/net/minecraft/world/level/block/FarmBlock.java
 index c3dba0c2c94f3804338f86621dc42405e380a6b3..df89b18f0d5d2dad5745ec65bcd9e4a7bf2f1f2b 100644
---- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+--- a/net/minecraft/world/level/block/FarmBlock.java
++++ b/net/minecraft/world/level/block/FarmBlock.java
 @@ -174,7 +174,7 @@ public class FarmBlock extends Block {
              }
          }
diff --git a/patches/server/0039-Minecart-settings-and-WASD-controls.patch b/patches/server/0039-Minecart-settings-and-WASD-controls.patch
index d7fc7a048..904d05ecd 100644
--- a/patches/server/0039-Minecart-settings-and-WASD-controls.patch
+++ b/patches/server/0039-Minecart-settings-and-WASD-controls.patch
@@ -4,10 +4,10 @@ Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Minecart settings and WASD controls
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 5e8a5e8e4120420a170c4733ae217e7948cef46c..3ea226168519e07b10d015f4c9b2b369569daf11 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -1439,6 +1439,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          if (this.isInvulnerableTo(world, source)) {
              return false;
@@ -16,10 +16,10 @@ index 5e8a5e8e4120420a170c4733ae217e7948cef46c..3ea226168519e07b10d015f4c9b2b369
              Entity entity = source.getEntity();
  
              if (entity instanceof net.minecraft.world.entity.player.Player) {
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+diff --git a/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 index cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..d0c93f87795d7162bbfb3fdadadb6ae1c5fdaeeb 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+--- a/net/minecraft/world/entity/vehicle/AbstractMinecart.java
++++ b/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 @@ -92,6 +92,10 @@ public abstract class AbstractMinecart extends VehicleEntity {
      private double flyingY = 0.95;
      private double flyingZ = 0.95;
@@ -124,10 +124,10 @@ index cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..d0c93f87795d7162bbfb3fdadadb6ae1
  
          this.move(MoverType.SELF, this.getDeltaMovement());
          if (!this.onGround()) {
-diff --git a/src/main/java/net/minecraft/world/item/MinecartItem.java b/src/main/java/net/minecraft/world/item/MinecartItem.java
+diff --git a/net/minecraft/world/item/MinecartItem.java b/net/minecraft/world/item/MinecartItem.java
 index 7153d9ed12276a0f2d8b8a17c79734aa25ed1fa5..a82faf7f07cd71c8748979a726b1e7857d88e195 100644
---- a/src/main/java/net/minecraft/world/item/MinecartItem.java
-+++ b/src/main/java/net/minecraft/world/item/MinecartItem.java
+--- a/net/minecraft/world/item/MinecartItem.java
++++ b/net/minecraft/world/item/MinecartItem.java
 @@ -35,8 +35,9 @@ public class MinecartItem extends Item {
          BlockState iblockdata = world.getBlockState(blockposition);
  
@@ -148,10 +148,10 @@ index 7153d9ed12276a0f2d8b8a17c79734aa25ed1fa5..a82faf7f07cd71c8748979a726b1e785
 +        // } // Purpur - Minecart settings and WASD controls
      }
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
 index 8c0f332a1a0918f60226d969918ae7fe4fe74166..6376b8b3ff444f4cab93e2bb5d2becc77c33c118 100644
---- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+--- a/net/minecraft/world/level/block/state/BlockBehaviour.java
++++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -99,7 +99,7 @@ public abstract class BlockBehaviour implements FeatureElement {
      protected final float jumpFactor;
      protected final boolean dynamicShape;
diff --git a/patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch
index e0861d9ea..5a94afa6d 100644
--- a/patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch
@@ -4,10 +4,10 @@ Date: Wed, 3 Jul 2019 23:58:31 -0500
 Subject: [PATCH] Disable loot drops on death by cramming
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index 6884475a5217acb8073dc38e5f7a7b341c8b1dd1..34f2c17831c6edd16b6dc32f3d344b3c209244fc 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1925,6 +1925,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
          this.dropEquipment(world); // CraftBukkit - from below
diff --git a/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch
index 881bdbc1d..d37ed5b56 100644
--- a/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch
@@ -4,10 +4,10 @@ Date: Wed, 10 Jul 2019 20:43:05 -0500
 Subject: [PATCH] Option to toggle milk curing bad omen
 
 
-diff --git a/src/main/java/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java b/src/main/java/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
+diff --git a/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java b/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
 index 0651c2af040e3f248860cfb3c5effce91589380e..d884df481b4bbb978113a4ac7a1feac31cf2f951 100644
---- a/src/main/java/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
-+++ b/src/main/java/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
+--- a/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
++++ b/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
 @@ -24,6 +24,12 @@ public record ClearAllStatusEffectsConsumeEffect() implements ConsumeEffect {
      @Override
      // CraftBukkit start
diff --git a/patches/server/0042-Skip-events-if-there-s-no-listeners.patch b/patches/server/0042-Skip-events-if-there-s-no-listeners.patch
index 230c1bd2c..2d0553e9f 100644
--- a/patches/server/0042-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0042-Skip-events-if-there-s-no-listeners.patch
@@ -4,10 +4,10 @@ Date: Sat, 4 Apr 2020 03:07:59 -0500
 Subject: [PATCH] Skip events if there's no listeners
 
 
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
 index 517cb238ec280aadd1fc54bcb675ed386e798eaf..832930024b0d642496efe17f7e2f8e02413275f0 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
 @@ -515,6 +515,7 @@ public class Commands {
      private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
          // Paper end - Perf: Async command map building
diff --git a/patches/server/0043-Add-permission-for-F3-N-debug.patch b/patches/server/0043-Add-permission-for-F3-N-debug.patch
index 07272b51e..a1406cc30 100644
--- a/patches/server/0043-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0043-Add-permission-for-F3-N-debug.patch
@@ -4,10 +4,10 @@ Date: Sat, 28 Dec 2019 04:21:54 -0600
 Subject: [PATCH] Add permission for F3+N debug
 
 
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
 index b9136fcec3f36549ddd572cbb8cd01ecae45590f..8596e1c016c51a840b8c0c6a8d5c8e0893c4f1c7 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
 @@ -1108,6 +1108,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + permissionLevel);
diff --git a/patches/server/0044-Configurable-TPS-Catchup.patch b/patches/server/0044-Configurable-TPS-Catchup.patch
index 89e37d025..0c884bc1c 100644
--- a/patches/server/0044-Configurable-TPS-Catchup.patch
+++ b/patches/server/0044-Configurable-TPS-Catchup.patch
@@ -4,10 +4,10 @@ Date: Thu, 26 Mar 2020 19:06:22 -0500
 Subject: [PATCH] Configurable TPS Catchup
 
 
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index 18dc66b78f91c0b9efdf9008c0a38c52fdfc93ad..22cbe00a19a2ac0ad25b1107b1290b793903e3aa 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -1344,6 +1344,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                          gameprofilerfiller.popPush("nextTickWait");
                          this.mayHaveDelayedTasks = true;
diff --git a/patches/server/0045-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0045-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
index 30e41cf55..c756d9778 100644
--- a/patches/server/0045-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0045-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -4,10 +4,10 @@ Date: Thu, 19 Mar 2020 19:39:34 -0500
 Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+diff --git a/net/minecraft/world/entity/projectile/ThrownTrident.java b/net/minecraft/world/entity/projectile/ThrownTrident.java
 index 1e045397763e8233c2e8f9955468788374b80068..3573a6cf0632dfb6859f5a5e7ceffb947e9d3692 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+--- a/net/minecraft/world/entity/projectile/ThrownTrident.java
++++ b/net/minecraft/world/entity/projectile/ThrownTrident.java
 @@ -70,7 +70,7 @@ public class ThrownTrident extends AbstractArrow {
          Entity entity = this.getOwner();
          byte b0 = (Byte) this.entityData.get(ThrownTrident.ID_LOYALTY);
diff --git a/patches/server/0046-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0046-Add-enderman-and-creeper-griefing-controls.patch
index 1a4a3e298..77e0a06db 100644
--- a/patches/server/0046-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/server/0046-Add-enderman-and-creeper-griefing-controls.patch
@@ -4,10 +4,10 @@ Date: Sun, 26 Apr 2020 16:28:38 -0500
 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
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
 index d67136ccf5e23accb656f2532e2ced93669f2a8d..4711f5e5d9f1738d739be68f586f744eba8621c9 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+--- a/net/minecraft/world/entity/monster/Creeper.java
++++ b/net/minecraft/world/entity/monster/Creeper.java
 @@ -365,7 +365,7 @@ public class Creeper extends Monster {
              if (!event.isCancelled()) {
              // CraftBukkit end
@@ -17,10 +17,10 @@ index d67136ccf5e23accb656f2532e2ced93669f2a8d..4711f5e5d9f1738d739be68f586f744e
              this.spawnLingeringCloud();
              this.triggerOnDeathMobEffects(worldserver, Entity.RemovalReason.KILLED);
              this.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index 9f7261bd22803f0b094e2bfd4a0eb66ad727211e..13eaf1e8b12c3b4cba6b202f2d31e99a8a9bae92 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -514,6 +514,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
          @Override
diff --git a/patches/server/0047-Villagers-follow-emerald-blocks.patch b/patches/server/0047-Villagers-follow-emerald-blocks.patch
index baeccdd1d..a1a535fed 100644
--- a/patches/server/0047-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0047-Villagers-follow-emerald-blocks.patch
@@ -4,10 +4,10 @@ Date: Fri, 29 Nov 2019 22:10:12 -0600
 Subject: [PATCH] Villagers follow emerald blocks
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java b/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
+diff --git a/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java b/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
 index 8ccbf0386aa453e82fc0f82d2aefd1e08b6c3345..8c1ff0b273e25373c6b581613f692265d9569952 100644
---- a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
+--- a/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
++++ b/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
 @@ -162,7 +162,7 @@ public class DefaultAttributes {
          .put(EntityType.VILLAGER, Villager.createAttributes().build())
          .put(EntityType.VINDICATOR, Vindicator.createAttributes().build())
@@ -17,10 +17,10 @@ index 8ccbf0386aa453e82fc0f82d2aefd1e08b6c3345..8c1ff0b273e25373c6b581613f692265
          .put(EntityType.WITCH, Witch.createAttributes().build())
          .put(EntityType.WITHER, WitherBoss.createAttributes().build())
          .put(EntityType.WITHER_SKELETON, AbstractSkeleton.createAttributes().build())
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
+diff --git a/net/minecraft/world/entity/ai/goal/TemptGoal.java b/net/minecraft/world/entity/ai/goal/TemptGoal.java
 index 84ab90dd1fe693da71732533ccff940c1007e1b6..798d1a169ebebfbdc5e0cf71e7a1256cefcbd32b 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
+--- a/net/minecraft/world/entity/ai/goal/TemptGoal.java
++++ b/net/minecraft/world/entity/ai/goal/TemptGoal.java
 @@ -67,7 +67,7 @@ public class TemptGoal extends Goal {
      }
  
@@ -30,10 +30,10 @@ index 84ab90dd1fe693da71732533ccff940c1007e1b6..798d1a169ebebfbdc5e0cf71e7a1256c
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
+diff --git a/net/minecraft/world/entity/npc/AbstractVillager.java b/net/minecraft/world/entity/npc/AbstractVillager.java
 index 3c037cabd8331eb96a6523b37abab4e73ab79a02..94ba68e063e63f77f7951d482af7a3586ba4ffdf 100644
---- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
+--- a/net/minecraft/world/entity/npc/AbstractVillager.java
++++ b/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -48,6 +48,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
  // CraftBukkit end
  
@@ -42,10 +42,10 @@ index 3c037cabd8331eb96a6523b37abab4e73ab79a02..94ba68e063e63f77f7951d482af7a358
  
      // CraftBukkit start
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index 39f2091391222bcd4ab0f2677f896c5ecdc6e86c..129833b7ecd644e4180fadca15015276961725c6 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -175,6 +175,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      @Override
      protected void registerGoals() {
@@ -71,10 +71,10 @@ index 39f2091391222bcd4ab0f2677f896c5ecdc6e86c..129833b7ecd644e4180fadca15015276
      }
  
      public boolean assignProfessionWhenSpawned() {
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
 index 8e12ae313c76d742b61aa83a35d41d83b92bded5..c307aa1153d6a17ee8624453fc9303ac5749b6ef 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+--- a/net/minecraft/world/entity/npc/WanderingTrader.java
++++ b/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -93,8 +93,14 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
      @Override
      public void initAttributes() {
diff --git a/patches/server/0048-Allow-leashing-villagers.patch b/patches/server/0048-Allow-leashing-villagers.patch
index 88a753be4..da3e230bf 100644
--- a/patches/server/0048-Allow-leashing-villagers.patch
+++ b/patches/server/0048-Allow-leashing-villagers.patch
@@ -4,10 +4,10 @@ Date: Thu, 3 Oct 2019 18:08:03 -0500
 Subject: [PATCH] Allow leashing villagers
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index fe5e8009d16fe9292312e37538b02b92b9fea9ed..7b017806dde98a33b64223f098cc63c286dac02b 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -3115,6 +3115,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          if (this.isAlive() && this instanceof Leashable leashable) {
              if (leashable.getLeashHolder() == player) {
@@ -16,10 +16,10 @@ index fe5e8009d16fe9292312e37538b02b92b9fea9ed..7b017806dde98a33b64223f098cc63c2
                      // CraftBukkit start - fire PlayerUnleashEntityEvent
                      // Paper start - Expand EntityUnleashEvent
                      org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.hasInfiniteMaterials());
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index 129833b7ecd644e4180fadca15015276961725c6..f89c82db6333dc64ac57e225f5522943eb959f46 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -187,6 +187,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          this.getAttribute(Attributes.TEMPT_RANGE).setBaseValue(this.level().purpurConfig.villagerTemptRange); // Purpur - Villagers follow emerald blocks
      }
@@ -33,10 +33,10 @@ index 129833b7ecd644e4180fadca15015276961725c6..f89c82db6333dc64ac57e225f5522943
      @Override
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
 index c307aa1153d6a17ee8624453fc9303ac5749b6ef..0066e413d1fa92ecd5573c00195aa2f1412e665e 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+--- a/net/minecraft/world/entity/npc/WanderingTrader.java
++++ b/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -101,6 +101,12 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          return Mob.createMobAttributes().add(net.minecraft.world.entity.ai.attributes.Attributes.TEMPT_RANGE, 10.0D);
      }
diff --git a/patches/server/0049-Implement-infinite-liquids.patch b/patches/server/0049-Implement-infinite-liquids.patch
index 280ecf911..e67e3f2cb 100644
--- a/patches/server/0049-Implement-infinite-liquids.patch
+++ b/patches/server/0049-Implement-infinite-liquids.patch
@@ -4,10 +4,10 @@ Date: Sat, 23 Nov 2019 17:55:42 -0600
 Subject: [PATCH] Implement infinite liquids
 
 
-diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
+diff --git a/net/minecraft/world/level/material/FlowingFluid.java b/net/minecraft/world/level/material/FlowingFluid.java
 index f4fbcbb8ff6d2677af1a02a0801a323c06dce9b1..6f024a29e8824a604ff0c74f88522d23423beb5c 100644
---- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
+--- a/net/minecraft/world/level/material/FlowingFluid.java
++++ b/net/minecraft/world/level/material/FlowingFluid.java
 @@ -266,7 +266,7 @@ public abstract class FlowingFluid extends Fluid {
              }
          }
@@ -30,10 +30,10 @@ index f4fbcbb8ff6d2677af1a02a0801a323c06dce9b1..6f024a29e8824a604ff0c74f88522d23
      protected void spreadTo(LevelAccessor world, BlockPos pos, BlockState state, Direction direction, FluidState fluidState) {
          Block block = state.getBlock();
  
-diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
+diff --git a/net/minecraft/world/level/material/LavaFluid.java b/net/minecraft/world/level/material/LavaFluid.java
 index 884db3e64cb22ed765beec8f11ea309fcf810207..e9687c3580e5fff33ce902eb7b86eb815ca1072d 100644
---- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
+--- a/net/minecraft/world/level/material/LavaFluid.java
++++ b/net/minecraft/world/level/material/LavaFluid.java
 @@ -199,6 +199,13 @@ public abstract class LavaFluid extends FlowingFluid {
          world.levelEvent(1501, pos, 0);
      }
@@ -48,10 +48,10 @@ index 884db3e64cb22ed765beec8f11ea309fcf810207..e9687c3580e5fff33ce902eb7b86eb81
      @Override
      protected boolean canConvertToSource(ServerLevel world) {
          return world.getGameRules().getBoolean(GameRules.RULE_LAVA_SOURCE_CONVERSION);
-diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
+diff --git a/net/minecraft/world/level/material/WaterFluid.java b/net/minecraft/world/level/material/WaterFluid.java
 index 552925ba47c7475e2e1ec2ded0966f28ed3e50a5..1e741f36b79585f33abe413beafe00cf5205d54f 100644
---- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
+--- a/net/minecraft/world/level/material/WaterFluid.java
++++ b/net/minecraft/world/level/material/WaterFluid.java
 @@ -81,6 +81,13 @@ public abstract class WaterFluid extends FlowingFluid {
          return world.getGameRules().getBoolean(GameRules.RULE_WATER_SOURCE_CONVERSION);
      }
diff --git a/patches/server/0050-Make-lava-flow-speed-configurable.patch b/patches/server/0050-Make-lava-flow-speed-configurable.patch
index b3d3a8b64..742f9fa71 100644
--- a/patches/server/0050-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0050-Make-lava-flow-speed-configurable.patch
@@ -4,10 +4,10 @@ Date: Thu, 2 Jan 2020 11:31:36 -0600
 Subject: [PATCH] Make lava flow speed configurable
 
 
-diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
+diff --git a/net/minecraft/world/level/material/LavaFluid.java b/net/minecraft/world/level/material/LavaFluid.java
 index e9687c3580e5fff33ce902eb7b86eb815ca1072d..6e643c1a7f7e71cfd20603facaf224985ee81716 100644
---- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
+--- a/net/minecraft/world/level/material/LavaFluid.java
++++ b/net/minecraft/world/level/material/LavaFluid.java
 @@ -181,7 +181,7 @@ public abstract class LavaFluid extends FlowingFluid {
  
      @Override
diff --git a/patches/server/0051-Add-player-death-exp-control-options.patch b/patches/server/0051-Add-player-death-exp-control-options.patch
index ee7bc7206..850e5e765 100644
--- a/patches/server/0051-Add-player-death-exp-control-options.patch
+++ b/patches/server/0051-Add-player-death-exp-control-options.patch
@@ -4,10 +4,10 @@ Date: Thu, 26 Dec 2019 22:08:37 -0600
 Subject: [PATCH] Add player death exp control options
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index 2f69a511db8d43fbd3a17387cded1d3573579fce..8ccc760e84aec8aabbe5b8112b332cee13849b23 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -1924,7 +1924,23 @@ public abstract class Player extends LivingEntity {
  
      @Override
diff --git a/patches/server/0052-Configurable-void-damage-height-and-damage.patch b/patches/server/0052-Configurable-void-damage-height-and-damage.patch
index cd6898609..dded7c9ca 100644
--- a/patches/server/0052-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0052-Configurable-void-damage-height-and-damage.patch
@@ -40,10 +40,10 @@ index b1c917d65076a3805e5b78cb946753f0c101e214..82210667376fd466d5d4cdcb56b62f61
          public double voidDamageMinBuildHeightOffset = -64.0;
  
          public class FrostedIce extends ConfigurationPart {
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index 22cbe00a19a2ac0ad25b1107b1290b793903e3aa..6cec325942c44da6455f0b349ad83e1dc2b8b7d4 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -1270,7 +1270,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  LOGGER.info("*************************************************************************************");
              }
@@ -61,10 +61,10 @@ index 22cbe00a19a2ac0ad25b1107b1290b793903e3aa..6cec325942c44da6455f0b349ad83e1d
              while (this.running) {
                  long i;
  
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
 index cf63c64b8c2ac148b83325209940713a91b91bad..59a8007add25bf947b87eef3ece55bca192ba358 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          org.spigotmc.SpigotConfig.registerCommands();
          // Spigot end
diff --git a/patches/server/0053-Add-canSaveToDisk-to-Entity.patch b/patches/server/0053-Add-canSaveToDisk-to-Entity.patch
index fa153cc4d..da56d5d6a 100644
--- a/patches/server/0053-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0053-Add-canSaveToDisk-to-Entity.patch
@@ -4,10 +4,10 @@ Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add canSaveToDisk to Entity
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index 7b017806dde98a33b64223f098cc63c286dac02b..eea1053e0ec1446e117d3ac4732deaba191db8f2 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -569,6 +569,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
      }
@@ -20,10 +20,10 @@ index 7b017806dde98a33b64223f098cc63c286dac02b..eea1053e0ec1446e117d3ac4732deaba
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
+diff --git a/net/minecraft/world/entity/projectile/WitherSkull.java b/net/minecraft/world/entity/projectile/WitherSkull.java
 index 8296765d8f63f1a9fd207b27d495d7c04646f134..45e0b9b3653de2dcb51a579f939b991beac03149 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
+--- a/net/minecraft/world/entity/projectile/WitherSkull.java
++++ b/net/minecraft/world/entity/projectile/WitherSkull.java
 @@ -122,6 +122,12 @@ public class WitherSkull extends AbstractHurtingProjectile {
          return target != this.getRider() && super.canHitEntity(target);
      }
@@ -37,10 +37,10 @@ index 8296765d8f63f1a9fd207b27d495d7c04646f134..45e0b9b3653de2dcb51a579f939b991b
  
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
+diff --git a/net/minecraft/world/level/chunk/storage/EntityStorage.java b/net/minecraft/world/level/chunk/storage/EntityStorage.java
 index 356d010506fd21f3c752e4aa86c46c1106fdde3b..8573d4dbb45db6510d1a4deccb3e5a257504f7d5 100644
---- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
+--- a/net/minecraft/world/level/chunk/storage/EntityStorage.java
++++ b/net/minecraft/world/level/chunk/storage/EntityStorage.java
 @@ -106,6 +106,7 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
                  }
                  // Paper end - Entity load/save limit per chunk
diff --git a/patches/server/0054-Dispenser-curse-of-binding-protection.patch b/patches/server/0054-Dispenser-curse-of-binding-protection.patch
index fb198a7fd..9564cc7fb 100644
--- a/patches/server/0054-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0054-Dispenser-curse-of-binding-protection.patch
@@ -4,10 +4,10 @@ Date: Sun, 25 Aug 2019 00:09:52 -0500
 Subject: [PATCH] Dispenser curse of binding protection
 
 
-diff --git a/src/main/java/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
+diff --git a/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java b/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
 index bf8c511739265c6a9cd277752e844481598f8966..ffe2399ab6b1f311536475d8216238b5b01c5dab 100644
---- a/src/main/java/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
-+++ b/src/main/java/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
+--- a/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
++++ b/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
 @@ -41,7 +41,7 @@ public class EquipmentDispenseItemBehavior extends DefaultDispenseItemBehavior {
              return false;
          } else {
@@ -17,10 +17,10 @@ index bf8c511739265c6a9cd277752e844481598f8966..ffe2399ab6b1f311536475d8216238b5
              ItemStack itemstack1 = stack.copyWithCount(1); // Paper - shrink below and single item in event
  
              // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index 34f2c17831c6edd16b6dc32f3d344b3c209244fc..8829e613e1c307e9a40b30a797cada500971453d 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -4699,7 +4699,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              if (equippable != null && equippable.dispensable()) {
                  EquipmentSlot enumitemslot = equippable.slot();
diff --git a/patches/server/0055-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0055-Add-option-for-boats-to-eject-players-on-land.patch
index a3c74c910..09b48eee7 100644
--- a/patches/server/0055-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0055-Add-option-for-boats-to-eject-players-on-land.patch
@@ -4,10 +4,10 @@ Date: Sat, 7 Sep 2019 22:47:59 -0500
 Subject: [PATCH] Add option for boats to eject players on land
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
+diff --git a/net/minecraft/world/entity/vehicle/AbstractBoat.java b/net/minecraft/world/entity/vehicle/AbstractBoat.java
 index b87fd952020d88a6612429df73121422bf9ae422..a301f32a292afb010f3888732e339897b176243d 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
+--- a/net/minecraft/world/entity/vehicle/AbstractBoat.java
++++ b/net/minecraft/world/entity/vehicle/AbstractBoat.java
 @@ -499,6 +499,7 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
  
              if (f > 0.0F) {
diff --git a/patches/server/0056-Mending-mends-most-damages-equipment-first.patch b/patches/server/0056-Mending-mends-most-damages-equipment-first.patch
index 479b5475b..2483b76a4 100644
--- a/patches/server/0056-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0056-Mending-mends-most-damages-equipment-first.patch
@@ -4,10 +4,10 @@ Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java
 index 23b47d90fd35659d9eaa661e808a7f89b29614cf..f1eb74a43881400f23f3750c909f999b35c2f5ce 100644
---- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+--- a/net/minecraft/world/entity/ExperienceOrb.java
++++ b/net/minecraft/world/entity/ExperienceOrb.java
 @@ -353,7 +353,7 @@ public class ExperienceOrb extends Entity {
      }
  
@@ -17,10 +17,10 @@ index 23b47d90fd35659d9eaa661e808a7f89b29614cf..f1eb74a43881400f23f3750c909f999b
  
          if (optional.isPresent()) {
              ItemStack itemstack = ((EnchantedItemInUse) optional.get()).itemStack();
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
 index 731d2bf4a5861bfe10496162d367e003f40b2d50..122859ba52e9719f98111a9c543dab27abac39b5 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
+--- a/net/minecraft/world/item/ItemStack.java
++++ b/net/minecraft/world/item/ItemStack.java
 @@ -686,6 +686,26 @@ public final class ItemStack implements DataComponentHolder {
          return this.isDamageableItem() && this.getDamageValue() > 0;
      }
@@ -48,10 +48,10 @@ index 731d2bf4a5861bfe10496162d367e003f40b2d50..122859ba52e9719f98111a9c543dab27
      public int getDamageValue() {
          return Mth.clamp((Integer) this.getOrDefault(DataComponents.DAMAGE, 0), 0, this.getMaxDamage());
      }
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
+diff --git a/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/net/minecraft/world/item/enchantment/EnchantmentHelper.java
 index 64c315372277300e58ce413210f47eed5b6e1d6c..2c1799e8c9009a6ab24c24e7363d5a87e41f0c35 100644
---- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
+--- a/net/minecraft/world/item/enchantment/EnchantmentHelper.java
++++ b/net/minecraft/world/item/enchantment/EnchantmentHelper.java
 @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry;
  import java.util.ArrayList;
  import java.util.Collection;
diff --git a/patches/server/0057-Add-5-second-tps-average-in-tps.patch b/patches/server/0057-Add-5-second-tps-average-in-tps.patch
index b2979597a..fbde56bdb 100644
--- a/patches/server/0057-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0057-Add-5-second-tps-average-in-tps.patch
@@ -25,10 +25,10 @@ index 12b327eea95e0de9e9c39b7d039badee8ec46508..46696cfe1d99e705d383a1fe4e66f5c5
          setListData(vector);
      }
  
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index 6cec325942c44da6455f0b349ad83e1dc2b8b7d4..75ef1a4f80449e87affbd9ba62f5f9447ef9db87 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -324,7 +324,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
      private static final int SAMPLE_INTERVAL = 20; // Paper - improve server tick loop
@@ -68,10 +68,10 @@ index 6cec325942c44da6455f0b349ad83e1dc2b8b7d4..75ef1a4f80449e87affbd9ba62f5f944
                      lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur - Lagging threshold
                      tickSection = currentTime;
                  }
-diff --git a/src/main/java/net/minecraft/server/gui/StatsComponent.java b/src/main/java/net/minecraft/server/gui/StatsComponent.java
+diff --git a/net/minecraft/server/gui/StatsComponent.java b/net/minecraft/server/gui/StatsComponent.java
 index 096c89bd01cec2abd151bf6fffc4847d1bcd548f..735c2b3434715edf8fe40cbb5ce46ae10b73026c 100644
---- a/src/main/java/net/minecraft/server/gui/StatsComponent.java
-+++ b/src/main/java/net/minecraft/server/gui/StatsComponent.java
+--- a/net/minecraft/server/gui/StatsComponent.java
++++ b/net/minecraft/server/gui/StatsComponent.java
 @@ -45,7 +45,7 @@ public class StatsComponent extends JComponent {
          this.msgs[1] = "Avg tick: "
              + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double)TimeUtil.NANOSECONDS_PER_MILLISECOND)
diff --git a/patches/server/0058-Implement-elytra-settings.patch b/patches/server/0058-Implement-elytra-settings.patch
index db5d39d48..a935e367f 100644
--- a/patches/server/0058-Implement-elytra-settings.patch
+++ b/patches/server/0058-Implement-elytra-settings.patch
@@ -4,10 +4,10 @@ Date: Thu, 25 Jul 2019 18:07:37 -0500
 Subject: [PATCH] Implement elytra settings
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index 8829e613e1c307e9a40b30a797cada500971453d..d711bef21fba8e32ae99a0a52992e609e4841734 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -3772,7 +3772,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      }).toList();
                      EquipmentSlot enumitemslot = (EquipmentSlot) Util.getRandom(list, this.random);
@@ -36,10 +36,10 @@ index 8829e613e1c307e9a40b30a797cada500971453d..d711bef21fba8e32ae99a0a52992e609
          if (!this.onGround() && !this.isPassenger() && !this.hasEffect(MobEffects.LEVITATION)) {
              Iterator iterator = EquipmentSlot.VALUES.iterator();
  
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index 8ccc760e84aec8aabbe5b8112b332cee13849b23..fee0ffaaf94c484c9272d3b5743b90bb70e0d08d 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -1664,7 +1664,7 @@ public abstract class Player extends LivingEntity {
      }
  
@@ -49,10 +49,10 @@ index 8ccc760e84aec8aabbe5b8112b332cee13849b23..fee0ffaaf94c484c9272d3b5743b90bb
          return !this.abilities.flying && super.canGlide();
      }
  
-diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
+diff --git a/net/minecraft/world/item/FireworkRocketItem.java b/net/minecraft/world/item/FireworkRocketItem.java
 index 29a048a9b09166838616ac7ba1d31625d56b0bca..184e6d9bf393188fc1f1c7acd545b4ac6d31f6a4 100644
---- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-+++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
+--- a/net/minecraft/world/item/FireworkRocketItem.java
++++ b/net/minecraft/world/item/FireworkRocketItem.java
 @@ -66,6 +66,18 @@ public class FireworkRocketItem extends Item implements ProjectileItem {
                  com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Firework) delayed.projectile().getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand));
                  if (event.callEvent() && delayed.attemptSpawn()) {
@@ -72,10 +72,10 @@ index 29a048a9b09166838616ac7ba1d31625d56b0bca..184e6d9bf393188fc1f1c7acd545b4ac
                      if (event.shouldConsume() && !user.hasInfiniteMaterials()) {
                          itemStack.shrink(1); // Moved up from below
                      } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
 index 122859ba52e9719f98111a9c543dab27abac39b5..c616ebbf0f709b8c3a500a23a2190f7023f7757d 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
+--- a/net/minecraft/world/item/ItemStack.java
++++ b/net/minecraft/world/item/ItemStack.java
 @@ -786,6 +786,12 @@ public final class ItemStack implements DataComponentHolder {
                  org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(serverPlayer, this); // Paper - Add EntityDamageItemEvent
              }
@@ -89,10 +89,10 @@ index 122859ba52e9719f98111a9c543dab27abac39b5..c616ebbf0f709b8c3a500a23a2190f70
  
              this.shrink(1);
              breakCallback.accept(item);
-diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
+diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java
 index 2b2af4b7cc2c8be8c3aed30885be26816c021bdc..aff4f33be216f62d6c6e139dcd7fd82efdbd267c 100644
---- a/src/main/java/net/minecraft/world/item/TridentItem.java
-+++ b/src/main/java/net/minecraft/world/item/TridentItem.java
+--- a/net/minecraft/world/item/TridentItem.java
++++ b/net/minecraft/world/item/TridentItem.java
 @@ -132,6 +132,18 @@ public class TridentItem extends Item implements ProjectileItem {
                          f4 *= f / f6;
                          f5 *= f / f6;
diff --git a/patches/server/0059-Item-entity-immunities.patch b/patches/server/0059-Item-entity-immunities.patch
index 27c16c58b..987c2df90 100644
--- a/patches/server/0059-Item-entity-immunities.patch
+++ b/patches/server/0059-Item-entity-immunities.patch
@@ -4,10 +4,10 @@ Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Item entity immunities
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
+diff --git a/net/minecraft/server/level/ServerEntity.java b/net/minecraft/server/level/ServerEntity.java
 index 103e2c414780be66324bcb9cd4ea539bbdfe12ad..dcf1d9c5456bcc7e71a5fbee640998cf41f5d94d 100644
---- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
+--- a/net/minecraft/server/level/ServerEntity.java
++++ b/net/minecraft/server/level/ServerEntity.java
 @@ -81,7 +81,7 @@ public class ServerEntity {
      @Nullable
      private List<SynchedEntityData.DataValue<?>> trackedDataValues;
@@ -17,10 +17,10 @@ index 103e2c414780be66324bcb9cd4ea539bbdfe12ad..dcf1d9c5456bcc7e71a5fbee640998cf
  
      public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
          this.trackedPlayers = trackedPlayers;
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
 index 0f086af57a5ff08c264dcbf89a8c3931ec73a609..09403344ad63c538a2a221c6b726ebab1aab5642 100644
---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+--- a/net/minecraft/world/entity/item/ItemEntity.java
++++ b/net/minecraft/world/entity/item/ItemEntity.java
 @@ -64,6 +64,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
      public boolean canMobPickup = true; // Paper - Item#canEntityPickup
      private int despawnRate = -1; // Paper - Alternative item-despawn-rate
diff --git a/patches/server/0060-Add-ping-command.patch b/patches/server/0060-Add-ping-command.patch
index 1f18ba125..7c1cb4a82 100644
--- a/patches/server/0060-Add-ping-command.patch
+++ b/patches/server/0060-Add-ping-command.patch
@@ -4,10 +4,10 @@ Date: Fri, 13 Mar 2020 22:29:10 -0500
 Subject: [PATCH] Add ping command
 
 
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
 index 832930024b0d642496efe17f7e2f8e02413275f0..d4ca48d52c32c5dfb290936fdfc7268f0485aeaf 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
 @@ -255,6 +255,7 @@ public class Commands {
              StopCommand.register(this.dispatcher);
              TransferCommand.register(this.dispatcher);
diff --git a/patches/server/0061-Add-demo-command.patch b/patches/server/0061-Add-demo-command.patch
index a6d8ca58b..ead84d8e9 100644
--- a/patches/server/0061-Add-demo-command.patch
+++ b/patches/server/0061-Add-demo-command.patch
@@ -4,10 +4,10 @@ Date: Mon, 30 Nov 2020 03:12:04 -0600
 Subject: [PATCH] Add demo command
 
 
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
 index d4ca48d52c32c5dfb290936fdfc7268f0485aeaf..e0b5a1d017cbafdde2c38745a045452c76614b66 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
 @@ -255,6 +255,7 @@ public class Commands {
              StopCommand.register(this.dispatcher);
              TransferCommand.register(this.dispatcher);
diff --git a/patches/server/0062-Add-credits-command.patch b/patches/server/0062-Add-credits-command.patch
index 626f386c2..91331f2d0 100644
--- a/patches/server/0062-Add-credits-command.patch
+++ b/patches/server/0062-Add-credits-command.patch
@@ -4,10 +4,10 @@ Date: Fri, 30 Apr 2021 14:03:06 -0400
 Subject: [PATCH] Add credits command
 
 
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
 index e0b5a1d017cbafdde2c38745a045452c76614b66..719fbce359f8c2c52ee4e9da3dfe9566f58c0346 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
 @@ -255,6 +255,7 @@ public class Commands {
              StopCommand.register(this.dispatcher);
              TransferCommand.register(this.dispatcher);
diff --git a/patches/server/0063-Configurable-jockey-options.patch b/patches/server/0063-Configurable-jockey-options.patch
index d0e6b2ec2..95d6aecdb 100644
--- a/patches/server/0063-Configurable-jockey-options.patch
+++ b/patches/server/0063-Configurable-jockey-options.patch
@@ -4,10 +4,10 @@ Date: Thu, 26 Mar 2020 21:39:32 -0500
 Subject: [PATCH] Configurable jockey options
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java
 index 6675ccfe80cd3c4369ca3f5aec53d0cfa294432b..d471fe99acaf25cb06e36be8a68ab64cfedb4a09 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+--- a/net/minecraft/world/entity/monster/Drowned.java
++++ b/net/minecraft/world/entity/monster/Drowned.java
 @@ -104,6 +104,22 @@ public class Drowned extends Zombie implements RangedAttackMob {
          this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level().purpurConfig.drownedSpawnReinforcements);
      }
@@ -31,10 +31,10 @@ index 6675ccfe80cd3c4369ca3f5aec53d0cfa294432b..d471fe99acaf25cb06e36be8a68ab64c
      @Override
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(1, new Drowned.DrownedGoToWaterGoal(this, 1.0));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+diff --git a/net/minecraft/world/entity/monster/Husk.java b/net/minecraft/world/entity/monster/Husk.java
 index 5ad22d4041afcbd50bf5a6ebfbdcb232eb6d3fbe..cd155b47369318f58ec55289a345f1bf28e2af14 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+--- a/net/minecraft/world/entity/monster/Husk.java
++++ b/net/minecraft/world/entity/monster/Husk.java
 @@ -51,6 +51,22 @@ public class Husk extends Zombie {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level().purpurConfig.huskSpawnReinforcements);
      }
@@ -58,10 +58,10 @@ index 5ad22d4041afcbd50bf5a6ebfbdcb232eb6d3fbe..cd155b47369318f58ec55289a345f1bf
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random) {
          return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (EntitySpawnReason.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
 index 5763d259162750297e08acc51551489150dbc593..2ce812ff9cb702a1fc1784f35efb643a2f9036c2 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+--- a/net/minecraft/world/entity/monster/Zombie.java
++++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -134,6 +134,19 @@ public class Zombie extends Monster {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.zombieScale);
      }
@@ -117,10 +117,10 @@ index 5763d259162750297e08acc51551489150dbc593..2ce812ff9cb702a1fc1784f35efb643a
                      }
                  }
              }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
 index 35d8cef3c84bfd1bbf8afe2885b4f303a4985cdd..36a074627a95886d38bd5a262dddcebfe32d1ba6 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+--- a/net/minecraft/world/entity/monster/ZombieVillager.java
++++ b/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -113,6 +113,22 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level().purpurConfig.zombieVillagerSpawnReinforcements);
      }
@@ -144,10 +144,10 @@ index 35d8cef3c84bfd1bbf8afe2885b4f303a4985cdd..36a074627a95886d38bd5a262dddcebf
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+diff --git a/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 index ca74450f13198fd7bf0190b4dc1df4288df5729d..953df397ea261d417ada15db8d6ffc539ad07c03 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+--- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java
++++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -87,6 +87,22 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.zombifiedPiglinScale);
      }
diff --git a/patches/server/0064-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0064-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 779ff35a8..fc82f2731 100644
--- a/patches/server/0064-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0064-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -4,10 +4,10 @@ Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 index 7cb3d69a69e0e3ef4b7f9f9c8b1eb67edb5d116d..931cb90a8b32eb47d5985807d74d8ef7f1d01baf 100644
---- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+--- a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
++++ b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 @@ -31,6 +31,12 @@ public class EndCrystal extends Entity {
      private static final EntityDataAccessor<Boolean> DATA_SHOW_BOTTOM = SynchedEntityData.defineId(EndCrystal.class, EntityDataSerializers.BOOLEAN);
      public int time;
@@ -71,10 +71,10 @@ index 7cb3d69a69e0e3ef4b7f9f9c8b1eb67edb5d116d..931cb90a8b32eb47d5985807d74d8ef7
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
 index ee00c4c7a1e0f08cdeccab63a20c4b465fdeb549..093c2601ff561c47775f9f99cb5990e6c1b05d8c 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+--- a/net/minecraft/world/entity/monster/Phantom.java
++++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -49,6 +49,7 @@ public class Phantom extends FlyingMob implements Enemy {
      Vec3 moveTargetPoint;
      public BlockPos anchorPoint;
diff --git a/patches/server/0065-Add-phantom-spawning-options.patch b/patches/server/0065-Add-phantom-spawning-options.patch
index f5e66e1cb..15f27305b 100644
--- a/patches/server/0065-Add-phantom-spawning-options.patch
+++ b/patches/server/0065-Add-phantom-spawning-options.patch
@@ -4,10 +4,10 @@ Date: Fri, 3 Jul 2020 00:03:52 -0500
 Subject: [PATCH] Add phantom spawning options
 
 
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
+diff --git a/net/minecraft/world/level/levelgen/PhantomSpawner.java b/net/minecraft/world/level/levelgen/PhantomSpawner.java
 index 021221da5d0315f6e371380a705ac6b3f6ac18d3..27eb9a365006884c85603dc6d9dd8eee009c98b3 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
+--- a/net/minecraft/world/level/levelgen/PhantomSpawner.java
++++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java
 @@ -48,7 +48,7 @@ public class PhantomSpawner implements CustomSpawner {
                  int spawnAttemptMaxSeconds = world.paperConfig().entities.behavior.phantomsSpawnAttemptMaxSeconds;
                  this.nextTick += (spawnAttemptMinSeconds + randomsource.nextInt(spawnAttemptMaxSeconds - spawnAttemptMinSeconds + 1)) * 20;
diff --git a/patches/server/0066-Implement-bed-explosion-options.patch b/patches/server/0066-Implement-bed-explosion-options.patch
index 2f825f86c..5f73dedfe 100644
--- a/patches/server/0066-Implement-bed-explosion-options.patch
+++ b/patches/server/0066-Implement-bed-explosion-options.patch
@@ -4,10 +4,10 @@ Date: Sat, 4 Jul 2020 13:12:43 -0500
 Subject: [PATCH] Implement bed explosion options
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
+diff --git a/net/minecraft/world/level/block/BedBlock.java b/net/minecraft/world/level/block/BedBlock.java
 index be700995c3e7f63e0471712c3cd6fd83db583491..db79ef24ea01db5f619ab29700d3d391438fb742 100644
---- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
+--- a/net/minecraft/world/level/block/BedBlock.java
++++ b/net/minecraft/world/level/block/BedBlock.java
 @@ -106,7 +106,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
  
                  Vec3 vec3d = pos.getCenter();
diff --git a/patches/server/0067-Implement-respawn-anchor-explosion-options.patch b/patches/server/0067-Implement-respawn-anchor-explosion-options.patch
index 6b619580d..ac58c39e1 100644
--- a/patches/server/0067-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/server/0067-Implement-respawn-anchor-explosion-options.patch
@@ -4,10 +4,10 @@ Date: Sat, 4 Jul 2020 13:23:19 -0500
 Subject: [PATCH] Implement respawn anchor explosion options
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
+diff --git a/net/minecraft/world/level/block/RespawnAnchorBlock.java b/net/minecraft/world/level/block/RespawnAnchorBlock.java
 index 9117c035d5a6ff114b028fad3380ceb1fc2b9691..2c5e394156dbf76107adb4913a094dfd4a598dd7 100644
---- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
+--- a/net/minecraft/world/level/block/RespawnAnchorBlock.java
++++ b/net/minecraft/world/level/block/RespawnAnchorBlock.java
 @@ -149,7 +149,7 @@ public class RespawnAnchorBlock extends Block {
          };
          Vec3 vec3d = explodedPos.getCenter();
diff --git a/patches/server/0068-Add-allow-water-in-end-world-option.patch b/patches/server/0068-Add-allow-water-in-end-world-option.patch
index 3317f9174..d76466da2 100644
--- a/patches/server/0068-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0068-Add-allow-water-in-end-world-option.patch
@@ -4,10 +4,10 @@ Date: Sun, 5 Jul 2020 23:40:16 -0500
 Subject: [PATCH] Add allow water in end world option
 
 
-diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java
+diff --git a/net/minecraft/world/item/BucketItem.java b/net/minecraft/world/item/BucketItem.java
 index 3bddfb6f7412ab86e0c090d0cbc6cf254b3f891c..b9190acbcb256a3072f0a5f1c4c731f1222b459f 100644
---- a/src/main/java/net/minecraft/world/item/BucketItem.java
-+++ b/src/main/java/net/minecraft/world/item/BucketItem.java
+--- a/net/minecraft/world/item/BucketItem.java
++++ b/net/minecraft/world/item/BucketItem.java
 @@ -196,7 +196,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
              // CraftBukkit end
              if (!flag2) {
@@ -26,10 +26,10 @@ index 3bddfb6f7412ab86e0c090d0cbc6cf254b3f891c..b9190acbcb256a3072f0a5f1c4c731f1
                  }
  
                  return true;
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
 index f3c5e076558cd8d7b9d9b3212872f8675670b2dd..13c99a770e8c466cdba5f397cf8156aed42b55ba 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
+--- a/net/minecraft/world/level/Level.java
++++ b/net/minecraft/world/level/Level.java
 @@ -2047,4 +2047,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
              return this.id;
          }
@@ -45,10 +45,10 @@ index f3c5e076558cd8d7b9d9b3212872f8675670b2dd..13c99a770e8c466cdba5f397cf8156ae
 +    }
 +    // Purpur end - Add allow water in end world option
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/IceBlock.java b/src/main/java/net/minecraft/world/level/block/IceBlock.java
+diff --git a/net/minecraft/world/level/block/IceBlock.java b/net/minecraft/world/level/block/IceBlock.java
 index a94762e65853ccad38cf90b0049ca256106c0c9f..aa93b5041b65dbcdc5bbea65567eaf5d8c433a0d 100644
---- a/src/main/java/net/minecraft/world/level/block/IceBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/IceBlock.java
+--- a/net/minecraft/world/level/block/IceBlock.java
++++ b/net/minecraft/world/level/block/IceBlock.java
 @@ -42,7 +42,7 @@ public class IceBlock extends HalfTransparentBlock {
      public void afterDestroy(Level world, BlockPos pos, ItemStack tool) {
          // Paper end - Improve Block#breakNaturally API
diff --git a/patches/server/0069-Allow-color-codes-in-books.patch b/patches/server/0069-Allow-color-codes-in-books.patch
index 4f767c7b0..f3acf2d4b 100644
--- a/patches/server/0069-Allow-color-codes-in-books.patch
+++ b/patches/server/0069-Allow-color-codes-in-books.patch
@@ -4,10 +4,10 @@ Date: Tue, 3 Nov 2020 01:25:06 -0600
 Subject: [PATCH] Allow color codes in books
 
 
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index 830e0705f3a3d45fcf0eab6b8eea403c3023f3f9..0654c2753a44b4cda55fd92513fabc45ff4ab6c9 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1302,10 +1302,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              Objects.requireNonNull(list);
              optional.ifPresent(list::add);
diff --git a/patches/server/0070-Entity-lifespan.patch b/patches/server/0070-Entity-lifespan.patch
index 41314b868..28384db34 100644
--- a/patches/server/0070-Entity-lifespan.patch
+++ b/patches/server/0070-Entity-lifespan.patch
@@ -4,10 +4,10 @@ Date: Sat, 11 Jul 2020 19:41:34 -0500
 Subject: [PATCH] Entity lifespan
 
 
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index 0654c2753a44b4cda55fd92513fabc45ff4ab6c9..6b460227a12ba275c02243a1fbafb87e3845cb14 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2922,6 +2922,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  AABB axisalignedbb = entity.getBoundingBox();
  
@@ -16,10 +16,10 @@ index 0654c2753a44b4cda55fd92513fabc45ff4ab6c9..6b460227a12ba275c02243a1fbafb87e
                      packet.dispatch(new ServerboundInteractPacket.Handler() {
                          private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
                              ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
 index 261288f51ed47b0eac80cc965c76683f3e13687f..1f253d5ace885423aa25ebdd986e1909a15ba018 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
+--- a/net/minecraft/world/entity/Mob.java
++++ b/net/minecraft/world/entity/Mob.java
 @@ -144,6 +144,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      private BlockPos restrictCenter;
      private float restrictRadius;
diff --git a/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index 3bb64b515..fdf714d67 100644
--- a/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -4,10 +4,10 @@ Date: Mon, 13 Jul 2020 11:40:00 -0500
 Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 3ea226168519e07b10d015f4c9b2b369569daf11..5d4b0f8b621f62604f098da7bf0822d25b469547 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -3390,4 +3390,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          return (CraftPlayer) super.getBukkitEntity();
      }
@@ -35,10 +35,10 @@ index 3ea226168519e07b10d015f4c9b2b369569daf11..5d4b0f8b621f62604f098da7bf0822d2
 +    }
 +    // Purpur end
  }
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index d711bef21fba8e32ae99a0a52992e609e4841734..c073786171306ba023f31d2f9ede037707253fa2 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -477,6 +477,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      if (d1 < 0.0D) {
                          d0 = this.level().getWorldBorder().getDamagePerBlock();
diff --git a/patches/server/0073-Phantoms-burn-in-light.patch b/patches/server/0073-Phantoms-burn-in-light.patch
index 029710601..eaf657da5 100644
--- a/patches/server/0073-Phantoms-burn-in-light.patch
+++ b/patches/server/0073-Phantoms-burn-in-light.patch
@@ -4,10 +4,10 @@ Date: Sun, 12 Apr 2020 20:41:59 -0700
 Subject: [PATCH] Phantoms burn in light
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
 index 093c2601ff561c47775f9f99cb5990e6c1b05d8c..7f62544ed66850c9545d8db9897236abd52cbd56 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+--- a/net/minecraft/world/entity/monster/Phantom.java
++++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -50,6 +50,7 @@ public class Phantom extends FlyingMob implements Enemy {
      public BlockPos anchorPoint;
      Phantom.AttackPhase attackPhase;
diff --git a/patches/server/0074-Configurable-villager-breeding.patch b/patches/server/0074-Configurable-villager-breeding.patch
index 17ee6caf7..66839b2d0 100644
--- a/patches/server/0074-Configurable-villager-breeding.patch
+++ b/patches/server/0074-Configurable-villager-breeding.patch
@@ -4,10 +4,10 @@ Date: Tue, 31 Mar 2020 23:48:55 -0700
 Subject: [PATCH] Configurable villager breeding
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index f89c82db6333dc64ac57e225f5522943eb959f46..ca1996ab3b998607c193ba427163a6a144990c97 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -768,7 +768,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      @Override
diff --git a/patches/server/0075-Redstone-deactivates-spawners.patch b/patches/server/0075-Redstone-deactivates-spawners.patch
index 451dfbe43..f94966fff 100644
--- a/patches/server/0075-Redstone-deactivates-spawners.patch
+++ b/patches/server/0075-Redstone-deactivates-spawners.patch
@@ -4,10 +4,10 @@ Date: Tue, 14 Apr 2020 00:35:12 -0700
 Subject: [PATCH] Redstone deactivates spawners
 
 
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+diff --git a/net/minecraft/world/level/BaseSpawner.java b/net/minecraft/world/level/BaseSpawner.java
 index 7de66aa435dd36899b80f4ecc64480680e474d94..79a8e5dd1d189c4eaf93999925ea0790eb6ce368 100644
---- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+--- a/net/minecraft/world/level/BaseSpawner.java
++++ b/net/minecraft/world/level/BaseSpawner.java
 @@ -59,6 +59,7 @@ public abstract class BaseSpawner {
      }
  
diff --git a/patches/server/0076-Totems-work-in-inventory.patch b/patches/server/0076-Totems-work-in-inventory.patch
index dfd9bdefb..88dc02bad 100644
--- a/patches/server/0076-Totems-work-in-inventory.patch
+++ b/patches/server/0076-Totems-work-in-inventory.patch
@@ -4,10 +4,10 @@ Date: Wed, 29 Apr 2020 00:45:58 -0700
 Subject: [PATCH] Totems work in inventory
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index c073786171306ba023f31d2f9ede037707253fa2..dfbb47c200dab7d99cde867c12420c67964867c2 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1718,6 +1718,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  }
              }
diff --git a/patches/server/0077-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0077-Add-vindicator-johnny-spawn-chance.patch
index 197861c4b..d6eeec766 100644
--- a/patches/server/0077-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/server/0077-Add-vindicator-johnny-spawn-chance.patch
@@ -4,10 +4,10 @@ Date: Fri, 24 Jul 2020 19:38:21 -0500
 Subject: [PATCH] Add vindicator johnny spawn chance
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+diff --git a/net/minecraft/world/entity/monster/Vindicator.java b/net/minecraft/world/entity/monster/Vindicator.java
 index 065bd31afe948c1ffab4da6f2a236cd931e75259..7f414f74c315db67a8e8a3d3636811abe733f62a 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+--- a/net/minecraft/world/entity/monster/Vindicator.java
++++ b/net/minecraft/world/entity/monster/Vindicator.java
 @@ -158,6 +158,11 @@ public class Vindicator extends AbstractIllager {
          RandomSource randomSource = world.getRandom();
          this.populateDefaultEquipmentSlots(randomSource, difficulty);
diff --git a/patches/server/0078-Dispensers-place-anvils-option.patch b/patches/server/0078-Dispensers-place-anvils-option.patch
index 6a5c7d733..15f233981 100644
--- a/patches/server/0078-Dispensers-place-anvils-option.patch
+++ b/patches/server/0078-Dispensers-place-anvils-option.patch
@@ -4,10 +4,10 @@ Date: Tue, 4 Aug 2020 21:11:03 -0500
 Subject: [PATCH] Dispensers place anvils option
 
 
-diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
+diff --git a/net/minecraft/core/dispenser/DispenseItemBehavior.java b/net/minecraft/core/dispenser/DispenseItemBehavior.java
 index c9d7ac819ce26f5301df7df56edce59b7ef377e0..cdd73bb358e309844bef576175a9026cb8563e7e 100644
---- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
+--- a/net/minecraft/core/dispenser/DispenseItemBehavior.java
++++ b/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -930,5 +930,22 @@ public interface DispenseItemBehavior {
          DispenserBlock.registerBehavior(Items.TNT_MINECART, new MinecartDispenseItemBehavior(EntityType.TNT_MINECART));
          DispenserBlock.registerBehavior(Items.HOPPER_MINECART, new MinecartDispenseItemBehavior(EntityType.HOPPER_MINECART));
diff --git a/patches/server/0079-Allow-anvil-colors.patch b/patches/server/0079-Allow-anvil-colors.patch
index 2e7bac233..da383b5af 100644
--- a/patches/server/0079-Allow-anvil-colors.patch
+++ b/patches/server/0079-Allow-anvil-colors.patch
@@ -4,10 +4,10 @@ Date: Tue, 4 Aug 2020 22:08:23 -0500
 Subject: [PATCH] Allow anvil colors
 
 
-diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+diff --git a/net/minecraft/world/inventory/AnvilMenu.java b/net/minecraft/world/inventory/AnvilMenu.java
 index f8c0a4fd95f341cbf8f6a06dfae408d505b0f018..a7c3338ed6edcd26fce869ec66fdcaa4c32c0e4f 100644
---- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+--- a/net/minecraft/world/inventory/AnvilMenu.java
++++ b/net/minecraft/world/inventory/AnvilMenu.java
 @@ -285,6 +285,54 @@ public class AnvilMenu extends ItemCombinerMenu {
                  if (!this.itemName.equals(itemstack.getHoverName().getString())) {
                      b0 = 1;
diff --git a/patches/server/0080-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0080-Add-option-to-disable-dolphin-treasure-searching.patch
index 234dcbef5..e3cddd39c 100644
--- a/patches/server/0080-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/server/0080-Add-option-to-disable-dolphin-treasure-searching.patch
@@ -4,10 +4,10 @@ Date: Sat, 8 Aug 2020 16:11:51 -0500
 Subject: [PATCH] Add option to disable dolphin treasure searching
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+diff --git a/net/minecraft/world/entity/animal/Dolphin.java b/net/minecraft/world/entity/animal/Dolphin.java
 index 2ee7de39712d67b593ff287a9ed17c28fa768b3c..5dfaed8ecf9438e8ea11cadd6c5638e0cc25cbb1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+--- a/net/minecraft/world/entity/animal/Dolphin.java
++++ b/net/minecraft/world/entity/animal/Dolphin.java
 @@ -494,6 +494,7 @@ public class Dolphin extends AgeableWaterCreature {
  
          @Override
diff --git a/patches/server/0081-Short-enderman-height.patch b/patches/server/0081-Short-enderman-height.patch
index 27430dfb2..b547c03ec 100644
--- a/patches/server/0081-Short-enderman-height.patch
+++ b/patches/server/0081-Short-enderman-height.patch
@@ -4,10 +4,10 @@ Date: Mon, 10 Aug 2020 21:46:22 -0500
 Subject: [PATCH] Short enderman height
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
+diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
 index 426d47c14d137906ed70fc3082e3d77e7f48c8d7..20a7fe2995db717f394fc3041435a95dbfee2ff7 100644
---- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
+--- a/net/minecraft/world/entity/EntityType.java
++++ b/net/minecraft/world/entity/EntityType.java
 @@ -388,7 +388,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
      @Nullable
      private Component description;
@@ -18,10 +18,10 @@ index 426d47c14d137906ed70fc3082e3d77e7f48c8d7..20a7fe2995db717f394fc3041435a95d
      private final float spawnDimensionsScale;
      private final FeatureFlagSet requiredFeatures;
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index 13eaf1e8b12c3b4cba6b202f2d31e99a8a9bae92..d2959976cf206f6c92ae90f103035e4760b9d955 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -409,6 +409,7 @@ public class EnderMan extends Monster implements NeutralMob {
          if (this.isInvulnerableTo(world, source)) {
              return false;
diff --git a/patches/server/0082-Stop-squids-floating-on-top-of-water.patch b/patches/server/0082-Stop-squids-floating-on-top-of-water.patch
index 096a49e27..b4fbfd859 100644
--- a/patches/server/0082-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0082-Stop-squids-floating-on-top-of-water.patch
@@ -4,10 +4,10 @@ Date: Thu, 13 Aug 2020 04:00:26 -0500
 Subject: [PATCH] Stop squids floating on top of water
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index eea1053e0ec1446e117d3ac4732deaba191db8f2..2cf83678a2a37ff9082eae1a8b6cbf5be60a065f 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -4775,6 +4775,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Mth.lerp(delta, this.yRotO, this.yRot);
      }
@@ -21,10 +21,10 @@ index eea1053e0ec1446e117d3ac4732deaba191db8f2..2cf83678a2a37ff9082eae1a8b6cbf5b
      // Paper start - optimise collisions
      public boolean updateFluidHeightAndDoFluidPushing(final TagKey<Fluid> fluid, final double flowScale) {
          if (this.touchingUnloadedChunk()) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java
 index bb63ad576731df34a90ab9b1b6165731a826ad7b..490fa58d09d58cefb1adef1ba11823ba14fa2855 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+--- a/net/minecraft/world/entity/animal/Squid.java
++++ b/net/minecraft/world/entity/animal/Squid.java
 @@ -79,6 +79,12 @@ public class Squid extends AgeableWaterCreature {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.squidScale);
      }
@@ -38,10 +38,10 @@ index bb63ad576731df34a90ab9b1b6165731a826ad7b..490fa58d09d58cefb1adef1ba11823ba
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
-diff --git a/src/main/java/net/minecraft/world/phys/AABB.java b/src/main/java/net/minecraft/world/phys/AABB.java
+diff --git a/net/minecraft/world/phys/AABB.java b/net/minecraft/world/phys/AABB.java
 index 6cf6d4ec7b9e43c7b2b4c0e2fb080964ff588130..e74866e5195a5eeae7666ad7be750edac5947094 100644
---- a/src/main/java/net/minecraft/world/phys/AABB.java
-+++ b/src/main/java/net/minecraft/world/phys/AABB.java
+--- a/net/minecraft/world/phys/AABB.java
++++ b/net/minecraft/world/phys/AABB.java
 @@ -551,4 +551,10 @@ public class AABB {
      public static AABB ofSize(Vec3 center, double dx, double dy, double dz) {
          return new AABB(center.x - dx / 2.0, center.y - dy / 2.0, center.z - dz / 2.0, center.x + dx / 2.0, center.y + dy / 2.0, center.z + dz / 2.0);
diff --git a/patches/server/0083-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0083-Crying-obsidian-valid-for-portal-frames.patch
index 3b44dd6ad..47c292d01 100644
--- a/patches/server/0083-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0083-Crying-obsidian-valid-for-portal-frames.patch
@@ -4,10 +4,10 @@ Date: Mon, 17 Aug 2020 17:34:33 -0500
 Subject: [PATCH] Crying obsidian valid for portal frames
 
 
-diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
+diff --git a/net/minecraft/world/level/portal/PortalShape.java b/net/minecraft/world/level/portal/PortalShape.java
 index 90056822cd17f3d33d14b3f94b34750ee522a0a9..acdff7b4a00d563739fd301c3633a266875296fa 100644
---- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-+++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
+--- a/net/minecraft/world/level/portal/PortalShape.java
++++ b/net/minecraft/world/level/portal/PortalShape.java
 @@ -35,7 +35,7 @@ public class PortalShape {
      private static final int MIN_HEIGHT = 3;
      public static final int MAX_HEIGHT = 21;
diff --git a/patches/server/0084-Entities-can-use-portals.patch b/patches/server/0084-Entities-can-use-portals.patch
index 31378a71e..59040c01c 100644
--- a/patches/server/0084-Entities-can-use-portals.patch
+++ b/patches/server/0084-Entities-can-use-portals.patch
@@ -4,10 +4,10 @@ Date: Mon, 17 Aug 2020 19:32:05 -0500
 Subject: [PATCH] Entities can use portals
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index 2cf83678a2a37ff9082eae1a8b6cbf5be60a065f..c0e8739f0dd9290550872839eddca4b0090b603b 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -3468,7 +3468,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public void setAsInsidePortal(Portal portal, BlockPos pos) {
          if (this.isOnPortalCooldown()) {
diff --git a/patches/server/0085-Customizable-wither-health-and-healing.patch b/patches/server/0085-Customizable-wither-health-and-healing.patch
index a6988337b..f4325a5a2 100644
--- a/patches/server/0085-Customizable-wither-health-and-healing.patch
+++ b/patches/server/0085-Customizable-wither-health-and-healing.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Customizable wither health and healing
 
 Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.
 
-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
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 index 57cf253fc69c087cfa0270225166f926ce6829f7..098ef0d6879e88009193c6dcedf1aa285980cbc6 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
+--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -518,8 +518,10 @@ public class WitherBoss extends Monster implements RangedAttackMob {
                  }
              }
diff --git a/patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch
index 3c1a883fe..3809e8c0b 100644
--- a/patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
 
 In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
 index 7ab130afddb0893016fb558ed624198316ca191d..3442ace00904b73f4384760d42c9385697132bc9 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
 @@ -606,7 +606,24 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          // CraftBukkit end
          this.tickTime = flag1;
@@ -35,10 +35,10 @@ index 7ab130afddb0893016fb558ed624198316ca191d..3442ace00904b73f4384760d42c93856
          this.serverLevelData = iworlddataserver;
          ChunkGenerator chunkgenerator = worlddimension.generator();
          // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
+diff --git a/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 index a728dcbf956f108f01c966c7531449a506a14a87..4c1378132201c1e5d1bc01f8c0cbba91629bcffa 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
+--- a/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
++++ b/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 @@ -160,7 +160,17 @@ public class WanderingTraderSpawner implements CustomSpawner {
              int k = pos.getX() + this.random.nextInt(range * 2) - range;
              int l = pos.getZ() + this.random.nextInt(range * 2) - range;
diff --git a/patches/server/0087-Raid-cooldown-setting.patch b/patches/server/0087-Raid-cooldown-setting.patch
index b1805bb7b..9ed8b584d 100644
--- a/patches/server/0087-Raid-cooldown-setting.patch
+++ b/patches/server/0087-Raid-cooldown-setting.patch
@@ -4,10 +4,10 @@ Date: Thu, 27 Aug 2020 13:48:52 -0700
 Subject: [PATCH] Raid cooldown setting
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/raid/Raids.java b/src/main/java/net/minecraft/world/entity/raid/Raids.java
+diff --git a/net/minecraft/world/entity/raid/Raids.java b/net/minecraft/world/entity/raid/Raids.java
 index 439d61d8689fabe940006b9b317a6810175dccfb..6b30941a84054efb5fcccb5d9e6c80d713a23889 100644
---- a/src/main/java/net/minecraft/world/entity/raid/Raids.java
-+++ b/src/main/java/net/minecraft/world/entity/raid/Raids.java
+--- a/net/minecraft/world/entity/raid/Raids.java
++++ b/net/minecraft/world/entity/raid/Raids.java
 @@ -26,6 +26,7 @@ import net.minecraft.world.phys.Vec3;
  public class Raids extends SavedData {
  
diff --git a/patches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch
index 3ebd24c6f..7220c8f7b 100644
--- a/patches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -19,10 +19,10 @@ index 6bdc683b5ade408ee27f1d6636b4d60c8c89cb7c..11d91f58208c1e816620f5b97c5fdfc6
  
          ignored.add("goal_selector_1");
          ignored.add("goal_selector_2");
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java
 index d471fe99acaf25cb06e36be8a68ab64cfedb4a09..3f02cb4924817ed132d2b17b97a67f7d7bf57cb8 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+--- a/net/minecraft/world/entity/monster/Drowned.java
++++ b/net/minecraft/world/entity/monster/Drowned.java
 @@ -130,7 +130,19 @@ public class Drowned extends Zombie implements RangedAttackMob {
          this.goalSelector.addGoal(7, new RandomStrollGoal(this, 1.0));
          this.targetSelector.addGoal(1, new HurtByTargetGoal(this, Drowned.class).setAlertOthers(ZombifiedPiglin.class));
@@ -44,10 +44,10 @@ index d471fe99acaf25cb06e36be8a68ab64cfedb4a09..3f02cb4924817ed132d2b17b97a67f7d
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Axolotl.class, true, false));
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
 index 2ce812ff9cb702a1fc1784f35efb643a2f9036c2..473ab54ac90f00bf5baf6b53190fa0f4f762700b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+--- a/net/minecraft/world/entity/monster/Zombie.java
++++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -163,7 +163,19 @@ public class Zombie extends Monster {
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers(ZombifiedPiglin.class));
diff --git a/patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
index 08d1f639c..e59729518 100644
--- a/patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
@@ -4,10 +4,10 @@ Date: Sat, 3 Oct 2020 17:40:52 -0500
 Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient
 
 
-diff --git a/src/main/java/net/minecraft/world/item/crafting/Ingredient.java b/src/main/java/net/minecraft/world/item/crafting/Ingredient.java
+diff --git a/net/minecraft/world/item/crafting/Ingredient.java b/net/minecraft/world/item/crafting/Ingredient.java
 index 0b0054b3d5d56ba24e1aee0e3ab56ea5b01a82a8..2e3a834643d56543418e9b9beb9d3448bf059d22 100644
---- a/src/main/java/net/minecraft/world/item/crafting/Ingredient.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/Ingredient.java
+--- a/net/minecraft/world/item/crafting/Ingredient.java
++++ b/net/minecraft/world/item/crafting/Ingredient.java
 @@ -45,6 +45,7 @@ public final class Ingredient implements StackedContents.IngredientInfo<io.paper
      // CraftBukkit start
      @Nullable
diff --git a/patches/server/0090-Flying-squids-Oh-my.patch b/patches/server/0090-Flying-squids-Oh-my.patch
index dad94609d..183b32d66 100644
--- a/patches/server/0090-Flying-squids-Oh-my.patch
+++ b/patches/server/0090-Flying-squids-Oh-my.patch
@@ -4,10 +4,10 @@ Date: Sun, 4 Oct 2020 12:00:42 -0500
 Subject: [PATCH] Flying squids! Oh my!
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
+diff --git a/net/minecraft/world/entity/GlowSquid.java b/net/minecraft/world/entity/GlowSquid.java
 index 66a5c485ed2d29d0079ae714c2dd7b01aab11d86..d556642fd07492aa52bfc0a2432ab3d16fe4f866 100644
---- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
-+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
+--- a/net/minecraft/world/entity/GlowSquid.java
++++ b/net/minecraft/world/entity/GlowSquid.java
 @@ -44,6 +44,11 @@ public class GlowSquid extends Squid {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.glowSquidMaxHealth);
      }
@@ -20,10 +20,10 @@ index 66a5c485ed2d29d0079ae714c2dd7b01aab11d86..d556642fd07492aa52bfc0a2432ab3d1
      @Override
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java
 index 490fa58d09d58cefb1adef1ba11823ba14fa2855..d976fca9b9764f9298bc9aa2e28b6f0feed1939f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+--- a/net/minecraft/world/entity/animal/Squid.java
++++ b/net/minecraft/world/entity/animal/Squid.java
 @@ -85,6 +85,15 @@ public class Squid extends AgeableWaterCreature {
          return super.getAxisForFluidCheck().offsetY(level().purpurConfig.squidOffsetWaterCheck);
      }
diff --git a/patches/server/0091-Infinity-bow-settings.patch b/patches/server/0091-Infinity-bow-settings.patch
index 727127486..dec76b5fd 100644
--- a/patches/server/0091-Infinity-bow-settings.patch
+++ b/patches/server/0091-Infinity-bow-settings.patch
@@ -4,10 +4,10 @@ Date: Sun, 4 Oct 2020 19:08:53 -0500
 Subject: [PATCH] Infinity bow settings
 
 
-diff --git a/src/main/java/net/minecraft/world/item/BowItem.java b/src/main/java/net/minecraft/world/item/BowItem.java
+diff --git a/net/minecraft/world/item/BowItem.java b/net/minecraft/world/item/BowItem.java
 index bb593209c95c9cf1f9c5d52d52fab4a33ddbabcf..1d4d0799a86b9940b5e3b614c5a188ade5133f7e 100644
---- a/src/main/java/net/minecraft/world/item/BowItem.java
-+++ b/src/main/java/net/minecraft/world/item/BowItem.java
+--- a/net/minecraft/world/item/BowItem.java
++++ b/net/minecraft/world/item/BowItem.java
 @@ -28,6 +28,11 @@ public class BowItem extends ProjectileWeaponItem {
              return false;
          } else {
diff --git a/patches/server/0092-Configurable-daylight-cycle.patch b/patches/server/0092-Configurable-daylight-cycle.patch
index 4a3c55c7a..edfe25562 100644
--- a/patches/server/0092-Configurable-daylight-cycle.patch
+++ b/patches/server/0092-Configurable-daylight-cycle.patch
@@ -4,10 +4,10 @@ Date: Sat, 10 Oct 2020 14:29:55 -0500
 Subject: [PATCH] Configurable daylight cycle
 
 
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index 75ef1a4f80449e87affbd9ba62f5f9447ef9db87..d55390d725f8798becb0b7b04485c99611e0e527 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -1858,7 +1858,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
@@ -17,10 +17,10 @@ index 75ef1a4f80449e87affbd9ba62f5f9447ef9db87..d55390d725f8798becb0b7b04485c996
                      continue;
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
 index 3442ace00904b73f4384760d42c9385697132bc9..6585e0d72b2fbb8af5c62ceba57eef2fb7794e87 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
 @@ -224,6 +224,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      private final StructureManager structureManager;
      private final StructureCheck structureCheck;
diff --git a/patches/server/0093-Furnace-uses-lava-from-underneath.patch b/patches/server/0093-Furnace-uses-lava-from-underneath.patch
index a14f8fc72..9b3cf0991 100644
--- a/patches/server/0093-Furnace-uses-lava-from-underneath.patch
+++ b/patches/server/0093-Furnace-uses-lava-from-underneath.patch
@@ -4,10 +4,10 @@ Date: Mon, 19 Oct 2020 15:14:01 -0500
 Subject: [PATCH] Furnace uses lava from underneath
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 index a9809c18233d82f910735e59363a49de488defcd..affa084b6bd4a6792d1c55719f88f3fb16627761 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+--- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -218,6 +218,21 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
          }
  
diff --git a/patches/server/0094-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0094-Arrows-should-not-reset-despawn-counter.patch
index c215cf5ed..c8802810b 100644
--- a/patches/server/0094-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server/0094-Arrows-should-not-reset-despawn-counter.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Arrows should not reset despawn counter
 This prevents keeping arrows alive indefinitely (such as when the block
 the arrow is stuck in gets removed, like a piston head going up/down)
 
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+diff --git a/net/minecraft/world/entity/projectile/AbstractArrow.java b/net/minecraft/world/entity/projectile/AbstractArrow.java
 index f4513b1887f823b088dabe425be042b8fb2bde66..d2a8e0fb1e673cec5701fd184cedfd8e49212acd 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+--- a/net/minecraft/world/entity/projectile/AbstractArrow.java
++++ b/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -372,7 +372,7 @@ public abstract class AbstractArrow extends Projectile {
          Vec3 vec3d = this.getDeltaMovement();
  
diff --git a/patches/server/0095-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0095-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
index 31c06b3c7..f9b51b971 100644
--- a/patches/server/0095-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/server/0095-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@@ -4,10 +4,10 @@ Date: Sat, 14 Nov 2020 08:06:20 -0800
 Subject: [PATCH] Ability to re-add farmland mechanics from Alpha
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+diff --git a/net/minecraft/world/level/block/FarmBlock.java b/net/minecraft/world/level/block/FarmBlock.java
 index df89b18f0d5d2dad5745ec65bcd9e4a7bf2f1f2b..e744a117d2f25ad24c87263ba2ab7f760b6e594d 100644
---- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+--- a/net/minecraft/world/level/block/FarmBlock.java
++++ b/net/minecraft/world/level/block/FarmBlock.java
 @@ -126,6 +126,14 @@ public class FarmBlock extends Block {
                      return;
                  }
diff --git a/patches/server/0096-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0096-Add-adjustable-breeding-cooldown-to-config.patch
index ca6cd7904..0afa0827b 100644
--- a/patches/server/0096-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0096-Add-adjustable-breeding-cooldown-to-config.patch
@@ -4,10 +4,10 @@ Date: Fri, 13 Nov 2020 17:52:40 +0100
 Subject: [PATCH] Add adjustable breeding cooldown to config
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
+diff --git a/net/minecraft/world/entity/animal/Animal.java b/net/minecraft/world/entity/animal/Animal.java
 index 5677dc97ed83652f261100cf391883cfac7d16fe..4637d062b6a4c4d6de2ef54ec3cfdeb4344ff38e 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
+--- a/net/minecraft/world/entity/animal/Animal.java
++++ b/net/minecraft/world/entity/animal/Animal.java
 @@ -157,7 +157,7 @@ public abstract class Animal extends AgeableMob {
          if (this.isFood(itemstack)) {
              int i = this.getAge();
@@ -41,10 +41,10 @@ index 5677dc97ed83652f261100cf391883cfac7d16fe..4637d062b6a4c4d6de2ef54ec3cfdeb4
              int experience = this.getRandom().nextInt(7) + 1;
              EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, other, breeder, this.breedItem, experience);
              if (entityBreedEvent.isCancelled()) {
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
 index 13c99a770e8c466cdba5f397cf8156aed42b55ba..1aa251cfdf941027f529ce02f0c16c815ade296f 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
+--- a/net/minecraft/world/level/Level.java
++++ b/net/minecraft/world/level/Level.java
 @@ -183,6 +183,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      public final Map<ServerExplosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
      public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here
diff --git a/patches/server/0097-Make-entity-breeding-times-configurable.patch b/patches/server/0097-Make-entity-breeding-times-configurable.patch
index e6ba99a75..a7391a6fb 100644
--- a/patches/server/0097-Make-entity-breeding-times-configurable.patch
+++ b/patches/server/0097-Make-entity-breeding-times-configurable.patch
@@ -4,10 +4,10 @@ Date: Sun, 15 Nov 2020 02:18:15 -0800
 Subject: [PATCH] Make entity breeding times configurable
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
+diff --git a/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java b/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
 index 0a608418f87b71d5d71706712e1f82da0d7e4d34..03e7ca83e4c28dfaa5b52bcb100bd542db105970 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
+--- a/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
++++ b/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
 @@ -125,8 +125,10 @@ public class VillagerMakeLove extends Behavior<Villager> {
                  return Optional.empty();
              }
@@ -21,10 +21,10 @@ index 0a608418f87b71d5d71706712e1f82da0d7e4d34..03e7ca83e4c28dfaa5b52bcb100bd542
              world.addFreshEntityWithPassengers(entityvillager2, CreatureSpawnEvent.SpawnReason.BREEDING);
              // CraftBukkit end
              world.broadcastEntityEvent(entityvillager2, (byte) 12);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
+diff --git a/net/minecraft/world/entity/animal/Animal.java b/net/minecraft/world/entity/animal/Animal.java
 index 4637d062b6a4c4d6de2ef54ec3cfdeb4344ff38e..8df1682dca61b0f771a1c08f5bcd797506badf19 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
+--- a/net/minecraft/world/entity/animal/Animal.java
++++ b/net/minecraft/world/entity/animal/Animal.java
 @@ -49,6 +49,7 @@ public abstract class Animal extends AgeableMob {
      @Nullable
      public UUID loveCause;
@@ -46,10 +46,10 @@ index 4637d062b6a4c4d6de2ef54ec3cfdeb4344ff38e..8df1682dca61b0f771a1c08f5bcd7975
          this.resetLove();
          entityanimal.resetLove();
          worldserver.broadcastEntityEvent(this, (byte) 18);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
 index 8751cc882f2dcbf6dfc10cebab9d9a4f95ebfb10..121a4c58d4052eb0880f540e87beaf12a74eecd7 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+--- a/net/minecraft/world/entity/animal/Bee.java
++++ b/net/minecraft/world/entity/animal/Bee.java
 @@ -496,6 +496,12 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.beeScale);
      }
@@ -63,10 +63,10 @@ index 8751cc882f2dcbf6dfc10cebab9d9a4f95ebfb10..121a4c58d4052eb0880f540e87beaf12
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java
 index b4f022093a52c1fe13ad67ad70d57fd0278a9d55..06b68fcf750a637e1f41eecacca2969cb55a8fa8 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+--- a/net/minecraft/world/entity/animal/Cat.java
++++ b/net/minecraft/world/entity/animal/Cat.java
 @@ -132,6 +132,12 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.catScale);
      }
@@ -80,10 +80,10 @@ index b4f022093a52c1fe13ad67ad70d57fd0278a9d55..06b68fcf750a637e1f41eecacca2969c
      @Override
      protected void registerGoals() {
          this.temptGoal = new Cat.CatTemptGoal(this, 0.6D, (itemstack) -> {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+diff --git a/net/minecraft/world/entity/animal/Chicken.java b/net/minecraft/world/entity/animal/Chicken.java
 index f6f7afc6a421022738f77e5eece193ad15de78ba..d06fb7d714efc88af13e6357536d4c58a7ec3bb5 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+--- a/net/minecraft/world/entity/animal/Chicken.java
++++ b/net/minecraft/world/entity/animal/Chicken.java
 @@ -82,6 +82,12 @@ public class Chicken extends Animal {
          // Purpur end - Chickens can retaliate
      }
@@ -97,10 +97,10 @@ index f6f7afc6a421022738f77e5eece193ad15de78ba..d06fb7d714efc88af13e6357536d4c58
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+diff --git a/net/minecraft/world/entity/animal/Cow.java b/net/minecraft/world/entity/animal/Cow.java
 index 88dd147317e200a11eb6a7e496bfffee9079fd6f..4b27440624deda151f63f7ce4670fd805d24eaba 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+--- a/net/minecraft/world/entity/animal/Cow.java
++++ b/net/minecraft/world/entity/animal/Cow.java
 @@ -68,6 +68,12 @@ public class Cow extends Animal {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.cowScale);
      }
@@ -114,10 +114,10 @@ index 88dd147317e200a11eb6a7e496bfffee9079fd6f..4b27440624deda151f63f7ce4670fd80
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java
 index a0adc29bb09a3eaecdaf564fd992b8aefec69629..ce597675e973eb0d7ce580a2b4dfd76e7bb586b1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+--- a/net/minecraft/world/entity/animal/Fox.java
++++ b/net/minecraft/world/entity/animal/Fox.java
 @@ -189,6 +189,12 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.foxScale);
      }
@@ -144,10 +144,10 @@ index a0adc29bb09a3eaecdaf564fd992b8aefec69629..ce597675e973eb0d7ce580a2b4dfd76e
                  this.animal.resetLove();
                  this.partner.resetLove();
                  worldserver.addFreshEntityWithPassengers(entityfox, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
-diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+diff --git a/net/minecraft/world/entity/animal/MushroomCow.java b/net/minecraft/world/entity/animal/MushroomCow.java
 index 96078cf11f13c85a3f019f70fa02668c43dbc559..28b544f4f2e0f30d831b57167fc3ea3ce28e2191 100644
---- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+--- a/net/minecraft/world/entity/animal/MushroomCow.java
++++ b/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -87,6 +87,12 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.mooshroomMaxHealth);
      }
@@ -161,10 +161,10 @@ index 96078cf11f13c85a3f019f70fa02668c43dbc559..28b544f4f2e0f30d831b57167fc3ea3c
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+diff --git a/net/minecraft/world/entity/animal/Ocelot.java b/net/minecraft/world/entity/animal/Ocelot.java
 index c7acefca654c7a833da7c122634df5626cf208e5..9412acb55bccfb0e5f3f77ce9df09f33807de57c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+--- a/net/minecraft/world/entity/animal/Ocelot.java
++++ b/net/minecraft/world/entity/animal/Ocelot.java
 @@ -89,6 +89,12 @@ public class Ocelot extends Animal {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.ocelotScale);
      }
@@ -178,10 +178,10 @@ index c7acefca654c7a833da7c122634df5626cf208e5..9412acb55bccfb0e5f3f77ce9df09f33
      public boolean isTrusting() {
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+diff --git a/net/minecraft/world/entity/animal/Panda.java b/net/minecraft/world/entity/animal/Panda.java
 index 08114535138918dce26c6881194617028a5a258c..9c91207391f20adaf8f777c1db9502ee7aeda597 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+--- a/net/minecraft/world/entity/animal/Panda.java
++++ b/net/minecraft/world/entity/animal/Panda.java
 @@ -146,6 +146,12 @@ public class Panda extends Animal {
          setAttributes();
      }
@@ -195,10 +195,10 @@ index 08114535138918dce26c6881194617028a5a258c..9c91207391f20adaf8f777c1db9502ee
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java
 index cad1d66326837d88166eb3a7b5d871c3132b8b98..2311595018175d2786e34a3dd68ded7a7fe0838c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+--- a/net/minecraft/world/entity/animal/Parrot.java
++++ b/net/minecraft/world/entity/animal/Parrot.java
 @@ -194,6 +194,12 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.parrotScale);
      }
@@ -212,10 +212,10 @@ index cad1d66326837d88166eb3a7b5d871c3132b8b98..2311595018175d2786e34a3dd68ded7a
      @Nullable
      @Override
      public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData entityData) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+diff --git a/net/minecraft/world/entity/animal/Pig.java b/net/minecraft/world/entity/animal/Pig.java
 index f9efd4c1fc30f2bbb061d31ded6e45c546b0bfa8..aea1462503e41b09a4581651a8fa0d72e2d9b3cb 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+--- a/net/minecraft/world/entity/animal/Pig.java
++++ b/net/minecraft/world/entity/animal/Pig.java
 @@ -89,6 +89,12 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.pigScale);
      }
@@ -229,10 +229,10 @@ index f9efd4c1fc30f2bbb061d31ded6e45c546b0bfa8..aea1462503e41b09a4581651a8fa0d72
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+diff --git a/net/minecraft/world/entity/animal/PolarBear.java b/net/minecraft/world/entity/animal/PolarBear.java
 index 09039a5a69ea582223d6ad06b1d99776742ec2e2..1fccc501f581dfd0c27c116a2e01a97abc023959 100644
---- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+--- a/net/minecraft/world/entity/animal/PolarBear.java
++++ b/net/minecraft/world/entity/animal/PolarBear.java
 @@ -122,6 +122,12 @@ public class PolarBear extends Animal implements NeutralMob {
          }
      }
@@ -246,10 +246,10 @@ index 09039a5a69ea582223d6ad06b1d99776742ec2e2..1fccc501f581dfd0c27c116a2e01a97a
      @Nullable
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java
 index 6448d4f44f948f08121302784e966bf58abd9be1..0b4a1a8b0a41aaa083995c2059a9ce8757d44144 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+--- a/net/minecraft/world/entity/animal/Rabbit.java
++++ b/net/minecraft/world/entity/animal/Rabbit.java
 @@ -148,6 +148,12 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.rabbitScale);
      }
@@ -263,10 +263,10 @@ index 6448d4f44f948f08121302784e966bf58abd9be1..0b4a1a8b0a41aaa083995c2059a9ce87
      @Override
      public void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+diff --git a/net/minecraft/world/entity/animal/Sheep.java b/net/minecraft/world/entity/animal/Sheep.java
 index 3fd84abe0889b224c7c8d5af06b384d2fb431eb4..761ff22d66a191ab4c38d872e65afc2ee70f233d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+--- a/net/minecraft/world/entity/animal/Sheep.java
++++ b/net/minecraft/world/entity/animal/Sheep.java
 @@ -108,6 +108,12 @@ public class Sheep extends Animal implements Shearable {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.sheepScale);
      }
@@ -280,10 +280,10 @@ index 3fd84abe0889b224c7c8d5af06b384d2fb431eb4..761ff22d66a191ab4c38d872e65afc2e
      @Override
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+diff --git a/net/minecraft/world/entity/animal/Turtle.java b/net/minecraft/world/entity/animal/Turtle.java
 index 2133b8a2615be6502bf9d7b4d4c1bc75929b5022..0a29ce3a783a5bcadfd386927f176457596882ce 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+--- a/net/minecraft/world/entity/animal/Turtle.java
++++ b/net/minecraft/world/entity/animal/Turtle.java
 @@ -110,6 +110,12 @@ public class Turtle extends Animal {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.turtleScale);
      }
@@ -297,10 +297,10 @@ index 2133b8a2615be6502bf9d7b4d4c1bc75929b5022..0a29ce3a783a5bcadfd386927f176457
      public void setHomePos(BlockPos pos) {
          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
+diff --git a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java
 index d86bad821e781d698cc2bf0b3179eb4d2ed065b1..539eba7148be12eb05c907ed86b0cea975424874 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+--- a/net/minecraft/world/entity/animal/Wolf.java
++++ b/net/minecraft/world/entity/animal/Wolf.java
 @@ -153,6 +153,12 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.wolfScale);
      }
@@ -314,10 +314,10 @@ index d86bad821e781d698cc2bf0b3179eb4d2ed065b1..539eba7148be12eb05c907ed86b0cea9
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+diff --git a/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 index 1a6c88558a11066ec2a78d40e6a1b0f2fa546b88..30779f8a00d438972ad59372ce92e23193f99820 100644
---- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+--- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java
++++ b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 @@ -106,6 +106,12 @@ public class Armadillo extends Animal {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.armadilloScale);
      }
@@ -331,10 +331,10 @@ index 1a6c88558a11066ec2a78d40e6a1b0f2fa546b88..30779f8a00d438972ad59372ce92e231
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+diff --git a/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 index f95b9be60c3725fe279a07300f706abb25e152f1..9bffdbfcd49cf84865926a0e341784c1d4a1c98c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+--- a/net/minecraft/world/entity/animal/axolotl/Axolotl.java
++++ b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -124,6 +124,12 @@ public class Axolotl extends Animal implements VariantHolder<Axolotl.Variant>, B
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.axolotlScale);
      }
@@ -348,10 +348,10 @@ index f95b9be60c3725fe279a07300f706abb25e152f1..9bffdbfcd49cf84865926a0e341784c1
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return 0.0F;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+diff --git a/net/minecraft/world/entity/animal/camel/Camel.java b/net/minecraft/world/entity/animal/camel/Camel.java
 index ab0b90c300d0610e423abe7ac9e5b93305a21c5a..d0023e3734bb3c625fa53077f47039dcb82d9606 100644
---- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+--- a/net/minecraft/world/entity/animal/camel/Camel.java
++++ b/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -94,6 +94,12 @@ public class Camel extends AbstractHorse {
      }
      // Purpur end - Ridables
@@ -365,10 +365,10 @@ index ab0b90c300d0610e423abe7ac9e5b93305a21c5a..d0023e3734bb3c625fa53077f47039dc
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+diff --git a/net/minecraft/world/entity/animal/frog/Frog.java b/net/minecraft/world/entity/animal/frog/Frog.java
 index b42e1e1749c9f18b3bf842517522e90ba60330ff..e862803b38aceec149da8deddb9c88c46e916ad6 100644
---- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+--- a/net/minecraft/world/entity/animal/frog/Frog.java
++++ b/net/minecraft/world/entity/animal/frog/Frog.java
 @@ -165,6 +165,12 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
      }
      // Purpur end - Ridables
@@ -382,10 +382,10 @@ index b42e1e1749c9f18b3bf842517522e90ba60330ff..e862803b38aceec149da8deddb9c88c4
      @Override
      protected Brain.Provider<Frog> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
 index 307d11e5ad6d0b47af36b1469a73ae1caa100232..c9d7be823a040e7de407537d247062821dca643a 100644
---- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+--- a/net/minecraft/world/entity/animal/goat/Goat.java
++++ b/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -110,6 +110,12 @@ public class Goat extends Animal {
      }
      // Purpur end - Ridables
@@ -399,10 +399,10 @@ index 307d11e5ad6d0b47af36b1469a73ae1caa100232..c9d7be823a040e7de407537d24706282
      @Override
      protected Brain.Provider<Goat> brainProvider() {
          return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+diff --git a/net/minecraft/world/entity/animal/horse/Donkey.java b/net/minecraft/world/entity/animal/horse/Donkey.java
 index 8fd709bcd4c7a5a875bdc65fd4dd1420ea618e3a..4cff4fcedc75a99ca71ae6a7c34d6f407665bf1b 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+--- a/net/minecraft/world/entity/animal/horse/Donkey.java
++++ b/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -39,6 +39,12 @@ public class Donkey extends AbstractChestedHorse {
          return generateSpeed(this.level().purpurConfig.donkeyMovementSpeedMin, this.level().purpurConfig.donkeyMovementSpeedMax);
      }
@@ -416,10 +416,10 @@ index 8fd709bcd4c7a5a875bdc65fd4dd1420ea618e3a..4cff4fcedc75a99ca71ae6a7c34d6f40
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+diff --git a/net/minecraft/world/entity/animal/horse/Horse.java b/net/minecraft/world/entity/animal/horse/Horse.java
 index 13056a0a13eeb3dcc164344b973e6ff656c0793d..cbeb7d1e834a4f0f120248bec619e34ca46f8069 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+--- a/net/minecraft/world/entity/animal/horse/Horse.java
++++ b/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -66,6 +66,12 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
          return generateSpeed(this.level().purpurConfig.horseMovementSpeedMin, this.level().purpurConfig.horseMovementSpeedMax);
      }
@@ -433,10 +433,10 @@ index 13056a0a13eeb3dcc164344b973e6ff656c0793d..cbeb7d1e834a4f0f120248bec619e34c
      @Override
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
 index cbab482bd44c0a0fa82a80f41fdfd8c124c58c43..ea396b5740ae1e7b2cf5356607835467b412d379 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+--- a/net/minecraft/world/entity/animal/horse/Llama.java
++++ b/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -140,6 +140,12 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          return generateSpeed(this.level().purpurConfig.llamaMovementSpeedMin, this.level().purpurConfig.llamaMovementSpeedMax);
      }
@@ -450,10 +450,10 @@ index cbab482bd44c0a0fa82a80f41fdfd8c124c58c43..ea396b5740ae1e7b2cf5356607835467
      public boolean isTraderLlama() {
          return false;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+diff --git a/net/minecraft/world/entity/animal/horse/Mule.java b/net/minecraft/world/entity/animal/horse/Mule.java
 index f54df53412186a67efc8ef33b82e8756109059c3..02f075b6aadbd3b263235be761653c7d16ba3b1e 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+--- a/net/minecraft/world/entity/animal/horse/Mule.java
++++ b/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -38,6 +38,12 @@ public class Mule extends AbstractChestedHorse {
          return generateSpeed(this.level().purpurConfig.muleMovementSpeedMin, this.level().purpurConfig.muleMovementSpeedMax);
      }
@@ -467,10 +467,10 @@ index f54df53412186a67efc8ef33b82e8756109059c3..02f075b6aadbd3b263235be761653c7d
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 index 133b1fdba0129ccbff146af6d44d8990f7598158..064f33e8c1768b20cf1ef61d20a7bda93b6e2855 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+--- a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
++++ b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 @@ -65,6 +65,12 @@ public class SkeletonHorse extends AbstractHorse {
          return generateSpeed(this.level().purpurConfig.skeletonHorseMovementSpeedMin, this.level().purpurConfig.skeletonHorseMovementSpeedMax);
      }
@@ -484,10 +484,10 @@ index 133b1fdba0129ccbff146af6d44d8990f7598158..064f33e8c1768b20cf1ef61d20a7bda9
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/animal/horse/TraderLlama.java b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 index 39ee4b850072ff27dc86857c5ce7ef66842a214d..e9d03e3063a5afe296720314f74a25e9cfb5dabf 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
+--- a/net/minecraft/world/entity/animal/horse/TraderLlama.java
++++ b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 @@ -71,6 +71,12 @@ public class TraderLlama extends Llama {
          return generateSpeed(this.level().purpurConfig.traderLlamaMovementSpeedMin, this.level().purpurConfig.traderLlamaMovementSpeedMax);
      }
@@ -501,10 +501,10 @@ index 39ee4b850072ff27dc86857c5ce7ef66842a214d..e9d03e3063a5afe296720314f74a25e9
      @Override
      public boolean isTraderLlama() {
          return true;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 index 6f910056aeed1b2fdf23c97ea706d062ae10bbfe..455c0e32931ef1fae41278ed360e2af535ccbaad 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+--- a/net/minecraft/world/entity/animal/horse/ZombieHorse.java
++++ b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 @@ -61,6 +61,12 @@ public class ZombieHorse extends AbstractHorse {
          return generateSpeed(this.level().purpurConfig.zombieHorseMovementSpeedMin, this.level().purpurConfig.zombieHorseMovementSpeedMax);
      }
@@ -518,10 +518,10 @@ index 6f910056aeed1b2fdf23c97ea706d062ae10bbfe..455c0e32931ef1fae41278ed360e2af5
      public static AttributeSupplier.Builder createAttributes() {
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+diff --git a/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 index e1354ffd4fc3a9b5bf6b43ff5c17d2416918520b..489854333e71ad4e7635870eedbdd07a84297a13 100644
---- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+--- a/net/minecraft/world/entity/animal/sniffer/Sniffer.java
++++ b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -114,6 +114,12 @@ public class Sniffer extends Animal {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.snifferScale);
      }
@@ -535,10 +535,10 @@ index e1354ffd4fc3a9b5bf6b43ff5c17d2416918520b..489854333e71ad4e7635870eedbdd07a
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
+diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
 index c66126f3a43e6e011e5f9a977ad481c96529d1d5..b2f9e7dec710f9a135074d6b5eb438e127a7aaa9 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
+--- a/net/minecraft/world/entity/monster/Strider.java
++++ b/net/minecraft/world/entity/monster/Strider.java
 @@ -121,6 +121,12 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.striderScale);
      }
@@ -552,10 +552,10 @@ index c66126f3a43e6e011e5f9a977ad481c96529d1d5..b2f9e7dec710f9a135074d6b5eb438e1
      public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random) {
          BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 index 476dcc613f566d88273f195b847e6b4dec777e44..d7bef344f1d18aa6037b3805da07353c54c82142 100644
---- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+--- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java
++++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -100,6 +100,12 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
          this.timeInOverworld = timeInOverworld;
      }
diff --git a/patches/server/0098-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0098-Apply-display-names-from-item-forms-of-entities-to-e.patch
index c26f25016..8bd5321af 100644
--- a/patches/server/0098-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0098-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Apply display names from item forms of entities to entities
  and vice versa
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
 index edb0cd90e28016c44b0aaf5c9ed5d7bdbced5295..12ff824ffa81ea45f76337ec2b6d80b01047b698 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+--- a/net/minecraft/world/entity/decoration/ArmorStand.java
++++ b/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -618,6 +618,7 @@ public class ArmorStand extends LivingEntity {
      private org.bukkit.event.entity.EntityDeathEvent brokenByPlayer(ServerLevel world, DamageSource damageSource) { // Paper
          ItemStack itemstack = new ItemStack(Items.ARMOR_STAND);
@@ -17,10 +17,10 @@ index edb0cd90e28016c44b0aaf5c9ed5d7bdbced5295..12ff824ffa81ea45f76337ec2b6d80b0
          itemstack.set(DataComponents.CUSTOM_NAME, this.getCustomName());
          this.drops.add(new DefaultDrop(itemstack, stack -> Block.popResource(this.level(), this.blockPosition(), stack))); // CraftBukkit - add to drops // Paper - Restore vanilla drops behavior
          return this.brokenByAnything(world, damageSource); // Paper
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
+diff --git a/net/minecraft/world/entity/decoration/ItemFrame.java b/net/minecraft/world/entity/decoration/ItemFrame.java
 index 7d83ad8a61f6aafbc063506c1858554f9b700b70..fd1bd4fb88d1bd4a0734db463dc1be640c736d34 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
+--- a/net/minecraft/world/entity/decoration/ItemFrame.java
++++ b/net/minecraft/world/entity/decoration/ItemFrame.java
 @@ -240,7 +240,13 @@ public class ItemFrame extends HangingEntity {
                  }
  
@@ -36,10 +36,10 @@ index 7d83ad8a61f6aafbc063506c1858554f9b700b70..fd1bd4fb88d1bd4a0734db463dc1be64
                  }
  
                  if (!itemstack.isEmpty()) {
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/Painting.java b/src/main/java/net/minecraft/world/entity/decoration/Painting.java
+diff --git a/net/minecraft/world/entity/decoration/Painting.java b/net/minecraft/world/entity/decoration/Painting.java
 index fd0e78a2318e3950d011c17358245e107b38154a..0fcab828e81176323cbdf16c0ec714d9a2846ae5 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/Painting.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/Painting.java
+--- a/net/minecraft/world/entity/decoration/Painting.java
++++ b/net/minecraft/world/entity/decoration/Painting.java
 @@ -179,7 +179,13 @@ public class Painting extends HangingEntity implements VariantHolder<Holder<Pain
                  }
              }
@@ -55,10 +55,10 @@ index fd0e78a2318e3950d011c17358245e107b38154a..0fcab828e81176323cbdf16c0ec714d9
          }
      }
  
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
+diff --git a/net/minecraft/world/entity/vehicle/AbstractBoat.java b/net/minecraft/world/entity/vehicle/AbstractBoat.java
 index a301f32a292afb010f3888732e339897b176243d..1a4fb057025689a22b3dd05f531f0d8639d7e47b 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
+--- a/net/minecraft/world/entity/vehicle/AbstractBoat.java
++++ b/net/minecraft/world/entity/vehicle/AbstractBoat.java
 @@ -930,7 +930,13 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
  
      @Override
@@ -74,10 +74,10 @@ index a301f32a292afb010f3888732e339897b176243d..1a4fb057025689a22b3dd05f531f0d86
      }
  
      public static enum Status {
-diff --git a/src/main/java/net/minecraft/world/item/ArmorStandItem.java b/src/main/java/net/minecraft/world/item/ArmorStandItem.java
+diff --git a/net/minecraft/world/item/ArmorStandItem.java b/net/minecraft/world/item/ArmorStandItem.java
 index cb4baebe22eeab17aed67a5ecc506b932fe2230b..c1a6734cc08de1c9fc413b1fa81a199ac9547ec2 100644
---- a/src/main/java/net/minecraft/world/item/ArmorStandItem.java
-+++ b/src/main/java/net/minecraft/world/item/ArmorStandItem.java
+--- a/net/minecraft/world/item/ArmorStandItem.java
++++ b/net/minecraft/world/item/ArmorStandItem.java
 @@ -59,6 +59,14 @@ public class ArmorStandItem extends Item {
                          return InteractionResult.FAIL;
                      }
@@ -93,10 +93,10 @@ index cb4baebe22eeab17aed67a5ecc506b932fe2230b..c1a6734cc08de1c9fc413b1fa81a199a
                      worldserver.addFreshEntityWithPassengers(entityarmorstand);
                      world.playSound((Player) null, entityarmorstand.getX(), entityarmorstand.getY(), entityarmorstand.getZ(), SoundEvents.ARMOR_STAND_PLACE, SoundSource.BLOCKS, 0.75F, 0.8F);
                      entityarmorstand.gameEvent(GameEvent.ENTITY_PLACE, context.getPlayer());
-diff --git a/src/main/java/net/minecraft/world/item/BoatItem.java b/src/main/java/net/minecraft/world/item/BoatItem.java
+diff --git a/net/minecraft/world/item/BoatItem.java b/net/minecraft/world/item/BoatItem.java
 index e51ffd6c5047ee907a58f3029f0ea7fc66aedfa7..78d41d57df9cb61b295f1f54db1e1d62c13db701 100644
---- a/src/main/java/net/minecraft/world/item/BoatItem.java
-+++ b/src/main/java/net/minecraft/world/item/BoatItem.java
+--- a/net/minecraft/world/item/BoatItem.java
++++ b/net/minecraft/world/item/BoatItem.java
 @@ -71,6 +71,11 @@ public class BoatItem extends Item {
                      return InteractionResult.FAIL;
                  } else {
@@ -109,10 +109,10 @@ index e51ffd6c5047ee907a58f3029f0ea7fc66aedfa7..78d41d57df9cb61b295f1f54db1e1d62
                      if (!world.noCollision(abstractboat, abstractboat.getBoundingBox())) {
                          return InteractionResult.FAIL;
                      } else {
-diff --git a/src/main/java/net/minecraft/world/item/HangingEntityItem.java b/src/main/java/net/minecraft/world/item/HangingEntityItem.java
+diff --git a/net/minecraft/world/item/HangingEntityItem.java b/net/minecraft/world/item/HangingEntityItem.java
 index cdc17ad948d8ac5de62f14b1a561433d33211f32..44a7cee7df2927a923455e8cedaab59307b42506 100644
---- a/src/main/java/net/minecraft/world/item/HangingEntityItem.java
-+++ b/src/main/java/net/minecraft/world/item/HangingEntityItem.java
+--- a/net/minecraft/world/item/HangingEntityItem.java
++++ b/net/minecraft/world/item/HangingEntityItem.java
 @@ -75,6 +75,11 @@ public class HangingEntityItem extends Item {
  
              if (!customdata.isEmpty()) {
diff --git a/patches/server/0099-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0099-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
index 8eab72bf5..dc9698aff 100644
--- a/patches/server/0099-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
+++ b/patches/server/0099-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
@@ -4,10 +4,10 @@ Date: Tue, 17 Nov 2020 13:12:09 -0800
 Subject: [PATCH] Set name visible when using a Name Tag on an Armor Stand
 
 
-diff --git a/src/main/java/net/minecraft/world/item/NameTagItem.java b/src/main/java/net/minecraft/world/item/NameTagItem.java
+diff --git a/net/minecraft/world/item/NameTagItem.java b/net/minecraft/world/item/NameTagItem.java
 index df9cdcb9544a171a5a07c65ba0150933fb70d5fc..793bd6392ca3c3792306a20538233e4d7fb69b86 100644
---- a/src/main/java/net/minecraft/world/item/NameTagItem.java
-+++ b/src/main/java/net/minecraft/world/item/NameTagItem.java
+--- a/net/minecraft/world/item/NameTagItem.java
++++ b/net/minecraft/world/item/NameTagItem.java
 @@ -23,6 +23,7 @@ public class NameTagItem extends Item {
                  if (!event.callEvent()) return InteractionResult.PASS;
                  LivingEntity newEntity = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle();
diff --git a/patches/server/0100-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0100-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
index 8d4f84ebd..227ac682b 100644
--- a/patches/server/0100-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
+++ b/patches/server/0100-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add config for allowing Endermen to despawn even while
 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
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index d2959976cf206f6c92ae90f103035e4760b9d955..c816521a5f73ccd04216ac0225945c6ef585869d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -468,7 +468,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
      @Override
diff --git a/patches/server/0101-Add-configurable-snowball-damage.patch b/patches/server/0101-Add-configurable-snowball-damage.patch
index d4248b989..fd67a563e 100644
--- a/patches/server/0101-Add-configurable-snowball-damage.patch
+++ b/patches/server/0101-Add-configurable-snowball-damage.patch
@@ -4,10 +4,10 @@ Date: Tue, 24 Nov 2020 05:32:02 -0600
 Subject: [PATCH] Add configurable snowball damage
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
+diff --git a/net/minecraft/world/entity/projectile/Snowball.java b/net/minecraft/world/entity/projectile/Snowball.java
 index 048ca5232d71f07d8ba7d3eaf0236660494c6b35..f712963fcd80535eee2bd04ec55ae1abdadef2bd 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
+--- a/net/minecraft/world/entity/projectile/Snowball.java
++++ b/net/minecraft/world/entity/projectile/Snowball.java
 @@ -58,7 +58,7 @@ public class Snowball extends ThrowableItemProjectile {
      protected void onHitEntity(EntityHitResult entityHitResult) {
          super.onHitEntity(entityHitResult);
diff --git a/patches/server/0102-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0102-Changeable-Mob-Left-Handed-Chance.patch
index 5ab06e4fe..a4f2a3b1d 100644
--- a/patches/server/0102-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server/0102-Changeable-Mob-Left-Handed-Chance.patch
@@ -4,10 +4,10 @@ Date: Mon, 30 Nov 2020 11:40:11 -0500
 Subject: [PATCH] Changeable Mob Left Handed Chance
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
 index 1f253d5ace885423aa25ebdd986e1909a15ba018..06fbac8a968971d9ec3305e98b136d88be19a9f7 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
+--- a/net/minecraft/world/entity/Mob.java
++++ b/net/minecraft/world/entity/Mob.java
 @@ -1422,7 +1422,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              attributemodifiable.addPermanentModifier(new AttributeModifier(Mob.RANDOM_SPAWN_BONUS_ID, randomsource.triangle(0.0D, 0.11485000000000001D), AttributeModifier.Operation.ADD_MULTIPLIED_BASE));
          }
diff --git a/patches/server/0103-Add-boat-fall-damage-config.patch b/patches/server/0103-Add-boat-fall-damage-config.patch
index d6e967c48..b20144c18 100644
--- a/patches/server/0103-Add-boat-fall-damage-config.patch
+++ b/patches/server/0103-Add-boat-fall-damage-config.patch
@@ -4,10 +4,10 @@ Date: Mon, 30 Nov 2020 19:36:35 -0600
 Subject: [PATCH] Add boat fall damage config
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 5d4b0f8b621f62604f098da7bf0822d25b469547..51e58f447cc07224b2d9bbeff3719a719931a40c 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -1439,7 +1439,16 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          if (this.isInvulnerableTo(world, source)) {
              return false;
diff --git a/patches/server/0104-Snow-Golem-rate-of-fire-config.patch b/patches/server/0104-Snow-Golem-rate-of-fire-config.patch
index 8d2f24025..53d891579 100644
--- a/patches/server/0104-Snow-Golem-rate-of-fire-config.patch
+++ b/patches/server/0104-Snow-Golem-rate-of-fire-config.patch
@@ -9,10 +9,10 @@ The formula used to determine the amount of ticks between shots is:
 If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to
 0, snow golems won't shoot any snowballs.
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java
 index aaa581c5fa7a14958b2a7c20996cf70ad4efff04..d13d8d251af99289a66934ef04c7dfb9bf0611a2 100644
---- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+--- a/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -82,7 +82,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
      @Override
      protected void registerGoals() {
diff --git a/patches/server/0105-EMC-Configurable-disable-give-dropping.patch b/patches/server/0105-EMC-Configurable-disable-give-dropping.patch
index dab7d4201..9a0f6b78e 100644
--- a/patches/server/0105-EMC-Configurable-disable-give-dropping.patch
+++ b/patches/server/0105-EMC-Configurable-disable-give-dropping.patch
@@ -7,10 +7,10 @@ Modified version of a patch by Aikar from EMC. Adds a config option in
 purpur.yml to disable the /give command from dropping items on the
 floor when a player's inventory is full.
 
-diff --git a/src/main/java/net/minecraft/server/commands/GiveCommand.java b/src/main/java/net/minecraft/server/commands/GiveCommand.java
+diff --git a/net/minecraft/server/commands/GiveCommand.java b/net/minecraft/server/commands/GiveCommand.java
 index 0d9de4c61c7b26a6ff37c12fde629161fd0c3d5a..2f7897744f4aea718170698881773e9031a58a51 100644
---- a/src/main/java/net/minecraft/server/commands/GiveCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/GiveCommand.java
+--- a/net/minecraft/server/commands/GiveCommand.java
++++ b/net/minecraft/server/commands/GiveCommand.java
 @@ -60,6 +60,7 @@ public class GiveCommand {
                      boolean flag = entityplayer.getInventory().add(itemstack1);
                      ItemEntity entityitem;
diff --git a/patches/server/0106-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0106-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
index 9424f27ce..e5daf17a1 100644
--- a/patches/server/0106-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
+++ b/patches/server/0106-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
@@ -7,10 +7,10 @@ Adds an option so that Villagers with the Cleric profession are able to
 farm Nether Wart. Reimplemented based on a feature of the carpet-extra
 mod.
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
+diff --git a/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
 index 2ade08d1466660ee1787fa97908002ef56389712..4fa4ec34963730507253182cad1c2bf04090ad50 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
+--- a/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
++++ b/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
 @@ -41,6 +41,7 @@ public class HarvestFarmland extends Behavior<Villager> {
      private long nextOkStartTime;
      private int timeWorkedSoFar;
@@ -72,10 +72,10 @@ index 2ade08d1466660ee1787fa97908002ef56389712..4fa4ec34963730507253182cad1c2bf0
                              itemstack.shrink(1);
                              if (itemstack.isEmpty()) {
                                  inventorysubcontainer.setItem(j, ItemStack.EMPTY);
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java b/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
+diff --git a/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java b/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
 index 8508ac7de8cda3127b73e11ff4aee62502e65ead..b1544e028d5a9b84b944e1fb5a12bb163067fb54 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
+--- a/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
++++ b/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
 @@ -59,6 +59,12 @@ public class TradeWithVillager extends Behavior<Villager> {
                  throwHalfStack(entity, ImmutableSet.of(Items.WHEAT), villager);
              }
@@ -89,10 +89,10 @@ index 8508ac7de8cda3127b73e11ff4aee62502e65ead..b1544e028d5a9b84b944e1fb5a12bb16
              if (!this.trades.isEmpty() && entity.getInventory().hasAnyOf(this.trades)) {
                  throwHalfStack(entity, this.trades, villager);
              }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
+diff --git a/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java b/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
 index 41f4107101bcd5d753b72cdbabe7946a1975c653..4475b406dde30e5be8ce9d2ff45f8d22d242690c 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
+--- a/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
++++ b/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
 @@ -74,8 +74,13 @@ public class VillagerGoalPackages {
      }
  
@@ -108,10 +108,10 @@ index 41f4107101bcd5d753b72cdbabe7946a1975c653..4475b406dde30e5be8ce9d2ff45f8d22
              workAtPoi = new WorkAtComposter();
          } else {
              workAtPoi = new WorkAtPoi();
-diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
+diff --git a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
 index a0e0692d17760f440fe81d52887284c787e562db..ab9bebc07b5228dbc0d3ba4b0f7d1bbe41814c9b 100644
---- a/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
+--- a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
++++ b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
 @@ -22,6 +22,13 @@ public class SecondaryPoiSensor extends Sensor<Villager> {
  
      @Override
@@ -135,10 +135,10 @@ index a0e0692d17760f440fe81d52887284c787e562db..ab9bebc07b5228dbc0d3ba4b0f7d1bbe
          if (!list.isEmpty()) {
              brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list);
          } else {
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index ca1996ab3b998607c193ba427163a6a144990c97..66a8beddde806e04ca4d0e943734d6116b107bcc 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -227,7 +227,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
              brain.addActivity(Activity.PLAY, VillagerGoalPackages.getPlayPackage(0.5F));
          } else {
@@ -160,10 +160,10 @@ index ca1996ab3b998607c193ba427163a6a144990c97..66a8beddde806e04ca4d0e943734d611
              return itemstack.is(ItemTags.VILLAGER_PLANTABLE_SEEDS);
          });
      }
-diff --git a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java b/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
+diff --git a/net/minecraft/world/entity/npc/VillagerProfession.java b/net/minecraft/world/entity/npc/VillagerProfession.java
 index 8734ab1bd8299bbf43906d81a349c2a13e0981a7..3ca83269311cbc18c9ef3ce62cff6a2d4dc0a683 100644
---- a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
+--- a/net/minecraft/world/entity/npc/VillagerProfession.java
++++ b/net/minecraft/world/entity/npc/VillagerProfession.java
 @@ -31,7 +31,7 @@ public record VillagerProfession(
      public static final VillagerProfession ARMORER = register("armorer", PoiTypes.ARMORER, SoundEvents.VILLAGER_WORK_ARMORER);
      public static final VillagerProfession BUTCHER = register("butcher", PoiTypes.BUTCHER, SoundEvents.VILLAGER_WORK_BUTCHER);
diff --git a/patches/server/0107-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0107-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
index e0689a3d7..1c137782a 100644
--- a/patches/server/0107-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
+++ b/patches/server/0107-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
@@ -12,10 +12,10 @@ to the Piglin being angry, even though the player never hit them.
 
 This patch adds a toggle to disable this behavior.
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+diff --git a/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 index 953df397ea261d417ada15db8d6ffc539ad07c03..c4bf422557fe6abbe882f575f19a9334c7a94fe5 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+--- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java
++++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -150,7 +150,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
              this.maybeAlertOthers();
          }
diff --git a/patches/server/0108-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0108-Configurable-chance-for-wolves-to-spawn-rabid.patch
index a248f7e10..e0e17aa68 100644
--- a/patches/server/0108-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server/0108-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable chance for wolves to spawn rabid
 Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+diff --git a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java
 index 539eba7148be12eb05c907ed86b0cea975424874..966fe4544212cc831ae617bc2eb05189102ff470 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+--- a/net/minecraft/world/entity/animal/Wolf.java
++++ b/net/minecraft/world/entity/animal/Wolf.java
 @@ -103,6 +103,37 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
  
          return entitytypes == EntityType.SHEEP || entitytypes == EntityType.RABBIT || entitytypes == EntityType.FOX;
diff --git a/patches/server/0109-Configurable-default-collar-color.patch b/patches/server/0109-Configurable-default-collar-color.patch
index fd7b73a7e..bba40e435 100644
--- a/patches/server/0109-Configurable-default-collar-color.patch
+++ b/patches/server/0109-Configurable-default-collar-color.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable default collar color
 This allows for the server to set a default collar color when a wolf or cat is tamed.
 Resets to RED when the value is invalid.
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java
 index 06b68fcf750a637e1f41eecacca2969cb55a8fa8..8d20b19b65616d8470542cc7337c8ddd7418be0b 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+--- a/net/minecraft/world/entity/animal/Cat.java
++++ b/net/minecraft/world/entity/animal/Cat.java
 @@ -357,6 +357,14 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
          return Mth.lerp(tickDelta, this.relaxStateOneAmountO, this.relaxStateOneAmount);
      }
@@ -25,10 +25,10 @@ index 06b68fcf750a637e1f41eecacca2969cb55a8fa8..8d20b19b65616d8470542cc7337c8ddd
      @Nullable
      @Override
      public Cat getBreedOffspring(ServerLevel world, AgeableMob entity) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+diff --git a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java
 index 966fe4544212cc831ae617bc2eb05189102ff470..f1d2e40f55a91810693a5604f3060e284f615fa0 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+--- a/net/minecraft/world/entity/animal/Wolf.java
++++ b/net/minecraft/world/entity/animal/Wolf.java
 @@ -215,6 +215,12 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          }
      }
diff --git a/patches/server/0110-Phantom-flames-on-swoop.patch b/patches/server/0110-Phantom-flames-on-swoop.patch
index 4d2c89f39..c2521ce6e 100644
--- a/patches/server/0110-Phantom-flames-on-swoop.patch
+++ b/patches/server/0110-Phantom-flames-on-swoop.patch
@@ -4,10 +4,10 @@ Date: Sat, 12 Dec 2020 09:10:59 -0600
 Subject: [PATCH] Phantom flames on swoop
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
 index 7f62544ed66850c9545d8db9897236abd52cbd56..7926c11714b0f50fd02f2da4817c822fd5f60115 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+--- a/net/minecraft/world/entity/monster/Phantom.java
++++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -240,6 +240,7 @@ public class Phantom extends FlyingMob implements Enemy {
              this.level().addParticle(ParticleTypes.MYCELIUM, this.getX() - (double) f3, this.getY() + (double) f5, this.getZ() - (double) f4, 0.0D, 0.0D, 0.0D);
          }
diff --git a/patches/server/0111-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0111-Option-for-chests-to-open-even-with-a-solid-block-on.patch
index 2131b7c84..5c5fb3143 100644
--- a/patches/server/0111-Option-for-chests-to-open-even-with-a-solid-block-on.patch
+++ b/patches/server/0111-Option-for-chests-to-open-even-with-a-solid-block-on.patch
@@ -4,10 +4,10 @@ Date: Sat, 12 Dec 2020 14:34:18 -0800
 Subject: [PATCH] Option for chests to open even with a solid block on top
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
+diff --git a/net/minecraft/world/level/block/ChestBlock.java b/net/minecraft/world/level/block/ChestBlock.java
 index ca69a9fbd4942f9079aeaab7cead2d7a2c3b8659..54f351f1cbb50a5b1aa3167e3a0b10bb0456c1cf 100644
---- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
+--- a/net/minecraft/world/level/block/ChestBlock.java
++++ b/net/minecraft/world/level/block/ChestBlock.java
 @@ -336,6 +336,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
      }
  
diff --git a/patches/server/0112-Implement-TPSBar.patch b/patches/server/0112-Implement-TPSBar.patch
index 543a5d6fd..83606575a 100644
--- a/patches/server/0112-Implement-TPSBar.patch
+++ b/patches/server/0112-Implement-TPSBar.patch
@@ -4,10 +4,10 @@ Date: Sat, 12 Dec 2020 21:19:05 -0600
 Subject: [PATCH] Implement TPSBar
 
 
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
 index 719fbce359f8c2c52ee4e9da3dfe9566f58c0346..f01fff591efc92267d96084660f9e9688bd65795 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
 @@ -258,6 +258,7 @@ public class Commands {
              org.purpurmc.purpur.command.CreditsCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
@@ -16,10 +16,10 @@ index 719fbce359f8c2c52ee4e9da3dfe9566f58c0346..f01fff591efc92267d96084660f9e968
          }
  
          if (environment.includeIntegrated) {
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index d55390d725f8798becb0b7b04485c99611e0e527..7ce4148a1fcd221bf22f4ad02a2fc32e007fa1da 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -1158,6 +1158,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.safeShutdown(waitForShutdown, false);
      }
@@ -28,10 +28,10 @@ index d55390d725f8798becb0b7b04485c99611e0e527..7ce4148a1fcd221bf22f4ad02a2fc32e
          this.isRestarting = isRestarting;
          this.hasLoggedStop = true; // Paper - Debugging
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
 index 59a8007add25bf947b87eef3ece55bca192ba358..6252001c03230f35c5ec7354faa3720e407dee6c 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -374,6 +374,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  DedicatedServer.LOGGER.info("JMX monitoring enabled");
              }
@@ -40,10 +40,10 @@ index 59a8007add25bf947b87eef3ece55bca192ba358..6252001c03230f35c5ec7354faa3720e
              return true;
          }
      }
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 51e58f447cc07224b2d9bbeff3719a719931a40c..303c9b2c6f1a62e40c5657248b727c14bb9c613a 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -328,6 +328,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      public @Nullable String clientBrandName = null; // Paper - Brand support
      public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@@ -82,10 +82,10 @@ index 51e58f447cc07224b2d9bbeff3719a719931a40c..303c9b2c6f1a62e40c5657248b727c14
 +    }
      // Purpur end
  }
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
 index 8596e1c016c51a840b8c0c6a8d5c8e0893c4f1c7..0969a713df3150b0b2d2dd2d595e5f49e491f8af 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
 @@ -419,6 +419,7 @@ public abstract class PlayerList {
              scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
          }
diff --git a/patches/server/0113-Striders-give-saddle-back.patch b/patches/server/0113-Striders-give-saddle-back.patch
index 8866f5fd8..a30eb5d85 100644
--- a/patches/server/0113-Striders-give-saddle-back.patch
+++ b/patches/server/0113-Striders-give-saddle-back.patch
@@ -4,10 +4,10 @@ Date: Sun, 13 Dec 2020 20:40:57 -0500
 Subject: [PATCH] Striders give saddle back
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
+diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
 index b2f9e7dec710f9a135074d6b5eb438e127a7aaa9..b5bc19ea93058374ce3a01ed650b0396b5e4176d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
+--- a/net/minecraft/world/entity/monster/Strider.java
++++ b/net/minecraft/world/entity/monster/Strider.java
 @@ -485,6 +485,19 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
          boolean flag = this.isFood(player.getItemInHand(hand));
diff --git a/patches/server/0114-PlayerBookTooLargeEvent.patch b/patches/server/0114-PlayerBookTooLargeEvent.patch
index b9613cfab..b16b0b362 100644
--- a/patches/server/0114-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0114-PlayerBookTooLargeEvent.patch
@@ -4,10 +4,10 @@ Date: Wed, 23 Dec 2020 00:43:59 -0600
 Subject: [PATCH] PlayerBookTooLargeEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index 6b460227a12ba275c02243a1fbafb87e3845cb14..2e714a4faf07e7ca18fa073ff6660c5d4f377507 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1256,6 +1256,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              final int maxBookPageSize = pageMax.intValue();
              final double multiplier = Math.clamp(io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier, 0.3D, 1D);
diff --git a/patches/server/0115-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0115-Full-netherite-armor-grants-fire-resistance.patch
index e692d0071..72442ba0d 100644
--- a/patches/server/0115-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/server/0115-Full-netherite-armor-grants-fire-resistance.patch
@@ -4,10 +4,10 @@ Date: Thu, 24 Dec 2020 11:00:15 -0600
 Subject: [PATCH] Full netherite armor grants fire resistance
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index fee0ffaaf94c484c9272d3b5743b90bb70e0d08d..fc0e571b62a9bd40df2d3d066cf374e12004a6d8 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -356,6 +356,17 @@ public abstract class Player extends LivingEntity {
              this.turtleHelmetTick();
          }
diff --git a/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch
index 1c0a2a101..c5693183c 100644
--- a/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -4,10 +4,10 @@ Date: Tue, 5 Jan 2021 22:21:56 -0500
 Subject: [PATCH] Add mobGriefing bypass to everything affected
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index dfbb47c200dab7d99cde867c12420c67964867c2..c513e6de7d89992720fc4139969377c261571b72 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1901,7 +1901,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              boolean flag = false;
  
@@ -17,10 +17,10 @@ index dfbb47c200dab7d99cde867c12420c67964867c2..c513e6de7d89992720fc4139969377c2
                      BlockPos blockposition = this.blockPosition();
                      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
+diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
 index 06fbac8a968971d9ec3305e98b136d88be19a9f7..6836f0ddab9d05d146fc03c234b1b58829ec96c0 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
+--- a/net/minecraft/world/entity/Mob.java
++++ b/net/minecraft/world/entity/Mob.java
 @@ -714,7 +714,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          Level world = this.level();
  
@@ -30,10 +30,10 @@ index 06fbac8a968971d9ec3305e98b136d88be19a9f7..6836f0ddab9d05d146fc03c234b1b588
                  Vec3i baseblockposition = this.getPickupReach();
                  List<ItemEntity> list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate((double) baseblockposition.getX(), (double) baseblockposition.getY(), (double) baseblockposition.getZ()));
                  Iterator iterator = list.iterator();
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
+diff --git a/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
 index 4fa4ec34963730507253182cad1c2bf04090ad50..88b7de6c0ab5bf6ba2af7b4cee0393879c2a4fdc 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
+--- a/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
++++ b/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
 @@ -48,7 +48,7 @@ public class HarvestFarmland extends Behavior<Villager> {
      }
  
@@ -43,10 +43,10 @@ index 4fa4ec34963730507253182cad1c2bf04090ad50..88b7de6c0ab5bf6ba2af7b4cee039387
              return false;
          } else if (entity.getVillagerData().getProfession() != VillagerProfession.FARMER && !(world.purpurConfig.villagerClericsFarmWarts && entity.getVillagerData().getProfession() == VillagerProfession.CLERIC)) { // Purpur
              return false;
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
+diff --git a/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
 index 7324da6b7dd2623ce394e3827ff77ef684a3b98b..a96f49641898aa16bdc99eed8a86497ddcd5a492 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
+--- a/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
++++ b/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
 @@ -33,7 +33,7 @@ public class BreakDoorGoal extends DoorInteractGoal {
  
      @Override
@@ -56,10 +56,10 @@ index 7324da6b7dd2623ce394e3827ff77ef684a3b98b..a96f49641898aa16bdc99eed8a86497d
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
+diff --git a/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
 index 32bb591371fe78ba10a2bc52389ef33978cbc0eb..6032eb2209d013b34c28eedd180583af3680fc69 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
+--- a/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
++++ b/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
 @@ -74,7 +74,7 @@ public class EatBlockGoal extends Goal {
  
              final BlockState blockState = this.level.getBlockState(blockposition); // Paper - fix wrong block state
@@ -78,10 +78,10 @@ index 32bb591371fe78ba10a2bc52389ef33978cbc0eb..6032eb2209d013b34c28eedd180583af
                          this.level.levelEvent(2001, blockposition1, Block.getId(Blocks.GRASS_BLOCK.defaultBlockState()));
                          this.level.setBlock(blockposition1, Blocks.DIRT.defaultBlockState(), 2);
                      }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
+diff --git a/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
 index 9d245d08be61d7edee9138196ae3bf52023e3993..07e3e727e339765284095aa8fd6b5edd41dc4158 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
+--- a/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
++++ b/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
 @@ -41,7 +41,7 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
  
      @Override
@@ -91,10 +91,10 @@ index 9d245d08be61d7edee9138196ae3bf52023e3993..07e3e727e339765284095aa8fd6b5edd
              return false;
          } else if (this.nextStartTick > 0) {
              --this.nextStartTick;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java
 index ce597675e973eb0d7ce580a2b4dfd76e7bb586b1..7770288abae40de80954ce47a15e609ee1b3a8bc 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+--- a/net/minecraft/world/entity/animal/Fox.java
++++ b/net/minecraft/world/entity/animal/Fox.java
 @@ -1372,7 +1372,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
          }
  
@@ -104,10 +104,10 @@ index ce597675e973eb0d7ce580a2b4dfd76e7bb586b1..7770288abae40de80954ce47a15e609e
                  BlockState iblockdata = Fox.this.level().getBlockState(this.blockPos);
  
                  if (iblockdata.is(Blocks.SWEET_BERRY_BUSH)) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java
 index 0b4a1a8b0a41aaa083995c2059a9ce8757d44144..c90bbf17639157e38dc2cada25677e22d63be12d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+--- a/net/minecraft/world/entity/animal/Rabbit.java
++++ b/net/minecraft/world/entity/animal/Rabbit.java
 @@ -636,7 +636,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          @Override
          public boolean canUse() {
@@ -117,10 +117,10 @@ index 0b4a1a8b0a41aaa083995c2059a9ce8757d44144..c90bbf17639157e38dc2cada25677e22
                      return false;
                  }
  
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java
 index d13d8d251af99289a66934ef04c7dfb9bf0611a2..1c73b81053551b2aa2817f9629bc7b4050e8f070 100644
---- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+--- a/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -132,7 +132,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
                  this.hurtServer(worldserver, this.damageSources().melting(), 1.0F); // CraftBukkit - DamageSources.ON_FIRE -> CraftEventFactory.MELTING
              }
@@ -130,10 +130,10 @@ index d13d8d251af99289a66934ef04c7dfb9bf0611a2..1c73b81053551b2aa2817f9629bc7b40
                  return;
              }
  
-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
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 index 14feab288349f0fcd80b89466926b37d1087bf53..b7ba6c303826e35ee1261cb46f1e778af29a59e5 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
+--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
++++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -592,7 +592,7 @@ public class EnderDragon extends Mob implements Enemy {
                      BlockState iblockdata = world.getBlockState(blockposition);
  
@@ -143,10 +143,10 @@ index 14feab288349f0fcd80b89466926b37d1087bf53..b7ba6c303826e35ee1261cb46f1e778a
                              // CraftBukkit start - Add blocks to list rather than destroying them
                              // flag1 = worldserver.removeBlock(blockposition, false) || flag1;
                              flag1 = true;
-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
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 index 098ef0d6879e88009193c6dcedf1aa285980cbc6..297a67e8a8c1e314ad7f8d32d5bcacc3746b0b6c 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
+--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -491,7 +491,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
  
              if (this.destroyBlocksTick > 0) {
@@ -156,10 +156,10 @@ index 098ef0d6879e88009193c6dcedf1aa285980cbc6..297a67e8a8c1e314ad7f8d32d5bcacc3
                      boolean flag = false;
  
                      j = Mth.floor(this.getBbWidth() / 2.0F + 1.0F);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index c816521a5f73ccd04216ac0225945c6ef585869d..61a113074a6839d6dcb59019eefe9f532fb9cb2b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -516,7 +516,15 @@ public class EnderMan extends Monster implements NeutralMob {
          @Override
          public boolean canUse() {
@@ -194,10 +194,10 @@ index c816521a5f73ccd04216ac0225945c6ef585869d..61a113074a6839d6dcb59019eefe9f53
          }
  
          @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+diff --git a/net/minecraft/world/entity/monster/Evoker.java b/net/minecraft/world/entity/monster/Evoker.java
 index 76ee60fc1df5846393a5d387a514dfaf22e20229..05f859c3062c34f1fdb74c43423c1f5767180c1f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+--- a/net/minecraft/world/entity/monster/Evoker.java
++++ b/net/minecraft/world/entity/monster/Evoker.java
 @@ -368,7 +368,7 @@ public class Evoker extends SpellcasterIllager {
              } else {
                  ServerLevel worldserver = getServerLevel(Evoker.this.level());
@@ -207,10 +207,10 @@ index 76ee60fc1df5846393a5d387a514dfaf22e20229..05f859c3062c34f1fdb74c43423c1f57
                      return false;
                  } else {
                      List<Sheep> list = worldserver.getNearbyEntities(Sheep.class, this.wololoTargeting, Evoker.this, Evoker.this.getBoundingBox().inflate(16.0D, 4.0D, 16.0D));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
 index ecf37a99fa5e8919146ba73c7313998855ea0d88..b71aec7588a2a812cca71d89810ed765fcc33b9f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+--- a/net/minecraft/world/entity/monster/Ravager.java
++++ b/net/minecraft/world/entity/monster/Ravager.java
 @@ -182,7 +182,7 @@ public class Ravager extends Raider {
              if (world instanceof ServerLevel) {
                  ServerLevel worldserver = (ServerLevel) world;
@@ -220,10 +220,10 @@ index ecf37a99fa5e8919146ba73c7313998855ea0d88..b71aec7588a2a812cca71d89810ed765
                      boolean flag = false;
                      AABB axisalignedbb = this.getBoundingBox().inflate(0.2D);
                      Iterator iterator = BlockPos.betweenClosed(Mth.floor(axisalignedbb.minX), Mth.floor(axisalignedbb.minY), Mth.floor(axisalignedbb.minZ), Mth.floor(axisalignedbb.maxX), Mth.floor(axisalignedbb.maxY), Mth.floor(axisalignedbb.maxZ)).iterator();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+diff --git a/net/minecraft/world/entity/monster/Silverfish.java b/net/minecraft/world/entity/monster/Silverfish.java
 index 191724aa48081017adf3db0b6ff99a77dd4ce68d..3159c61e1f34e95749661a711e4d97f7f5a04766 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+--- a/net/minecraft/world/entity/monster/Silverfish.java
++++ b/net/minecraft/world/entity/monster/Silverfish.java
 @@ -193,12 +193,12 @@ public class Silverfish extends Monster {
  
                              if (block instanceof InfestedBlock) {
@@ -248,10 +248,10 @@ index 191724aa48081017adf3db0b6ff99a77dd4ce68d..3159c61e1f34e95749661a711e4d97f7
                      this.selectedDirection = Direction.getRandom(randomsource);
                      BlockPos blockposition = BlockPos.containing(this.mob.getX(), this.mob.getY() + 0.5D, this.mob.getZ()).relative(this.selectedDirection);
                      BlockState iblockdata = this.mob.level().getBlockState(blockposition);
-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
+diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java
 index 1a40babc8f6b3f56377cb2af45e9d17d0028a77b..e1ae622ec56f1e011f8007c5b5b8a7032cd28102 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
+--- a/net/minecraft/world/entity/monster/piglin/Piglin.java
++++ b/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -438,7 +438,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
  
      @Override
@@ -261,10 +261,10 @@ index 1a40babc8f6b3f56377cb2af45e9d17d0028a77b..e1ae622ec56f1e011f8007c5b5b8a703
      }
  
      protected boolean canReplaceCurrentItem(ItemStack stack) {
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/LargeFireball.java b/src/main/java/net/minecraft/world/entity/projectile/LargeFireball.java
+diff --git a/net/minecraft/world/entity/projectile/LargeFireball.java b/net/minecraft/world/entity/projectile/LargeFireball.java
 index 2f00676f62478897ae4931ea06e047567c407535..59c71183e2c4edae72623f6aa662b807ba2093f2 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/LargeFireball.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/LargeFireball.java
+--- a/net/minecraft/world/entity/projectile/LargeFireball.java
++++ b/net/minecraft/world/entity/projectile/LargeFireball.java
 @@ -23,13 +23,13 @@ public class LargeFireball extends Fireball {
  
      public LargeFireball(EntityType<? extends LargeFireball> type, Level world) {
@@ -290,10 +290,10 @@ index 2f00676f62478897ae4931ea06e047567c407535..59c71183e2c4edae72623f6aa662b807
  
              // 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
+diff --git a/net/minecraft/world/entity/projectile/Projectile.java b/net/minecraft/world/entity/projectile/Projectile.java
 index 9a7b56b653848974e1194eb4f6d40cb99a96ff57..3a39eb8572cea2596edd26bef4a484c8cd78904d 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+--- a/net/minecraft/world/entity/projectile/Projectile.java
++++ b/net/minecraft/world/entity/projectile/Projectile.java
 @@ -468,7 +468,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
      public boolean mayInteract(ServerLevel world, BlockPos pos) {
          Entity entity = this.getOwner();
@@ -303,10 +303,10 @@ index 9a7b56b653848974e1194eb4f6d40cb99a96ff57..3a39eb8572cea2596edd26bef4a484c8
      }
  
      public boolean mayBreak(ServerLevel world) {
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java b/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java
+diff --git a/net/minecraft/world/entity/projectile/SmallFireball.java b/net/minecraft/world/entity/projectile/SmallFireball.java
 index bb159ea4baf208aab6d6fcfbbddacd5b089b55c8..f1786d17ce8ffd221674c887be01c7907f36f129 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java
+--- a/net/minecraft/world/entity/projectile/SmallFireball.java
++++ b/net/minecraft/world/entity/projectile/SmallFireball.java
 @@ -30,7 +30,7 @@ public class SmallFireball extends Fireball {
          super(EntityType.SMALL_FIREBALL, owner, velocity, world);
          // CraftBukkit start
@@ -316,10 +316,10 @@ index bb159ea4baf208aab6d6fcfbbddacd5b089b55c8..f1786d17ce8ffd221674c887be01c790
          }
          // CraftBukkit end
      }
-diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
+diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
 index cee1e4db2312efb4843c4b6dc18f4af10b91d304..65206bc0c3276fda449936cae88cc819a346e299 100644
---- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
-+++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
+--- a/net/minecraft/world/entity/raid/Raider.java
++++ b/net/minecraft/world/entity/raid/Raider.java
 @@ -345,7 +345,7 @@ public abstract class Raider extends PatrollingMonster {
          }
  
@@ -329,10 +329,10 @@ index cee1e4db2312efb4843c4b6dc18f4af10b91d304..65206bc0c3276fda449936cae88cc819
              if (!this.mob.hasActiveRaid()) {
                  return true;
              } else if (this.mob.getCurrentRaid().isOver()) {
-diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
+diff --git a/net/minecraft/world/level/block/CropBlock.java b/net/minecraft/world/level/block/CropBlock.java
 index 1967ff3fcb94988be85985c4754904f0077de066..e1cfad4834fdee910bf261a60e2b76678a0fec6d 100644
---- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
+--- a/net/minecraft/world/level/block/CropBlock.java
++++ b/net/minecraft/world/level/block/CropBlock.java
 @@ -180,7 +180,7 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
      protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
          if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
@@ -342,10 +342,10 @@ index 1967ff3fcb94988be85985c4754904f0077de066..e1cfad4834fdee910bf261a60e2b7667
                  worldserver.destroyBlock(pos, true, entity);
              }
          }
-diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+diff --git a/net/minecraft/world/level/block/FarmBlock.java b/net/minecraft/world/level/block/FarmBlock.java
 index e744a117d2f25ad24c87263ba2ab7f760b6e594d..032b8252c3ff2fc111442610998e36a5c145ae13 100644
---- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+--- a/net/minecraft/world/level/block/FarmBlock.java
++++ b/net/minecraft/world/level/block/FarmBlock.java
 @@ -112,7 +112,7 @@ public class FarmBlock extends Block {
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
          super.fallOn(world, state, pos, entity, fallDistance); // CraftBukkit - moved here as game rules / events shouldn't affect fall damage.
@@ -355,10 +355,10 @@ index e744a117d2f25ad24c87263ba2ab7f760b6e594d..032b8252c3ff2fc111442610998e36a5
                  // CraftBukkit start - Interact soil
                  org.bukkit.event.Cancellable cancellable;
                  if (entity instanceof Player) {
-diff --git a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
+diff --git a/net/minecraft/world/level/block/PowderSnowBlock.java b/net/minecraft/world/level/block/PowderSnowBlock.java
 index 53f1a7ed6b4bd6e2d8460531226aabf249994c02..f91c845061fa632e53efb31c63cf0c67c9c2e86a 100644
---- a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
+--- a/net/minecraft/world/level/block/PowderSnowBlock.java
++++ b/net/minecraft/world/level/block/PowderSnowBlock.java
 @@ -76,7 +76,7 @@ public class PowderSnowBlock extends Block implements BucketPickup {
          if (world instanceof ServerLevel worldserver) {
              // CraftBukkit start
@@ -368,10 +368,10 @@ index 53f1a7ed6b4bd6e2d8460531226aabf249994c02..f91c845061fa632e53efb31c63cf0c67
                      return;
                  }
                  // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
+diff --git a/net/minecraft/world/level/block/TurtleEggBlock.java b/net/minecraft/world/level/block/TurtleEggBlock.java
 index df2028f53fd07551f8aa7eeb49f99ac0676d5fe0..30af2a98a52208c3a36dfaad474582806f86aede 100644
---- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
+--- a/net/minecraft/world/level/block/TurtleEggBlock.java
++++ b/net/minecraft/world/level/block/TurtleEggBlock.java
 @@ -222,7 +222,7 @@ public class TurtleEggBlock extends Block {
          }
          if (entity instanceof Player) return true;
diff --git a/patches/server/0117-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0117-Config-to-allow-Note-Block-sounds-when-blocked.patch
index 47931c0fe..cc1a46839 100644
--- a/patches/server/0117-Config-to-allow-Note-Block-sounds-when-blocked.patch
+++ b/patches/server/0117-Config-to-allow-Note-Block-sounds-when-blocked.patch
@@ -8,10 +8,10 @@ Allows for Note Blocks to ignore whether or not there's air above them to play.
 Normally, the sounds will only play when the block directly above is air.
 With this patch enabled, players can place any block above the Note Block and it will still work.
 
-diff --git a/src/main/java/net/minecraft/world/level/block/NoteBlock.java b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
+diff --git a/net/minecraft/world/level/block/NoteBlock.java b/net/minecraft/world/level/block/NoteBlock.java
 index 6582db84c5307257f16c321453491cf24e40c9c7..f9015d4e478efeec8a796b7a897638f76064db20 100644
---- a/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
+--- a/net/minecraft/world/level/block/NoteBlock.java
++++ b/net/minecraft/world/level/block/NoteBlock.java
 @@ -97,7 +97,7 @@ public class NoteBlock extends Block {
      }
  
diff --git a/patches/server/0118-Add-EntityTeleportHinderedEvent.patch b/patches/server/0118-Add-EntityTeleportHinderedEvent.patch
index 3fe19cf38..b0997e2e5 100644
--- a/patches/server/0118-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0118-Add-EntityTeleportHinderedEvent.patch
@@ -16,10 +16,10 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-diff --git a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
+diff --git a/net/minecraft/world/level/block/EndGatewayBlock.java b/net/minecraft/world/level/block/EndGatewayBlock.java
 index af46f2885ead1e3ec1734504d8ba134c886e04fb..47ee0538c8ea94136b2416c324c8a264e54d2c09 100644
---- a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
+--- a/net/minecraft/world/level/block/EndGatewayBlock.java
++++ b/net/minecraft/world/level/block/EndGatewayBlock.java
 @@ -104,6 +104,13 @@ public class EndGatewayBlock extends BaseEntityBlock implements Portal {
                  TheEndGatewayBlockEntity tileentityendgateway = (TheEndGatewayBlockEntity) tileentity;
  
@@ -34,10 +34,10 @@ index af46f2885ead1e3ec1734504d8ba134c886e04fb..47ee0538c8ea94136b2416c324c8a264
                      entity.setAsInsidePortal(this, pos);
                      TheEndGatewayBlockEntity.triggerCooldown(world, pos, state, tileentityendgateway);
                  }
-diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
+diff --git a/net/minecraft/world/level/block/EndPortalBlock.java b/net/minecraft/world/level/block/EndPortalBlock.java
 index 8cb4142562db0be1f1a7d961ec5a10d4abf31692..84ecb012cb0a47e47799dc73c7fadc75f462f47a 100644
---- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
+--- a/net/minecraft/world/level/block/EndPortalBlock.java
++++ b/net/minecraft/world/level/block/EndPortalBlock.java
 @@ -70,6 +70,13 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
      protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
          if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
@@ -52,10 +52,10 @@ index 8cb4142562db0be1f1a7d961ec5a10d4abf31692..84ecb012cb0a47e47799dc73c7fadc75
              // CraftBukkit start - Entity in portal
              EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()), org.bukkit.PortalType.ENDER); // Paper - add portal type
              world.getCraftServer().getPluginManager().callEvent(event);
-diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+diff --git a/net/minecraft/world/level/block/NetherPortalBlock.java b/net/minecraft/world/level/block/NetherPortalBlock.java
 index 3e9642e5236d9a1cc8e8f3b375d76810f4bc7c6c..5169cba4c43d80ce3597c57bf7d40bd0148ec8a0 100644
---- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+--- a/net/minecraft/world/level/block/NetherPortalBlock.java
++++ b/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -117,6 +117,13 @@ public class NetherPortalBlock extends Block implements Portal {
      protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
          if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
diff --git a/patches/server/0119-Farmland-trampling-changes.patch b/patches/server/0119-Farmland-trampling-changes.patch
index 1369ff158..d30dcf0cd 100644
--- a/patches/server/0119-Farmland-trampling-changes.patch
+++ b/patches/server/0119-Farmland-trampling-changes.patch
@@ -11,10 +11,10 @@ distance equal to their feather falling level, plus the extra block
 necessary to trample in the first place. Feather Falling 1 requires
 you to fall over 3+ blocks to trample. FF 2 requires 4+, etc.
 
-diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+diff --git a/net/minecraft/world/level/block/FarmBlock.java b/net/minecraft/world/level/block/FarmBlock.java
 index 032b8252c3ff2fc111442610998e36a5c145ae13..fc5a755c558714442c1e12e88ee05764d6c1d9f4 100644
---- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+--- a/net/minecraft/world/level/block/FarmBlock.java
++++ b/net/minecraft/world/level/block/FarmBlock.java
 @@ -127,12 +127,20 @@ public class FarmBlock extends Block {
                  }
  
diff --git a/patches/server/0120-Movement-options-for-armor-stands.patch b/patches/server/0120-Movement-options-for-armor-stands.patch
index bd2b53b73..fa999bbb7 100644
--- a/patches/server/0120-Movement-options-for-armor-stands.patch
+++ b/patches/server/0120-Movement-options-for-armor-stands.patch
@@ -16,10 +16,10 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index c0e8739f0dd9290550872839eddca4b0090b603b..cfe26c762b2affa5050c175f6ab0306af6cfbe71 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -2037,7 +2037,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return this.isInWater() || flag;
      }
@@ -29,10 +29,10 @@ index c0e8739f0dd9290550872839eddca4b0090b603b..cfe26c762b2affa5050c175f6ab0306a
          Entity entity = this.getVehicle();
  
          if (entity instanceof AbstractBoat abstractboat) {
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
 index 12ff824ffa81ea45f76337ec2b6d80b01047b698..e1c7a644dc922ca726cebf71ec2f0b159d6db289 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+--- a/net/minecraft/world/entity/decoration/ArmorStand.java
++++ b/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -114,10 +114,12 @@ public class ArmorStand extends LivingEntity {
      private boolean noTickPoseDirty = false;
      private boolean noTickEquipmentDirty = false;
diff --git a/patches/server/0121-Fix-stuck-in-portals.patch b/patches/server/0121-Fix-stuck-in-portals.patch
index 1954d35e5..b82ae6777 100644
--- a/patches/server/0121-Fix-stuck-in-portals.patch
+++ b/patches/server/0121-Fix-stuck-in-portals.patch
@@ -4,10 +4,10 @@ Date: Thu, 14 Jan 2021 16:48:10 -0600
 Subject: [PATCH] Fix stuck in portals
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 303c9b2c6f1a62e40c5657248b727c14bb9c613a..92c0a7609e45a8cdb809ad7579f1713fc15675cf 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -1678,6 +1678,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
                  worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
@@ -16,10 +16,10 @@ index 303c9b2c6f1a62e40c5657248b727c14bb9c613a..92c0a7609e45a8cdb809ad7579f1713f
                  this.setServerLevel(worldserver);
                  this.connection.internalTeleport(PositionMoveRotation.of(teleportTarget), teleportTarget.relatives()); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index cfe26c762b2affa5050c175f6ab0306af6cfbe71..f15a8c14417b83b237dc7b9a11490116314cd4c6 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -3465,14 +3465,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Vec3.directionFromRotation(this.getRotationVector());
      }
diff --git a/patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch
index dd635a015..d3a1c4005 100644
--- a/patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch
@@ -4,10 +4,10 @@ Date: Fri, 5 Feb 2021 01:11:22 +0100
 Subject: [PATCH] Toggle for water sensitive mob damage
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
+diff --git a/net/minecraft/world/entity/GlowSquid.java b/net/minecraft/world/entity/GlowSquid.java
 index d556642fd07492aa52bfc0a2432ab3d16fe4f866..781f0adde9194162af57523aad4b73a358f622a7 100644
---- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
-+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
+--- a/net/minecraft/world/entity/GlowSquid.java
++++ b/net/minecraft/world/entity/GlowSquid.java
 @@ -44,6 +44,12 @@ public class GlowSquid extends Squid {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.glowSquidMaxHealth);
      }
@@ -21,10 +21,10 @@ index d556642fd07492aa52bfc0a2432ab3d16fe4f866..781f0adde9194162af57523aad4b73a3
      @Override
      public boolean canFly() {
          return this.level().purpurConfig.glowSquidsCanFly;
-diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+diff --git a/net/minecraft/world/entity/ambient/Bat.java b/net/minecraft/world/entity/ambient/Bat.java
 index 5f11c687df87015261d1d39c957e241fbeb5476a..79175bd42f37f10fae812e101dd5b09b209ebe30 100644
---- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+--- a/net/minecraft/world/entity/ambient/Bat.java
++++ b/net/minecraft/world/entity/ambient/Bat.java
 @@ -114,6 +114,12 @@ public class Bat extends AmbientCreature {
          this.getAttribute(Attributes.ATTACK_KNOCKBACK).setBaseValue(this.level().purpurConfig.batAttackKnockback);
      }
@@ -38,10 +38,10 @@ index 5f11c687df87015261d1d39c957e241fbeb5476a..79175bd42f37f10fae812e101dd5b09b
      @Override
      public boolean isFlapping() {
          return !this.isResting() && (float) this.tickCount % 10.0F == 0.0F;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
 index 121a4c58d4052eb0880f540e87beaf12a74eecd7..40137a98174cd0238d06c894373984a403f96fbc 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+--- a/net/minecraft/world/entity/animal/Bee.java
++++ b/net/minecraft/world/entity/animal/Bee.java
 @@ -186,7 +186,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          // Paper end - Fix MC-167279
          this.lookControl = new Bee.BeeLookControl(this);
@@ -63,10 +63,10 @@ index 121a4c58d4052eb0880f540e87beaf12a74eecd7..40137a98174cd0238d06c894373984a4
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java
 index 8d20b19b65616d8470542cc7337c8ddd7418be0b..75a961906658ff271bc0acf849648ce877c9e1be 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+--- a/net/minecraft/world/entity/animal/Cat.java
++++ b/net/minecraft/world/entity/animal/Cat.java
 @@ -138,6 +138,12 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
          return this.level().purpurConfig.catBreedingTicks;
      }
@@ -80,10 +80,10 @@ index 8d20b19b65616d8470542cc7337c8ddd7418be0b..75a961906658ff271bc0acf849648ce8
      @Override
      protected void registerGoals() {
          this.temptGoal = new Cat.CatTemptGoal(this, 0.6D, (itemstack) -> {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+diff --git a/net/minecraft/world/entity/animal/Chicken.java b/net/minecraft/world/entity/animal/Chicken.java
 index d06fb7d714efc88af13e6357536d4c58a7ec3bb5..09ad3ca4fd5aaebb1f394e73bc030ffa798346ba 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+--- a/net/minecraft/world/entity/animal/Chicken.java
++++ b/net/minecraft/world/entity/animal/Chicken.java
 @@ -88,6 +88,12 @@ public class Chicken extends Animal {
          return this.level().purpurConfig.chickenBreedingTicks;
      }
@@ -97,10 +97,10 @@ index d06fb7d714efc88af13e6357536d4c58a7ec3bb5..09ad3ca4fd5aaebb1f394e73bc030ffa
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
+diff --git a/net/minecraft/world/entity/animal/Cod.java b/net/minecraft/world/entity/animal/Cod.java
 index dad2dc77afead53e0fa7f2f797ac3850279d5d40..478fb13b84609a545713371f903e4d6042747e94 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
+--- a/net/minecraft/world/entity/animal/Cod.java
++++ b/net/minecraft/world/entity/animal/Cod.java
 @@ -31,6 +31,12 @@ public class Cod extends AbstractSchoolingFish {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.codMaxHealth);
      }
@@ -114,10 +114,10 @@ index dad2dc77afead53e0fa7f2f797ac3850279d5d40..478fb13b84609a545713371f903e4d60
      @Override
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+diff --git a/net/minecraft/world/entity/animal/Cow.java b/net/minecraft/world/entity/animal/Cow.java
 index 4b27440624deda151f63f7ce4670fd805d24eaba..4d5d4f7bb24aded2933daa003b4c4bc38601e12d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+--- a/net/minecraft/world/entity/animal/Cow.java
++++ b/net/minecraft/world/entity/animal/Cow.java
 @@ -74,6 +74,12 @@ public class Cow extends Animal {
          return this.level().purpurConfig.cowBreedingTicks;
      }
@@ -131,10 +131,10 @@ index 4b27440624deda151f63f7ce4670fd805d24eaba..4d5d4f7bb24aded2933daa003b4c4bc3
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+diff --git a/net/minecraft/world/entity/animal/Dolphin.java b/net/minecraft/world/entity/animal/Dolphin.java
 index 5dfaed8ecf9438e8ea11cadd6c5638e0cc25cbb1..46862ebf302454a077a837da001abdceeffa1026 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+--- a/net/minecraft/world/entity/animal/Dolphin.java
++++ b/net/minecraft/world/entity/animal/Dolphin.java
 @@ -168,6 +168,12 @@ public class Dolphin extends AgeableWaterCreature {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.dolphinScale);
      }
@@ -148,10 +148,10 @@ index 5dfaed8ecf9438e8ea11cadd6c5638e0cc25cbb1..46862ebf302454a077a837da001abdce
      @Nullable
      @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
+diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java
 index 7770288abae40de80954ce47a15e609ee1b3a8bc..a758f312ae4ed4a0404ca7cedbd8c7b88aef58f4 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+--- a/net/minecraft/world/entity/animal/Fox.java
++++ b/net/minecraft/world/entity/animal/Fox.java
 @@ -195,6 +195,12 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
          return this.level().purpurConfig.foxBreedingTicks;
      }
@@ -165,10 +165,10 @@ index 7770288abae40de80954ce47a15e609ee1b3a8bc..a758f312ae4ed4a0404ca7cedbd8c7b8
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+diff --git a/net/minecraft/world/entity/animal/IronGolem.java b/net/minecraft/world/entity/animal/IronGolem.java
 index 124b7d6881964039829313c52427e332e1ac526b..74971f19a646b78bff66d2543d80d9358fdd29c5 100644
---- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+--- a/net/minecraft/world/entity/animal/IronGolem.java
++++ b/net/minecraft/world/entity/animal/IronGolem.java
 @@ -86,6 +86,12 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.ironGolemScale);
      }
@@ -182,10 +182,10 @@ index 124b7d6881964039829313c52427e332e1ac526b..74971f19a646b78bff66d2543d80d935
      @Override
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+diff --git a/net/minecraft/world/entity/animal/MushroomCow.java b/net/minecraft/world/entity/animal/MushroomCow.java
 index 28b544f4f2e0f30d831b57167fc3ea3ce28e2191..a8694e39954db18840e7c066ef6bcb58e3399c0b 100644
---- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+--- a/net/minecraft/world/entity/animal/MushroomCow.java
++++ b/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -93,6 +93,12 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          return this.level().purpurConfig.mooshroomBreedingTicks;
      }
@@ -199,10 +199,10 @@ index 28b544f4f2e0f30d831b57167fc3ea3ce28e2191..a8694e39954db18840e7c066ef6bcb58
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+diff --git a/net/minecraft/world/entity/animal/Ocelot.java b/net/minecraft/world/entity/animal/Ocelot.java
 index 9412acb55bccfb0e5f3f77ce9df09f33807de57c..84b67619d38ff21a2bb8f4ea85c7d37c6794b59f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+--- a/net/minecraft/world/entity/animal/Ocelot.java
++++ b/net/minecraft/world/entity/animal/Ocelot.java
 @@ -95,6 +95,12 @@ public class Ocelot extends Animal {
          return this.level().purpurConfig.ocelotBreedingTicks;
      }
@@ -216,10 +216,10 @@ index 9412acb55bccfb0e5f3f77ce9df09f33807de57c..84b67619d38ff21a2bb8f4ea85c7d37c
      public boolean isTrusting() {
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+diff --git a/net/minecraft/world/entity/animal/Panda.java b/net/minecraft/world/entity/animal/Panda.java
 index 9c91207391f20adaf8f777c1db9502ee7aeda597..2081d18dc740748a37915bb7f41056bafbb93426 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+--- a/net/minecraft/world/entity/animal/Panda.java
++++ b/net/minecraft/world/entity/animal/Panda.java
 @@ -152,6 +152,12 @@ public class Panda extends Animal {
          return this.level().purpurConfig.pandaBreedingTicks;
      }
@@ -233,10 +233,10 @@ index 9c91207391f20adaf8f777c1db9502ee7aeda597..2081d18dc740748a37915bb7f41056ba
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java
 index 2311595018175d2786e34a3dd68ded7a7fe0838c..9c6385183bc93d84386577dd4d775b2b42138925 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+--- a/net/minecraft/world/entity/animal/Parrot.java
++++ b/net/minecraft/world/entity/animal/Parrot.java
 @@ -200,6 +200,12 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
          return 6000;
      }
@@ -250,10 +250,10 @@ index 2311595018175d2786e34a3dd68ded7a7fe0838c..9c6385183bc93d84386577dd4d775b2b
      @Nullable
      @Override
      public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData entityData) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+diff --git a/net/minecraft/world/entity/animal/Pig.java b/net/minecraft/world/entity/animal/Pig.java
 index aea1462503e41b09a4581651a8fa0d72e2d9b3cb..d1f61ab812aef23ff5eab508ce71683d88c8275d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+--- a/net/minecraft/world/entity/animal/Pig.java
++++ b/net/minecraft/world/entity/animal/Pig.java
 @@ -96,6 +96,12 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
      }
      // Purpur end - Make entity breeding times configurable
@@ -267,10 +267,10 @@ index aea1462503e41b09a4581651a8fa0d72e2d9b3cb..d1f61ab812aef23ff5eab508ce71683d
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+diff --git a/net/minecraft/world/entity/animal/PolarBear.java b/net/minecraft/world/entity/animal/PolarBear.java
 index 1fccc501f581dfd0c27c116a2e01a97abc023959..eb1797c50c680586178aa8b42d56e2f41b3fe2fd 100644
---- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+--- a/net/minecraft/world/entity/animal/PolarBear.java
++++ b/net/minecraft/world/entity/animal/PolarBear.java
 @@ -128,6 +128,12 @@ public class PolarBear extends Animal implements NeutralMob {
          return this.level().purpurConfig.polarBearBreedingTicks;
      }
@@ -284,10 +284,10 @@ index 1fccc501f581dfd0c27c116a2e01a97abc023959..eb1797c50c680586178aa8b42d56e2f4
      @Nullable
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
+diff --git a/net/minecraft/world/entity/animal/Pufferfish.java b/net/minecraft/world/entity/animal/Pufferfish.java
 index 27946024e1d0ed4f49b4e7c398f600aafae7f63c..386b0a39f5c7596ae6f682000f4cc0907275e750 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
+--- a/net/minecraft/world/entity/animal/Pufferfish.java
++++ b/net/minecraft/world/entity/animal/Pufferfish.java
 @@ -70,6 +70,12 @@ public class Pufferfish extends AbstractFish {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.pufferfishMaxHealth);
      }
@@ -301,10 +301,10 @@ index 27946024e1d0ed4f49b4e7c398f600aafae7f63c..386b0a39f5c7596ae6f682000f4cc090
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java
 index c90bbf17639157e38dc2cada25677e22d63be12d..688a8ad45111a71853bea22b1b9f72e3505d82a6 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+--- a/net/minecraft/world/entity/animal/Rabbit.java
++++ b/net/minecraft/world/entity/animal/Rabbit.java
 @@ -154,6 +154,12 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          return this.level().purpurConfig.rabbitBreedingTicks;
      }
@@ -318,10 +318,10 @@ index c90bbf17639157e38dc2cada25677e22d63be12d..688a8ad45111a71853bea22b1b9f72e3
      @Override
      public void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Salmon.java b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
+diff --git a/net/minecraft/world/entity/animal/Salmon.java b/net/minecraft/world/entity/animal/Salmon.java
 index 88f0f9074db9a9afff55aa6bd17c38fa2e1e1f81..053c2773b52bd3399c3812452dbee2d1882d32a2 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
+--- a/net/minecraft/world/entity/animal/Salmon.java
++++ b/net/minecraft/world/entity/animal/Salmon.java
 @@ -53,6 +53,12 @@ public class Salmon extends AbstractSchoolingFish implements VariantHolder<Salmo
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.salmonMaxHealth);
      }
@@ -335,10 +335,10 @@ index 88f0f9074db9a9afff55aa6bd17c38fa2e1e1f81..053c2773b52bd3399c3812452dbee2d1
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Sheep.java b/net/minecraft/world/entity/animal/Sheep.java
 index 761ff22d66a191ab4c38d872e65afc2ee70f233d..a8a985c219036da9d58ad62ebdc925b62c44fce5 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+--- a/net/minecraft/world/entity/animal/Sheep.java
++++ b/net/minecraft/world/entity/animal/Sheep.java
 @@ -114,6 +114,12 @@ public class Sheep extends Animal implements Shearable {
          return this.level().purpurConfig.sheepBreedingTicks;
      }
@@ -352,10 +352,10 @@ index 761ff22d66a191ab4c38d872e65afc2ee70f233d..a8a985c219036da9d58ad62ebdc925b6
      @Override
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java
 index 1c73b81053551b2aa2817f9629bc7b4050e8f070..f27f68750221852e55b92395530e00e9c6918551 100644
---- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+--- a/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -119,7 +119,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
  
      @Override
@@ -365,10 +365,10 @@ index 1c73b81053551b2aa2817f9629bc7b4050e8f070..f27f68750221852e55b92395530e00e9
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java
 index d976fca9b9764f9298bc9aa2e28b6f0feed1939f..600e12b135c4ad2d50247761542ffa3675113c39 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+--- a/net/minecraft/world/entity/animal/Squid.java
++++ b/net/minecraft/world/entity/animal/Squid.java
 @@ -79,6 +79,12 @@ public class Squid extends AgeableWaterCreature {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.squidScale);
      }
@@ -382,10 +382,10 @@ index d976fca9b9764f9298bc9aa2e28b6f0feed1939f..600e12b135c4ad2d50247761542ffa36
      @Override
      public net.minecraft.world.phys.AABB getAxisForFluidCheck() {
          // Stops squids from floating just over the water
-diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
+diff --git a/net/minecraft/world/entity/animal/TropicalFish.java b/net/minecraft/world/entity/animal/TropicalFish.java
 index 52b64100ec9b5624758264569da08dee4e710b60..e8d3ecfcc3f25d271b81048c5d7f9722775bdbb1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
+--- a/net/minecraft/world/entity/animal/TropicalFish.java
++++ b/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -85,6 +85,12 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.tropicalFishMaxHealth);
      }
@@ -399,10 +399,10 @@ index 52b64100ec9b5624758264569da08dee4e710b60..e8d3ecfcc3f25d271b81048c5d7f9722
      public static String getPredefinedName(int variant) {
          return "entity.minecraft.tropical_fish.predefined." + variant;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+diff --git a/net/minecraft/world/entity/animal/Turtle.java b/net/minecraft/world/entity/animal/Turtle.java
 index 0a29ce3a783a5bcadfd386927f176457596882ce..e18e7c264dffcff41b9d244fbc411d7aeeeeb45e 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+--- a/net/minecraft/world/entity/animal/Turtle.java
++++ b/net/minecraft/world/entity/animal/Turtle.java
 @@ -116,6 +116,12 @@ public class Turtle extends Animal {
          return this.level().purpurConfig.turtleBreedingTicks;
      }
@@ -416,10 +416,10 @@ index 0a29ce3a783a5bcadfd386927f176457596882ce..e18e7c264dffcff41b9d244fbc411d7a
      public void setHomePos(BlockPos pos) {
          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
+diff --git a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java
 index f1d2e40f55a91810693a5604f3060e284f615fa0..95b24da0de519363d67e0bcb4fcdeaa2a2c17060 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+--- a/net/minecraft/world/entity/animal/Wolf.java
++++ b/net/minecraft/world/entity/animal/Wolf.java
 @@ -215,6 +215,12 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          }
      }
@@ -433,10 +433,10 @@ index f1d2e40f55a91810693a5604f3060e284f615fa0..95b24da0de519363d67e0bcb4fcdeaa2
      @Override
      public void tame(Player player) {
          setCollarColor(level().purpurConfig.wolfDefaultCollarColor);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+diff --git a/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 index 9bffdbfcd49cf84865926a0e341784c1d4a1c98c..aff5b95fcccdba79ddc58e5e56d268aa49879b36 100644
---- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+--- a/net/minecraft/world/entity/animal/axolotl/Axolotl.java
++++ b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -130,6 +130,12 @@ public class Axolotl extends Animal implements VariantHolder<Axolotl.Variant>, B
          return this.level().purpurConfig.axolotlBreedingTicks;
      }
@@ -450,10 +450,10 @@ index 9bffdbfcd49cf84865926a0e341784c1d4a1c98c..aff5b95fcccdba79ddc58e5e56d268aa
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return 0.0F;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
 index c9d7be823a040e7de407537d247062821dca643a..4a8ac3d75a3c75eea8e361d7eb729f27ea807347 100644
---- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+--- a/net/minecraft/world/entity/animal/goat/Goat.java
++++ b/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -116,6 +116,12 @@ public class Goat extends Animal {
          return this.level().purpurConfig.goatBreedingTicks;
      }
@@ -467,10 +467,10 @@ index c9d7be823a040e7de407537d247062821dca643a..4a8ac3d75a3c75eea8e361d7eb729f27
      @Override
      protected Brain.Provider<Goat> brainProvider() {
          return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+diff --git a/net/minecraft/world/entity/animal/horse/Donkey.java b/net/minecraft/world/entity/animal/horse/Donkey.java
 index 4cff4fcedc75a99ca71ae6a7c34d6f407665bf1b..6a511e01f8805451ce89d697568c23803b5985a8 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+--- a/net/minecraft/world/entity/animal/horse/Donkey.java
++++ b/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -45,6 +45,12 @@ public class Donkey extends AbstractChestedHorse {
          return this.level().purpurConfig.donkeyBreedingTicks;
      }
@@ -484,10 +484,10 @@ index 4cff4fcedc75a99ca71ae6a7c34d6f407665bf1b..6a511e01f8805451ce89d697568c2380
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+diff --git a/net/minecraft/world/entity/animal/horse/Horse.java b/net/minecraft/world/entity/animal/horse/Horse.java
 index cbeb7d1e834a4f0f120248bec619e34ca46f8069..c5ba0669b7e184ac42243a65a230fe325c3f84cc 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+--- a/net/minecraft/world/entity/animal/horse/Horse.java
++++ b/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -72,6 +72,12 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
          return this.level().purpurConfig.horseBreedingTicks;
      }
@@ -501,10 +501,10 @@ index cbeb7d1e834a4f0f120248bec619e34ca46f8069..c5ba0669b7e184ac42243a65a230fe32
      @Override
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
 index ea396b5740ae1e7b2cf5356607835467b412d379..fa1bf3e2e11564b9528e056369a610cb5bbd25d0 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+--- a/net/minecraft/world/entity/animal/horse/Llama.java
++++ b/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -146,6 +146,12 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          return this.level().purpurConfig.llamaBreedingTicks;
      }
@@ -518,10 +518,10 @@ index ea396b5740ae1e7b2cf5356607835467b412d379..fa1bf3e2e11564b9528e056369a610cb
      public boolean isTraderLlama() {
          return false;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+diff --git a/net/minecraft/world/entity/animal/horse/Mule.java b/net/minecraft/world/entity/animal/horse/Mule.java
 index 02f075b6aadbd3b263235be761653c7d16ba3b1e..8da2ff2fba266884593cefb3c192ff41afce5740 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+--- a/net/minecraft/world/entity/animal/horse/Mule.java
++++ b/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -44,6 +44,12 @@ public class Mule extends AbstractChestedHorse {
          return this.level().purpurConfig.muleBreedingTicks;
      }
@@ -535,10 +535,10 @@ index 02f075b6aadbd3b263235be761653c7d16ba3b1e..8da2ff2fba266884593cefb3c192ff41
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 index 064f33e8c1768b20cf1ef61d20a7bda93b6e2855..f720deaa578d094c924be9935318ddc5817674f1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+--- a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
++++ b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 @@ -71,6 +71,12 @@ public class SkeletonHorse extends AbstractHorse {
          return 6000;
      }
@@ -552,10 +552,10 @@ index 064f33e8c1768b20cf1ef61d20a7bda93b6e2855..f720deaa578d094c924be9935318ddc5
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/animal/horse/TraderLlama.java b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 index e9d03e3063a5afe296720314f74a25e9cfb5dabf..8748e41742a3d8d2d160fbd27c171f9839d5f10e 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
+--- a/net/minecraft/world/entity/animal/horse/TraderLlama.java
++++ b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 @@ -77,6 +77,12 @@ public class TraderLlama extends Llama {
          return this.level().purpurConfig.traderLlamaBreedingTicks;
      }
@@ -569,10 +569,10 @@ index e9d03e3063a5afe296720314f74a25e9cfb5dabf..8748e41742a3d8d2d160fbd27c171f98
      @Override
      public boolean isTraderLlama() {
          return true;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 index 455c0e32931ef1fae41278ed360e2af535ccbaad..d7f96f19c3a4eec8497ff1b8bffdf9bc5bacfbb7 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+--- a/net/minecraft/world/entity/animal/horse/ZombieHorse.java
++++ b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 @@ -67,6 +67,12 @@ public class ZombieHorse extends AbstractHorse {
          return 6000;
      }
@@ -586,10 +586,10 @@ index 455c0e32931ef1fae41278ed360e2af535ccbaad..d7f96f19c3a4eec8497ff1b8bffdf9bc
      public static AttributeSupplier.Builder createAttributes() {
          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/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 index b7ba6c303826e35ee1261cb46f1e778af29a59e5..587b477305addbd1e5c71f34dc9df07be7f60384 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
+--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
++++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -192,6 +192,12 @@ public class EnderDragon extends Mob implements Enemy {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.enderDragonMaxHealth);
      }
@@ -603,10 +603,10 @@ index b7ba6c303826e35ee1261cb46f1e778af29a59e5..587b477305addbd1e5c71f34dc9df07b
      public static AttributeSupplier.Builder createAttributes() {
          return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
      }
-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
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 index 297a67e8a8c1e314ad7f8d32d5bcacc3746b0b6c..cb3277d101b48db434a7e3155bf54559d6c13ba2 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
+--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -120,6 +120,12 @@ public class WitherBoss extends Monster implements RangedAttackMob {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.witherScale);
      }
@@ -620,10 +620,10 @@ index 297a67e8a8c1e314ad7f8d32d5bcacc3746b0b6c..cb3277d101b48db434a7e3155bf54559
      @Override
      protected PathNavigation createNavigation(Level world) {
          FlyingPathNavigation navigationflying = new FlyingPathNavigation(this, world);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+diff --git a/net/minecraft/world/entity/monster/Blaze.java b/net/minecraft/world/entity/monster/Blaze.java
 index edbe135484847979c76565229354e5963c84083c..477e000d518522b9d546567cd96930053f8a15c5 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+--- a/net/minecraft/world/entity/monster/Blaze.java
++++ b/net/minecraft/world/entity/monster/Blaze.java
 @@ -34,7 +34,7 @@ public class Blaze extends Monster {
      public Blaze(EntityType<? extends Blaze> type, Level world) {
          super(type, world);
@@ -642,10 +642,10 @@ index edbe135484847979c76565229354e5963c84083c..477e000d518522b9d546567cd9693005
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
+diff --git a/net/minecraft/world/entity/monster/CaveSpider.java b/net/minecraft/world/entity/monster/CaveSpider.java
 index 9d8d836c93635f133a2ad6911cac9b8ac24f1f57..6de7a8cf41af2a4d2988f86341ba4329f9c45361 100644
---- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
+--- a/net/minecraft/world/entity/monster/CaveSpider.java
++++ b/net/minecraft/world/entity/monster/CaveSpider.java
 @@ -51,6 +51,12 @@ public class CaveSpider extends Spider {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.caveSpiderScale);
      }
@@ -659,10 +659,10 @@ index 9d8d836c93635f133a2ad6911cac9b8ac24f1f57..6de7a8cf41af2a4d2988f86341ba4329
      @Override
      public boolean doHurtTarget(ServerLevel world, Entity target) {
          if (super.doHurtTarget(world, target)) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
 index 4711f5e5d9f1738d739be68f586f744eba8621c9..76e0dcedc72576c0e0a85e09a762aa5e2b63c7ef 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+--- a/net/minecraft/world/entity/monster/Creeper.java
++++ b/net/minecraft/world/entity/monster/Creeper.java
 @@ -267,6 +267,12 @@ public class Creeper extends Monster {
          return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
      }
@@ -676,10 +676,10 @@ index 4711f5e5d9f1738d739be68f586f744eba8621c9..76e0dcedc72576c0e0a85e09a762aa5e
  
      @Override
      protected SoundEvent getHurtSound(DamageSource source) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java
 index 3f02cb4924817ed132d2b17b97a67f7d7bf57cb8..7651c29a6468e93bd10d58f76a86a68912509bd3 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+--- a/net/minecraft/world/entity/monster/Drowned.java
++++ b/net/minecraft/world/entity/monster/Drowned.java
 @@ -120,6 +120,12 @@ public class Drowned extends Zombie implements RangedAttackMob {
          return level().purpurConfig.drownedJockeyTryExistingChickens;
      }
@@ -693,10 +693,10 @@ index 3f02cb4924817ed132d2b17b97a67f7d7bf57cb8..7651c29a6468e93bd10d58f76a86a689
      @Override
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(1, new Drowned.DrownedGoToWaterGoal(this, 1.0));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
+diff --git a/net/minecraft/world/entity/monster/ElderGuardian.java b/net/minecraft/world/entity/monster/ElderGuardian.java
 index 011327ea9bf9ef3497f2183ef149f8ec9bb29fab..d69716edb777155d0b52db25af64107e4657e03c 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
+--- a/net/minecraft/world/entity/monster/ElderGuardian.java
++++ b/net/minecraft/world/entity/monster/ElderGuardian.java
 @@ -52,6 +52,12 @@ public class ElderGuardian extends Guardian {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.elderGuardianScale);
      }
@@ -710,10 +710,10 @@ index 011327ea9bf9ef3497f2183ef149f8ec9bb29fab..d69716edb777155d0b52db25af64107e
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index 61a113074a6839d6dcb59019eefe9f532fb9cb2b..a92c30b5d3079ce58e00b9824ec3a60e6b41f104 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -91,7 +91,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
      public EnderMan(EntityType<? extends EnderMan> type, Level world) {
@@ -732,10 +732,10 @@ index 61a113074a6839d6dcb59019eefe9f532fb9cb2b..a92c30b5d3079ce58e00b9824ec3a60e
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
 index aeeb003cc43d6cff87a634099299ff30db7ed10b..fa4f25c7aece94a7468da1d7ed3cbd1abbce9640 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+--- a/net/minecraft/world/entity/monster/Endermite.java
++++ b/net/minecraft/world/entity/monster/Endermite.java
 @@ -62,6 +62,12 @@ public class Endermite extends Monster {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.endermiteScale);
      }
@@ -749,10 +749,10 @@ index aeeb003cc43d6cff87a634099299ff30db7ed10b..fa4f25c7aece94a7468da1d7ed3cbd1a
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Evoker.java b/net/minecraft/world/entity/monster/Evoker.java
 index 05f859c3062c34f1fdb74c43423c1f5767180c1f..8cc90983c0e4781b4cc73040ceba069e302f7664 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+--- a/net/minecraft/world/entity/monster/Evoker.java
++++ b/net/minecraft/world/entity/monster/Evoker.java
 @@ -77,6 +77,12 @@ public class Evoker extends SpellcasterIllager {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.evokerScale);
      }
@@ -766,10 +766,10 @@ index 05f859c3062c34f1fdb74c43423c1f5767180c1f..8cc90983c0e4781b4cc73040ceba069e
      @Override
      protected void registerGoals() {
          super.registerGoals();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java
 index b0d7bbca3c3a34f329698ee70ec0bea60c76b12e..67bc0ec362929099e741486e3424770478a046d9 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+--- a/net/minecraft/world/entity/monster/Ghast.java
++++ b/net/minecraft/world/entity/monster/Ghast.java
 @@ -85,6 +85,12 @@ public class Ghast extends FlyingMob implements Enemy {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.ghastScale);
      }
@@ -783,10 +783,10 @@ index b0d7bbca3c3a34f329698ee70ec0bea60c76b12e..67bc0ec362929099e741486e34247704
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+diff --git a/net/minecraft/world/entity/monster/Giant.java b/net/minecraft/world/entity/monster/Giant.java
 index adc90a306fc9023f4a1cdfe9f58c39726086c849..4bf1414569685e9e8704216c9dcf585def88b2e5 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+--- a/net/minecraft/world/entity/monster/Giant.java
++++ b/net/minecraft/world/entity/monster/Giant.java
 @@ -59,6 +59,12 @@ public class Giant extends Monster {
          this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(this.level().purpurConfig.giantAttackDamage);
      }
@@ -800,10 +800,10 @@ index adc90a306fc9023f4a1cdfe9f58c39726086c849..4bf1414569685e9e8704216c9dcf585d
      public static AttributeSupplier.Builder createAttributes() {
          return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.ATTACK_DAMAGE, 50.0);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java
 index 210e9dacd001e2e0c1a95d41c6a31aea6eab893b..01917ec09069be5d8b1051969367df1e53ff38ca 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+--- a/net/minecraft/world/entity/monster/Guardian.java
++++ b/net/minecraft/world/entity/monster/Guardian.java
 @@ -98,6 +98,12 @@ public class Guardian extends Monster {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.guardianScale);
      }
@@ -817,10 +817,10 @@ index 210e9dacd001e2e0c1a95d41c6a31aea6eab893b..01917ec09069be5d8b1051969367df1e
      @Override
      protected void registerGoals() {
          MoveTowardsRestrictionGoal pathfindergoalmovetowardsrestriction = new MoveTowardsRestrictionGoal(this, 1.0D);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+diff --git a/net/minecraft/world/entity/monster/Husk.java b/net/minecraft/world/entity/monster/Husk.java
 index cd155b47369318f58ec55289a345f1bf28e2af14..43887b5aa533d456de5e66da2a3bef82aed58084 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+--- a/net/minecraft/world/entity/monster/Husk.java
++++ b/net/minecraft/world/entity/monster/Husk.java
 @@ -67,6 +67,12 @@ public class Husk extends Zombie {
          return level().purpurConfig.huskJockeyTryExistingChickens;
      }
@@ -834,10 +834,10 @@ index cd155b47369318f58ec55289a345f1bf28e2af14..43887b5aa533d456de5e66da2a3bef82
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random) {
          return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (EntitySpawnReason.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
+diff --git a/net/minecraft/world/entity/monster/Illusioner.java b/net/minecraft/world/entity/monster/Illusioner.java
 index 6e3362324c81afacaaa0f9766e2d23a0a4f53ac3..d0fe85e7c44b78a078e6c2d6220849a336b079d3 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
+--- a/net/minecraft/world/entity/monster/Illusioner.java
++++ b/net/minecraft/world/entity/monster/Illusioner.java
 @@ -85,6 +85,12 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.illusionerScale);
      }
@@ -851,10 +851,10 @@ index 6e3362324c81afacaaa0f9766e2d23a0a4f53ac3..d0fe85e7c44b78a078e6c2d6220849a3
      @Override
      protected void registerGoals() {
          super.registerGoals();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
+diff --git a/net/minecraft/world/entity/monster/MagmaCube.java b/net/minecraft/world/entity/monster/MagmaCube.java
 index 5ba64f9c653345b742624f18c4cf692d1e7880e1..8f0e9f854c4032c43cc1c9a8b087a5fa286326d8 100644
---- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
+--- a/net/minecraft/world/entity/monster/MagmaCube.java
++++ b/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -67,6 +67,12 @@ public class MagmaCube extends Slime {
          return level().purpurConfig.magmaCubeAttackDamageCache;
      }
@@ -868,10 +868,10 @@ index 5ba64f9c653345b742624f18c4cf692d1e7880e1..8f0e9f854c4032c43cc1c9a8b087a5fa
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
 index 7926c11714b0f50fd02f2da4817c822fd5f60115..f09830c1c88f4b28f05e1647706a3c96a596ad1e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+--- a/net/minecraft/world/entity/monster/Phantom.java
++++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -120,6 +120,12 @@ public class Phantom extends FlyingMob implements Enemy {
      }
      // Purpur end - Ridables
@@ -885,10 +885,10 @@ index 7926c11714b0f50fd02f2da4817c822fd5f60115..f09830c1c88f4b28f05e1647706a3c96
      // Purpur start - Phantoms attracted to crystals and crystals shoot phantoms
      @Override
      protected void dropFromLootTable(ServerLevel world, DamageSource damageSource, boolean causedByPlayer) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
+diff --git a/net/minecraft/world/entity/monster/Pillager.java b/net/minecraft/world/entity/monster/Pillager.java
 index 78c01f0be0cc6689f68e2fcf3111d79abb5a59fb..0bc9ee0de4f30d4d57164e02992856a0bfa92041 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
+--- a/net/minecraft/world/entity/monster/Pillager.java
++++ b/net/minecraft/world/entity/monster/Pillager.java
 @@ -91,6 +91,12 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.pillagerScale);
      }
@@ -902,10 +902,10 @@ index 78c01f0be0cc6689f68e2fcf3111d79abb5a59fb..0bc9ee0de4f30d4d57164e02992856a0
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
 index b71aec7588a2a812cca71d89810ed765fcc33b9f..39081629685e3c7cd109626d1d61ce24b6afb860 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+--- a/net/minecraft/world/entity/monster/Ravager.java
++++ b/net/minecraft/world/entity/monster/Ravager.java
 @@ -105,6 +105,12 @@ public class Ravager extends Raider {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.ravagerScale);
      }
@@ -919,10 +919,10 @@ index b71aec7588a2a812cca71d89810ed765fcc33b9f..39081629685e3c7cd109626d1d61ce24
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
 index c04d6a5190f3db06601c3a0ab0ddaede3a9f88ac..2b2e68e1449606ecfe5c414834ce3e2c6912d820 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+--- a/net/minecraft/world/entity/monster/Shulker.java
++++ b/net/minecraft/world/entity/monster/Shulker.java
 @@ -120,7 +120,12 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.shulkerMaxHealth);
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.shulkerScale);
@@ -937,10 +937,10 @@ index c04d6a5190f3db06601c3a0ab0ddaede3a9f88ac..2b2e68e1449606ecfe5c414834ce3e2c
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+diff --git a/net/minecraft/world/entity/monster/Silverfish.java b/net/minecraft/world/entity/monster/Silverfish.java
 index 3159c61e1f34e95749661a711e4d97f7f5a04766..256b57f6aea44cdfd209a546f98c5b0538b8242b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+--- a/net/minecraft/world/entity/monster/Silverfish.java
++++ b/net/minecraft/world/entity/monster/Silverfish.java
 @@ -70,6 +70,12 @@ public class Silverfish extends Monster {
          this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(this.level().purpurConfig.silverfishAttackDamage);
      }
@@ -954,10 +954,10 @@ index 3159c61e1f34e95749661a711e4d97f7f5a04766..256b57f6aea44cdfd209a546f98c5b05
      @Override
      protected void registerGoals() {
          this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+diff --git a/net/minecraft/world/entity/monster/Skeleton.java b/net/minecraft/world/entity/monster/Skeleton.java
 index 8e93da5112cbb14af1ca755c40698740303717ee..2bbdaaad2ab0d44dc27172a81df732c03ec8147d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+--- a/net/minecraft/world/entity/monster/Skeleton.java
++++ b/net/minecraft/world/entity/monster/Skeleton.java
 @@ -52,6 +52,12 @@ public class Skeleton extends AbstractSkeleton {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.skeletonMaxHealth);
      }
@@ -971,10 +971,10 @@ index 8e93da5112cbb14af1ca755c40698740303717ee..2bbdaaad2ab0d44dc27172a81df732c0
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
+diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
 index d2cdb2119cd6e0afd57e00b1b706d36342b8858d..b48210e8e08ca607b272d78cf5697b89dd3201a0 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
+--- a/net/minecraft/world/entity/monster/Slime.java
++++ b/net/minecraft/world/entity/monster/Slime.java
 @@ -139,6 +139,12 @@ public class Slime extends Mob implements Enemy {
          return value;
      }
@@ -988,10 +988,10 @@ index d2cdb2119cd6e0afd57e00b1b706d36342b8858d..b48210e8e08ca607b272d78cf5697b89
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+diff --git a/net/minecraft/world/entity/monster/Spider.java b/net/minecraft/world/entity/monster/Spider.java
 index 26ce5425d8217f8954ceef898b806d3b56c01027..cb61d3b402155241dc66ac05893c44e76c104dfc 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+--- a/net/minecraft/world/entity/monster/Spider.java
++++ b/net/minecraft/world/entity/monster/Spider.java
 @@ -75,6 +75,12 @@ public class Spider extends Monster {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.spiderScale);
      }
@@ -1005,10 +1005,10 @@ index 26ce5425d8217f8954ceef898b806d3b56c01027..cb61d3b402155241dc66ac05893c44e7
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
+diff --git a/net/minecraft/world/entity/monster/Stray.java b/net/minecraft/world/entity/monster/Stray.java
 index 4b4eced856ad68c38042b5368bf1b9433ec1e8b1..874727cd86f530c4ddb895fd6e005d9b9ec20daa 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
+--- a/net/minecraft/world/entity/monster/Stray.java
++++ b/net/minecraft/world/entity/monster/Stray.java
 @@ -45,6 +45,12 @@ public class Stray extends AbstractSkeleton {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.strayMaxHealth);
      }
@@ -1022,10 +1022,10 @@ index 4b4eced856ad68c38042b5368bf1b9433ec1e8b1..874727cd86f530c4ddb895fd6e005d9b
      public static boolean checkStraySpawnRules(
          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
+diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
 index b5bc19ea93058374ce3a01ed650b0396b5e4176d..420118b1df271377f69e8e2bab8a62623382c819 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
+--- a/net/minecraft/world/entity/monster/Strider.java
++++ b/net/minecraft/world/entity/monster/Strider.java
 @@ -91,7 +91,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
          super(type, world);
          this.steering = new ItemBasedSteering(this.entityData, Strider.DATA_BOOST_TIME, Strider.DATA_SADDLE_ID);
@@ -1044,10 +1044,10 @@ index b5bc19ea93058374ce3a01ed650b0396b5e4176d..420118b1df271377f69e8e2bab8a6262
      }
  
      @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
+diff --git a/net/minecraft/world/entity/monster/Vex.java b/net/minecraft/world/entity/monster/Vex.java
 index 906934076dd721a39f8ee960fc7c0d1058b66ae2..1630074bf8065a7ecf49d426f8d5fe5e109b1d2c 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
+--- a/net/minecraft/world/entity/monster/Vex.java
++++ b/net/minecraft/world/entity/monster/Vex.java
 @@ -110,6 +110,12 @@ public class Vex extends Monster implements TraceableEntity {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.vexScale);
      }
@@ -1061,10 +1061,10 @@ index 906934076dd721a39f8ee960fc7c0d1058b66ae2..1630074bf8065a7ecf49d426f8d5fe5e
      @Override
      public boolean isFlapping() {
          return this.tickCount % Vex.TICKS_PER_FLAP == 0;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+diff --git a/net/minecraft/world/entity/monster/Vindicator.java b/net/minecraft/world/entity/monster/Vindicator.java
 index 7f414f74c315db67a8e8a3d3636811abe733f62a..5693081f061dcefbfda374c26a6ab5be0c2e2fcc 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+--- a/net/minecraft/world/entity/monster/Vindicator.java
++++ b/net/minecraft/world/entity/monster/Vindicator.java
 @@ -79,6 +79,12 @@ public class Vindicator extends AbstractIllager {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.vindicatorScale);
      }
@@ -1078,10 +1078,10 @@ index 7f414f74c315db67a8e8a3d3636811abe733f62a..5693081f061dcefbfda374c26a6ab5be
      @Override
      protected void registerGoals() {
          super.registerGoals();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
+diff --git a/net/minecraft/world/entity/monster/Witch.java b/net/minecraft/world/entity/monster/Witch.java
 index 9b2d76722385ccf9d0ace747339ca7705ca41f4f..f77ce3de847ea5c7f40bfa6bd4bba254dc863bd0 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
+--- a/net/minecraft/world/entity/monster/Witch.java
++++ b/net/minecraft/world/entity/monster/Witch.java
 @@ -81,6 +81,12 @@ public class Witch extends Raider implements RangedAttackMob {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.witchScale);
      }
@@ -1095,10 +1095,10 @@ index 9b2d76722385ccf9d0ace747339ca7705ca41f4f..f77ce3de847ea5c7f40bfa6bd4bba254
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/WitherSkeleton.java b/net/minecraft/world/entity/monster/WitherSkeleton.java
 index feb1b516c7ac7200e7cebeea739369426e87bf27..1a864ebb6257f34e8fb7a543d6da19cfa96bb7d0 100644
---- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
+--- a/net/minecraft/world/entity/monster/WitherSkeleton.java
++++ b/net/minecraft/world/entity/monster/WitherSkeleton.java
 @@ -60,6 +60,12 @@ public class WitherSkeleton extends AbstractSkeleton {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.witherSkeletonScale);
      }
@@ -1112,10 +1112,10 @@ index feb1b516c7ac7200e7cebeea739369426e87bf27..1a864ebb6257f34e8fb7a543d6da19cf
      @Override
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+diff --git a/net/minecraft/world/entity/monster/Zoglin.java b/net/minecraft/world/entity/monster/Zoglin.java
 index b5c4e127298795567ea4f35aa5a209ee6e1629b3..1c2c0f94811f934804cfb0be15fa55c0281ad0ba 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+--- a/net/minecraft/world/entity/monster/Zoglin.java
++++ b/net/minecraft/world/entity/monster/Zoglin.java
 @@ -109,6 +109,12 @@ public class Zoglin extends Monster implements HoglinBase {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.zoglinScale);
      }
@@ -1129,10 +1129,10 @@ index b5c4e127298795567ea4f35aa5a209ee6e1629b3..1c2c0f94811f934804cfb0be15fa55c0
      @Override
      protected Brain.Provider<Zoglin> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
 index 473ab54ac90f00bf5baf6b53190fa0f4f762700b..09b21cf02a07e1eb6a0aa2c6880d4106fe9e0d77 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+--- a/net/minecraft/world/entity/monster/Zombie.java
++++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -147,6 +147,12 @@ public class Zombie extends Monster {
          return level().purpurConfig.zombieJockeyTryExistingChickens;
      }
@@ -1146,10 +1146,10 @@ index 473ab54ac90f00bf5baf6b53190fa0f4f762700b..09b21cf02a07e1eb6a0aa2c6880d4106
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
 index 36a074627a95886d38bd5a262dddcebfe32d1ba6..3f3e0dd479afad1ca73ad9f76ed673fa399955c6 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+--- a/net/minecraft/world/entity/monster/ZombieVillager.java
++++ b/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -129,6 +129,12 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          return level().purpurConfig.zombieVillagerJockeyTryExistingChickens;
      }
@@ -1163,10 +1163,10 @@ index 36a074627a95886d38bd5a262dddcebfe32d1ba6..3f3e0dd479afad1ca73ad9f76ed673fa
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+diff --git a/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 index c4bf422557fe6abbe882f575f19a9334c7a94fe5..3070f4484276f8ea6b95134abda6409e58f1161a 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+--- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java
++++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -103,6 +103,12 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
          return level().purpurConfig.zombifiedPiglinJockeyTryExistingChickens;
      }
@@ -1180,10 +1180,10 @@ index c4bf422557fe6abbe882f575f19a9334c7a94fe5..3070f4484276f8ea6b95134abda6409e
      @Override
      public void setPersistentAngerTarget(@Nullable UUID angryAt) {
          this.persistentAngerTarget = angryAt;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 index d7bef344f1d18aa6037b3805da07353c54c82142..534626336e45da2c67cb023f4e5feea59daa8b5d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+--- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java
++++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -106,6 +106,12 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
          return this.level().purpurConfig.hoglinBreedingTicks;
      }
@@ -1197,10 +1197,10 @@ index d7bef344f1d18aa6037b3805da07353c54c82142..534626336e45da2c67cb023f4e5feea5
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java
 index e1ae622ec56f1e011f8007c5b5b8a7032cd28102..f0b0642571a242f9c22febbafba587f1ca6caaaa 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
+--- a/net/minecraft/world/entity/monster/piglin/Piglin.java
++++ b/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -123,6 +123,12 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.piglinScale);
      }
@@ -1214,10 +1214,10 @@ index e1ae622ec56f1e011f8007c5b5b8a7032cd28102..f0b0642571a242f9c22febbafba587f1
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+diff --git a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 index a0fa32a1217bbdae2c91e5a51598d7bd555ca1eb..0e77e9e4a4fd14b5cecc377a03f0d6b2c9df039f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+--- a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
++++ b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 @@ -89,6 +89,12 @@ public class PiglinBrute extends AbstractPiglin {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.piglinBruteScale);
      }
@@ -1231,10 +1231,10 @@ index a0fa32a1217bbdae2c91e5a51598d7bd555ca1eb..0e77e9e4a4fd14b5cecc377a03f0d6b2
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index 66a8beddde806e04ca4d0e943734d6116b107bcc..e33a29c486d50c5f22888bcb1979830143c8b06d 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -193,6 +193,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return level().purpurConfig.villagerCanBeLeashed;
      }
@@ -1248,10 +1248,10 @@ index 66a8beddde806e04ca4d0e943734d6116b107bcc..e33a29c486d50c5f22888bcb19798301
      @Override
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
 index 0066e413d1fa92ecd5573c00195aa2f1412e665e..455390bd5350282d1a6c9b25e9cdbd4a620b136c 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+--- a/net/minecraft/world/entity/npc/WanderingTrader.java
++++ b/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -107,6 +107,12 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          return level().purpurConfig.wanderingTraderCanBeLeashed;
      }
diff --git a/patches/server/0123-Config-to-always-tame-in-Creative.patch b/patches/server/0123-Config-to-always-tame-in-Creative.patch
index df4fffd32..8ef3c6f7a 100644
--- a/patches/server/0123-Config-to-always-tame-in-Creative.patch
+++ b/patches/server/0123-Config-to-always-tame-in-Creative.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Config to always tame in Creative
 Adds a configuration option that ensures a player in Creative always tames a tameable entity.
 This essentially allows Creative mode players to tame animals on their first try.
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
+diff --git a/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java b/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
 index b0944fa1f3849dd24cd010fa0a6638f5fd7179d1..d409ae987088df3d47192128401d7491aaabc87c 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
+--- a/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
++++ b/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
 @@ -67,7 +67,7 @@ public class RunAroundLikeCrazyGoal extends Goal {
                  int i = this.horse.getTemper();
                  int j = this.horse.getMaxTemper();
@@ -19,10 +19,10 @@ index b0944fa1f3849dd24cd010fa0a6638f5fd7179d1..d409ae987088df3d47192128401d7491
                      this.horse.tameWithName(entityhuman);
                      return;
                  }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java
 index 75a961906658ff271bc0acf849648ce877c9e1be..9bf07130a86ac8ab153eb7547c451d35eb2bb016 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+--- a/net/minecraft/world/entity/animal/Cat.java
++++ b/net/minecraft/world/entity/animal/Cat.java
 @@ -524,7 +524,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
      }
  
@@ -32,10 +32,10 @@ index 75a961906658ff271bc0acf849648ce877c9e1be..9bf07130a86ac8ab153eb7547c451d35
              this.tame(player);
              this.setOrderedToSit(true);
              this.level().broadcastEntityEvent(this, (byte) 7);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java
 index 9c6385183bc93d84386577dd4d775b2b42138925..3305a49fed395c134cf099253ea0558b6bd27bd4 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+--- a/net/minecraft/world/entity/animal/Parrot.java
++++ b/net/minecraft/world/entity/animal/Parrot.java
 @@ -325,7 +325,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
              }
  
@@ -45,10 +45,10 @@ index 9c6385183bc93d84386577dd4d775b2b42138925..3305a49fed395c134cf099253ea0558b
                      this.tame(player);
                      this.level().broadcastEntityEvent(this, (byte) 7);
                  } else {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+diff --git a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java
 index 95b24da0de519363d67e0bcb4fcdeaa2a2c17060..615a0de7b2d6fb69ca86f1fa27e9dc7d4368bd24 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+--- a/net/minecraft/world/entity/animal/Wolf.java
++++ b/net/minecraft/world/entity/animal/Wolf.java
 @@ -640,7 +640,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
  
      private void tryToTame(Player player) {
diff --git a/patches/server/0124-End-crystal-explosion-options.patch b/patches/server/0124-End-crystal-explosion-options.patch
index 9f5119ea7..fd08612f3 100644
--- a/patches/server/0124-End-crystal-explosion-options.patch
+++ b/patches/server/0124-End-crystal-explosion-options.patch
@@ -4,10 +4,10 @@ Date: Sat, 13 Feb 2021 09:28:56 -0500
 Subject: [PATCH] End crystal explosion options
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 index 931cb90a8b32eb47d5985807d74d8ef7f1d01baf..218263958a90dfd95e4ecb7218c9eeefb069e50d 100644
---- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+--- a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
++++ b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 @@ -49,6 +49,22 @@ public class EndCrystal extends Entity {
          this.setPos(x, y, z);
      }
diff --git a/patches/server/0125-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0125-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
index 72c65c631..5f6ba1003 100644
--- a/patches/server/0125-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
+++ b/patches/server/0125-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
@@ -4,10 +4,10 @@ Date: Sat, 20 Feb 2021 14:47:08 -0800
 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
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 index 587b477305addbd1e5c71f34dc9df07be7f60384..d3721fcd9a537ad1e3c5712cd78bd436ac3e1a8b 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
+--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
++++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -1171,6 +1171,7 @@ public class EnderDragon extends Mob implements Enemy {
  
      @Override
@@ -16,10 +16,10 @@ index 587b477305addbd1e5c71f34dc9df07be7f60384..d3721fcd9a537ad1e3c5712cd78bd436
          return false;
      }
  
-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
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 index cb3277d101b48db434a7e3155bf54559d6c13ba2..7bdc2b79fbf58f248caf63008ce898b9a43bfcd3 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
+--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -729,6 +729,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
  
      @Override
diff --git a/patches/server/0126-Dont-run-with-scissors.patch b/patches/server/0126-Dont-run-with-scissors.patch
index 5e51127ca..08267bf5a 100644
--- a/patches/server/0126-Dont-run-with-scissors.patch
+++ b/patches/server/0126-Dont-run-with-scissors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Dont run with scissors!
 
 inspired by https://modrinth.com/mod/dont-run-with-scissors
 
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index 2e714a4faf07e7ca18fa073ff6660c5d4f377507..ea6713bd5a2807cf00d664296c13e076b2fca3a0 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1720,6 +1720,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                      this.player.tryResetCurrentImpulseContext();
                                  }
@@ -41,10 +41,10 @@ index 2e714a4faf07e7ca18fa073ff6660c5d4f377507..ea6713bd5a2807cf00d664296c13e076
      // Paper start - optimise out extra getCubes
      private boolean hasNewCollision(final ServerLevel world, final Entity entity, final AABB oldBox, final AABB newBox) {
          final List<AABB> collisionsBB = new java.util.ArrayList<>();
-diff --git a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+diff --git a/net/minecraft/world/damagesource/CombatTracker.java b/net/minecraft/world/damagesource/CombatTracker.java
 index 99a7e9eb75231c15bd8bb24fbb4e296bc9fdedff..254aea4138afa1009a3c949a24c1a0fb8edbbd1d 100644
---- a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-+++ b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+--- a/net/minecraft/world/damagesource/CombatTracker.java
++++ b/net/minecraft/world/damagesource/CombatTracker.java
 @@ -98,6 +98,11 @@ public class CombatTracker {
                  Component component = ComponentUtils.wrapInSquareBrackets(Component.translatable(string + ".link")).withStyle(INTENTIONAL_GAME_DESIGN_STYLE);
                  return Component.translatable(string + ".message", this.mob.getDisplayName(), component);
@@ -57,10 +57,10 @@ index 99a7e9eb75231c15bd8bb24fbb4e296bc9fdedff..254aea4138afa1009a3c949a24c1a0fb
                  return damageSource.getLocalizedDeathMessage(this.mob);
              }
          }
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+diff --git a/net/minecraft/world/damagesource/DamageSource.java b/net/minecraft/world/damagesource/DamageSource.java
 index ab0ba4406dcaa915435c3f53ac9ca06fb21c673b..43985b4442145728c28bbeb9d18444a7c8f3a41f 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+--- a/net/minecraft/world/damagesource/DamageSource.java
++++ b/net/minecraft/world/damagesource/DamageSource.java
 @@ -29,6 +29,7 @@ public class DamageSource {
      private boolean sweep = false;
      private boolean melting = false;
@@ -95,10 +95,10 @@ index ab0ba4406dcaa915435c3f53ac9ca06fb21c673b..43985b4442145728c28bbeb9d18444a7
          return damageSource;
      }
      // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSources.java b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
+diff --git a/net/minecraft/world/damagesource/DamageSources.java b/net/minecraft/world/damagesource/DamageSources.java
 index be87cb3cfa15a7d889118cdc4b87232e30749023..a4f710ad1aecd8265cde8d71d55eea952cd3c03b 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
+--- a/net/minecraft/world/damagesource/DamageSources.java
++++ b/net/minecraft/world/damagesource/DamageSources.java
 @@ -46,11 +46,13 @@ public class DamageSources {
      // CraftBukkit start
      private final DamageSource melting;
diff --git a/patches/server/0127-One-Punch-Man.patch b/patches/server/0127-One-Punch-Man.patch
index fe9865fe3..da238417c 100644
--- a/patches/server/0127-One-Punch-Man.patch
+++ b/patches/server/0127-One-Punch-Man.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man!
 
 inspired by https://modrinth.com/mod/creative-one-punch
 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index c513e6de7d89992720fc4139969377c261571b72..7b60c84df74cb542e2da3c8d81383cc4afc47a55 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1455,6 +1455,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  this.stopSleeping();
              }
diff --git a/patches/server/0128-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0128-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
index 99e4ab796..ada15c6ce 100644
--- a/patches/server/0128-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
+++ b/patches/server/0128-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Configurable Ender Pearl cooldown, damage, and Endermite RNG
 - Damage dealt on pearl usage
 - Endermite spawn chance
 
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+diff --git a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 index bd2684528157f928460f2143dd71a48e11983123..a044a5242ce1d1f6e34ecd5b4568553428d2f0b8 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+--- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
++++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 @@ -152,7 +152,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
                                  return;
                              }
@@ -29,10 +29,10 @@ index bd2684528157f928460f2143dd71a48e11983123..a044a5242ce1d1f6e34ecd5b45685534
                              }
  
                              this.playSound(worldserver, vec3d);
-diff --git a/src/main/java/net/minecraft/world/item/EnderpearlItem.java b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
+diff --git a/net/minecraft/world/item/EnderpearlItem.java b/net/minecraft/world/item/EnderpearlItem.java
 index eaee34054233c8f0296b65a09f1287ba515496f2..83bd9b1eff5b7f581c3f0af6f0f15bdf4b9de201 100644
---- a/src/main/java/net/minecraft/world/item/EnderpearlItem.java
-+++ b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
+--- a/net/minecraft/world/item/EnderpearlItem.java
++++ b/net/minecraft/world/item/EnderpearlItem.java
 @@ -37,6 +37,7 @@ public class EnderpearlItem extends Item {
  
                  world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENDER_PEARL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
diff --git a/patches/server/0129-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0129-Config-to-ignore-nearby-mobs-when-sleeping.patch
index f873300ca..95e0711d9 100644
--- a/patches/server/0129-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0129-Config-to-ignore-nearby-mobs-when-sleeping.patch
@@ -4,10 +4,10 @@ Date: Mon, 8 Mar 2021 16:46:54 -0500
 Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 92c0a7609e45a8cdb809ad7579f1713fc15675cf..6467e72fa43469ae065462e1a0720130dee336b3 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -1789,7 +1789,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
                              return entitymonster.isPreventingPlayerRest(this.serverLevel(), this);
                          });
diff --git a/patches/server/0130-Add-back-player-spawned-endermite-API.patch b/patches/server/0130-Add-back-player-spawned-endermite-API.patch
index 57fef7b30..60316af60 100644
--- a/patches/server/0130-Add-back-player-spawned-endermite-API.patch
+++ b/patches/server/0130-Add-back-player-spawned-endermite-API.patch
@@ -4,10 +4,10 @@ Date: Tue, 9 Mar 2021 16:10:39 -0500
 Subject: [PATCH] Add back player spawned endermite API
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
 index fa4f25c7aece94a7468da1d7ed3cbd1abbce9640..e48ebd0424828624c980e0c3e09a0cb37685be5e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+--- a/net/minecraft/world/entity/monster/Endermite.java
++++ b/net/minecraft/world/entity/monster/Endermite.java
 @@ -32,6 +32,7 @@ public class Endermite extends Monster {
  
      private static final int MAX_LIFE = 2400;
@@ -47,10 +47,10 @@ index fa4f25c7aece94a7468da1d7ed3cbd1abbce9640..e48ebd0424828624c980e0c3e09a0cb3
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+diff --git a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 index a044a5242ce1d1f6e34ecd5b4568553428d2f0b8..0720df603b4f89dd6aa346091b13033ad5d62907 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+--- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
++++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 @@ -156,6 +156,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
                                  Endermite entityendermite = (Endermite) EntityType.ENDERMITE.create(worldserver, EntitySpawnReason.TRIGGERED);
  
diff --git a/patches/server/0131-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0131-Config-Enderman-aggressiveness-towards-Endermites.patch
index 7692383b5..5b8ab793d 100644
--- a/patches/server/0131-Config-Enderman-aggressiveness-towards-Endermites.patch
+++ b/patches/server/0131-Config-Enderman-aggressiveness-towards-Endermites.patch
@@ -4,10 +4,10 @@ Date: Tue, 9 Mar 2021 16:10:39 -0500
 Subject: [PATCH] Config Enderman aggressiveness towards Endermites
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index a92c30b5d3079ce58e00b9824ec3a60e6b41f104..09a49b598c35c8d51142aee7b4958bc344536cb3 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -132,7 +132,7 @@ public class EnderMan extends Monster implements NeutralMob {
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
          this.targetSelector.addGoal(1, new EnderMan.EndermanLookForPlayerGoal(this, this::isAngryAt));
diff --git a/patches/server/0132-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0132-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
index 0656e5abb..9db625214 100644
--- a/patches/server/0132-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
+++ b/patches/server/0132-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Config to ignore Dragon Head wearers and stare aggro
 Prevents Enderman from becoming aggresive towards players that are wearing a Dragon Head.
 Adds functionality to a useless item!
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index 09a49b598c35c8d51142aee7b4958bc344536cb3..efeb8a214c3e0ab6cb28a6f6e0d6417916ed670f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -260,7 +260,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
      boolean isBeingStaredBy(Player player) {
diff --git a/patches/server/0133-Tick-fluids-config.patch b/patches/server/0133-Tick-fluids-config.patch
index 7ea964c57..ddb6e54e7 100644
--- a/patches/server/0133-Tick-fluids-config.patch
+++ b/patches/server/0133-Tick-fluids-config.patch
@@ -4,10 +4,10 @@ Date: Mon, 15 Mar 2021 03:52:17 -0500
 Subject: [PATCH] Tick fluids config
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
+diff --git a/net/minecraft/world/level/block/LiquidBlock.java b/net/minecraft/world/level/block/LiquidBlock.java
 index a2d023ff011f71f80032f02430a53d6a08a23623..8c1c24e98f79888faee204129145746279d5d159 100644
---- a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
+--- a/net/minecraft/world/level/block/LiquidBlock.java
++++ b/net/minecraft/world/level/block/LiquidBlock.java
 @@ -140,7 +140,7 @@ public class LiquidBlock extends Block implements BucketPickup {
  
      @Override
diff --git a/patches/server/0134-Config-to-disable-Llama-caravans.patch b/patches/server/0134-Config-to-disable-Llama-caravans.patch
index fd35a4bd7..9a36c6418 100644
--- a/patches/server/0134-Config-to-disable-Llama-caravans.patch
+++ b/patches/server/0134-Config-to-disable-Llama-caravans.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to disable Llama caravans
 
 Disables the mechanic where llamas follow leashed llamas.
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
+diff --git a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
 index eb0faf58fa1a408f294fc62120b140def97f998d..0f4f546cd0eda4bd82b47446ae23ac32da8a9556 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
+--- a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
++++ b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
 @@ -22,7 +22,7 @@ public class LlamaFollowCaravanGoal extends Goal {
  
      @Override
@@ -18,10 +18,10 @@ index eb0faf58fa1a408f294fc62120b140def97f998d..0f4f546cd0eda4bd82b47446ae23ac32
          if (!this.llama.isLeashed() && !this.llama.inCaravan()) {
              List<Entity> list = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), entity -> {
                  EntityType<?> entityType = entity.getType();
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
 index fa1bf3e2e11564b9528e056369a610cb5bbd25d0..ee8d756fed5b6458b28acbd2a62a5693baddd45d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+--- a/net/minecraft/world/entity/animal/horse/Llama.java
++++ b/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -464,7 +464,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      }
  
diff --git a/patches/server/0135-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0135-Config-to-make-Creepers-explode-on-death.patch
index 1e91724ec..32a927986 100644
--- a/patches/server/0135-Config-to-make-Creepers-explode-on-death.patch
+++ b/patches/server/0135-Config-to-make-Creepers-explode-on-death.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to make Creepers explode on death
 
 Creepers exploded after being killed in the alpha days. This brings that back.
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
 index 76e0dcedc72576c0e0a85e09a762aa5e2b63c7ef..58ef6c538a33199e5a8423223c22c61bf91fccae 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+--- a/net/minecraft/world/entity/monster/Creeper.java
++++ b/net/minecraft/world/entity/monster/Creeper.java
 @@ -65,6 +65,7 @@ public class Creeper extends Monster {
      private int prevSpacebarCharge = 0;
      private int powerToggleDelay = 0;
diff --git a/patches/server/0136-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0136-Configurable-ravager-griefable-blocks-list.patch
index 511813df0..2432919a5 100644
--- a/patches/server/0136-Configurable-ravager-griefable-blocks-list.patch
+++ b/patches/server/0136-Configurable-ravager-griefable-blocks-list.patch
@@ -4,10 +4,10 @@ Date: Wed, 17 Mar 2021 14:54:43 -0500
 Subject: [PATCH] Configurable ravager griefable blocks list
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
 index 39081629685e3c7cd109626d1d61ce24b6afb860..7fb2af68c101dc12e60f120da1bb5c1efd20d164 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+--- a/net/minecraft/world/entity/monster/Ravager.java
++++ b/net/minecraft/world/entity/monster/Ravager.java
 @@ -198,7 +198,7 @@ public class Ravager extends Raider {
                          BlockState iblockdata = worldserver.getBlockState(blockposition);
                          Block block = iblockdata.getBlock();
@@ -17,10 +17,10 @@ index 39081629685e3c7cd109626d1d61ce24b6afb860..7fb2af68c101dc12e60f120da1bb5c1e
                              // CraftBukkit start
                              if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
                                  continue;
-diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
+diff --git a/net/minecraft/world/level/block/CropBlock.java b/net/minecraft/world/level/block/CropBlock.java
 index e1cfad4834fdee910bf261a60e2b76678a0fec6d..00a06146e119a47eeaf66d240b8dd84e38498676 100644
---- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
+--- a/net/minecraft/world/level/block/CropBlock.java
++++ b/net/minecraft/world/level/block/CropBlock.java
 @@ -180,7 +180,7 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
      protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
          if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
diff --git a/patches/server/0137-Sneak-to-bulk-process-composter.patch b/patches/server/0137-Sneak-to-bulk-process-composter.patch
index 09ec5a441..48d0573ec 100644
--- a/patches/server/0137-Sneak-to-bulk-process-composter.patch
+++ b/patches/server/0137-Sneak-to-bulk-process-composter.patch
@@ -4,10 +4,10 @@ Date: Sun, 7 May 2023 22:26:59 -0700
 Subject: [PATCH] Sneak to bulk process composter
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
 index a96f859a5d0c6ec692d4627a69f3c9ee49199dbc..adecb4915a0428b71e8c1e59b11f94dd1776697d 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+--- a/net/minecraft/server/level/ServerPlayerGameMode.java
++++ b/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -583,7 +583,7 @@ public class ServerPlayerGameMode {
              ItemStack itemstack1 = stack.copy();
              InteractionResult enuminteractionresult;
@@ -17,10 +17,10 @@ index a96f859a5d0c6ec692d4627a69f3c9ee49199dbc..adecb4915a0428b71e8c1e59b11f94dd
                  InteractionResult enuminteractionresult1 = iblockdata.useItemOn(player.getItemInHand(hand), world, player, hand, hitResult);
  
                  if (enuminteractionresult1.consumesAction()) {
-diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
+diff --git a/net/minecraft/world/level/block/ComposterBlock.java b/net/minecraft/world/level/block/ComposterBlock.java
 index 9264ba58188a7a682eeb8eb449b89ff8e60f91d6..809a820dd8eec3e48dd3263335c62fbea4cd4f2c 100644
---- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
+--- a/net/minecraft/world/level/block/ComposterBlock.java
++++ b/net/minecraft/world/level/block/ComposterBlock.java
 @@ -243,18 +243,27 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          int i = (Integer) state.getValue(ComposterBlock.LEVEL);
  
diff --git a/patches/server/0138-Config-for-skipping-night.patch b/patches/server/0138-Config-for-skipping-night.patch
index 699ddae81..b076a35f7 100644
--- a/patches/server/0138-Config-for-skipping-night.patch
+++ b/patches/server/0138-Config-for-skipping-night.patch
@@ -4,10 +4,10 @@ Date: Thu, 18 Mar 2021 06:22:40 -0400
 Subject: [PATCH] Config for skipping night
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
 index 6585e0d72b2fbb8af5c62ceba57eef2fb7794e87..56fe25076109827815d7d8ebc45a62d391462bbf 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
 @@ -749,7 +749,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
          long j;
diff --git a/patches/server/0139-Add-config-for-villager-trading.patch b/patches/server/0139-Add-config-for-villager-trading.patch
index 112f4ee78..8977f02f1 100644
--- a/patches/server/0139-Add-config-for-villager-trading.patch
+++ b/patches/server/0139-Add-config-for-villager-trading.patch
@@ -4,10 +4,10 @@ Date: Thu, 18 Mar 2021 07:23:27 -0400
 Subject: [PATCH] Add config for villager trading
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index e33a29c486d50c5f22888bcb1979830143c8b06d..0bca1eeaa0f35d702dad41758c72bb3c9ab35220 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -377,6 +377,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
                      }
  
@@ -16,10 +16,10 @@ index e33a29c486d50c5f22888bcb1979830143c8b06d..0bca1eeaa0f35d702dad41758c72bb3c
                      this.startTrading(player);
                  }
  
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
 index 455390bd5350282d1a6c9b25e9cdbd4a620b136c..2cfd9c9194edda92185adecca80c5cd140e26c9f 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+--- a/net/minecraft/world/entity/npc/WanderingTrader.java
++++ b/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -165,8 +165,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
                      return tryRide(player, hand, InteractionResult.CONSUME); // Purpur - Ridables
                  }
diff --git a/patches/server/0140-Drowning-Settings.patch b/patches/server/0140-Drowning-Settings.patch
index dcbf8ab07..c1d2457a2 100644
--- a/patches/server/0140-Drowning-Settings.patch
+++ b/patches/server/0140-Drowning-Settings.patch
@@ -4,10 +4,10 @@ Date: Sun, 21 Mar 2021 15:26:52 -0400
 Subject: [PATCH] Drowning Settings
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index f15a8c14417b83b237dc7b9a11490116314cd4c6..a5f4f5d915a864240fd738ca32872829bfcabb41 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -3692,7 +3692,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
@@ -17,10 +17,10 @@ index f15a8c14417b83b237dc7b9a11490116314cd4c6..a5f4f5d915a864240fd738ca32872829
      }
  
      public int getAirSupply() {
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index 7b60c84df74cb542e2da3c8d81383cc4afc47a55..dc0656378d81a77e1d49895a90f92f27e3e247f3 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -489,7 +489,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
                  if (flag1) {
diff --git a/patches/server/0141-Break-individual-slabs-when-sneaking.patch b/patches/server/0141-Break-individual-slabs-when-sneaking.patch
index dcc00de18..bf59e9f1a 100644
--- a/patches/server/0141-Break-individual-slabs-when-sneaking.patch
+++ b/patches/server/0141-Break-individual-slabs-when-sneaking.patch
@@ -4,10 +4,10 @@ Date: Tue, 23 Mar 2021 19:38:53 -0500
 Subject: [PATCH] Break individual slabs when sneaking
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
 index adecb4915a0428b71e8c1e59b11f94dd1776697d..7315e604a2f9cb068eb5bbca744e44eeabac09c9 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+--- a/net/minecraft/server/level/ServerPlayerGameMode.java
++++ b/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -403,6 +403,7 @@ public class ServerPlayerGameMode {
                  } else {capturedBlockEntity = true;} // Paper - Send block entities after destroy prediction
                  return false;
@@ -16,10 +16,10 @@ index adecb4915a0428b71e8c1e59b11f94dd1776697d..7315e604a2f9cb068eb5bbca744e44ee
          }
          // CraftBukkit end
  
-diff --git a/src/main/java/net/minecraft/world/level/block/SlabBlock.java b/src/main/java/net/minecraft/world/level/block/SlabBlock.java
+diff --git a/net/minecraft/world/level/block/SlabBlock.java b/net/minecraft/world/level/block/SlabBlock.java
 index 9274fd639c22e305dda567b303f9b01068adb52c..4433e432ea0ee8d11045b87e68dac3ed43e8cf82 100644
---- a/src/main/java/net/minecraft/world/level/block/SlabBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SlabBlock.java
+--- a/net/minecraft/world/level/block/SlabBlock.java
++++ b/net/minecraft/world/level/block/SlabBlock.java
 @@ -150,4 +150,25 @@ public class SlabBlock extends Block implements SimpleWaterloggedBlock {
                  return false;
          }
diff --git a/patches/server/0142-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0142-Config-to-disable-hostile-mob-spawn-on-ice.patch
index 580511620..bf3453998 100644
--- a/patches/server/0142-Config-to-disable-hostile-mob-spawn-on-ice.patch
+++ b/patches/server/0142-Config-to-disable-hostile-mob-spawn-on-ice.patch
@@ -4,10 +4,10 @@ Date: Tue, 23 Mar 2021 15:40:45 -0400
 Subject: [PATCH] Config to disable hostile mob spawn on ice
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java
+diff --git a/net/minecraft/world/entity/monster/Monster.java b/net/minecraft/world/entity/monster/Monster.java
 index e2de074bbe7bab0e5a7aecc1fae4c5914a203dd4..c2061f575c731ecc6071384b007517c08e0cf983 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Monster.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java
+--- a/net/minecraft/world/entity/monster/Monster.java
++++ b/net/minecraft/world/entity/monster/Monster.java
 @@ -88,6 +88,14 @@ public abstract class Monster extends PathfinderMob implements Enemy {
      }
  
diff --git a/patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch
index a62f1e0fd..6cedac152 100644
--- a/patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch
+++ b/patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch
@@ -4,10 +4,10 @@ Date: Tue, 23 Mar 2021 22:42:20 -0400
 Subject: [PATCH] Config to show Armor Stand arms on spawn
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
 index e1c7a644dc922ca726cebf71ec2f0b159d6db289..572bb7e1f6ae75f6dfe53b0e100b3654e42bf4c2 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+--- a/net/minecraft/world/entity/decoration/ArmorStand.java
++++ b/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -128,6 +128,7 @@ public class ArmorStand extends LivingEntity {
          this.rightArmPose = ArmorStand.DEFAULT_RIGHT_ARM_POSE;
          this.leftLegPose = ArmorStand.DEFAULT_LEFT_LEG_POSE;
diff --git a/patches/server/0144-Option-to-make-doors-require-redstone.patch b/patches/server/0144-Option-to-make-doors-require-redstone.patch
index 12b9ef121..7b8450f83 100644
--- a/patches/server/0144-Option-to-make-doors-require-redstone.patch
+++ b/patches/server/0144-Option-to-make-doors-require-redstone.patch
@@ -4,10 +4,10 @@ Date: Wed, 24 Mar 2021 04:40:11 -0500
 Subject: [PATCH] Option to make doors require redstone
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java b/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
+diff --git a/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java b/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
 index 3513b15f6622bfc134ecfcd9129f81a8acc2c601..2768e2a61ab7fbd82c2b8787e715163a7b0450b9 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
+--- a/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
++++ b/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
 @@ -57,7 +57,7 @@ public class InteractWithDoor {
  
                          if (iblockdata.is(BlockTags.MOB_INTERACTABLE_DOORS, (blockbase_blockdata) -> {
@@ -35,10 +35,10 @@ index 3513b15f6622bfc134ecfcd9129f81a8acc2c601..2768e2a61ab7fbd82c2b8787e715163a
                          iterator.remove();
                      } else {
                          DoorBlock blockdoor = (DoorBlock) iblockdata.getBlock();
-diff --git a/src/main/java/net/minecraft/world/level/block/DoorBlock.java b/src/main/java/net/minecraft/world/level/block/DoorBlock.java
+diff --git a/net/minecraft/world/level/block/DoorBlock.java b/net/minecraft/world/level/block/DoorBlock.java
 index 077b99caf0ec0ee098786d23194d88e1dc4481ce..f8356e468841137dcc92b2fe5db1cafa24619eaf 100644
---- a/src/main/java/net/minecraft/world/level/block/DoorBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DoorBlock.java
+--- a/net/minecraft/world/level/block/DoorBlock.java
++++ b/net/minecraft/world/level/block/DoorBlock.java
 @@ -200,6 +200,7 @@ public class DoorBlock extends Block {
      protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
          if (!this.type.canOpenByHand()) {
diff --git a/patches/server/0145-Config-to-allow-unsafe-enchants.patch b/patches/server/0145-Config-to-allow-unsafe-enchants.patch
index 70cff0575..881c0b7e6 100644
--- a/patches/server/0145-Config-to-allow-unsafe-enchants.patch
+++ b/patches/server/0145-Config-to-allow-unsafe-enchants.patch
@@ -4,10 +4,10 @@ Date: Wed, 24 Mar 2021 17:59:54 -0400
 Subject: [PATCH] Config to allow unsafe enchants
 
 
-diff --git a/src/main/java/net/minecraft/server/commands/EnchantCommand.java b/src/main/java/net/minecraft/server/commands/EnchantCommand.java
+diff --git a/net/minecraft/server/commands/EnchantCommand.java b/net/minecraft/server/commands/EnchantCommand.java
 index cf0a5943f457c532958f40b4989fa18f967abae6..2ab8ff8ca51eb841932ccca4a348acc0141264a8 100644
---- a/src/main/java/net/minecraft/server/commands/EnchantCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/EnchantCommand.java
+--- a/net/minecraft/server/commands/EnchantCommand.java
++++ b/net/minecraft/server/commands/EnchantCommand.java
 @@ -70,7 +70,7 @@ public class EnchantCommand {
  
      private static int enchant(CommandSourceStack source, Collection<? extends Entity> targets, Holder<Enchantment> enchantment, int level) throws CommandSyntaxException {
@@ -26,10 +26,10 @@ index cf0a5943f457c532958f40b4989fa18f967abae6..2ab8ff8ca51eb841932ccca4a348acc0
                              itemStack.enchant(enchantment, level);
                              i++;
                          } else if (targets.size() == 1) {
-diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+diff --git a/net/minecraft/world/inventory/AnvilMenu.java b/net/minecraft/world/inventory/AnvilMenu.java
 index a7c3338ed6edcd26fce869ec66fdcaa4c32c0e4f..346681cf9c3c9ff5274f63236b0cc7c4eec76492 100644
---- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+--- a/net/minecraft/world/inventory/AnvilMenu.java
++++ b/net/minecraft/world/inventory/AnvilMenu.java
 @@ -234,7 +234,10 @@ public class AnvilMenu extends ItemCombinerMenu {
  
                          i2 = l1 == i2 ? i2 + 1 : Math.max(i2, l1);
@@ -77,10 +77,10 @@ index a7c3338ed6edcd26fce869ec66fdcaa4c32c0e4f..346681cf9c3c9ff5274f63236b0cc7c4
                  ((ServerPlayer) this.player).connection.send(new ClientboundContainerSetSlotPacket(this.containerId, this.incrementStateId(), 2, itemstack1));
                  ((ServerPlayer) this.player).connection.send(new ClientboundContainerSetDataPacket(this.containerId, 0, this.cost.get()));
              }
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
 index c616ebbf0f709b8c3a500a23a2190f7023f7757d..aac771d7d8aefc6d5fcb497763ab9bac1ce2dc31 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
+--- a/net/minecraft/world/item/ItemStack.java
++++ b/net/minecraft/world/item/ItemStack.java
 @@ -1369,6 +1369,12 @@ public final class ItemStack implements DataComponentHolder {
          return !((ItemEnchantments) this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY)).isEmpty();
      }
diff --git a/patches/server/0146-Configurable-sponge-absorption.patch b/patches/server/0146-Configurable-sponge-absorption.patch
index abfb6fe57..1924f96d6 100644
--- a/patches/server/0146-Configurable-sponge-absorption.patch
+++ b/patches/server/0146-Configurable-sponge-absorption.patch
@@ -7,10 +7,10 @@ Allows the total area and radius of water blocks the sponge can absorb to be cha
 
 Co-authored by: granny <granny@purpurmc.org>
 
-diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
+diff --git a/net/minecraft/world/level/block/SpongeBlock.java b/net/minecraft/world/level/block/SpongeBlock.java
 index e9a77c1ae09af42d2d444ad6b5f6c8ac395044e1..0edb7e821a60fe95fea3cae900e5b88192946fe6 100644
---- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
+--- a/net/minecraft/world/level/block/SpongeBlock.java
++++ b/net/minecraft/world/level/block/SpongeBlock.java
 @@ -61,7 +61,7 @@ public class SpongeBlock extends Block {
  
      private boolean removeWaterBreadthFirstSearch(Level world, BlockPos pos) {
diff --git a/patches/server/0147-Projectile-offset-config.patch b/patches/server/0147-Projectile-offset-config.patch
index 2f1e5c60b..5aa40b6cc 100644
--- a/patches/server/0147-Projectile-offset-config.patch
+++ b/patches/server/0147-Projectile-offset-config.patch
@@ -4,10 +4,10 @@ Date: Thu, 25 Mar 2021 01:56:38 +0100
 Subject: [PATCH] Projectile offset config
 
 
-diff --git a/src/main/java/net/minecraft/world/item/BowItem.java b/src/main/java/net/minecraft/world/item/BowItem.java
+diff --git a/net/minecraft/world/item/BowItem.java b/net/minecraft/world/item/BowItem.java
 index 1d4d0799a86b9940b5e3b614c5a188ade5133f7e..58fa528e4b2589d362eb976afd6221cd94f2623c 100644
---- a/src/main/java/net/minecraft/world/item/BowItem.java
-+++ b/src/main/java/net/minecraft/world/item/BowItem.java
+--- a/net/minecraft/world/item/BowItem.java
++++ b/net/minecraft/world/item/BowItem.java
 @@ -43,7 +43,7 @@ public class BowItem extends ProjectileWeaponItem {
                  } else {
                      List<ItemStack> list = draw(stack, itemStack, player);
@@ -17,10 +17,10 @@ index 1d4d0799a86b9940b5e3b614c5a188ade5133f7e..58fa528e4b2589d362eb976afd6221cd
                      }
  
                      world.playSound(
-diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
+diff --git a/net/minecraft/world/item/CrossbowItem.java b/net/minecraft/world/item/CrossbowItem.java
 index be1902a307a54434644b242b429ad47c271d2a0c..cac4de9877b91bd805a5a8f4b84d27449fc5001f 100644
---- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
-+++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
+--- a/net/minecraft/world/item/CrossbowItem.java
++++ b/net/minecraft/world/item/CrossbowItem.java
 @@ -70,7 +70,7 @@ public class CrossbowItem extends ProjectileWeaponItem {
          ItemStack itemStack = user.getItemInHand(hand);
          ChargedProjectiles chargedProjectiles = itemStack.get(DataComponents.CHARGED_PROJECTILES);
@@ -30,10 +30,10 @@ index be1902a307a54434644b242b429ad47c271d2a0c..cac4de9877b91bd805a5a8f4b84d2744
              return InteractionResult.CONSUME;
          } else if (!user.getProjectile(itemStack).isEmpty()) {
              this.startSoundPlayed = false;
-diff --git a/src/main/java/net/minecraft/world/item/EggItem.java b/src/main/java/net/minecraft/world/item/EggItem.java
+diff --git a/net/minecraft/world/item/EggItem.java b/net/minecraft/world/item/EggItem.java
 index 6d559fef484036194e4d899b82aaa7b5d518311e..9fb04b4e5b61ea497238e042fefa9a06f7489618 100644
---- a/src/main/java/net/minecraft/world/item/EggItem.java
-+++ b/src/main/java/net/minecraft/world/item/EggItem.java
+--- a/net/minecraft/world/item/EggItem.java
++++ b/net/minecraft/world/item/EggItem.java
 @@ -29,7 +29,7 @@ public class EggItem extends Item implements ProjectileItem {
          if (world instanceof ServerLevel worldserver) {
              // CraftBukkit start
@@ -43,10 +43,10 @@ index 6d559fef484036194e4d899b82aaa7b5d518311e..9fb04b4e5b61ea497238e042fefa9a06
              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) thrownEgg.projectile().getBukkitEntity());
              if (event.callEvent() && thrownEgg.attemptSpawn()) {
                  if (event.shouldConsume()) {
-diff --git a/src/main/java/net/minecraft/world/item/EnderpearlItem.java b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
+diff --git a/net/minecraft/world/item/EnderpearlItem.java b/net/minecraft/world/item/EnderpearlItem.java
 index 83bd9b1eff5b7f581c3f0af6f0f15bdf4b9de201..392f2600e4fb1ff937c3ec5635156b358eb36888 100644
---- a/src/main/java/net/minecraft/world/item/EnderpearlItem.java
-+++ b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
+--- a/net/minecraft/world/item/EnderpearlItem.java
++++ b/net/minecraft/world/item/EnderpearlItem.java
 @@ -26,7 +26,7 @@ public class EnderpearlItem extends Item {
          if (world instanceof ServerLevel worldserver) {
              // CraftBukkit start
@@ -56,10 +56,10 @@ index 83bd9b1eff5b7f581c3f0af6f0f15bdf4b9de201..392f2600e4fb1ff937c3ec5635156b35
              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) thrownEnderpearl.projectile().getBukkitEntity());
              if (event.callEvent() && thrownEnderpearl.attemptSpawn()) {
                  if (event.shouldConsume()) {
-diff --git a/src/main/java/net/minecraft/world/item/SnowballItem.java b/src/main/java/net/minecraft/world/item/SnowballItem.java
+diff --git a/net/minecraft/world/item/SnowballItem.java b/net/minecraft/world/item/SnowballItem.java
 index d3bba4665ae14cc279c0f937831f909f8831b12b..27499f01ef0bc89c4c3f60eb696ca07cc5984809 100644
---- a/src/main/java/net/minecraft/world/item/SnowballItem.java
-+++ b/src/main/java/net/minecraft/world/item/SnowballItem.java
+--- a/net/minecraft/world/item/SnowballItem.java
++++ b/net/minecraft/world/item/SnowballItem.java
 @@ -29,7 +29,7 @@ public class SnowballItem extends Item implements ProjectileItem {
          // world.playSound((EntityHuman) null, entityhuman.getX(), entityhuman.getY(), entityhuman.getZ(), SoundEffects.SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
          if (world instanceof ServerLevel worldserver) {
@@ -69,10 +69,10 @@ index d3bba4665ae14cc279c0f937831f909f8831b12b..27499f01ef0bc89c4c3f60eb696ca07c
              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) snowball.projectile().getBukkitEntity());
              if (event.callEvent() && snowball.attemptSpawn()) {
                  user.awardStat(Stats.ITEM_USED.get(this));
-diff --git a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
+diff --git a/net/minecraft/world/item/ThrowablePotionItem.java b/net/minecraft/world/item/ThrowablePotionItem.java
 index e422881d1ab0f1a5bb2cb741d23089a2e35de2d4..bbd65d35d91d4f3ffabeb355b82f22ddde0f868b 100644
---- a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
-+++ b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
+--- a/net/minecraft/world/item/ThrowablePotionItem.java
++++ b/net/minecraft/world/item/ThrowablePotionItem.java
 @@ -23,7 +23,7 @@ public class ThrowablePotionItem extends PotionItem implements ProjectileItem {
          ItemStack itemStack = user.getItemInHand(hand);
          if (world instanceof ServerLevel serverLevel) {
@@ -82,10 +82,10 @@ index e422881d1ab0f1a5bb2cb741d23089a2e35de2d4..bbd65d35d91d4f3ffabeb355b82f22dd
              // Paper start - PlayerLaunchProjectileEvent
              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Projectile) thrownPotion.projectile().getBukkitEntity());
              if (event.callEvent() && thrownPotion.attemptSpawn()) {
-diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
+diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java
 index aff4f33be216f62d6c6e139dcd7fd82efdbd267c..810082126567eb02bec395065b95b3c3902d4973 100644
---- a/src/main/java/net/minecraft/world/item/TridentItem.java
-+++ b/src/main/java/net/minecraft/world/item/TridentItem.java
+--- a/net/minecraft/world/item/TridentItem.java
++++ b/net/minecraft/world/item/TridentItem.java
 @@ -89,7 +89,7 @@ public class TridentItem extends Item implements ProjectileItem {
                          // itemstack.hurtWithoutBreaking(1, entityhuman); // CraftBukkit - moved down
                          if (f == 0.0F) {
diff --git a/patches/server/0148-Config-for-powered-rail-activation-distance.patch b/patches/server/0148-Config-for-powered-rail-activation-distance.patch
index c5d21071c..4a8ff9ce6 100644
--- a/patches/server/0148-Config-for-powered-rail-activation-distance.patch
+++ b/patches/server/0148-Config-for-powered-rail-activation-distance.patch
@@ -4,10 +4,10 @@ Date: Thu, 25 Mar 2021 18:10:03 -0400
 Subject: [PATCH] Config for powered rail activation distance
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java b/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java
+diff --git a/net/minecraft/world/level/block/PoweredRailBlock.java b/net/minecraft/world/level/block/PoweredRailBlock.java
 index b763361a8f0f1b46093d5dd9afe8dba0cadf9c78..bd14c08defe8afc5ceca59d16a5b1dbad178f594 100644
---- a/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java
+--- a/net/minecraft/world/level/block/PoweredRailBlock.java
++++ b/net/minecraft/world/level/block/PoweredRailBlock.java
 @@ -30,7 +30,7 @@ public class PoweredRailBlock extends BaseRailBlock {
      }
  
diff --git a/patches/server/0149-Piglin-portal-spawn-modifier.patch b/patches/server/0149-Piglin-portal-spawn-modifier.patch
index c7b19d358..2c7e1e44e 100644
--- a/patches/server/0149-Piglin-portal-spawn-modifier.patch
+++ b/patches/server/0149-Piglin-portal-spawn-modifier.patch
@@ -17,10 +17,10 @@ Difficulties:
 2 - normal
 3 - hard
 
-diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+diff --git a/net/minecraft/world/level/block/NetherPortalBlock.java b/net/minecraft/world/level/block/NetherPortalBlock.java
 index 5169cba4c43d80ce3597c57bf7d40bd0148ec8a0..2d53c57c961fa8977e37931775863665381595eb 100644
---- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+--- a/net/minecraft/world/level/block/NetherPortalBlock.java
++++ b/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -78,7 +78,7 @@ public class NetherPortalBlock extends Block implements Portal {
  
      @Override
diff --git a/patches/server/0150-Config-to-change-max-number-of-bees.patch b/patches/server/0150-Config-to-change-max-number-of-bees.patch
index 5dbcc264e..1b9c4d57e 100644
--- a/patches/server/0150-Config-to-change-max-number-of-bees.patch
+++ b/patches/server/0150-Config-to-change-max-number-of-bees.patch
@@ -4,10 +4,10 @@ Date: Thu, 29 Apr 2021 19:37:48 +0200
 Subject: [PATCH] Config to change max number of bees
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+diff --git a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 index 65a85b4a4e159cfe55e435ed342a87bcc07b21d5..7f0e37e23ff4c64355fdc822c0ac683959b8588a 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+--- a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -60,7 +60,7 @@ public class BeehiveBlockEntity extends BlockEntity {
      private List<BeehiveBlockEntity.BeeData> stored = Lists.newArrayList();
      @Nullable
diff --git a/patches/server/0151-Config-for-wither-explosion-radius.patch b/patches/server/0151-Config-for-wither-explosion-radius.patch
index dd386114f..cc68888f9 100644
--- a/patches/server/0151-Config-for-wither-explosion-radius.patch
+++ b/patches/server/0151-Config-for-wither-explosion-radius.patch
@@ -4,10 +4,10 @@ Date: Thu, 29 Apr 2021 14:39:07 -0400
 Subject: [PATCH] Config for wither explosion radius
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
+diff --git a/net/minecraft/world/entity/projectile/WitherSkull.java b/net/minecraft/world/entity/projectile/WitherSkull.java
 index 45e0b9b3653de2dcb51a579f939b991beac03149..eeb91f7e744d20c1a05212308a23102a347b9c19 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
+--- a/net/minecraft/world/entity/projectile/WitherSkull.java
++++ b/net/minecraft/world/entity/projectile/WitherSkull.java
 @@ -103,7 +103,7 @@ public class WitherSkull extends AbstractHurtingProjectile {
          if (!this.level().isClientSide) {
              // CraftBukkit start
diff --git a/patches/server/0152-Gamemode-extra-permissions.patch b/patches/server/0152-Gamemode-extra-permissions.patch
index e97cffe62..92036a5c0 100644
--- a/patches/server/0152-Gamemode-extra-permissions.patch
+++ b/patches/server/0152-Gamemode-extra-permissions.patch
@@ -4,10 +4,10 @@ Date: Fri, 30 Apr 2021 13:39:39 -0500
 Subject: [PATCH] Gamemode extra permissions
 
 
-diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
+diff --git a/net/minecraft/commands/CommandSourceStack.java b/net/minecraft/commands/CommandSourceStack.java
 index 7b2daf47e411362a462019a1612a99c952170200..8ed5e9293e80f53d741c145fa415fab6311036d7 100644
---- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
-+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
+--- a/net/minecraft/commands/CommandSourceStack.java
++++ b/net/minecraft/commands/CommandSourceStack.java
 @@ -211,6 +211,19 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
      }
      // CraftBukkit end
@@ -28,10 +28,10 @@ index 7b2daf47e411362a462019a1612a99c952170200..8ed5e9293e80f53d741c145fa415fab6
      public Vec3 getPosition() {
          return this.worldPosition;
      }
-diff --git a/src/main/java/net/minecraft/server/commands/GameModeCommand.java b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
+diff --git a/net/minecraft/server/commands/GameModeCommand.java b/net/minecraft/server/commands/GameModeCommand.java
 index d1da3600dc07107309b20ebe6e7c0c4da0e8de76..244b4719c689f153fa36381a60acc280bb0bd9b3 100644
---- a/src/main/java/net/minecraft/server/commands/GameModeCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
+--- a/net/minecraft/server/commands/GameModeCommand.java
++++ b/net/minecraft/server/commands/GameModeCommand.java
 @@ -57,6 +57,18 @@ public class GameModeCommand {
      }
  
diff --git a/patches/server/0153-Configurable-piston-push-limit.patch b/patches/server/0153-Configurable-piston-push-limit.patch
index f7a1f8a9f..04eb93150 100644
--- a/patches/server/0153-Configurable-piston-push-limit.patch
+++ b/patches/server/0153-Configurable-piston-push-limit.patch
@@ -4,10 +4,10 @@ Date: Sun, 2 May 2021 23:14:54 +0200
 Subject: [PATCH] Configurable piston push limit
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonStructureResolver.java b/src/main/java/net/minecraft/world/level/block/piston/PistonStructureResolver.java
+diff --git a/net/minecraft/world/level/block/piston/PistonStructureResolver.java b/net/minecraft/world/level/block/piston/PistonStructureResolver.java
 index 205e223c356634bd6bc6bd58c6f0b7fda61a6f5f..bea05cb928d540a2f19b51bb7352d032b2dd69cd 100644
---- a/src/main/java/net/minecraft/world/level/block/piston/PistonStructureResolver.java
-+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonStructureResolver.java
+--- a/net/minecraft/world/level/block/piston/PistonStructureResolver.java
++++ b/net/minecraft/world/level/block/piston/PistonStructureResolver.java
 @@ -81,7 +81,7 @@ public class PistonStructureResolver {
              return true;
          } else {
diff --git a/patches/server/0154-Configurable-broadcast-settings.patch b/patches/server/0154-Configurable-broadcast-settings.patch
index 75df7a9ba..a8fa5c5c4 100644
--- a/patches/server/0154-Configurable-broadcast-settings.patch
+++ b/patches/server/0154-Configurable-broadcast-settings.patch
@@ -4,10 +4,10 @@ Date: Mon, 3 May 2021 01:33:14 +0200
 Subject: [PATCH] Configurable broadcast settings
 
 
-diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
+diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
 index 0a16aa193ef24aa8f1716f9e089b8027fa3c0a3c..1e85c9318ede93b8e9fe548a8945324b5b00e818 100644
---- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
-+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
+--- a/net/minecraft/server/PlayerAdvancements.java
++++ b/net/minecraft/server/PlayerAdvancements.java
 @@ -250,6 +250,7 @@ public class PlayerAdvancements {
                  advancement.value().display().ifPresent((advancementdisplay) -> {
                      // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
@@ -16,10 +16,10 @@ index 0a16aa193ef24aa8f1716f9e089b8027fa3c0a3c..1e85c9318ede93b8e9fe548a8945324b
                          this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.message()), false);
                          // Paper end
                      }
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 6467e72fa43469ae065462e1a0720130dee336b3..4c69fa830a216c189f97ddfb62f0008b891455da 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -1339,6 +1339,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
              }));
              PlayerTeam scoreboardteam = this.getTeam();
diff --git a/patches/server/0155-Configurable-mob-blindness.patch b/patches/server/0155-Configurable-mob-blindness.patch
index 6de679507..919f594e2 100644
--- a/patches/server/0155-Configurable-mob-blindness.patch
+++ b/patches/server/0155-Configurable-mob-blindness.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable mob blindness
 
 Ported from https://github.com/raltsmc/mobblindness
 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index dc0656378d81a77e1d49895a90f92f27e3e247f3..28d3b200ab0c3e8993dfb89a3e48146898c6b85e 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1065,6 +1065,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
              if (entitytypes == EntityType.SKELETON && itemstack.is(Items.SKELETON_SKULL) || entitytypes == EntityType.ZOMBIE && itemstack.is(Items.ZOMBIE_HEAD) || entitytypes == EntityType.PIGLIN && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.PIGLIN_BRUTE && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.CREEPER && itemstack.is(Items.CREEPER_HEAD)) {
                  d0 *= 0.5D;
diff --git a/patches/server/0156-Hide-hidden-players-from-entity-selector.patch b/patches/server/0156-Hide-hidden-players-from-entity-selector.patch
index 046fbbb50..dfd71a2ca 100644
--- a/patches/server/0156-Hide-hidden-players-from-entity-selector.patch
+++ b/patches/server/0156-Hide-hidden-players-from-entity-selector.patch
@@ -4,10 +4,10 @@ Date: Thu, 13 May 2021 16:18:29 -0500
 Subject: [PATCH] Hide hidden players from entity selector
 
 
-diff --git a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
+diff --git a/net/minecraft/commands/arguments/selector/EntitySelector.java b/net/minecraft/commands/arguments/selector/EntitySelector.java
 index c8d39e6e1c570c9219f6066da273dc0130920519..d881caf99c2bad66b76bdc6ddb11a6cac1e94db6 100644
---- a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
-+++ b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
+--- a/net/minecraft/commands/arguments/selector/EntitySelector.java
++++ b/net/minecraft/commands/arguments/selector/EntitySelector.java
 @@ -198,10 +198,10 @@ public class EntitySelector {
  
          if (this.playerName != null) {
diff --git a/patches/server/0157-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0157-Config-for-health-to-impact-Creeper-explosion-radius.patch
index 8b94ea7c8..8d53aa8d2 100644
--- a/patches/server/0157-Config-for-health-to-impact-Creeper-explosion-radius.patch
+++ b/patches/server/0157-Config-for-health-to-impact-Creeper-explosion-radius.patch
@@ -4,10 +4,10 @@ Date: Thu, 29 Apr 2021 20:28:18 -0400
 Subject: [PATCH] Config for health to impact Creeper explosion radius
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
 index 58ef6c538a33199e5a8423223c22c61bf91fccae..d22a36bdabf04da4c4fe6e4699c9d78dc5b4e0c6 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+--- a/net/minecraft/world/entity/monster/Creeper.java
++++ b/net/minecraft/world/entity/monster/Creeper.java
 @@ -377,9 +377,10 @@ public class Creeper extends Monster {
  
          if (world instanceof ServerLevel worldserver) {
diff --git a/patches/server/0158-Iron-golem-calm-anger-options.patch b/patches/server/0158-Iron-golem-calm-anger-options.patch
index f9046c4d0..35d975172 100644
--- a/patches/server/0158-Iron-golem-calm-anger-options.patch
+++ b/patches/server/0158-Iron-golem-calm-anger-options.patch
@@ -4,10 +4,10 @@ Date: Thu, 13 May 2021 21:22:51 -0500
 Subject: [PATCH] Iron golem calm anger options
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+diff --git a/net/minecraft/world/entity/animal/IronGolem.java b/net/minecraft/world/entity/animal/IronGolem.java
 index 74971f19a646b78bff66d2543d80d9358fdd29c5..da51e119c290a850072679a7b4f4bde3025c95cf 100644
---- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+--- a/net/minecraft/world/entity/animal/IronGolem.java
++++ b/net/minecraft/world/entity/animal/IronGolem.java
 @@ -95,6 +95,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      @Override
      protected void registerGoals() {
diff --git a/patches/server/0159-Breedable-parrots.patch b/patches/server/0159-Breedable-parrots.patch
index 528b7a97a..e0e2d2065 100644
--- a/patches/server/0159-Breedable-parrots.patch
+++ b/patches/server/0159-Breedable-parrots.patch
@@ -4,10 +4,10 @@ Date: Thu, 13 May 2021 22:17:50 -0500
 Subject: [PATCH] Breedable parrots
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java
 index 3305a49fed395c134cf099253ea0558b6bd27bd4..eb7d6c1367ad9e4b8292987a69531cd627580167 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+--- a/net/minecraft/world/entity/animal/Parrot.java
++++ b/net/minecraft/world/entity/animal/Parrot.java
 @@ -226,6 +226,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
      protected void registerGoals() {
          //this.goalSelector.addGoal(0, new TamableAnimal.TamableAnimalPanicGoal(1.25D)); // Purpur - move down
diff --git a/patches/server/0160-Configurable-powered-rail-boost-modifier.patch b/patches/server/0160-Configurable-powered-rail-boost-modifier.patch
index eb22fd558..04da32d41 100644
--- a/patches/server/0160-Configurable-powered-rail-boost-modifier.patch
+++ b/patches/server/0160-Configurable-powered-rail-boost-modifier.patch
@@ -4,10 +4,10 @@ Date: Fri, 14 May 2021 21:22:57 +0100
 Subject: [PATCH] Configurable powered rail boost modifier
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java b/src/main/java/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
+diff --git a/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java b/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
 index f43439b31a14b9db4744512465d81134ebe5b3e1..0b9741dfebd0bb95e8c0e1f55ce18dfb353f693a 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
+--- a/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
++++ b/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
 @@ -426,7 +426,7 @@ public class NewMinecartBehavior extends MinecartBehavior {
      private Vec3 calculateBoostTrackSpeed(Vec3 velocity, BlockPos railPos, BlockState railState) {
          if (railState.is(Blocks.POWERED_RAIL) && (Boolean) railState.getValue(PoweredRailBlock.POWERED)) {
@@ -17,10 +17,10 @@ index f43439b31a14b9db4744512465d81134ebe5b3e1..0b9741dfebd0bb95e8c0e1f55ce18dfb
              } else {
                  Vec3 vec3d1 = this.minecart.getRedstoneDirection(railPos);
  
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java b/src/main/java/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
+diff --git a/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java b/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
 index 04a622f52353ebcc21f41c233f5a0fd67690cf4a..f10ce069ef427df16fd0ce0e60b85c805ca703f0 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
+--- a/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
++++ b/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
 @@ -310,9 +310,9 @@ public class OldMinecartBehavior extends MinecartBehavior {
              vec3d5 = this.getDeltaMovement();
              d17 = vec3d5.horizontalDistance();
diff --git a/patches/server/0161-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0161-Add-config-change-multiplier-critical-damage-value.patch
index ea121b858..f73baa86a 100644
--- a/patches/server/0161-Add-config-change-multiplier-critical-damage-value.patch
+++ b/patches/server/0161-Add-config-change-multiplier-critical-damage-value.patch
@@ -4,10 +4,10 @@ Date: Mon, 17 May 2021 02:40:13 +0200
 Subject: [PATCH] Add config change multiplier critical damage 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
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index fc0e571b62a9bd40df2d3d066cf374e12004a6d8..bc3c67e8f70890831a0bb1799a3b7c10852b1273 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -1309,7 +1309,7 @@ public abstract class Player extends LivingEntity {
                      flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
                      if (flag2) {
diff --git a/patches/server/0162-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0162-Option-to-disable-dragon-egg-teleporting.patch
index 2829d6e62..608b3048d 100644
--- a/patches/server/0162-Option-to-disable-dragon-egg-teleporting.patch
+++ b/patches/server/0162-Option-to-disable-dragon-egg-teleporting.patch
@@ -4,10 +4,10 @@ Date: Mon, 17 May 2021 04:46:23 -0500
 Subject: [PATCH] Option to disable dragon egg teleporting
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/DragonEggBlock.java b/src/main/java/net/minecraft/world/level/block/DragonEggBlock.java
+diff --git a/net/minecraft/world/level/block/DragonEggBlock.java b/net/minecraft/world/level/block/DragonEggBlock.java
 index 30d15686b1a81de7ac28feb0c6188eb007c6f2fd..b6799db00e157892dd4339a01d2ca36092c8e491 100644
---- a/src/main/java/net/minecraft/world/level/block/DragonEggBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DragonEggBlock.java
+--- a/net/minecraft/world/level/block/DragonEggBlock.java
++++ b/net/minecraft/world/level/block/DragonEggBlock.java
 @@ -48,8 +48,8 @@ public class DragonEggBlock extends FallingBlock {
      }
  
diff --git a/patches/server/0163-Config-for-unverified-username-message.patch b/patches/server/0163-Config-for-unverified-username-message.patch
index 007140c04..f8e316f4a 100644
--- a/patches/server/0163-Config-for-unverified-username-message.patch
+++ b/patches/server/0163-Config-for-unverified-username-message.patch
@@ -4,10 +4,10 @@ Date: Wed, 19 May 2021 15:33:43 -0400
 Subject: [PATCH] Config for unverified username message
 
 
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 index 033755682c61c889723c3669b5cff4de147f637e..16069b9cbf6c7679c28a2e9a54e77d23cd10e541 100644
---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -322,7 +322,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
                          ServerLoginPacketListenerImpl.LOGGER.warn("Failed to verify username but will let them in anyway!");
                          ServerLoginPacketListenerImpl.this.startClientVerification(ServerLoginPacketListenerImpl.this.createOfflineProfile(s1)); // Spigot
diff --git a/patches/server/0164-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0164-Make-anvil-cumulative-cost-configurable.patch
index 4bcd6dbe5..2d76c1361 100644
--- a/patches/server/0164-Make-anvil-cumulative-cost-configurable.patch
+++ b/patches/server/0164-Make-anvil-cumulative-cost-configurable.patch
@@ -4,10 +4,10 @@ Date: Fri, 21 May 2021 16:58:45 +0200
 Subject: [PATCH] Make anvil cumulative cost configurable
 
 
-diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+diff --git a/net/minecraft/world/inventory/AnvilMenu.java b/net/minecraft/world/inventory/AnvilMenu.java
 index 346681cf9c3c9ff5274f63236b0cc7c4eec76492..5959e1df9374bcb889be1726abb83b8c58962d05 100644
---- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+--- a/net/minecraft/world/inventory/AnvilMenu.java
++++ b/net/minecraft/world/inventory/AnvilMenu.java
 @@ -406,7 +406,7 @@ public class AnvilMenu extends ItemCombinerMenu {
      }
  
diff --git a/patches/server/0165-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0165-Bee-can-work-when-raining-or-at-night.patch
index ad3886d00..1a950aba6 100644
--- a/patches/server/0165-Bee-can-work-when-raining-or-at-night.patch
+++ b/patches/server/0165-Bee-can-work-when-raining-or-at-night.patch
@@ -4,10 +4,10 @@ Date: Thu, 27 May 2021 06:46:30 +0200
 Subject: [PATCH] Bee can work when raining or at night
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
 index 40137a98174cd0238d06c894373984a403f96fbc..e191e27308dd8c5c8702692091541756f2b57ac1 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+--- a/net/minecraft/world/entity/animal/Bee.java
++++ b/net/minecraft/world/entity/animal/Bee.java
 @@ -430,7 +430,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      }
  
diff --git a/patches/server/0166-API-for-any-mob-to-burn-daylight.patch b/patches/server/0166-API-for-any-mob-to-burn-daylight.patch
index ff515fb0f..07d21912b 100644
--- a/patches/server/0166-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0166-API-for-any-mob-to-burn-daylight.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for any mob to burn daylight
 
 Co-authored by: Encode42 <me@encode42.dev>
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index a5f4f5d915a864240fd738ca32872829bfcabb41..25a6f228bad7deca7e7301868039d27bf65505c8 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -575,6 +575,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
      // Purpur end - Add canSaveToDisk to Entity
@@ -32,10 +32,10 @@ index a5f4f5d915a864240fd738ca32872829bfcabb41..25a6f228bad7deca7e7301868039d27b
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
          this.despawnTime = type == EntityType.PLAYER ? -1 : world.paperConfig().entities.spawning.despawnTime.getOrDefault(type, io.papermc.paper.configuration.type.number.IntOr.Disabled.DISABLED).or(-1); // Paper - entity despawn time limit
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index 28d3b200ab0c3e8993dfb89a3e48146898c6b85e..ecf8e9742951c144170ce818c14d368011ef99a8 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -295,6 +295,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
      public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
@@ -99,10 +99,10 @@ index 28d3b200ab0c3e8993dfb89a3e48146898c6b85e..ecf8e9742951c144170ce818c14d3680
      }
  
      public boolean isSensitiveToWater() {
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
 index 6836f0ddab9d05d146fc03c234b1b58829ec96c0..30213b1917de318989f280aed8735bbe539de100 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
+--- a/net/minecraft/world/entity/Mob.java
++++ b/net/minecraft/world/entity/Mob.java
 @@ -1773,17 +1773,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      protected void playAttackSound() {}
  
@@ -123,10 +123,10 @@ index 6836f0ddab9d05d146fc03c234b1b58829ec96c0..30213b1917de318989f280aed8735bbe
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+diff --git a/net/minecraft/world/entity/monster/AbstractSkeleton.java b/net/minecraft/world/entity/monster/AbstractSkeleton.java
 index 22b003a23b519bedc50bbcad0706aa2d7d7f4b3a..27bdd3c4e0dc3fbb906689e2390c945bf3d40eea 100644
---- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+--- a/net/minecraft/world/entity/monster/AbstractSkeleton.java
++++ b/net/minecraft/world/entity/monster/AbstractSkeleton.java
 @@ -70,6 +70,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
      protected AbstractSkeleton(EntityType<? extends AbstractSkeleton> type, Level world) {
          super(type, world);
@@ -193,10 +193,10 @@ index 22b003a23b519bedc50bbcad0706aa2d7d7f4b3a..27bdd3c4e0dc3fbb906689e2390c945b
      }
      // Paper end - shouldBurnInDay API
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+diff --git a/net/minecraft/world/entity/monster/Husk.java b/net/minecraft/world/entity/monster/Husk.java
 index 43887b5aa533d456de5e66da2a3bef82aed58084..9f0b91de19ecdb0f74fe6d93a1e75c27c262ee07 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+--- a/net/minecraft/world/entity/monster/Husk.java
++++ b/net/minecraft/world/entity/monster/Husk.java
 @@ -21,6 +21,7 @@ public class Husk extends Zombie {
  
      public Husk(EntityType<? extends Husk> type, Level world) {
@@ -214,10 +214,10 @@ index 43887b5aa533d456de5e66da2a3bef82aed58084..9f0b91de19ecdb0f74fe6d93a1e75c27
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
 index f09830c1c88f4b28f05e1647706a3c96a596ad1e..71bbb3209acc12c9f20b8964770be8666a7e72f8 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+--- a/net/minecraft/world/entity/monster/Phantom.java
++++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -60,6 +60,7 @@ public class Phantom extends FlyingMob implements Enemy {
          this.xpReward = 5;
          this.moveControl = new Phantom.PhantomMoveControl(this);
@@ -269,10 +269,10 @@ index f09830c1c88f4b28f05e1647706a3c96a596ad1e..71bbb3209acc12c9f20b8964770be866
      public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
      // Paper end
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
 index 09b21cf02a07e1eb6a0aa2c6880d4106fe9e0d77..d0fcd51e36e7c7e774fcf9b1db42ec7fceb9fc41 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+--- a/net/minecraft/world/entity/monster/Zombie.java
++++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -99,11 +99,12 @@ public class Zombie extends Monster {
      private int inWaterTime;
      public int conversionTime;
diff --git a/patches/server/0167-Config-MobEffect-by-world.patch b/patches/server/0167-Config-MobEffect-by-world.patch
index 04bd2172b..fbf98df84 100644
--- a/patches/server/0167-Config-MobEffect-by-world.patch
+++ b/patches/server/0167-Config-MobEffect-by-world.patch
@@ -4,10 +4,10 @@ Date: Sat, 23 Sep 2023 03:59:15 -0700
 Subject: [PATCH] Config MobEffect by world
 
 
-diff --git a/src/main/java/net/minecraft/world/effect/HungerMobEffect.java b/src/main/java/net/minecraft/world/effect/HungerMobEffect.java
+diff --git a/net/minecraft/world/effect/HungerMobEffect.java b/net/minecraft/world/effect/HungerMobEffect.java
 index 11d1ee8fae7670f02cb3f5d57f4774dbde77f48c..88cf1353892a7ead4e0f16822216b151726ac0e4 100644
---- a/src/main/java/net/minecraft/world/effect/HungerMobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/HungerMobEffect.java
+--- a/net/minecraft/world/effect/HungerMobEffect.java
++++ b/net/minecraft/world/effect/HungerMobEffect.java
 @@ -13,7 +13,7 @@ class HungerMobEffect extends MobEffect {
      @Override
      public boolean applyEffectTick(ServerLevel world, LivingEntity entity, int amplifier) {
@@ -17,10 +17,10 @@ index 11d1ee8fae7670f02cb3f5d57f4774dbde77f48c..88cf1353892a7ead4e0f16822216b151
          }
  
          return true;
-diff --git a/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java b/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java
+diff --git a/net/minecraft/world/effect/PoisonMobEffect.java b/net/minecraft/world/effect/PoisonMobEffect.java
 index 3f1e59229d6a71117700a56c87914bc9401f1da2..32c8474ffa88e997bb484caecb21e3dc98991e70 100644
---- a/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java
+--- a/net/minecraft/world/effect/PoisonMobEffect.java
++++ b/net/minecraft/world/effect/PoisonMobEffect.java
 @@ -13,8 +13,8 @@ public class PoisonMobEffect extends MobEffect {
  
      @Override
@@ -32,10 +32,10 @@ index 3f1e59229d6a71117700a56c87914bc9401f1da2..32c8474ffa88e997bb484caecb21e3dc
          }
  
          return true;
-diff --git a/src/main/java/net/minecraft/world/effect/RegenerationMobEffect.java b/src/main/java/net/minecraft/world/effect/RegenerationMobEffect.java
+diff --git a/net/minecraft/world/effect/RegenerationMobEffect.java b/net/minecraft/world/effect/RegenerationMobEffect.java
 index b43e573e91d1f1b407774bb2d60ee5f099f171e7..25aa932fc03eeebc5aabca6c5eae0cbfc8ad8396 100644
---- a/src/main/java/net/minecraft/world/effect/RegenerationMobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/RegenerationMobEffect.java
+--- a/net/minecraft/world/effect/RegenerationMobEffect.java
++++ b/net/minecraft/world/effect/RegenerationMobEffect.java
 @@ -12,7 +12,7 @@ class RegenerationMobEffect extends MobEffect {
      @Override
      public boolean applyEffectTick(ServerLevel world, LivingEntity entity, int amplifier) {
@@ -45,10 +45,10 @@ index b43e573e91d1f1b407774bb2d60ee5f099f171e7..25aa932fc03eeebc5aabca6c5eae0cbf
          }
  
          return true;
-diff --git a/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java b/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java
+diff --git a/net/minecraft/world/effect/SaturationMobEffect.java b/net/minecraft/world/effect/SaturationMobEffect.java
 index 98b74649a667fb9b10afef0ba5383a73022d8c71..837bdc7d6bd4e05b0deded829c678c86ae3d79d5 100644
---- a/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java
+--- a/net/minecraft/world/effect/SaturationMobEffect.java
++++ b/net/minecraft/world/effect/SaturationMobEffect.java
 @@ -21,7 +21,7 @@ class SaturationMobEffect extends InstantenousMobEffect {
              int oldFoodLevel = entityhuman.getFoodData().foodLevel;
              org.bukkit.event.entity.FoodLevelChangeEvent event = CraftEventFactory.callFoodLevelChangeEvent(entityhuman, amplifier + 1 + oldFoodLevel);
@@ -58,10 +58,10 @@ index 98b74649a667fb9b10afef0ba5383a73022d8c71..837bdc7d6bd4e05b0deded829c678c86
              }
  
              ((CraftPlayer) entityhuman.getBukkitEntity()).sendHealthUpdate();
-diff --git a/src/main/java/net/minecraft/world/effect/WitherMobEffect.java b/src/main/java/net/minecraft/world/effect/WitherMobEffect.java
+diff --git a/net/minecraft/world/effect/WitherMobEffect.java b/net/minecraft/world/effect/WitherMobEffect.java
 index 55132e6e064ddd15b26286eca335305ed57b2f9e..1e04947995009689315352b79989e7ce4e20073c 100644
---- a/src/main/java/net/minecraft/world/effect/WitherMobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/WitherMobEffect.java
+--- a/net/minecraft/world/effect/WitherMobEffect.java
++++ b/net/minecraft/world/effect/WitherMobEffect.java
 @@ -12,7 +12,7 @@ public class WitherMobEffect extends MobEffect {
  
      @Override
diff --git a/patches/server/0168-Beacon-Activation-Range-Configurable.patch b/patches/server/0168-Beacon-Activation-Range-Configurable.patch
index cce3d7713..91f830363 100644
--- a/patches/server/0168-Beacon-Activation-Range-Configurable.patch
+++ b/patches/server/0168-Beacon-Activation-Range-Configurable.patch
@@ -4,10 +4,10 @@ Date: Wed, 2 Jun 2021 02:45:47 +0200
 Subject: [PATCH] Beacon Activation Range Configurable
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+diff --git a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 index 0e0d178f2793ab014358f534c8dc53218b89f083..15a24cad5700cc1fe7430e425909869be84fe928 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+--- a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -92,6 +92,16 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
  
      public double getEffectRange() {
diff --git a/patches/server/0169-Make-lightning-rod-range-configurable.patch b/patches/server/0169-Make-lightning-rod-range-configurable.patch
index d93da1f1b..3e7ec5f46 100644
--- a/patches/server/0169-Make-lightning-rod-range-configurable.patch
+++ b/patches/server/0169-Make-lightning-rod-range-configurable.patch
@@ -4,10 +4,10 @@ Date: Wed, 23 Jun 2021 13:36:20 +0200
 Subject: [PATCH] Make lightning rod range configurable
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
 index 56fe25076109827815d7d8ebc45a62d391462bbf..9ff7fb18e52bea06b02ebf0d1b97647df6b304dc 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1073,7 +1073,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              return holder.is(PoiTypes.LIGHTNING_ROD);
          }, (blockposition1) -> {
diff --git a/patches/server/0170-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch b/patches/server/0170-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
index 291da503d..4548f8e03 100644
--- a/patches/server/0170-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
+++ b/patches/server/0170-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Burp delay, burp after eating food fills hunger bar
  completely
 
 
-diff --git a/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java b/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java
+diff --git a/net/minecraft/world/effect/SaturationMobEffect.java b/net/minecraft/world/effect/SaturationMobEffect.java
 index 837bdc7d6bd4e05b0deded829c678c86ae3d79d5..0c7c0524e487ff32e16dd9939d92bc6441602747 100644
---- a/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java
+--- a/net/minecraft/world/effect/SaturationMobEffect.java
++++ b/net/minecraft/world/effect/SaturationMobEffect.java
 @@ -21,6 +21,7 @@ class SaturationMobEffect extends InstantenousMobEffect {
              int oldFoodLevel = entityhuman.getFoodData().foodLevel;
              org.bukkit.event.entity.FoodLevelChangeEvent event = CraftEventFactory.callFoodLevelChangeEvent(entityhuman, amplifier + 1 + oldFoodLevel);
@@ -17,10 +17,10 @@ index 837bdc7d6bd4e05b0deded829c678c86ae3d79d5..0c7c0524e487ff32e16dd9939d92bc64
                  entityhuman.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, entity.level().purpurConfig.humanSaturationRegenAmount); // Purpur
              }
  
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index bc3c67e8f70890831a0bb1799a3b7c10852b1273..a8b5869160cb75c314459403a0a229ec68b69086 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -201,6 +201,7 @@ public abstract class Player extends LivingEntity {
      public boolean affectsSpawning = true; // Paper - Affects Spawning API
      public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
@@ -42,10 +42,10 @@ index bc3c67e8f70890831a0bb1799a3b7c10852b1273..a8b5869160cb75c314459403a0a229ec
          this.noPhysics = this.isSpectator();
          if (this.isSpectator() || this.isPassenger()) {
              this.setOnGround(false);
-diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
+diff --git a/net/minecraft/world/food/FoodData.java b/net/minecraft/world/food/FoodData.java
 index 6a686be6a69ae890d519a54ca099d4ba14e5b9e1..4f8ee2e5db3352306f3c035052866d95630f4aaf 100644
---- a/src/main/java/net/minecraft/world/food/FoodData.java
-+++ b/src/main/java/net/minecraft/world/food/FoodData.java
+--- a/net/minecraft/world/food/FoodData.java
++++ b/net/minecraft/world/food/FoodData.java
 @@ -44,6 +44,7 @@ public class FoodData {
          org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityplayer, foodinfo.nutrition() + oldFoodLevel, itemstack);
  
@@ -54,10 +54,10 @@ index 6a686be6a69ae890d519a54ca099d4ba14e5b9e1..4f8ee2e5db3352306f3c035052866d95
              this.add(event.getFoodLevel() - oldFoodLevel, foodinfo.saturation());
          }
  
-diff --git a/src/main/java/net/minecraft/world/food/FoodProperties.java b/src/main/java/net/minecraft/world/food/FoodProperties.java
+diff --git a/net/minecraft/world/food/FoodProperties.java b/net/minecraft/world/food/FoodProperties.java
 index 882b72799ae532f4e181214d5756ec024af223e2..9a3f2a95debcf8b94f7deb375922ea09b30aabab 100644
---- a/src/main/java/net/minecraft/world/food/FoodProperties.java
-+++ b/src/main/java/net/minecraft/world/food/FoodProperties.java
+--- a/net/minecraft/world/food/FoodProperties.java
++++ b/net/minecraft/world/food/FoodProperties.java
 @@ -33,7 +33,7 @@ public record FoodProperties(int nutrition, float saturation, boolean canAlwaysE
          world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), (SoundEvent) consumable.sound().value(), SoundSource.NEUTRAL, 1.0F, randomsource.triangle(1.0F, 0.4F));
          if (user instanceof Player entityhuman) {
@@ -67,10 +67,10 @@ index 882b72799ae532f4e181214d5756ec024af223e2..9a3f2a95debcf8b94f7deb375922ea09
          }
  
      }
-diff --git a/src/main/java/net/minecraft/world/level/block/CakeBlock.java b/src/main/java/net/minecraft/world/level/block/CakeBlock.java
+diff --git a/net/minecraft/world/level/block/CakeBlock.java b/net/minecraft/world/level/block/CakeBlock.java
 index 648c2510beb162e73aed236a3169d0bbb8fc5050..3563a241c0b697dc0167cf7b1aa73fef7d1e7934 100644
---- a/src/main/java/net/minecraft/world/level/block/CakeBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CakeBlock.java
+--- a/net/minecraft/world/level/block/CakeBlock.java
++++ b/net/minecraft/world/level/block/CakeBlock.java
 @@ -119,6 +119,7 @@ public class CakeBlock extends Block {
              org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, 2 + oldFoodLevel);
  
diff --git a/patches/server/0171-Allow-player-join-full-server-by-permission.patch b/patches/server/0171-Allow-player-join-full-server-by-permission.patch
index e49803d32..5363e2870 100644
--- a/patches/server/0171-Allow-player-join-full-server-by-permission.patch
+++ b/patches/server/0171-Allow-player-join-full-server-by-permission.patch
@@ -4,10 +4,10 @@ Date: Thu, 24 Jun 2021 02:28:32 +0200
 Subject: [PATCH] Allow player join full server by permission
 
 
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
 index 0969a713df3150b0b2d2dd2d595e5f49e491f8af..5b1705794a8c3914cb11fdd35f75c8e0c128ecd0 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
 @@ -711,7 +711,7 @@ public abstract class PlayerList {
              event.disallow(PlayerLoginEvent.Result.KICK_BANNED, io.papermc.paper.adventure.PaperAdventure.asAdventure(ichatmutablecomponent)); // Paper - Adventure
          } else {
diff --git a/patches/server/0172-Add-portal-permission-bypass.patch b/patches/server/0172-Add-portal-permission-bypass.patch
index 193fdeefd..a4f14e36e 100644
--- a/patches/server/0172-Add-portal-permission-bypass.patch
+++ b/patches/server/0172-Add-portal-permission-bypass.patch
@@ -4,10 +4,10 @@ Date: Thu, 7 Dec 2023 14:53:48 -0800
 Subject: [PATCH] Add portal permission bypass
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index a8b5869160cb75c314459403a0a229ec68b69086..ee88c493119a4a4629d6456c8698dd89e4f477f4 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -202,6 +202,7 @@ public abstract class Player extends LivingEntity {
      public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
      public int sixRowEnderchestSlotCount = -1; // Purpur
@@ -16,10 +16,10 @@ index a8b5869160cb75c314459403a0a229ec68b69086..ee88c493119a4a4629d6456c8698dd89
  
      // CraftBukkit start
      public boolean fauxSleeping;
-diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+diff --git a/net/minecraft/world/level/block/NetherPortalBlock.java b/net/minecraft/world/level/block/NetherPortalBlock.java
 index 2d53c57c961fa8977e37931775863665381595eb..6c10860aee8b8fac4089fb7f1506c890fb3f5308 100644
---- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+--- a/net/minecraft/world/level/block/NetherPortalBlock.java
++++ b/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -137,7 +137,7 @@ public class NetherPortalBlock extends Block implements Portal {
      @Override
      public int getPortalTransitionTime(ServerLevel world, Entity entity) {
diff --git a/patches/server/0173-Shulker-spawn-from-bullet-options.patch b/patches/server/0173-Shulker-spawn-from-bullet-options.patch
index 806e99e22..c7acddb92 100644
--- a/patches/server/0173-Shulker-spawn-from-bullet-options.patch
+++ b/patches/server/0173-Shulker-spawn-from-bullet-options.patch
@@ -12,10 +12,10 @@ Subject: [PATCH] Shulker spawn from bullet options
 (6 - 1) / 5.0 = 1.0    1.0 - 1.0 = 0.0      0% (5 other shulkers)
 (7 - 1) / 5.0 = 1.2    1.0 - 1.2 = -0.2     0% (6 other shulkers)
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
 index 2b2e68e1449606ecfe5c414834ce3e2c6912d820..1957e2be5087e7bf85be5dfba53de8385dbeadd6 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+--- a/net/minecraft/world/entity/monster/Shulker.java
++++ b/net/minecraft/world/entity/monster/Shulker.java
 @@ -512,12 +512,21 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
          Vec3 vec3d = this.position();
          AABB axisalignedbb = this.getBoundingBox();
@@ -52,10 +52,10 @@ index 2b2e68e1449606ecfe5c414834ce3e2c6912d820..1957e2be5087e7bf85be5dfba53de838
      }
  
      @Nullable
-diff --git a/src/main/java/net/minecraft/world/item/DyeColor.java b/src/main/java/net/minecraft/world/item/DyeColor.java
+diff --git a/net/minecraft/world/item/DyeColor.java b/net/minecraft/world/item/DyeColor.java
 index 648e6979aa72b9d1e1ea3b40d5a876e3c690b934..d9cd4f47e9990bdd85e30f68ca3b755a953332a1 100644
---- a/src/main/java/net/minecraft/world/item/DyeColor.java
-+++ b/src/main/java/net/minecraft/world/item/DyeColor.java
+--- a/net/minecraft/world/item/DyeColor.java
++++ b/net/minecraft/world/item/DyeColor.java
 @@ -123,4 +123,10 @@ public enum DyeColor implements StringRepresentable {
      private static CraftingInput makeCraftColorInput(DyeColor first, DyeColor second) {
          return CraftingInput.of(2, 1, List.of(new ItemStack(DyeItem.byColor(first)), new ItemStack(DyeItem.byColor(second))));
diff --git a/patches/server/0174-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0174-Eating-glow-berries-adds-glow-effect.patch
index 80fd266a9..fefd6cd1c 100644
--- a/patches/server/0174-Eating-glow-berries-adds-glow-effect.patch
+++ b/patches/server/0174-Eating-glow-berries-adds-glow-effect.patch
@@ -4,10 +4,10 @@ Date: Mon, 28 Jun 2021 14:07:35 -0500
 Subject: [PATCH] Eating glow berries adds glow effect
 
 
-diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
+diff --git a/net/minecraft/world/item/Items.java b/net/minecraft/world/item/Items.java
 index 41fbe61268c0a16078b5f846ab12bde172872ff7..e2f1d3f349e3f82e7a565363c42818e5cf6c4d61 100644
---- a/src/main/java/net/minecraft/world/item/Items.java
-+++ b/src/main/java/net/minecraft/world/item/Items.java
+--- a/net/minecraft/world/item/Items.java
++++ b/net/minecraft/world/item/Items.java
 @@ -1987,7 +1987,7 @@ public class Items {
          "sweet_berries", createBlockItemWithCustomItemName(Blocks.SWEET_BERRY_BUSH), new Item.Properties().food(Foods.SWEET_BERRIES)
      );
diff --git a/patches/server/0175-Option-to-make-drowned-break-doors.patch b/patches/server/0175-Option-to-make-drowned-break-doors.patch
index 1a2a6415d..472d9a834 100644
--- a/patches/server/0175-Option-to-make-drowned-break-doors.patch
+++ b/patches/server/0175-Option-to-make-drowned-break-doors.patch
@@ -4,10 +4,10 @@ Date: Fri, 25 Jun 2021 13:56:15 +0200
 Subject: [PATCH] Option to make drowned break doors
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java
 index 7651c29a6468e93bd10d58f76a86a68912509bd3..1e4208f720bfafe9542691b826e4b8dccd449ef3 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+--- a/net/minecraft/world/entity/monster/Drowned.java
++++ b/net/minecraft/world/entity/monster/Drowned.java
 @@ -133,6 +133,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
          this.goalSelector.addGoal(2, new Drowned.DrownedAttackGoal(this, 1.0, false));
          this.goalSelector.addGoal(5, new Drowned.DrownedGoToBeachGoal(this, 1.0));
diff --git a/patches/server/0176-Configurable-hunger-starvation-damage.patch b/patches/server/0176-Configurable-hunger-starvation-damage.patch
index c0ab2737d..f293d9aab 100644
--- a/patches/server/0176-Configurable-hunger-starvation-damage.patch
+++ b/patches/server/0176-Configurable-hunger-starvation-damage.patch
@@ -4,10 +4,10 @@ Date: Tue, 29 Jun 2021 23:44:36 -0400
 Subject: [PATCH] Configurable hunger starvation damage
 
 
-diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
+diff --git a/net/minecraft/world/food/FoodData.java b/net/minecraft/world/food/FoodData.java
 index 4f8ee2e5db3352306f3c035052866d95630f4aaf..26309851107fb80712b2dc7c5e6112cedf929003 100644
---- a/src/main/java/net/minecraft/world/food/FoodData.java
-+++ b/src/main/java/net/minecraft/world/food/FoodData.java
+--- a/net/minecraft/world/food/FoodData.java
++++ b/net/minecraft/world/food/FoodData.java
 @@ -97,7 +97,7 @@ public class FoodData {
              ++this.tickTimer;
              if (this.tickTimer >= this.starvationRate) { // CraftBukkit - add regen rate manipulation
diff --git a/patches/server/0178-Add-uptime-command.patch b/patches/server/0178-Add-uptime-command.patch
index 42b5381c5..6bbb9d995 100644
--- a/patches/server/0178-Add-uptime-command.patch
+++ b/patches/server/0178-Add-uptime-command.patch
@@ -4,10 +4,10 @@ Date: Thu, 1 Jul 2021 15:48:02 -0500
 Subject: [PATCH] Add uptime command
 
 
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
 index f01fff591efc92267d96084660f9e9688bd65795..357f2b078a1bd4730599d6d3f5ac3c6f859d3d86 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
 @@ -258,6 +258,7 @@ public class Commands {
              org.purpurmc.purpur.command.CreditsCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
@@ -16,10 +16,10 @@ index f01fff591efc92267d96084660f9e9688bd65795..357f2b078a1bd4730599d6d3f5ac3c6f
              org.purpurmc.purpur.command.TPSBarCommand.register(this.dispatcher); // Purpur
          }
  
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index 7ce4148a1fcd221bf22f4ad02a2fc32e007fa1da..9219b31a7273b08e7acd1a953c260a5520333922 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -314,6 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public OptionSet options;
      public org.bukkit.command.ConsoleCommandSender console;
diff --git a/patches/server/0179-Tool-actionable-options.patch b/patches/server/0179-Tool-actionable-options.patch
index a43e11c7b..2ac05e060 100644
--- a/patches/server/0179-Tool-actionable-options.patch
+++ b/patches/server/0179-Tool-actionable-options.patch
@@ -4,10 +4,10 @@ Date: Fri, 2 Jul 2021 20:54:29 -0500
 Subject: [PATCH] Tool actionable options
 
 
-diff --git a/src/main/java/net/minecraft/world/item/AxeItem.java b/src/main/java/net/minecraft/world/item/AxeItem.java
+diff --git a/net/minecraft/world/item/AxeItem.java b/net/minecraft/world/item/AxeItem.java
 index abff08f2d61014944235ffe2f5494a718a28cc10..dc2c415ab227e1357533079ada4903e9f69d4f55 100644
---- a/src/main/java/net/minecraft/world/item/AxeItem.java
-+++ b/src/main/java/net/minecraft/world/item/AxeItem.java
+--- a/net/minecraft/world/item/AxeItem.java
++++ b/net/minecraft/world/item/AxeItem.java
 @@ -62,13 +62,15 @@ public class AxeItem extends DiggerItem {
          if (playerHasShieldUseIntent(context)) {
              return InteractionResult.PASS;
@@ -77,10 +77,10 @@ index abff08f2d61014944235ffe2f5494a718a28cc10..dc2c415ab227e1357533079ada4903e9
                      world.levelEvent(player, 3004, pos, 0);
                      return optional3;
                  } else {
-diff --git a/src/main/java/net/minecraft/world/item/HoeItem.java b/src/main/java/net/minecraft/world/item/HoeItem.java
+diff --git a/net/minecraft/world/item/HoeItem.java b/net/minecraft/world/item/HoeItem.java
 index d2871bb4fd670ae4133d13f290b3256c9177d8e6..0936bdc945f73c7750c20a34276aead2921eeb61 100644
---- a/src/main/java/net/minecraft/world/item/HoeItem.java
-+++ b/src/main/java/net/minecraft/world/item/HoeItem.java
+--- a/net/minecraft/world/item/HoeItem.java
++++ b/net/minecraft/world/item/HoeItem.java
 @@ -46,15 +46,23 @@ public class HoeItem extends DiggerItem {
      public InteractionResult useOn(UseOnContext context) {
          Level level = context.getLevel();
@@ -112,10 +112,10 @@ index d2871bb4fd670ae4133d13f290b3256c9177d8e6..0936bdc945f73c7750c20a34276aead2
                  if (!level.isClientSide) {
                      consumer.accept(context);
                      if (player != null) {
-diff --git a/src/main/java/net/minecraft/world/item/ShovelItem.java b/src/main/java/net/minecraft/world/item/ShovelItem.java
+diff --git a/net/minecraft/world/item/ShovelItem.java b/net/minecraft/world/item/ShovelItem.java
 index 55c18f182166f4905d623d6f5e909eefd5ed2483..d10c4705cc9e7faabd4a5619e1da107231bdb37e 100644
---- a/src/main/java/net/minecraft/world/item/ShovelItem.java
-+++ b/src/main/java/net/minecraft/world/item/ShovelItem.java
+--- a/net/minecraft/world/item/ShovelItem.java
++++ b/net/minecraft/world/item/ShovelItem.java
 @@ -47,9 +47,12 @@ public class ShovelItem extends DiggerItem {
              BlockState blockState2 = FLATTENABLES.get(blockState.getBlock());
              BlockState blockState3 = null;
diff --git a/patches/server/0180-Store-placer-on-Block-when-placed.patch b/patches/server/0180-Store-placer-on-Block-when-placed.patch
index fb8ce08f2..4585f514b 100644
--- a/patches/server/0180-Store-placer-on-Block-when-placed.patch
+++ b/patches/server/0180-Store-placer-on-Block-when-placed.patch
@@ -4,10 +4,10 @@ Date: Sat, 3 Jul 2021 18:40:32 -0500
 Subject: [PATCH] Store placer on Block when placed
 
 
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
 index aac771d7d8aefc6d5fcb497763ab9bac1ce2dc31..a9fcade014e24f7967b003dcc45d290e3f456034 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
+--- a/net/minecraft/world/item/ItemStack.java
++++ b/net/minecraft/world/item/ItemStack.java
 @@ -508,6 +508,7 @@ public final class ItemStack implements DataComponentHolder {
                      world.isBlockPlaceCancelled = true; // Paper - prevent calling cleanup logic when undoing a block place upon a cancelled BlockPlaceEvent
                          for (BlockState blockstate : blocks) {
@@ -24,10 +24,10 @@ index aac771d7d8aefc6d5fcb497763ab9bac1ce2dc31..a9fcade014e24f7967b003dcc45d290e
  
                              world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
                          }
-diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
+diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
 index c0b1f903962b25d8ff6c2b4fcd2be0e45de09b35..b88326cc6c54bf38a37f2491bfb2f0e0deb2b1df 100644
---- a/src/main/java/net/minecraft/world/level/block/Block.java
-+++ b/src/main/java/net/minecraft/world/level/block/Block.java
+--- a/net/minecraft/world/level/block/Block.java
++++ b/net/minecraft/world/level/block/Block.java
 @@ -433,7 +433,17 @@ public class Block extends BlockBehaviour implements ItemLike {
          } // Paper - fix drops not preventing stats/food exhaustion
      }
diff --git a/patches/server/0181-Summoner-API.patch b/patches/server/0181-Summoner-API.patch
index eef9471a5..2c5e9f54b 100644
--- a/patches/server/0181-Summoner-API.patch
+++ b/patches/server/0181-Summoner-API.patch
@@ -4,10 +4,10 @@ Date: Sat, 3 Jul 2021 18:40:58 -0500
 Subject: [PATCH] Summoner API
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+diff --git a/net/minecraft/world/entity/animal/IronGolem.java b/net/minecraft/world/entity/animal/IronGolem.java
 index da51e119c290a850072679a7b4f4bde3025c95cf..2cde18232b4101a5b20ca7897c0b8638eab68169 100644
---- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+--- a/net/minecraft/world/entity/animal/IronGolem.java
++++ b/net/minecraft/world/entity/animal/IronGolem.java
 @@ -57,6 +57,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      private int remainingPersistentAngerTime;
      @Nullable
@@ -49,10 +49,10 @@ index da51e119c290a850072679a7b4f4bde3025c95cf..2cde18232b4101a5b20ca7897c0b8638
          this.readPersistentAngerSaveData(this.level(), nbt);
      }
  
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java
 index f27f68750221852e55b92395530e00e9c6918551..b9d2d942194784de64665e9d9d851f4027aa4db2 100644
---- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+--- a/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -50,6 +50,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
  
      private static final EntityDataAccessor<Byte> DATA_PUMPKIN_ID = SynchedEntityData.defineId(SnowGolem.class, EntityDataSerializers.BYTE);
@@ -94,10 +94,10 @@ index f27f68750221852e55b92395530e00e9c6918551..b9d2d942194784de64665e9d9d851f40
  
      }
  
-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
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 index 7bdc2b79fbf58f248caf63008ce898b9a43bfcd3..5f40d6d5b002f1f098245c3aa1174c85759191ce 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
+--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -87,6 +87,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
      };
      private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR);
@@ -139,10 +139,10 @@ index 7bdc2b79fbf58f248caf63008ce898b9a43bfcd3..5f40d6d5b002f1f098245c3aa1174c85
  
      }
  
-diff --git a/src/main/java/net/minecraft/world/level/block/CarvedPumpkinBlock.java b/src/main/java/net/minecraft/world/level/block/CarvedPumpkinBlock.java
+diff --git a/net/minecraft/world/level/block/CarvedPumpkinBlock.java b/net/minecraft/world/level/block/CarvedPumpkinBlock.java
 index 22242d11e009acab4c9738a1c6ada8b9ba678a0c..49b7565c26ce8bf217ae60d233d5963331ce6696 100644
---- a/src/main/java/net/minecraft/world/level/block/CarvedPumpkinBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CarvedPumpkinBlock.java
+--- a/net/minecraft/world/level/block/CarvedPumpkinBlock.java
++++ b/net/minecraft/world/level/block/CarvedPumpkinBlock.java
 @@ -72,7 +72,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
              SnowGolem entitysnowman = (SnowGolem) EntityType.SNOW_GOLEM.create(world, EntitySpawnReason.TRIGGERED);
  
@@ -178,10 +178,10 @@ index 22242d11e009acab4c9738a1c6ada8b9ba678a0c..49b7565c26ce8bf217ae60d233d59633
          // clearPatternBlocks(world, shapedetector_shapedetectorcollection); // CraftBukkit - moved down
          entity.moveTo((double) pos.getX() + 0.5D, (double) pos.getY() + 0.05D, (double) pos.getZ() + 0.5D, 0.0F, 0.0F);
          // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java b/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java
+diff --git a/net/minecraft/world/level/block/WitherSkullBlock.java b/net/minecraft/world/level/block/WitherSkullBlock.java
 index 0fbe66cc02bd3d95c0a5dcd55380a1b4a2f17ca6..11d6427682d8778d1cf668ee4c1d5760af2c185e 100644
---- a/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java
+--- a/net/minecraft/world/level/block/WitherSkullBlock.java
++++ b/net/minecraft/world/level/block/WitherSkullBlock.java
 @@ -80,6 +80,7 @@ public class WitherSkullBlock extends SkullBlock {
                          entitywither.moveTo((double) blockposition1.getX() + 0.5D, (double) blockposition1.getY() + 0.55D, (double) blockposition1.getZ() + 0.5D, shapedetector_shapedetectorcollection.getForwards().getAxis() == Direction.Axis.X ? 0.0F : 90.0F, 0.0F);
                          entitywither.yBodyRot = shapedetector_shapedetectorcollection.getForwards().getAxis() == Direction.Axis.X ? 0.0F : 90.0F;
diff --git a/patches/server/0182-Customizable-sleeping-actionbar-messages.patch b/patches/server/0182-Customizable-sleeping-actionbar-messages.patch
index 590ac6ea8..9a0ed6188 100644
--- a/patches/server/0182-Customizable-sleeping-actionbar-messages.patch
+++ b/patches/server/0182-Customizable-sleeping-actionbar-messages.patch
@@ -4,10 +4,10 @@ Date: Sat, 3 Jul 2021 21:52:15 -0500
 Subject: [PATCH] Customizable sleeping actionbar messages
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
 index 9ff7fb18e52bea06b02ebf0d1b97647df6b304dc..361885b28305e1c3e314b3b9f9807cf3c5ab843a 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1122,11 +1122,27 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          if (this.canSleepThroughNights()) {
              if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
@@ -37,10 +37,10 @@ index 9ff7fb18e52bea06b02ebf0d1b97647df6b304dc..361885b28305e1c3e314b3b9f9807cf3
                      ichatmutablecomponent = Component.translatable("sleep.players_sleeping", this.sleepStatus.amountSleeping(), this.sleepStatus.sleepersNeeded(i));
                  }
  
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 4c69fa830a216c189f97ddfb62f0008b891455da..16fba60c063d059ee069821041d1ee55fe7cc62b 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -1830,7 +1830,19 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
                      });
  
diff --git a/patches/server/0183-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0183-option-to-disable-shulker-box-items-from-dropping-co.patch
index a7072a07a..732b56eda 100644
--- a/patches/server/0183-option-to-disable-shulker-box-items-from-dropping-co.patch
+++ b/patches/server/0183-option-to-disable-shulker-box-items-from-dropping-co.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] option to disable shulker box items from dropping contents
  when destroyed
 
 
-diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
 index ac5dc472337cd9613db5fc03f64763245129dfd9..f8928d5ac2f107a904ecc636e6bdeee7edd8da45 100644
---- a/src/main/java/net/minecraft/world/item/BlockItem.java
-+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
+--- a/net/minecraft/world/item/BlockItem.java
++++ b/net/minecraft/world/item/BlockItem.java
 @@ -274,6 +274,7 @@ public class BlockItem extends Item {
          ItemContainerContents itemcontainercontents = (ItemContainerContents) entity.getItem().set(DataComponents.CONTAINER, ItemContainerContents.EMPTY);
  
diff --git a/patches/server/0184-Big-dripleaf-tilt-delay.patch b/patches/server/0184-Big-dripleaf-tilt-delay.patch
index 266e2b706..71b7011bb 100644
--- a/patches/server/0184-Big-dripleaf-tilt-delay.patch
+++ b/patches/server/0184-Big-dripleaf-tilt-delay.patch
@@ -10,10 +10,10 @@ UNSTABLE: big_dripleaf with UNSTABLE tilt will change to PARTIAL tilt after 10 t
 PARTIAL: big_dripleaf with PARTIAL tilt will change to FULL tilt after 10 ticks
 UNSTABLE: big_dripleaf with FULL tilt will change back to no tilt after 100 ticks
 
-diff --git a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
+diff --git a/net/minecraft/world/level/block/BigDripleafBlock.java b/net/minecraft/world/level/block/BigDripleafBlock.java
 index 9e3f1441d62128535112621bf259c24f1a90595b..2535e6d71b690f8dfde41a7d9cb76b6f010f5aa7 100644
---- a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
+--- a/net/minecraft/world/level/block/BigDripleafBlock.java
++++ b/net/minecraft/world/level/block/BigDripleafBlock.java
 @@ -246,7 +246,7 @@ public class BigDripleafBlock extends HorizontalDirectionalBlock implements Bone
              BigDripleafBlock.playTiltSound(world, blockposition, soundeffect);
          }
diff --git a/patches/server/0185-Player-ridable-in-water-option.patch b/patches/server/0185-Player-ridable-in-water-option.patch
index 75dea03ca..448165532 100644
--- a/patches/server/0185-Player-ridable-in-water-option.patch
+++ b/patches/server/0185-Player-ridable-in-water-option.patch
@@ -4,10 +4,10 @@ Date: Sat, 17 Jul 2021 15:55:14 -0500
 Subject: [PATCH] Player ridable in water option
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index ee88c493119a4a4629d6456c8698dd89e4f477f4..dda9391962b7360714cc1491e6cabfc2616dab25 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -2037,6 +2037,13 @@ public abstract class Player extends LivingEntity {
          return slot != EquipmentSlot.BODY;
      }
diff --git a/patches/server/0186-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0186-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
index 03f8045a7..568b6f933 100644
--- a/patches/server/0186-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
+++ b/patches/server/0186-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
@@ -4,10 +4,10 @@ Date: Mon, 19 Jul 2021 19:28:17 -0400
 Subject: [PATCH] Config to disable Enderman teleport on projectile hit
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index efeb8a214c3e0ab6cb28a6f6e0d6417916ed670f..327686f0c47894259532a15e98d69d332a6d483a 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -424,6 +424,7 @@ public class EnderMan extends Monster implements NeutralMob {
              } else {
                  flag1 = flag && this.hurtWithCleanWater(world, source, (ThrownPotion) source.getDirectEntity(), amount);
diff --git a/patches/server/0187-Add-compass-command.patch b/patches/server/0187-Add-compass-command.patch
index 346631f88..1a6d4bed5 100644
--- a/patches/server/0187-Add-compass-command.patch
+++ b/patches/server/0187-Add-compass-command.patch
@@ -4,10 +4,10 @@ Date: Sat, 24 Jul 2021 00:07:31 -0500
 Subject: [PATCH] Add compass command
 
 
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
 index 357f2b078a1bd4730599d6d3f5ac3c6f859d3d86..5873f74df67d59f25682286a5b027963d8a6d382 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
 @@ -260,6 +260,7 @@ public class Commands {
              org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.UptimeCommand.register(this.dispatcher); // Purpur
@@ -16,10 +16,10 @@ index 357f2b078a1bd4730599d6d3f5ac3c6f859d3d86..5873f74df67d59f25682286a5b027963
          }
  
          if (environment.includeIntegrated) {
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index 16fba60c063d059ee069821041d1ee55fe7cc62b..ad4ace81452d83cc01ac9de5ef323770a8a2f417 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -329,6 +329,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
      public boolean purpurClient = false; // Purpur - Purpur client support
diff --git a/patches/server/0188-Toggle-for-kinetic-damage.patch b/patches/server/0188-Toggle-for-kinetic-damage.patch
index 40e8a303d..f65e92af1 100644
--- a/patches/server/0188-Toggle-for-kinetic-damage.patch
+++ b/patches/server/0188-Toggle-for-kinetic-damage.patch
@@ -4,10 +4,10 @@ Date: Wed, 4 Aug 2021 11:44:26 +0200
 Subject: [PATCH] Toggle for kinetic damage
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index ecf8e9742951c144170ce818c14d368011ef99a8..c7e2330e7f30081dbf5d79f08c8adb1d7d84fa03 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -3212,6 +3212,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
              if (f > 0.0F) {
diff --git a/patches/server/0189-Add-Option-for-disable-observer-clocks.patch b/patches/server/0189-Add-Option-for-disable-observer-clocks.patch
index 7a58123ef..1669a7b34 100644
--- a/patches/server/0189-Add-Option-for-disable-observer-clocks.patch
+++ b/patches/server/0189-Add-Option-for-disable-observer-clocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Option for disable observer clocks
 
 Allow to disable observer clocks: https://www.spigotmc.org/attachments/observerclock-gif.365936/
 
-diff --git a/src/main/java/net/minecraft/world/level/block/ObserverBlock.java b/src/main/java/net/minecraft/world/level/block/ObserverBlock.java
+diff --git a/net/minecraft/world/level/block/ObserverBlock.java b/net/minecraft/world/level/block/ObserverBlock.java
 index 93ed9406c34804831b86d006dbd6087db9948f08..26cb9990b91991e0a2eadc2dcbbf229e2e88fb2d 100644
---- a/src/main/java/net/minecraft/world/level/block/ObserverBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ObserverBlock.java
+--- a/net/minecraft/world/level/block/ObserverBlock.java
++++ b/net/minecraft/world/level/block/ObserverBlock.java
 @@ -75,6 +75,7 @@ public class ObserverBlock extends DirectionalBlock {
      @Override
      protected BlockState updateShape(BlockState state, LevelReader world, ScheduledTickAccess tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, RandomSource random) {
diff --git a/patches/server/0190-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0190-Customizeable-Zombie-Villager-curing-times.patch
index 7f0e0f474..f7de15836 100644
--- a/patches/server/0190-Customizeable-Zombie-Villager-curing-times.patch
+++ b/patches/server/0190-Customizeable-Zombie-Villager-curing-times.patch
@@ -4,10 +4,10 @@ Date: Fri, 6 Aug 2021 22:30:10 +0200
 Subject: [PATCH] Customizeable Zombie Villager curing times
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
 index 3f3e0dd479afad1ca73ad9f76ed673fa399955c6..b10a12d9ddec3c064f5c42d6d8783e6608c917e0 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+--- a/net/minecraft/world/entity/monster/ZombieVillager.java
++++ b/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -230,7 +230,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
              if (this.hasEffect(MobEffects.WEAKNESS)) {
                  itemstack.consume(1, player);
diff --git a/patches/server/0191-Option-for-sponges-to-work-on-lava-and-mud.patch b/patches/server/0191-Option-for-sponges-to-work-on-lava-and-mud.patch
index 0503e6d71..2cd1c9b30 100644
--- a/patches/server/0191-Option-for-sponges-to-work-on-lava-and-mud.patch
+++ b/patches/server/0191-Option-for-sponges-to-work-on-lava-and-mud.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for sponges to work on lava and mud
 
 Co-authored by: granny <granny@purpurmc.org>
 
-diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
+diff --git a/net/minecraft/world/level/block/SpongeBlock.java b/net/minecraft/world/level/block/SpongeBlock.java
 index 0edb7e821a60fe95fea3cae900e5b88192946fe6..295c1439645c8da7f84f0a72abb3235ee879e89c 100644
---- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
+--- a/net/minecraft/world/level/block/SpongeBlock.java
++++ b/net/minecraft/world/level/block/SpongeBlock.java
 @@ -80,7 +80,7 @@ public class SpongeBlock extends Block {
                  FluidState fluid = blockList.getFluidState(blockposition1);
                  // CraftBukkit end
diff --git a/patches/server/0192-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0192-Toggle-for-Wither-s-spawn-sound.patch
index 892d480f4..8e7c52ac4 100644
--- a/patches/server/0192-Toggle-for-Wither-s-spawn-sound.patch
+++ b/patches/server/0192-Toggle-for-Wither-s-spawn-sound.patch
@@ -4,10 +4,10 @@ Date: Sat, 7 Aug 2021 21:27:56 +0200
 Subject: [PATCH] Toggle for Wither's spawn sound
 
 
-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
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 index 5f40d6d5b002f1f098245c3aa1174c85759191ce..9e37864a630151aee431aa4031ecc4033de1766f 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
+--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -425,7 +425,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
                  }
                  // CraftBukkit end
diff --git a/patches/server/0193-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0193-Cactus-breaks-from-solid-neighbors-config.patch
index f01df3a3a..6d1e097ab 100644
--- a/patches/server/0193-Cactus-breaks-from-solid-neighbors-config.patch
+++ b/patches/server/0193-Cactus-breaks-from-solid-neighbors-config.patch
@@ -4,10 +4,10 @@ Date: Sat, 7 Aug 2021 03:37:56 -0500
 Subject: [PATCH] Cactus breaks from solid neighbors config
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
+diff --git a/net/minecraft/world/level/block/CactusBlock.java b/net/minecraft/world/level/block/CactusBlock.java
 index c045b1cccf0047dbef8c04d5a28d31d53389054f..bbfd8f5d404d0add94f0d8ac89a2964692b37e44 100644
---- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
+--- a/net/minecraft/world/level/block/CactusBlock.java
++++ b/net/minecraft/world/level/block/CactusBlock.java
 @@ -115,7 +115,7 @@ public class CactusBlock extends Block {
  
              enumdirection = (Direction) iterator.next();
diff --git a/patches/server/0194-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0194-Config-to-remove-curse-of-binding-with-weakness.patch
index 14da388ac..8358f7f72 100644
--- a/patches/server/0194-Config-to-remove-curse-of-binding-with-weakness.patch
+++ b/patches/server/0194-Config-to-remove-curse-of-binding-with-weakness.patch
@@ -4,10 +4,10 @@ Date: Sun, 8 Aug 2021 16:59:21 -0400
 Subject: [PATCH] Config to remove curse of binding with weakness
 
 
-diff --git a/src/main/java/net/minecraft/world/inventory/ArmorSlot.java b/src/main/java/net/minecraft/world/inventory/ArmorSlot.java
+diff --git a/net/minecraft/world/inventory/ArmorSlot.java b/net/minecraft/world/inventory/ArmorSlot.java
 index db7caaa2e77b9b98adac8add3040131c673c036b..262d9b2507d37edf0ed9c0821059e518d1baa9e9 100644
---- a/src/main/java/net/minecraft/world/inventory/ArmorSlot.java
-+++ b/src/main/java/net/minecraft/world/inventory/ArmorSlot.java
+--- a/net/minecraft/world/inventory/ArmorSlot.java
++++ b/net/minecraft/world/inventory/ArmorSlot.java
 @@ -44,7 +44,7 @@ class ArmorSlot extends Slot {
      @Override
      public boolean mayPickup(Player playerEntity) {
diff --git a/patches/server/0195-Conduit-behavior-configuration.patch b/patches/server/0195-Conduit-behavior-configuration.patch
index 324d8e402..69f2758b9 100644
--- a/patches/server/0195-Conduit-behavior-configuration.patch
+++ b/patches/server/0195-Conduit-behavior-configuration.patch
@@ -4,10 +4,10 @@ Date: Sun, 8 Aug 2021 18:14:31 -0400
 Subject: [PATCH] Conduit behavior configuration
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
+diff --git a/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
 index d354c2ad41533ec8d52f7c5f63f8f74a0b1ce235..a43c41a26c1e34a2f4eda1c498a562664a783c77 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
+--- a/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
 @@ -169,7 +169,7 @@ public class ConduitBlockEntity extends BlockEntity {
                      if ((l > 1 || i1 > 1 || j1 > 1) && (i == 0 && (i1 == 2 || j1 == 2) || j == 0 && (l == 2 || j1 == 2) || k == 0 && (l == 2 || i1 == 2))) {
                          BlockPos blockposition2 = pos.offset(i, j, k);
diff --git a/patches/server/0196-Cauldron-fill-chances.patch b/patches/server/0196-Cauldron-fill-chances.patch
index e77069627..6c606615a 100644
--- a/patches/server/0196-Cauldron-fill-chances.patch
+++ b/patches/server/0196-Cauldron-fill-chances.patch
@@ -4,10 +4,10 @@ Date: Sun, 8 Aug 2021 18:38:44 -0400
 Subject: [PATCH] Cauldron fill chances
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/CauldronBlock.java b/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
+diff --git a/net/minecraft/world/level/block/CauldronBlock.java b/net/minecraft/world/level/block/CauldronBlock.java
 index c9968934f4ecaa8d81e545f279b3001c7b1ce545..03e4fce6f8226451365fc2831b5bf1e5e6091730 100644
---- a/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
+--- a/net/minecraft/world/level/block/CauldronBlock.java
++++ b/net/minecraft/world/level/block/CauldronBlock.java
 @@ -37,7 +37,7 @@ public class CauldronBlock extends AbstractCauldronBlock {
      }
  
@@ -17,10 +17,10 @@ index c9968934f4ecaa8d81e545f279b3001c7b1ce545..03e4fce6f8226451365fc2831b5bf1e5
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
+diff --git a/net/minecraft/world/level/block/PointedDripstoneBlock.java b/net/minecraft/world/level/block/PointedDripstoneBlock.java
 index 53cea36ec931de89e0060613acf87beb51dc16ec..fd5489993dca0f940da69e9163f78e5c2e6ee063 100644
---- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
+--- a/net/minecraft/world/level/block/PointedDripstoneBlock.java
++++ b/net/minecraft/world/level/block/PointedDripstoneBlock.java
 @@ -194,7 +194,7 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
  
      @VisibleForTesting
diff --git a/patches/server/0197-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0197-Config-to-allow-mobs-to-pathfind-over-rails.patch
index fafa33da0..e4d863f46 100644
--- a/patches/server/0197-Config-to-allow-mobs-to-pathfind-over-rails.patch
+++ b/patches/server/0197-Config-to-allow-mobs-to-pathfind-over-rails.patch
@@ -4,10 +4,10 @@ Date: Sun, 8 Aug 2021 22:50:23 -0400
 Subject: [PATCH] Config to allow mobs to pathfind over rails
 
 
-diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
+diff --git a/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 index c84fd369d92932903c76bb2012602617d3e2d213..e295fe4aac742ff8942b23456fdce8d7ff944e90 100644
---- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-+++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
+--- a/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
++++ b/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 @@ -240,7 +240,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
                  if ((node == null || node.costMalus < 0.0F)
                      && maxYStep > 0
diff --git a/patches/server/0198-Shulker-change-color-with-dye.patch b/patches/server/0198-Shulker-change-color-with-dye.patch
index 9637a15e8..79382da2a 100644
--- a/patches/server/0198-Shulker-change-color-with-dye.patch
+++ b/patches/server/0198-Shulker-change-color-with-dye.patch
@@ -4,10 +4,10 @@ Date: Sat, 21 Aug 2021 00:07:39 -0500
 Subject: [PATCH] Shulker change color with dye
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
 index 1957e2be5087e7bf85be5dfba53de8385dbeadd6..2052549f2e6b23aff5491bb0cc1af00b7f560227 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+--- a/net/minecraft/world/entity/monster/Shulker.java
++++ b/net/minecraft/world/entity/monster/Shulker.java
 @@ -126,6 +126,19 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
          return this.level().purpurConfig.shulkerTakeDamageFromWater;
      }
diff --git a/patches/server/0200-Added-the-ability-to-add-combustible-items.patch b/patches/server/0200-Added-the-ability-to-add-combustible-items.patch
index a72ec8455..842b947e4 100644
--- a/patches/server/0200-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0200-Added-the-ability-to-add-combustible-items.patch
@@ -4,10 +4,10 @@ Date: Mon, 9 Aug 2021 13:22:20 +0200
 Subject: [PATCH] Added the ability to add combustible items
 
 
-diff --git a/src/main/java/net/minecraft/world/inventory/AbstractFurnaceMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractFurnaceMenu.java
+diff --git a/net/minecraft/world/inventory/AbstractFurnaceMenu.java b/net/minecraft/world/inventory/AbstractFurnaceMenu.java
 index 1240df9368855f836412b06cf564926a18bfe90d..248e2fb41df3cb1efc64921074a51a02419d8fbb 100644
---- a/src/main/java/net/minecraft/world/inventory/AbstractFurnaceMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AbstractFurnaceMenu.java
+--- a/net/minecraft/world/inventory/AbstractFurnaceMenu.java
++++ b/net/minecraft/world/inventory/AbstractFurnaceMenu.java
 @@ -114,7 +114,13 @@ public abstract class AbstractFurnaceMenu extends RecipeBookMenu {
              } else if (slot != 1 && slot != 0) {
                  if (this.canSmelt(itemstack1)) {
@@ -23,10 +23,10 @@ index 1240df9368855f836412b06cf564926a18bfe90d..248e2fb41df3cb1efc64921074a51a02
                      }
                  } else if (this.isFuel(itemstack1)) {
                      if (!this.moveItemStackTo(itemstack1, 1, 2, false)) {
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/FuelValues.java b/src/main/java/net/minecraft/world/level/block/entity/FuelValues.java
+diff --git a/net/minecraft/world/level/block/entity/FuelValues.java b/net/minecraft/world/level/block/entity/FuelValues.java
 index 61ef08ac941b1e8988d001241780d3a1582f7a2d..6ceb938d6f6a4f2bc5b786c7af7bd291f7486340 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/FuelValues.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/FuelValues.java
+--- a/net/minecraft/world/level/block/entity/FuelValues.java
++++ b/net/minecraft/world/level/block/entity/FuelValues.java
 @@ -17,7 +17,7 @@ import net.minecraft.world.level.ItemLike;
  import net.minecraft.world.level.block.Blocks;
  
diff --git a/patches/server/0201-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0201-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
index 738a82630..edd58b824 100644
--- a/patches/server/0201-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
+++ b/patches/server/0201-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
@@ -4,10 +4,10 @@ Date: Mon, 23 Aug 2021 17:59:29 +0200
 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
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
 index 361885b28305e1c3e314b3b9f9807cf3c5ab843a..0487d55861302e1bf84225901d873b02c2f11d6e 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1282,6 +1282,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      @VisibleForTesting
      public void resetWeatherCycle() {
diff --git a/patches/server/0202-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0202-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
index 125b134d5..156350afc 100644
--- a/patches/server/0202-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
+++ b/patches/server/0202-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
@@ -4,10 +4,10 @@ Date: Mon, 23 Aug 2021 20:57:04 -0500
 Subject: [PATCH] Chance for azalea blocks to grow into trees naturally
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
+diff --git a/net/minecraft/world/level/block/AzaleaBlock.java b/net/minecraft/world/level/block/AzaleaBlock.java
 index affbbf6abc6bc09ecb652c1dee92aa297458bc39..c58e07f2a99e3cbb5bd5d3693c006919e0710b7a 100644
---- a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
+--- a/net/minecraft/world/level/block/AzaleaBlock.java
++++ b/net/minecraft/world/level/block/AzaleaBlock.java
 @@ -50,6 +50,20 @@ public class AzaleaBlock extends BushBlock implements BonemealableBlock {
  
      @Override
@@ -29,10 +29,10 @@ index affbbf6abc6bc09ecb652c1dee92aa297458bc39..c58e07f2a99e3cbb5bd5d3693c006919
          TreeGrower.AZALEA.growTree(world, world.getChunkSource().getGenerator(), pos, state, random);
      }
  
-diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java
+diff --git a/net/minecraft/world/level/block/Blocks.java b/net/minecraft/world/level/block/Blocks.java
 index 9bafac9b2c7b487f745fb64354f4bbc6a7ded468..c5f8227cd9631d98cc8404e3f6d6109a55c617aa 100644
---- a/src/main/java/net/minecraft/world/level/block/Blocks.java
-+++ b/src/main/java/net/minecraft/world/level/block/Blocks.java
+--- a/net/minecraft/world/level/block/Blocks.java
++++ b/net/minecraft/world/level/block/Blocks.java
 @@ -6454,6 +6454,7 @@ public class Blocks {
          BlockBehaviour.Properties.of()
              .mapColor(MapColor.PLANT)
diff --git a/patches/server/0203-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0203-Shift-right-click-to-use-exp-for-mending.patch
index 15f0e872f..e789d4653 100644
--- a/patches/server/0203-Shift-right-click-to-use-exp-for-mending.patch
+++ b/patches/server/0203-Shift-right-click-to-use-exp-for-mending.patch
@@ -4,10 +4,10 @@ Date: Tue, 24 Aug 2021 16:48:35 -0500
 Subject: [PATCH] Shift right click to use exp for mending
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
 index 7315e604a2f9cb068eb5bbca744e44eeabac09c9..88eb3774f688bcff383efa7f113bd0b1b97d8a11 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+--- a/net/minecraft/server/level/ServerPlayerGameMode.java
++++ b/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -524,6 +524,7 @@ public class ServerPlayerGameMode {
      public InteractionHand interactHand;
      public ItemStack interactItemStack;
@@ -35,10 +35,10 @@ 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
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index ea6713bd5a2807cf00d664296c13e076b2fca3a0..47952e504cc4d36b1d875651bb9bbd0a90606ae2 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2155,6 +2155,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                  boolean cancelled;
diff --git a/patches/server/0204-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0204-Dolphins-naturally-aggressive-to-players-chance.patch
index 20e535735..e50a3c45f 100644
--- a/patches/server/0204-Dolphins-naturally-aggressive-to-players-chance.patch
+++ b/patches/server/0204-Dolphins-naturally-aggressive-to-players-chance.patch
@@ -4,10 +4,10 @@ Date: Mon, 30 Aug 2021 22:14:39 -0500
 Subject: [PATCH] Dolphins naturally aggressive to players chance
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+diff --git a/net/minecraft/world/entity/animal/Dolphin.java b/net/minecraft/world/entity/animal/Dolphin.java
 index 46862ebf302454a077a837da001abdceeffa1026..64d1e932ac3bc673cffa324d8e75e8da596d6941 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+--- a/net/minecraft/world/entity/animal/Dolphin.java
++++ b/net/minecraft/world/entity/animal/Dolphin.java
 @@ -86,6 +86,7 @@ public class Dolphin extends AgeableWaterCreature {
      };
      public static final float BABY_SCALE = 0.65F;
diff --git a/patches/server/0205-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0205-Cows-naturally-aggressive-to-players-chance.patch
index 85959633f..59926debf 100644
--- a/patches/server/0205-Cows-naturally-aggressive-to-players-chance.patch
+++ b/patches/server/0205-Cows-naturally-aggressive-to-players-chance.patch
@@ -4,10 +4,10 @@ Date: Mon, 30 Aug 2021 22:49:53 -0500
 Subject: [PATCH] Cows naturally aggressive to players chance
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+diff --git a/net/minecraft/world/entity/animal/Cow.java b/net/minecraft/world/entity/animal/Cow.java
 index 4d5d4f7bb24aded2933daa003b4c4bc38601e12d..42324d0d22c1f1a233aa6e6a810171b26894f8bc 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+--- a/net/minecraft/world/entity/animal/Cow.java
++++ b/net/minecraft/world/entity/animal/Cow.java
 @@ -37,6 +37,7 @@ import org.bukkit.event.player.PlayerBucketFillEvent;
  // CraftBukkit end
  
diff --git a/patches/server/0206-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0206-Option-for-beds-to-explode-on-villager-sleep.patch
index 190da8867..8d3940a96 100644
--- a/patches/server/0206-Option-for-beds-to-explode-on-villager-sleep.patch
+++ b/patches/server/0206-Option-for-beds-to-explode-on-villager-sleep.patch
@@ -4,10 +4,10 @@ Date: Tue, 31 Aug 2021 16:48:29 +0200
 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
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index 0bca1eeaa0f35d702dad41758c72bb3c9ab35220..c912268081beda34c472cff13e41c9dfd51902f2 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -1080,6 +1080,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      @Override
diff --git a/patches/server/0207-Halloween-options-and-optimizations.patch b/patches/server/0207-Halloween-options-and-optimizations.patch
index 556e882da..063f7ed5e 100644
--- a/patches/server/0207-Halloween-options-and-optimizations.patch
+++ b/patches/server/0207-Halloween-options-and-optimizations.patch
@@ -4,10 +4,10 @@ Date: Mon, 13 Sep 2021 04:48:21 +0200
 Subject: [PATCH] Halloween options and optimizations
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+diff --git a/net/minecraft/world/entity/ambient/Bat.java b/net/minecraft/world/entity/ambient/Bat.java
 index 79175bd42f37f10fae812e101dd5b09b209ebe30..7b647f41bd5ca4fa62795ad2fbcb5b73a3405979 100644
---- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+--- a/net/minecraft/world/entity/ambient/Bat.java
++++ b/net/minecraft/world/entity/ambient/Bat.java
 @@ -307,7 +307,7 @@ public class Bat extends AmbientCreature {
              int i = world.getMaxLocalRawBrightness(pos);
              byte b0 = 4;
@@ -29,10 +29,10 @@ index 79175bd42f37f10fae812e101dd5b09b209ebe30..7b647f41bd5ca4fa62795ad2fbcb5b73
      private static boolean isHalloween() {
          LocalDate localdate = LocalDate.now();
          int i = localdate.get(ChronoField.DAY_OF_MONTH);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+diff --git a/net/minecraft/world/entity/monster/AbstractSkeleton.java b/net/minecraft/world/entity/monster/AbstractSkeleton.java
 index 27bdd3c4e0dc3fbb906689e2390c945bf3d40eea..20252b22c88d4cbfe7700052a8c56c9e0d703752 100644
---- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+--- a/net/minecraft/world/entity/monster/AbstractSkeleton.java
++++ b/net/minecraft/world/entity/monster/AbstractSkeleton.java
 @@ -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
@@ -46,10 +46,10 @@ index 27bdd3c4e0dc3fbb906689e2390c945bf3d40eea..20252b22c88d4cbfe7700052a8c56c9e
                  this.setItemSlot(EquipmentSlot.HEAD, new ItemStack(randomsource.nextFloat() < 0.1F ? Blocks.JACK_O_LANTERN : Blocks.CARVED_PUMPKIN));
                  this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
              }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
 index d0fcd51e36e7c7e774fcf9b1db42ec7fceb9fc41..37ee837f6e722cd4cb07ae9fcd366a1473dc0b49 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+--- a/net/minecraft/world/entity/monster/Zombie.java
++++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -598,11 +598,7 @@ public class Zombie extends Monster {
          }
  
diff --git a/patches/server/0208-Config-for-grindstones.patch b/patches/server/0208-Config-for-grindstones.patch
index c697acf1d..4d35d1355 100644
--- a/patches/server/0208-Config-for-grindstones.patch
+++ b/patches/server/0208-Config-for-grindstones.patch
@@ -4,10 +4,10 @@ Date: Wed, 29 Sep 2021 13:37:57 -0400
 Subject: [PATCH] Config for grindstones
 
 
-diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+diff --git a/net/minecraft/world/inventory/GrindstoneMenu.java b/net/minecraft/world/inventory/GrindstoneMenu.java
 index 5687f492fc76f699e2a388790ca5380d9b8c8d0a..cc229f3e1e9527cbedf929e326731943bb513dae 100644
---- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+--- a/net/minecraft/world/inventory/GrindstoneMenu.java
++++ b/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -135,7 +135,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
                      Holder<Enchantment> holder = (Holder) entry.getKey();
                      int k = entry.getIntValue();
diff --git a/patches/server/0209-UPnP-Port-Forwarding.patch b/patches/server/0209-UPnP-Port-Forwarding.patch
index e26abf20e..b6354d4ad 100644
--- a/patches/server/0209-UPnP-Port-Forwarding.patch
+++ b/patches/server/0209-UPnP-Port-Forwarding.patch
@@ -4,10 +4,10 @@ Date: Wed, 22 Jan 2020 20:13:40 -0600
 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
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index 9219b31a7273b08e7acd1a953c260a5520333922..80a8bd2dc32763f8ee2062c2d1b36188f2532523 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -331,6 +331,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
      private final Set<String> pluginsBlockingSleep = new java.util.HashSet<>(); // Paper - API to allow/disallow tick sleeping
@@ -32,10 +32,10 @@ index 9219b31a7273b08e7acd1a953c260a5520333922..80a8bd2dc32763f8ee2062c2d1b36188
          // CraftBukkit start
          if (this.server != null) {
              this.server.spark.disable(); // Paper - spark
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
 index 6252001c03230f35c5ec7354faa3720e407dee6c..683c7c373e1b9f764bb9b53cdaace9740f607c75 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -301,6 +301,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              if (true) throw new IllegalStateException("Failed to bind to port", ioexception); // Paper - Propagate failed to bind to port error
              return false;
diff --git a/patches/server/0210-Campfire-option-for-lit-when-placed.patch b/patches/server/0210-Campfire-option-for-lit-when-placed.patch
index b70004482..c23406a9e 100644
--- a/patches/server/0210-Campfire-option-for-lit-when-placed.patch
+++ b/patches/server/0210-Campfire-option-for-lit-when-placed.patch
@@ -4,10 +4,10 @@ Date: Thu, 14 Oct 2021 01:53:20 -0700
 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
+diff --git a/net/minecraft/world/level/block/CampfireBlock.java b/net/minecraft/world/level/block/CampfireBlock.java
 index 1b94f26e78db062f80d806b82f714a815b4710ff..b6ba6ebe6ac15cbcb5d3a6221b47762e37c4a56f 100644
---- a/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
+--- a/net/minecraft/world/level/block/CampfireBlock.java
++++ b/net/minecraft/world/level/block/CampfireBlock.java
 @@ -140,7 +140,7 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB
          BlockPos blockposition = ctx.getClickedPos();
          boolean flag = world.getFluidState(blockposition).getType() == Fluids.WATER;
diff --git a/patches/server/0211-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0211-options-to-extinguish-fire-blocks-with-snowballs.patch
index 9fd3ecd46..b021b6441 100644
--- a/patches/server/0211-options-to-extinguish-fire-blocks-with-snowballs.patch
+++ b/patches/server/0211-options-to-extinguish-fire-blocks-with-snowballs.patch
@@ -4,10 +4,10 @@ Date: Thu, 14 Oct 2021 02:05:52 -0700
 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
+diff --git a/net/minecraft/world/entity/projectile/Snowball.java b/net/minecraft/world/entity/projectile/Snowball.java
 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
+--- a/net/minecraft/world/entity/projectile/Snowball.java
++++ b/net/minecraft/world/entity/projectile/Snowball.java
 @@ -63,6 +63,36 @@ public class Snowball extends ThrowableItemProjectile {
          entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i);
      }
diff --git a/patches/server/0212-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0212-Add-option-to-disable-zombie-villagers-cure.patch
index 03656a547..e0bf2477d 100644
--- a/patches/server/0212-Add-option-to-disable-zombie-villagers-cure.patch
+++ b/patches/server/0212-Add-option-to-disable-zombie-villagers-cure.patch
@@ -4,10 +4,10 @@ Date: Tue, 19 Oct 2021 13:10:44 +0100
 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
+diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
 index b10a12d9ddec3c064f5c42d6d8783e6608c917e0..40490767e474bc1e954c8f837f25268d2fd38f5b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+--- a/net/minecraft/world/entity/monster/ZombieVillager.java
++++ b/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -227,7 +227,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          ItemStack itemstack = player.getItemInHand(hand);
  
diff --git a/patches/server/0213-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0213-Persistent-BlockEntity-Lore-and-DisplayName.patch
index 4f940870d..d75873cb5 100644
--- a/patches/server/0213-Persistent-BlockEntity-Lore-and-DisplayName.patch
+++ b/patches/server/0213-Persistent-BlockEntity-Lore-and-DisplayName.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Persistent BlockEntity Lore and DisplayName
 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
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
 index f8928d5ac2f107a904ecc636e6bdeee7edd8da45..3d7a09c81b10f7a34d55670b7f2cc50b80550380 100644
---- a/src/main/java/net/minecraft/world/item/BlockItem.java
-+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
+--- a/net/minecraft/world/item/BlockItem.java
++++ b/net/minecraft/world/item/BlockItem.java
 @@ -151,7 +151,16 @@ public class BlockItem extends Item {
      }
  
@@ -28,10 +28,10 @@ index f8928d5ac2f107a904ecc636e6bdeee7edd8da45..3d7a09c81b10f7a34d55670b7f2cc50b
      }
  
      @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
+diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
 index b88326cc6c54bf38a37f2491bfb2f0e0deb2b1df..7531381e2e4d87ceeaa6478e13b23f6c072bef07 100644
---- a/src/main/java/net/minecraft/world/level/block/Block.java
-+++ b/src/main/java/net/minecraft/world/level/block/Block.java
+--- a/net/minecraft/world/level/block/Block.java
++++ b/net/minecraft/world/level/block/Block.java
 @@ -303,7 +303,7 @@ public class Block extends BlockBehaviour implements ItemLike {
      public static void dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity) {
          if (world instanceof ServerLevel) {
@@ -84,10 +84,10 @@ index b88326cc6c54bf38a37f2491bfb2f0e0deb2b1df..7531381e2e4d87ceeaa6478e13b23f6c
      public static void popResource(Level world, BlockPos pos, ItemStack stack) {
          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
+diff --git a/net/minecraft/world/level/block/entity/BlockEntity.java b/net/minecraft/world/level/block/entity/BlockEntity.java
 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
+--- a/net/minecraft/world/level/block/entity/BlockEntity.java
++++ b/net/minecraft/world/level/block/entity/BlockEntity.java
 @@ -94,6 +94,12 @@ public abstract class BlockEntity {
          if (persistentDataTag instanceof CompoundTag) {
              this.persistentDataContainer.putAll((CompoundTag) persistentDataTag);
diff --git a/patches/server/0214-Signs-allow-color-codes.patch b/patches/server/0214-Signs-allow-color-codes.patch
index 88c66d608..5bbd03d7d 100644
--- a/patches/server/0214-Signs-allow-color-codes.patch
+++ b/patches/server/0214-Signs-allow-color-codes.patch
@@ -4,10 +4,10 @@ Date: Thu, 6 Jun 2019 17:40:30 -0500
 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
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index ad4ace81452d83cc01ac9de5ef323770a8a2f417..d97db4d05d7940d8408e7e0d473a3b17d956b858 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -1959,6 +1959,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
  
      @Override
@@ -16,10 +16,10 @@ index ad4ace81452d83cc01ac9de5ef323770a8a2f417..d97db4d05d7940d8408e7e0d473a3b17
          this.connection.send(new ClientboundBlockUpdatePacket(this.level(), sign.getBlockPos()));
          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
+diff --git a/net/minecraft/world/level/block/entity/SignBlockEntity.java b/net/minecraft/world/level/block/entity/SignBlockEntity.java
 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
+--- a/net/minecraft/world/level/block/entity/SignBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -201,16 +201,31 @@ public class SignBlockEntity extends BlockEntity {
          return this.setText((SignText) textChanger.apply(signtext), front);
      }
diff --git a/patches/server/0215-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch b/patches/server/0215-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
index 0f1544c6d..886d3215d 100644
--- a/patches/server/0215-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
+++ b/patches/server/0215-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Kelp, cave, weeping, and twisting vines configurable max
  growth age
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
+diff --git a/net/minecraft/world/level/block/CaveVinesBlock.java b/net/minecraft/world/level/block/CaveVinesBlock.java
 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
+--- a/net/minecraft/world/level/block/CaveVinesBlock.java
++++ b/net/minecraft/world/level/block/CaveVinesBlock.java
 @@ -94,4 +94,11 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements CaveVines {
      public void performBonemeal(ServerLevel world, RandomSource random, BlockPos pos, BlockState state) {
          world.setBlock(pos, state.setValue(BERRIES, Boolean.valueOf(true)), 2);
@@ -21,10 +21,10 @@ index 81e572783157926383dd9baa58d30f5419c1616f..84d6ae4acf80f6ff4f418739a0228e74
 +    }
 +    // Purpur end
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
+diff --git a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 index 9b424d7661fedf8ee1eb9f3167c62e563f04d4d1..2af311847a085a8073e9bcb26c762d1bbe1eae2c 100644
---- a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
+--- a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
++++ b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 @@ -34,12 +34,12 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
  
      @Override
@@ -86,10 +86,10 @@ index 9b424d7661fedf8ee1eb9f3167c62e563f04d4d1..2af311847a085a8073e9bcb26c762d1b
 +
 +    public abstract int getMaxGrowthAge(); // Purpur
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/KelpBlock.java b/src/main/java/net/minecraft/world/level/block/KelpBlock.java
+diff --git a/net/minecraft/world/level/block/KelpBlock.java b/net/minecraft/world/level/block/KelpBlock.java
 index 784b19bc78c8ad9476b6dac37b6778a409a7c675..d49dd8b20d3785cc9482ed2a34fbd7aed4c9e537 100644
---- a/src/main/java/net/minecraft/world/level/block/KelpBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/KelpBlock.java
+--- a/net/minecraft/world/level/block/KelpBlock.java
++++ b/net/minecraft/world/level/block/KelpBlock.java
 @@ -72,4 +72,11 @@ public class KelpBlock extends GrowingPlantHeadBlock implements LiquidBlockConta
      protected FluidState getFluidState(BlockState state) {
          return Fluids.WATER.getSource(false);
@@ -102,10 +102,10 @@ index 784b19bc78c8ad9476b6dac37b6778a409a7c675..d49dd8b20d3785cc9482ed2a34fbd7ae
 +    }
 +    // Purpur end
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/TwistingVinesBlock.java b/src/main/java/net/minecraft/world/level/block/TwistingVinesBlock.java
+diff --git a/net/minecraft/world/level/block/TwistingVinesBlock.java b/net/minecraft/world/level/block/TwistingVinesBlock.java
 index 6342bb11a162b9e6d9475c5989b1670d77e8f0fb..f8be92512446d3f0e5f0f21222bbefd04ab2838a 100644
---- a/src/main/java/net/minecraft/world/level/block/TwistingVinesBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TwistingVinesBlock.java
+--- a/net/minecraft/world/level/block/TwistingVinesBlock.java
++++ b/net/minecraft/world/level/block/TwistingVinesBlock.java
 @@ -34,4 +34,11 @@ public class TwistingVinesBlock extends GrowingPlantHeadBlock {
      protected boolean canGrowInto(BlockState state) {
          return NetherVines.isValidGrowthState(state);
@@ -118,10 +118,10 @@ index 6342bb11a162b9e6d9475c5989b1670d77e8f0fb..f8be92512446d3f0e5f0f21222bbefd0
 +    }
 +    // Purpur end
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/WeepingVinesBlock.java b/src/main/java/net/minecraft/world/level/block/WeepingVinesBlock.java
+diff --git a/net/minecraft/world/level/block/WeepingVinesBlock.java b/net/minecraft/world/level/block/WeepingVinesBlock.java
 index 3dec5a082606ee35a8c8d7f746480262d6a189c5..b2f6ccae9576c176263e51a232e17a08d54543b3 100644
---- a/src/main/java/net/minecraft/world/level/block/WeepingVinesBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/WeepingVinesBlock.java
+--- a/net/minecraft/world/level/block/WeepingVinesBlock.java
++++ b/net/minecraft/world/level/block/WeepingVinesBlock.java
 @@ -34,4 +34,11 @@ public class WeepingVinesBlock extends GrowingPlantHeadBlock {
      protected boolean canGrowInto(BlockState state) {
          return NetherVines.isValidGrowthState(state);
diff --git a/patches/server/0216-Mobs-always-drop-experience.patch b/patches/server/0216-Mobs-always-drop-experience.patch
index e496fd1be..15488f7a2 100644
--- a/patches/server/0216-Mobs-always-drop-experience.patch
+++ b/patches/server/0216-Mobs-always-drop-experience.patch
@@ -4,10 +4,10 @@ Date: Tue, 21 Dec 2021 20:40:42 -0600
 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
+diff --git a/net/minecraft/world/entity/GlowSquid.java b/net/minecraft/world/entity/GlowSquid.java
 index 781f0adde9194162af57523aad4b73a358f622a7..97a062c48b22c34edb2a5ad8b8c2f5443e6f7556 100644
---- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
-+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
+--- a/net/minecraft/world/entity/GlowSquid.java
++++ b/net/minecraft/world/entity/GlowSquid.java
 @@ -50,6 +50,12 @@ public class GlowSquid extends Squid {
          return this.level().purpurConfig.glowSquidTakeDamageFromWater;
      }
@@ -21,10 +21,10 @@ index 781f0adde9194162af57523aad4b73a358f622a7..97a062c48b22c34edb2a5ad8b8c2f544
      @Override
      public boolean canFly() {
          return this.level().purpurConfig.glowSquidsCanFly;
-diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+diff --git a/net/minecraft/world/entity/ambient/Bat.java b/net/minecraft/world/entity/ambient/Bat.java
 index 7b647f41bd5ca4fa62795ad2fbcb5b73a3405979..b9d146547a6993a960618bfd95f617046666e8eb 100644
---- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+--- a/net/minecraft/world/entity/ambient/Bat.java
++++ b/net/minecraft/world/entity/ambient/Bat.java
 @@ -120,6 +120,12 @@ public class Bat extends AmbientCreature {
          return this.level().purpurConfig.batTakeDamageFromWater;
      }
@@ -38,10 +38,10 @@ index 7b647f41bd5ca4fa62795ad2fbcb5b73a3405979..b9d146547a6993a960618bfd95f61704
      @Override
      public boolean isFlapping() {
          return !this.isResting() && (float) this.tickCount % 10.0F == 0.0F;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
 index e191e27308dd8c5c8702692091541756f2b57ac1..c73cc8ffe5f67826971872de78adce72d202325a 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+--- a/net/minecraft/world/entity/animal/Bee.java
++++ b/net/minecraft/world/entity/animal/Bee.java
 @@ -502,6 +502,12 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          return this.level().purpurConfig.beeBreedingTicks;
      }
@@ -55,10 +55,10 @@ index e191e27308dd8c5c8702692091541756f2b57ac1..c73cc8ffe5f67826971872de78adce72
      @Override
      public boolean isSensitiveToWater() {
          return this.level().purpurConfig.beeTakeDamageFromWater;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java
 index 9bf07130a86ac8ab153eb7547c451d35eb2bb016..5a3348ca39b86cfea941fdfb98ca90a7a0ef908d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+--- a/net/minecraft/world/entity/animal/Cat.java
++++ b/net/minecraft/world/entity/animal/Cat.java
 @@ -144,6 +144,12 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
          return this.level().purpurConfig.catTakeDamageFromWater;
      }
@@ -72,10 +72,10 @@ index 9bf07130a86ac8ab153eb7547c451d35eb2bb016..5a3348ca39b86cfea941fdfb98ca90a7
      @Override
      protected void registerGoals() {
          this.temptGoal = new Cat.CatTemptGoal(this, 0.6D, (itemstack) -> {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+diff --git a/net/minecraft/world/entity/animal/Chicken.java b/net/minecraft/world/entity/animal/Chicken.java
 index 09ad3ca4fd5aaebb1f394e73bc030ffa798346ba..550b1035c2d6c6c7f0fc959e1a82c867c1f362d8 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+--- a/net/minecraft/world/entity/animal/Chicken.java
++++ b/net/minecraft/world/entity/animal/Chicken.java
 @@ -94,6 +94,12 @@ public class Chicken extends Animal {
          return this.level().purpurConfig.chickenTakeDamageFromWater;
      }
@@ -89,10 +89,10 @@ index 09ad3ca4fd5aaebb1f394e73bc030ffa798346ba..550b1035c2d6c6c7f0fc959e1a82c867
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
+diff --git a/net/minecraft/world/entity/animal/Cod.java b/net/minecraft/world/entity/animal/Cod.java
 index 478fb13b84609a545713371f903e4d6042747e94..a2d946aa9784e49e628fe6ebbdcbf9ce4423520f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
+--- a/net/minecraft/world/entity/animal/Cod.java
++++ b/net/minecraft/world/entity/animal/Cod.java
 @@ -37,6 +37,12 @@ public class Cod extends AbstractSchoolingFish {
          return this.level().purpurConfig.codTakeDamageFromWater;
      }
@@ -106,10 +106,10 @@ index 478fb13b84609a545713371f903e4d6042747e94..a2d946aa9784e49e628fe6ebbdcbf9ce
      @Override
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+diff --git a/net/minecraft/world/entity/animal/Cow.java b/net/minecraft/world/entity/animal/Cow.java
 index 42324d0d22c1f1a233aa6e6a810171b26894f8bc..845206570193682f5aca5abbb6915a64fa7f5044 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+--- a/net/minecraft/world/entity/animal/Cow.java
++++ b/net/minecraft/world/entity/animal/Cow.java
 @@ -82,6 +82,12 @@ public class Cow extends Animal {
          return this.level().purpurConfig.cowTakeDamageFromWater;
      }
@@ -123,10 +123,10 @@ index 42324d0d22c1f1a233aa6e6a810171b26894f8bc..845206570193682f5aca5abbb6915a64
      @Override
      public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor world, net.minecraft.world.DifficultyInstance difficulty, net.minecraft.world.entity.EntitySpawnReason spawnReason, net.minecraft.world.entity.SpawnGroupData entityData) {
          this.isNaturallyAggressiveToPlayers = world.getLevel().purpurConfig.cowNaturallyAggressiveToPlayersChance > 0.0D && random.nextDouble() <= world.getLevel().purpurConfig.cowNaturallyAggressiveToPlayersChance;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+diff --git a/net/minecraft/world/entity/animal/Dolphin.java b/net/minecraft/world/entity/animal/Dolphin.java
 index 64d1e932ac3bc673cffa324d8e75e8da596d6941..abbf13d79b4c1ed46bd486ebbd4ff5001bb096b5 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+--- a/net/minecraft/world/entity/animal/Dolphin.java
++++ b/net/minecraft/world/entity/animal/Dolphin.java
 @@ -175,6 +175,12 @@ public class Dolphin extends AgeableWaterCreature {
          return this.level().purpurConfig.dolphinTakeDamageFromWater;
      }
@@ -140,10 +140,10 @@ index 64d1e932ac3bc673cffa324d8e75e8da596d6941..abbf13d79b4c1ed46bd486ebbd4ff500
      @Nullable
      @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
+diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java
 index a758f312ae4ed4a0404ca7cedbd8c7b88aef58f4..fb75b983f7c522708964a9352546ae29611bf4e9 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
+--- a/net/minecraft/world/entity/animal/Fox.java
++++ b/net/minecraft/world/entity/animal/Fox.java
 @@ -201,6 +201,12 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {
          return this.level().purpurConfig.foxTakeDamageFromWater;
      }
@@ -157,10 +157,10 @@ index a758f312ae4ed4a0404ca7cedbd8c7b88aef58f4..fb75b983f7c522708964a9352546ae29
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+diff --git a/net/minecraft/world/entity/animal/IronGolem.java b/net/minecraft/world/entity/animal/IronGolem.java
 index 2cde18232b4101a5b20ca7897c0b8638eab68169..caa29df16214c60c4e0a471ad6320ea5d62ba7d0 100644
---- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+--- a/net/minecraft/world/entity/animal/IronGolem.java
++++ b/net/minecraft/world/entity/animal/IronGolem.java
 @@ -103,6 +103,12 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
          this.summoner = summoner;
      }
@@ -174,10 +174,10 @@ index 2cde18232b4101a5b20ca7897c0b8638eab68169..caa29df16214c60c4e0a471ad6320ea5
      @Override
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+diff --git a/net/minecraft/world/entity/animal/MushroomCow.java b/net/minecraft/world/entity/animal/MushroomCow.java
 index a8694e39954db18840e7c066ef6bcb58e3399c0b..481d373d3906f35d0e8e7aeaef3b70b4d443894f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+--- a/net/minecraft/world/entity/animal/MushroomCow.java
++++ b/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -99,6 +99,12 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          return this.level().purpurConfig.mooshroomTakeDamageFromWater;
      }
@@ -191,10 +191,10 @@ index a8694e39954db18840e7c066ef6bcb58e3399c0b..481d373d3906f35d0e8e7aeaef3b70b4
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+diff --git a/net/minecraft/world/entity/animal/Ocelot.java b/net/minecraft/world/entity/animal/Ocelot.java
 index 84b67619d38ff21a2bb8f4ea85c7d37c6794b59f..be818af35d6e9495ce4d3d3fc8212f7a22ebae92 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+--- a/net/minecraft/world/entity/animal/Ocelot.java
++++ b/net/minecraft/world/entity/animal/Ocelot.java
 @@ -101,6 +101,12 @@ public class Ocelot extends Animal {
          return this.level().purpurConfig.ocelotTakeDamageFromWater;
      }
@@ -208,10 +208,10 @@ index 84b67619d38ff21a2bb8f4ea85c7d37c6794b59f..be818af35d6e9495ce4d3d3fc8212f7a
      public boolean isTrusting() {
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+diff --git a/net/minecraft/world/entity/animal/Panda.java b/net/minecraft/world/entity/animal/Panda.java
 index 2081d18dc740748a37915bb7f41056bafbb93426..18bda7f4d0e0dfb2074b70e1369915c3a486e5cd 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
+--- a/net/minecraft/world/entity/animal/Panda.java
++++ b/net/minecraft/world/entity/animal/Panda.java
 @@ -158,6 +158,12 @@ public class Panda extends Animal {
          return this.level().purpurConfig.pandaTakeDamageFromWater;
      }
@@ -225,10 +225,10 @@ index 2081d18dc740748a37915bb7f41056bafbb93426..18bda7f4d0e0dfb2074b70e1369915c3
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java
 index eb7d6c1367ad9e4b8292987a69531cd627580167..724e7e77b1c781c3c91689eb7dfc3aed21133fd0 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+--- a/net/minecraft/world/entity/animal/Parrot.java
++++ b/net/minecraft/world/entity/animal/Parrot.java
 @@ -206,6 +206,12 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
          return this.level().purpurConfig.parrotTakeDamageFromWater;
      }
@@ -242,10 +242,10 @@ index eb7d6c1367ad9e4b8292987a69531cd627580167..724e7e77b1c781c3c91689eb7dfc3aed
      @Nullable
      @Override
      public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData entityData) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+diff --git a/net/minecraft/world/entity/animal/Pig.java b/net/minecraft/world/entity/animal/Pig.java
 index d1f61ab812aef23ff5eab508ce71683d88c8275d..71d5934b154356c62e1d3f01888d7c5907fd4da8 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+--- a/net/minecraft/world/entity/animal/Pig.java
++++ b/net/minecraft/world/entity/animal/Pig.java
 @@ -101,6 +101,12 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
          return this.level().purpurConfig.pigTakeDamageFromWater;
      }
@@ -259,10 +259,10 @@ index d1f61ab812aef23ff5eab508ce71683d88c8275d..71d5934b154356c62e1d3f01888d7c59
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+diff --git a/net/minecraft/world/entity/animal/PolarBear.java b/net/minecraft/world/entity/animal/PolarBear.java
 index eb1797c50c680586178aa8b42d56e2f41b3fe2fd..986fad77b0340c344ba3a3e3a3e5bc0105625439 100644
---- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+--- a/net/minecraft/world/entity/animal/PolarBear.java
++++ b/net/minecraft/world/entity/animal/PolarBear.java
 @@ -134,6 +134,12 @@ public class PolarBear extends Animal implements NeutralMob {
          return this.level().purpurConfig.polarBearTakeDamageFromWater;
      }
@@ -276,10 +276,10 @@ index eb1797c50c680586178aa8b42d56e2f41b3fe2fd..986fad77b0340c344ba3a3e3a3e5bc01
      @Nullable
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
+diff --git a/net/minecraft/world/entity/animal/Pufferfish.java b/net/minecraft/world/entity/animal/Pufferfish.java
 index 386b0a39f5c7596ae6f682000f4cc0907275e750..a612f3e8034dd20566370c846f093b50ddef904c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
+--- a/net/minecraft/world/entity/animal/Pufferfish.java
++++ b/net/minecraft/world/entity/animal/Pufferfish.java
 @@ -76,6 +76,12 @@ public class Pufferfish extends AbstractFish {
          return this.level().purpurConfig.pufferfishTakeDamageFromWater;
      }
@@ -293,10 +293,10 @@ index 386b0a39f5c7596ae6f682000f4cc0907275e750..a612f3e8034dd20566370c846f093b50
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java
 index 688a8ad45111a71853bea22b1b9f72e3505d82a6..080551d9b55d12ef15fa2efbde1d195bc82d065c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+--- a/net/minecraft/world/entity/animal/Rabbit.java
++++ b/net/minecraft/world/entity/animal/Rabbit.java
 @@ -160,6 +160,12 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          return this.level().purpurConfig.rabbitTakeDamageFromWater;
      }
@@ -310,10 +310,10 @@ index 688a8ad45111a71853bea22b1b9f72e3505d82a6..080551d9b55d12ef15fa2efbde1d195b
      @Override
      public void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Salmon.java b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
+diff --git a/net/minecraft/world/entity/animal/Salmon.java b/net/minecraft/world/entity/animal/Salmon.java
 index 053c2773b52bd3399c3812452dbee2d1882d32a2..b0ac0fb823cb2860e301c63c4cd2d35cdf108275 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
+--- a/net/minecraft/world/entity/animal/Salmon.java
++++ b/net/minecraft/world/entity/animal/Salmon.java
 @@ -59,6 +59,12 @@ public class Salmon extends AbstractSchoolingFish implements VariantHolder<Salmo
          return this.level().purpurConfig.salmonTakeDamageFromWater;
      }
@@ -327,10 +327,10 @@ index 053c2773b52bd3399c3812452dbee2d1882d32a2..b0ac0fb823cb2860e301c63c4cd2d35c
      @Override
      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
+diff --git a/net/minecraft/world/entity/animal/Sheep.java b/net/minecraft/world/entity/animal/Sheep.java
 index a8a985c219036da9d58ad62ebdc925b62c44fce5..8c8c587646a1db8dc35fcbd85868e84a2f2697b2 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+--- a/net/minecraft/world/entity/animal/Sheep.java
++++ b/net/minecraft/world/entity/animal/Sheep.java
 @@ -120,6 +120,12 @@ public class Sheep extends Animal implements Shearable {
          return this.level().purpurConfig.sheepTakeDamageFromWater;
      }
@@ -344,10 +344,10 @@ index a8a985c219036da9d58ad62ebdc925b62c44fce5..8c8c587646a1db8dc35fcbd85868e84a
      @Override
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java
 index b9d2d942194784de64665e9d9d851f4027aa4db2..e338e92835d665840375049ecb475345e1631f06 100644
---- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+--- a/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -90,6 +90,12 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
          this.summoner = summoner;
      }
@@ -361,10 +361,10 @@ index b9d2d942194784de64665e9d9d851f4027aa4db2..e338e92835d665840375049ecb475345
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java
 index 600e12b135c4ad2d50247761542ffa3675113c39..a2f51788f88c20f282ea2a20485c56109b90c22b 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+--- a/net/minecraft/world/entity/animal/Squid.java
++++ b/net/minecraft/world/entity/animal/Squid.java
 @@ -85,6 +85,12 @@ public class Squid extends AgeableWaterCreature {
          return this.level().purpurConfig.squidTakeDamageFromWater;
      }
@@ -378,10 +378,10 @@ index 600e12b135c4ad2d50247761542ffa3675113c39..a2f51788f88c20f282ea2a20485c5610
      @Override
      public net.minecraft.world.phys.AABB getAxisForFluidCheck() {
          // Stops squids from floating just over the water
-diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
+diff --git a/net/minecraft/world/entity/animal/TropicalFish.java b/net/minecraft/world/entity/animal/TropicalFish.java
 index e8d3ecfcc3f25d271b81048c5d7f9722775bdbb1..26790832db3267dbfced4ce77e1a70ac2f2b6c3d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
+--- a/net/minecraft/world/entity/animal/TropicalFish.java
++++ b/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -91,6 +91,12 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
          return this.level().purpurConfig.tropicalFishTakeDamageFromWater;
      }
@@ -395,10 +395,10 @@ index e8d3ecfcc3f25d271b81048c5d7f9722775bdbb1..26790832db3267dbfced4ce77e1a70ac
      public static String getPredefinedName(int variant) {
          return "entity.minecraft.tropical_fish.predefined." + variant;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+diff --git a/net/minecraft/world/entity/animal/Turtle.java b/net/minecraft/world/entity/animal/Turtle.java
 index e18e7c264dffcff41b9d244fbc411d7aeeeeb45e..2f9cceaf189b7fe9271aeb8160abe2f284acaad8 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+--- a/net/minecraft/world/entity/animal/Turtle.java
++++ b/net/minecraft/world/entity/animal/Turtle.java
 @@ -122,6 +122,12 @@ public class Turtle extends Animal {
          return this.level().purpurConfig.turtleTakeDamageFromWater;
      }
@@ -412,10 +412,10 @@ index e18e7c264dffcff41b9d244fbc411d7aeeeeb45e..2f9cceaf189b7fe9271aeb8160abe2f2
      public void setHomePos(BlockPos pos) {
          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
+diff --git a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java
 index 615a0de7b2d6fb69ca86f1fa27e9dc7d4368bd24..30b4c09c6046c1d0843ccb8e4ff326e189b6cb95 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+--- a/net/minecraft/world/entity/animal/Wolf.java
++++ b/net/minecraft/world/entity/animal/Wolf.java
 @@ -221,6 +221,12 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          return this.level().purpurConfig.wolfTakeDamageFromWater;
      }
@@ -429,10 +429,10 @@ index 615a0de7b2d6fb69ca86f1fa27e9dc7d4368bd24..30b4c09c6046c1d0843ccb8e4ff326e1
      @Override
      public void tame(Player player) {
          setCollarColor(level().purpurConfig.wolfDefaultCollarColor);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+diff --git a/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 index aff5b95fcccdba79ddc58e5e56d268aa49879b36..7af27595f5e6b8a1690acf3c0ccb2bfae78408ef 100644
---- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+--- a/net/minecraft/world/entity/animal/axolotl/Axolotl.java
++++ b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -136,6 +136,12 @@ public class Axolotl extends Animal implements VariantHolder<Axolotl.Variant>, B
          return this.level().purpurConfig.axolotlTakeDamageFromWater;
      }
@@ -446,10 +446,10 @@ index aff5b95fcccdba79ddc58e5e56d268aa49879b36..7af27595f5e6b8a1690acf3c0ccb2bfa
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return 0.0F;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
 index 4a8ac3d75a3c75eea8e361d7eb729f27ea807347..214a97aa88c569f55619512e712b7bfe32d26b30 100644
---- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+--- a/net/minecraft/world/entity/animal/goat/Goat.java
++++ b/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -122,6 +122,12 @@ public class Goat extends Animal {
          return this.level().purpurConfig.goatTakeDamageFromWater;
      }
@@ -463,10 +463,10 @@ index 4a8ac3d75a3c75eea8e361d7eb729f27ea807347..214a97aa88c569f55619512e712b7bfe
      @Override
      protected Brain.Provider<Goat> brainProvider() {
          return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+diff --git a/net/minecraft/world/entity/animal/horse/Donkey.java b/net/minecraft/world/entity/animal/horse/Donkey.java
 index 6a511e01f8805451ce89d697568c23803b5985a8..dc1ed34349a6d0d2f233d35a81f2c28e32b10210 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+--- a/net/minecraft/world/entity/animal/horse/Donkey.java
++++ b/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -51,6 +51,12 @@ public class Donkey extends AbstractChestedHorse {
          return this.level().purpurConfig.donkeyTakeDamageFromWater;
      }
@@ -480,10 +480,10 @@ index 6a511e01f8805451ce89d697568c23803b5985a8..dc1ed34349a6d0d2f233d35a81f2c28e
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+diff --git a/net/minecraft/world/entity/animal/horse/Horse.java b/net/minecraft/world/entity/animal/horse/Horse.java
 index c5ba0669b7e184ac42243a65a230fe325c3f84cc..b39cbc42acacdedecfc996dbe25b3773a9fae8b2 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+--- a/net/minecraft/world/entity/animal/horse/Horse.java
++++ b/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -78,6 +78,12 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
          return this.level().purpurConfig.horseTakeDamageFromWater;
      }
@@ -497,10 +497,10 @@ index c5ba0669b7e184ac42243a65a230fe325c3f84cc..b39cbc42acacdedecfc996dbe25b3773
      @Override
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
 index ee8d756fed5b6458b28acbd2a62a5693baddd45d..3c265a80f55eee38406066cd02460b18fbac896d 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+--- a/net/minecraft/world/entity/animal/horse/Llama.java
++++ b/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -152,6 +152,12 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          return this.level().purpurConfig.llamaTakeDamageFromWater;
      }
@@ -514,10 +514,10 @@ index ee8d756fed5b6458b28acbd2a62a5693baddd45d..3c265a80f55eee38406066cd02460b18
      public boolean isTraderLlama() {
          return false;
      }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+diff --git a/net/minecraft/world/entity/animal/horse/Mule.java b/net/minecraft/world/entity/animal/horse/Mule.java
 index 8da2ff2fba266884593cefb3c192ff41afce5740..9decc32643a50bf02712f97c50eb36202bb233a8 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+--- a/net/minecraft/world/entity/animal/horse/Mule.java
++++ b/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -50,6 +50,12 @@ public class Mule extends AbstractChestedHorse {
          return this.level().purpurConfig.muleTakeDamageFromWater;
      }
@@ -531,10 +531,10 @@ index 8da2ff2fba266884593cefb3c192ff41afce5740..9decc32643a50bf02712f97c50eb3620
      @Override
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 index f720deaa578d094c924be9935318ddc5817674f1..d641092fb186766417d4da7c769333ef5b16de78 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+--- a/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
++++ b/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 @@ -77,6 +77,12 @@ public class SkeletonHorse extends AbstractHorse {
          return this.level().purpurConfig.skeletonHorseTakeDamageFromWater;
      }
@@ -548,10 +548,10 @@ index f720deaa578d094c924be9935318ddc5817674f1..d641092fb186766417d4da7c769333ef
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/animal/horse/TraderLlama.java b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 index 8748e41742a3d8d2d160fbd27c171f9839d5f10e..48c642308193243407353ea7a6849219b94b70e2 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
+--- a/net/minecraft/world/entity/animal/horse/TraderLlama.java
++++ b/net/minecraft/world/entity/animal/horse/TraderLlama.java
 @@ -83,6 +83,12 @@ public class TraderLlama extends Llama {
          return this.level().purpurConfig.traderLlamaTakeDamageFromWater;
      }
@@ -565,10 +565,10 @@ index 8748e41742a3d8d2d160fbd27c171f9839d5f10e..48c642308193243407353ea7a6849219
      @Override
      public boolean isTraderLlama() {
          return true;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+diff --git a/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 index d7f96f19c3a4eec8497ff1b8bffdf9bc5bacfbb7..339829bfc7ec9298ae6c31562ec9899d89645ebc 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+--- a/net/minecraft/world/entity/animal/horse/ZombieHorse.java
++++ b/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 @@ -73,6 +73,12 @@ public class ZombieHorse extends AbstractHorse {
          return this.level().purpurConfig.zombieHorseTakeDamageFromWater;
      }
@@ -582,10 +582,10 @@ index d7f96f19c3a4eec8497ff1b8bffdf9bc5bacfbb7..339829bfc7ec9298ae6c31562ec9899d
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 index 9e37864a630151aee431aa4031ecc4033de1766f..a732226a889d7eafd10f4a0d7129e60542fe90e7 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
+--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -137,6 +137,12 @@ public class WitherBoss extends Monster implements RangedAttackMob {
          this.summoner = summoner;
      }
@@ -599,10 +599,10 @@ index 9e37864a630151aee431aa4031ecc4033de1766f..a732226a889d7eafd10f4a0d7129e605
      @Override
      protected PathNavigation createNavigation(Level world) {
          FlyingPathNavigation navigationflying = new FlyingPathNavigation(this, world);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+diff --git a/net/minecraft/world/entity/monster/Blaze.java b/net/minecraft/world/entity/monster/Blaze.java
 index 477e000d518522b9d546567cd96930053f8a15c5..000d18bdcc2d26b7cc175c4f72e32ac7a882f2a6 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+--- a/net/minecraft/world/entity/monster/Blaze.java
++++ b/net/minecraft/world/entity/monster/Blaze.java
 @@ -82,6 +82,12 @@ public class Blaze extends Monster {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.blazeScale);
      }
@@ -616,10 +616,10 @@ index 477e000d518522b9d546567cd96930053f8a15c5..000d18bdcc2d26b7cc175c4f72e32ac7
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
+diff --git a/net/minecraft/world/entity/monster/CaveSpider.java b/net/minecraft/world/entity/monster/CaveSpider.java
 index 6de7a8cf41af2a4d2988f86341ba4329f9c45361..f34880530a5220b2ef73a2e4fad39445bbad73dd 100644
---- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
+--- a/net/minecraft/world/entity/monster/CaveSpider.java
++++ b/net/minecraft/world/entity/monster/CaveSpider.java
 @@ -57,6 +57,12 @@ public class CaveSpider extends Spider {
          return this.level().purpurConfig.caveSpiderTakeDamageFromWater;
      }
@@ -633,10 +633,10 @@ index 6de7a8cf41af2a4d2988f86341ba4329f9c45361..f34880530a5220b2ef73a2e4fad39445
      @Override
      public boolean doHurtTarget(ServerLevel world, Entity target) {
          if (super.doHurtTarget(world, target)) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
 index d22a36bdabf04da4c4fe6e4699c9d78dc5b4e0c6..b87a961c1f69f0cf51d8e1e462915234ee74d0a9 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+--- a/net/minecraft/world/entity/monster/Creeper.java
++++ b/net/minecraft/world/entity/monster/Creeper.java
 @@ -285,6 +285,12 @@ public class Creeper extends Monster {
      }
      // Purpur end - Config to make Creepers explode on death
@@ -650,10 +650,10 @@ index d22a36bdabf04da4c4fe6e4699c9d78dc5b4e0c6..b87a961c1f69f0cf51d8e1e462915234
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java
 index 1e4208f720bfafe9542691b826e4b8dccd449ef3..76db5a2d27ab435fdfd1e0ec0c77ef5012e128d4 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+--- a/net/minecraft/world/entity/monster/Drowned.java
++++ b/net/minecraft/world/entity/monster/Drowned.java
 @@ -126,6 +126,12 @@ public class Drowned extends Zombie implements RangedAttackMob {
          return this.level().purpurConfig.drownedTakeDamageFromWater;
      }
@@ -667,10 +667,10 @@ index 1e4208f720bfafe9542691b826e4b8dccd449ef3..76db5a2d27ab435fdfd1e0ec0c77ef50
      @Override
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(1, new Drowned.DrownedGoToWaterGoal(this, 1.0));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
+diff --git a/net/minecraft/world/entity/monster/ElderGuardian.java b/net/minecraft/world/entity/monster/ElderGuardian.java
 index d69716edb777155d0b52db25af64107e4657e03c..16edee73b099b66f12c45062df3108127d154921 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
+--- a/net/minecraft/world/entity/monster/ElderGuardian.java
++++ b/net/minecraft/world/entity/monster/ElderGuardian.java
 @@ -58,6 +58,12 @@ public class ElderGuardian extends Guardian {
          return this.level().purpurConfig.elderGuardianTakeDamageFromWater;
      }
@@ -684,10 +684,10 @@ index d69716edb777155d0b52db25af64107e4657e03c..16edee73b099b66f12c45062df310812
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
 index 327686f0c47894259532a15e98d69d332a6d483a..6edc95de8fd03538c36dc1a21e4539e81647642f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+--- a/net/minecraft/world/entity/monster/EnderMan.java
++++ b/net/minecraft/world/entity/monster/EnderMan.java
 @@ -118,6 +118,12 @@ public class EnderMan extends Monster implements NeutralMob {
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.endermanScale);
      }
@@ -701,10 +701,10 @@ index 327686f0c47894259532a15e98d69d332a6d483a..6edc95de8fd03538c36dc1a21e4539e8
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
 index e48ebd0424828624c980e0c3e09a0cb37685be5e..b5e957f101a1bd14501a043fb1b528de25cf2f75 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+--- a/net/minecraft/world/entity/monster/Endermite.java
++++ b/net/minecraft/world/entity/monster/Endermite.java
 @@ -78,6 +78,12 @@ public class Endermite extends Monster {
          this.isPlayerSpawned = playerSpawned;
      }
@@ -718,10 +718,10 @@ index e48ebd0424828624c980e0c3e09a0cb37685be5e..b5e957f101a1bd14501a043fb1b528de
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Evoker.java b/net/minecraft/world/entity/monster/Evoker.java
 index 8cc90983c0e4781b4cc73040ceba069e302f7664..5e46324e9509a67debfc07614f15d282d293f717 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+--- a/net/minecraft/world/entity/monster/Evoker.java
++++ b/net/minecraft/world/entity/monster/Evoker.java
 @@ -83,6 +83,12 @@ public class Evoker extends SpellcasterIllager {
          return this.level().purpurConfig.evokerTakeDamageFromWater;
      }
@@ -735,10 +735,10 @@ index 8cc90983c0e4781b4cc73040ceba069e302f7664..5e46324e9509a67debfc07614f15d282
      @Override
      protected void registerGoals() {
          super.registerGoals();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java
 index 67bc0ec362929099e741486e3424770478a046d9..d410824d481a83d11919c045e572eaffab3d9a9f 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+--- a/net/minecraft/world/entity/monster/Ghast.java
++++ b/net/minecraft/world/entity/monster/Ghast.java
 @@ -91,6 +91,12 @@ public class Ghast extends FlyingMob implements Enemy {
          return this.level().purpurConfig.ghastTakeDamageFromWater;
      }
@@ -752,10 +752,10 @@ index 67bc0ec362929099e741486e3424770478a046d9..d410824d481a83d11919c045e572eaff
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+diff --git a/net/minecraft/world/entity/monster/Giant.java b/net/minecraft/world/entity/monster/Giant.java
 index 4bf1414569685e9e8704216c9dcf585def88b2e5..a7996b600a94f87629a26349c317b379aef4b5a7 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
+--- a/net/minecraft/world/entity/monster/Giant.java
++++ b/net/minecraft/world/entity/monster/Giant.java
 @@ -65,6 +65,12 @@ public class Giant extends Monster {
          return this.level().purpurConfig.giantTakeDamageFromWater;
      }
@@ -769,10 +769,10 @@ index 4bf1414569685e9e8704216c9dcf585def88b2e5..a7996b600a94f87629a26349c317b379
      public static AttributeSupplier.Builder createAttributes() {
          return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.ATTACK_DAMAGE, 50.0);
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java
 index 01917ec09069be5d8b1051969367df1e53ff38ca..929864ee4e5e6e9c87d10bb1bb06118cd94bd5d7 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+--- a/net/minecraft/world/entity/monster/Guardian.java
++++ b/net/minecraft/world/entity/monster/Guardian.java
 @@ -104,6 +104,12 @@ public class Guardian extends Monster {
          return this.level().purpurConfig.guardianTakeDamageFromWater;
      }
@@ -786,10 +786,10 @@ index 01917ec09069be5d8b1051969367df1e53ff38ca..929864ee4e5e6e9c87d10bb1bb06118c
      @Override
      protected void registerGoals() {
          MoveTowardsRestrictionGoal pathfindergoalmovetowardsrestriction = new MoveTowardsRestrictionGoal(this, 1.0D);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+diff --git a/net/minecraft/world/entity/monster/Husk.java b/net/minecraft/world/entity/monster/Husk.java
 index 9f0b91de19ecdb0f74fe6d93a1e75c27c262ee07..c41a9b4bb24cc801b8460ce7e63695fdec146c5d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
+--- a/net/minecraft/world/entity/monster/Husk.java
++++ b/net/minecraft/world/entity/monster/Husk.java
 @@ -74,6 +74,12 @@ public class Husk extends Zombie {
          return this.level().purpurConfig.huskTakeDamageFromWater;
      }
@@ -803,10 +803,10 @@ index 9f0b91de19ecdb0f74fe6d93a1e75c27c262ee07..c41a9b4bb24cc801b8460ce7e63695fd
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random) {
          return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (EntitySpawnReason.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
+diff --git a/net/minecraft/world/entity/monster/Illusioner.java b/net/minecraft/world/entity/monster/Illusioner.java
 index d0fe85e7c44b78a078e6c2d6220849a336b079d3..83b64a8091a85b9eb940af33e4d44bd4a906b248 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
+--- a/net/minecraft/world/entity/monster/Illusioner.java
++++ b/net/minecraft/world/entity/monster/Illusioner.java
 @@ -91,6 +91,12 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
          return this.level().purpurConfig.illusionerTakeDamageFromWater;
      }
@@ -820,10 +820,10 @@ index d0fe85e7c44b78a078e6c2d6220849a336b079d3..83b64a8091a85b9eb940af33e4d44bd4
      @Override
      protected void registerGoals() {
          super.registerGoals();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
+diff --git a/net/minecraft/world/entity/monster/MagmaCube.java b/net/minecraft/world/entity/monster/MagmaCube.java
 index 8f0e9f854c4032c43cc1c9a8b087a5fa286326d8..2449a960493cbd99a22ce9b8d2fe852d1ec4b20d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
+--- a/net/minecraft/world/entity/monster/MagmaCube.java
++++ b/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -73,6 +73,12 @@ public class MagmaCube extends Slime {
          return this.level().purpurConfig.magmaCubeTakeDamageFromWater;
      }
@@ -837,10 +837,10 @@ index 8f0e9f854c4032c43cc1c9a8b087a5fa286326d8..2449a960493cbd99a22ce9b8d2fe852d
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
 index 71bbb3209acc12c9f20b8964770be8666a7e72f8..0682479b37064d7690c8da1569de8f7452a0439d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+--- a/net/minecraft/world/entity/monster/Phantom.java
++++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -145,6 +145,12 @@ public class Phantom extends FlyingMob implements Enemy {
          return crystalPosition != null;
      }
@@ -854,10 +854,10 @@ index 71bbb3209acc12c9f20b8964770be8666a7e72f8..0682479b37064d7690c8da1569de8f74
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Pillager.java b/net/minecraft/world/entity/monster/Pillager.java
 index 0bc9ee0de4f30d4d57164e02992856a0bfa92041..5b98144992c366009a2b2c48e13884ceaf72acfb 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
+--- a/net/minecraft/world/entity/monster/Pillager.java
++++ b/net/minecraft/world/entity/monster/Pillager.java
 @@ -97,6 +97,12 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
          return this.level().purpurConfig.pillagerTakeDamageFromWater;
      }
@@ -871,10 +871,10 @@ index 0bc9ee0de4f30d4d57164e02992856a0bfa92041..5b98144992c366009a2b2c48e13884ce
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
 index 7fb2af68c101dc12e60f120da1bb5c1efd20d164..95562e3614880702655df4578119e6cf3702e566 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+--- a/net/minecraft/world/entity/monster/Ravager.java
++++ b/net/minecraft/world/entity/monster/Ravager.java
 @@ -111,6 +111,12 @@ public class Ravager extends Raider {
          return this.level().purpurConfig.ravagerTakeDamageFromWater;
      }
@@ -888,10 +888,10 @@ index 7fb2af68c101dc12e60f120da1bb5c1efd20d164..95562e3614880702655df4578119e6cf
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
 index 2052549f2e6b23aff5491bb0cc1af00b7f560227..78ac42c89cb768e0dfb17197a850a029937c145c 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+--- a/net/minecraft/world/entity/monster/Shulker.java
++++ b/net/minecraft/world/entity/monster/Shulker.java
 @@ -126,6 +126,12 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
          return this.level().purpurConfig.shulkerTakeDamageFromWater;
      }
@@ -905,10 +905,10 @@ index 2052549f2e6b23aff5491bb0cc1af00b7f560227..78ac42c89cb768e0dfb17197a850a029
      @Override
      protected net.minecraft.world.InteractionResult mobInteract(Player player, net.minecraft.world.InteractionHand hand) {
          net.minecraft.world.item.ItemStack itemstack = player.getItemInHand(hand);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+diff --git a/net/minecraft/world/entity/monster/Silverfish.java b/net/minecraft/world/entity/monster/Silverfish.java
 index 256b57f6aea44cdfd209a546f98c5b0538b8242b..78aec4acc84b228537f90172f2e4c346b665bc0b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+--- a/net/minecraft/world/entity/monster/Silverfish.java
++++ b/net/minecraft/world/entity/monster/Silverfish.java
 @@ -76,6 +76,12 @@ public class Silverfish extends Monster {
          return this.level().purpurConfig.silverfishTakeDamageFromWater;
      }
@@ -922,10 +922,10 @@ index 256b57f6aea44cdfd209a546f98c5b0538b8242b..78aec4acc84b228537f90172f2e4c346
      @Override
      protected void registerGoals() {
          this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+diff --git a/net/minecraft/world/entity/monster/Skeleton.java b/net/minecraft/world/entity/monster/Skeleton.java
 index 2bbdaaad2ab0d44dc27172a81df732c03ec8147d..93b570c0d18f2fc76180c5c6ea292e191cb81be2 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+--- a/net/minecraft/world/entity/monster/Skeleton.java
++++ b/net/minecraft/world/entity/monster/Skeleton.java
 @@ -58,6 +58,12 @@ public class Skeleton extends AbstractSkeleton {
          return this.level().purpurConfig.skeletonTakeDamageFromWater;
      }
@@ -939,10 +939,10 @@ index 2bbdaaad2ab0d44dc27172a81df732c03ec8147d..93b570c0d18f2fc76180c5c6ea292e19
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
+diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
 index b48210e8e08ca607b272d78cf5697b89dd3201a0..d58f7b251d0c322d63e7e5e8ed30b41427a11227 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
+--- a/net/minecraft/world/entity/monster/Slime.java
++++ b/net/minecraft/world/entity/monster/Slime.java
 @@ -145,6 +145,12 @@ public class Slime extends Mob implements Enemy {
          return this.level().purpurConfig.slimeTakeDamageFromWater;
      }
@@ -956,10 +956,10 @@ index b48210e8e08ca607b272d78cf5697b89dd3201a0..d58f7b251d0c322d63e7e5e8ed30b414
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+diff --git a/net/minecraft/world/entity/monster/Spider.java b/net/minecraft/world/entity/monster/Spider.java
 index cb61d3b402155241dc66ac05893c44e76c104dfc..12bae0aa2f1cf3059b9c70f5377649cd9f8257aa 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+--- a/net/minecraft/world/entity/monster/Spider.java
++++ b/net/minecraft/world/entity/monster/Spider.java
 @@ -81,6 +81,12 @@ public class Spider extends Monster {
          return this.level().purpurConfig.spiderTakeDamageFromWater;
      }
@@ -973,10 +973,10 @@ index cb61d3b402155241dc66ac05893c44e76c104dfc..12bae0aa2f1cf3059b9c70f5377649cd
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
+diff --git a/net/minecraft/world/entity/monster/Stray.java b/net/minecraft/world/entity/monster/Stray.java
 index 874727cd86f530c4ddb895fd6e005d9b9ec20daa..b8b9b4316bebae4564fac4c56b303735b86563fb 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
+--- a/net/minecraft/world/entity/monster/Stray.java
++++ b/net/minecraft/world/entity/monster/Stray.java
 @@ -51,6 +51,12 @@ public class Stray extends AbstractSkeleton {
          return this.level().purpurConfig.strayTakeDamageFromWater;
      }
@@ -990,10 +990,10 @@ index 874727cd86f530c4ddb895fd6e005d9b9ec20daa..b8b9b4316bebae4564fac4c56b303735
      public static boolean checkStraySpawnRules(
          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
+diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
 index 420118b1df271377f69e8e2bab8a62623382c819..df44d9fbb71ff252cd261fc8da6de14383e054de 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
+--- a/net/minecraft/world/entity/monster/Strider.java
++++ b/net/minecraft/world/entity/monster/Strider.java
 @@ -127,6 +127,12 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
          return this.level().purpurConfig.striderBreedingTicks;
      }
@@ -1007,10 +1007,10 @@ index 420118b1df271377f69e8e2bab8a62623382c819..df44d9fbb71ff252cd261fc8da6de143
      public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random) {
          BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
+diff --git a/net/minecraft/world/entity/monster/Vex.java b/net/minecraft/world/entity/monster/Vex.java
 index 1630074bf8065a7ecf49d426f8d5fe5e109b1d2c..ec61bc0d9b934ceed15b721e86200abfea21a923 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
+--- a/net/minecraft/world/entity/monster/Vex.java
++++ b/net/minecraft/world/entity/monster/Vex.java
 @@ -116,6 +116,12 @@ public class Vex extends Monster implements TraceableEntity {
          return this.level().purpurConfig.vexTakeDamageFromWater;
      }
@@ -1024,10 +1024,10 @@ index 1630074bf8065a7ecf49d426f8d5fe5e109b1d2c..ec61bc0d9b934ceed15b721e86200abf
      @Override
      public boolean isFlapping() {
          return this.tickCount % Vex.TICKS_PER_FLAP == 0;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+diff --git a/net/minecraft/world/entity/monster/Vindicator.java b/net/minecraft/world/entity/monster/Vindicator.java
 index 5693081f061dcefbfda374c26a6ab5be0c2e2fcc..3d1cb875edfe6bf5c9e3f4b7dade7868b7dbfa93 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+--- a/net/minecraft/world/entity/monster/Vindicator.java
++++ b/net/minecraft/world/entity/monster/Vindicator.java
 @@ -85,6 +85,12 @@ public class Vindicator extends AbstractIllager {
          return this.level().purpurConfig.vindicatorTakeDamageFromWater;
      }
@@ -1041,10 +1041,10 @@ index 5693081f061dcefbfda374c26a6ab5be0c2e2fcc..3d1cb875edfe6bf5c9e3f4b7dade7868
      @Override
      protected void registerGoals() {
          super.registerGoals();
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
+diff --git a/net/minecraft/world/entity/monster/Witch.java b/net/minecraft/world/entity/monster/Witch.java
 index f77ce3de847ea5c7f40bfa6bd4bba254dc863bd0..8e7f4cb8ede8721f05c6c35e9b4d08884254853e 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
+--- a/net/minecraft/world/entity/monster/Witch.java
++++ b/net/minecraft/world/entity/monster/Witch.java
 @@ -87,6 +87,12 @@ public class Witch extends Raider implements RangedAttackMob {
          return this.level().purpurConfig.witchTakeDamageFromWater;
      }
@@ -1058,10 +1058,10 @@ index f77ce3de847ea5c7f40bfa6bd4bba254dc863bd0..8e7f4cb8ede8721f05c6c35e9b4d0888
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/WitherSkeleton.java b/net/minecraft/world/entity/monster/WitherSkeleton.java
 index 1a864ebb6257f34e8fb7a543d6da19cfa96bb7d0..351a35bdcb820c9c65aeddfbe0f00486d8057f7c 100644
---- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
+--- a/net/minecraft/world/entity/monster/WitherSkeleton.java
++++ b/net/minecraft/world/entity/monster/WitherSkeleton.java
 @@ -66,6 +66,12 @@ public class WitherSkeleton extends AbstractSkeleton {
          return this.level().purpurConfig.witherSkeletonTakeDamageFromWater;
      }
@@ -1075,10 +1075,10 @@ index 1a864ebb6257f34e8fb7a543d6da19cfa96bb7d0..351a35bdcb820c9c65aeddfbe0f00486
      @Override
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+diff --git a/net/minecraft/world/entity/monster/Zoglin.java b/net/minecraft/world/entity/monster/Zoglin.java
 index 1c2c0f94811f934804cfb0be15fa55c0281ad0ba..8aec50e7330d16bd3d0bc027c191fa1a4ce4552b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+--- a/net/minecraft/world/entity/monster/Zoglin.java
++++ b/net/minecraft/world/entity/monster/Zoglin.java
 @@ -115,6 +115,12 @@ public class Zoglin extends Monster implements HoglinBase {
          return this.level().purpurConfig.zoglinTakeDamageFromWater;
      }
@@ -1092,10 +1092,10 @@ index 1c2c0f94811f934804cfb0be15fa55c0281ad0ba..8aec50e7330d16bd3d0bc027c191fa1a
      @Override
      protected Brain.Provider<Zoglin> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
 index 37ee837f6e722cd4cb07ae9fcd366a1473dc0b49..867d9ddce630482a7d3fadfe5aab213a0f912ca4 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+--- a/net/minecraft/world/entity/monster/Zombie.java
++++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -154,6 +154,12 @@ public class Zombie extends Monster {
          return this.level().purpurConfig.zombieTakeDamageFromWater;
      }
@@ -1109,10 +1109,10 @@ index 37ee837f6e722cd4cb07ae9fcd366a1473dc0b49..867d9ddce630482a7d3fadfe5aab213a
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
 index 40490767e474bc1e954c8f837f25268d2fd38f5b..bba3562bf316878e7b8ba6a138889d9583a1b0f6 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+--- a/net/minecraft/world/entity/monster/ZombieVillager.java
++++ b/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -135,6 +135,12 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          return this.level().purpurConfig.zombieVillagerTakeDamageFromWater;
      }
@@ -1126,10 +1126,10 @@ index 40490767e474bc1e954c8f837f25268d2fd38f5b..bba3562bf316878e7b8ba6a138889d95
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+diff --git a/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 index 3070f4484276f8ea6b95134abda6409e58f1161a..c0e611f3222ffacfbd0683c8c65b778f9012a2ad 100644
---- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+--- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java
++++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -109,6 +109,12 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
          return this.level().purpurConfig.zombifiedPiglinTakeDamageFromWater;
      }
@@ -1143,10 +1143,10 @@ index 3070f4484276f8ea6b95134abda6409e58f1161a..c0e611f3222ffacfbd0683c8c65b778f
      @Override
      public void setPersistentAngerTarget(@Nullable UUID angryAt) {
          this.persistentAngerTarget = angryAt;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 index 534626336e45da2c67cb023f4e5feea59daa8b5d..5e8da964681cb63d7733af8b5173715fd7e54a63 100644
---- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+--- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java
++++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -112,6 +112,12 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
          return this.level().purpurConfig.hoglinTakeDamageFromWater;
      }
@@ -1160,10 +1160,10 @@ index 534626336e45da2c67cb023f4e5feea59daa8b5d..5e8da964681cb63d7733af8b5173715f
      @Override
      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
+diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java
 index f0b0642571a242f9c22febbafba587f1ca6caaaa..468be0368d0f485eaa2a5c321f45986bf5156b4b 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
+--- a/net/minecraft/world/entity/monster/piglin/Piglin.java
++++ b/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -129,6 +129,12 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
          return this.level().purpurConfig.piglinTakeDamageFromWater;
      }
@@ -1177,10 +1177,10 @@ index f0b0642571a242f9c22febbafba587f1ca6caaaa..468be0368d0f485eaa2a5c321f45986b
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+diff --git a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 index 0e77e9e4a4fd14b5cecc377a03f0d6b2c9df039f..24e198440d4841daac664dc6c5a8a3dc6825b469 100644
---- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+--- a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
++++ b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 @@ -95,6 +95,12 @@ public class PiglinBrute extends AbstractPiglin {
          return this.level().purpurConfig.piglinBruteTakeDamageFromWater;
      }
@@ -1194,10 +1194,10 @@ index 0e77e9e4a4fd14b5cecc377a03f0d6b2c9df039f..24e198440d4841daac664dc6c5a8a3dc
      public static AttributeSupplier.Builder createAttributes() {
          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
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index c912268081beda34c472cff13e41c9dfd51902f2..fcaf3db893d14b8359bddc1cc69da82e533ebc87 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -199,6 +199,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return this.level().purpurConfig.villagerTakeDamageFromWater;
      }
@@ -1211,10 +1211,10 @@ index c912268081beda34c472cff13e41c9dfd51902f2..fcaf3db893d14b8359bddc1cc69da82e
      @Override
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
 index 2cfd9c9194edda92185adecca80c5cd140e26c9f..89ad300d0ba9088af64fb9fee19399939bb4eff6 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+--- a/net/minecraft/world/entity/npc/WanderingTrader.java
++++ b/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -113,6 +113,12 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          return this.level().purpurConfig.wanderingTraderTakeDamageFromWater;
      }
diff --git a/patches/server/0217-Grindstone-API.patch b/patches/server/0217-Grindstone-API.patch
index eca41ec5a..6ada79f62 100644
--- a/patches/server/0217-Grindstone-API.patch
+++ b/patches/server/0217-Grindstone-API.patch
@@ -4,10 +4,10 @@ Date: Mon, 27 Dec 2021 08:11:00 -0600
 Subject: [PATCH] Grindstone API
 
 
-diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+diff --git a/net/minecraft/world/inventory/GrindstoneMenu.java b/net/minecraft/world/inventory/GrindstoneMenu.java
 index cc229f3e1e9527cbedf929e326731943bb513dae..111da7435f0abb5a57bd2c5fecead2380ac4347a 100644
---- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+--- a/net/minecraft/world/inventory/GrindstoneMenu.java
++++ b/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -96,12 +96,14 @@ public class GrindstoneMenu extends AbstractContainerMenu {
  
              @Override
diff --git a/patches/server/0218-Ability-for-hoe-to-replant-crops-and-nether-warts.patch b/patches/server/0218-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
index d4e0e6585..0c00a5d2f 100644
--- a/patches/server/0218-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
+++ b/patches/server/0218-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
@@ -4,10 +4,10 @@ Date: Tue, 28 Dec 2021 16:22:20 -0600
 Subject: [PATCH] Ability for hoe to replant crops and nether warts
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/BushBlock.java b/src/main/java/net/minecraft/world/level/block/BushBlock.java
+diff --git a/net/minecraft/world/level/block/BushBlock.java b/net/minecraft/world/level/block/BushBlock.java
 index eb324fda54ada3ed7941713a784ed2d686ec8c4b..09cc76f3fee4a767c9ec3fa592f2c3c6146344ec 100644
---- a/src/main/java/net/minecraft/world/level/block/BushBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BushBlock.java
+--- a/net/minecraft/world/level/block/BushBlock.java
++++ b/net/minecraft/world/level/block/BushBlock.java
 @@ -55,4 +55,24 @@ public abstract class BushBlock extends Block {
      protected boolean isPathfindable(BlockState state, PathComputationType type) {
          return type == PathComputationType.AIR && !this.hasCollision ? true : super.isPathfindable(state, type);
@@ -33,10 +33,10 @@ 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
+diff --git a/net/minecraft/world/level/block/CropBlock.java b/net/minecraft/world/level/block/CropBlock.java
 index 00a06146e119a47eeaf66d240b8dd84e38498676..34f338a246824dbabc7bc386b74cb62c78a8f1b6 100644
---- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
+--- a/net/minecraft/world/level/block/CropBlock.java
++++ b/net/minecraft/world/level/block/CropBlock.java
 @@ -216,4 +216,15 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
      protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
          builder.add(CropBlock.AGE);
@@ -53,10 +53,10 @@ index 00a06146e119a47eeaf66d240b8dd84e38498676..34f338a246824dbabc7bc386b74cb62c
 +    }
 +    // 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
+diff --git a/net/minecraft/world/level/block/NetherWartBlock.java b/net/minecraft/world/level/block/NetherWartBlock.java
 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
+--- a/net/minecraft/world/level/block/NetherWartBlock.java
++++ b/net/minecraft/world/level/block/NetherWartBlock.java
 @@ -68,4 +68,15 @@ public class NetherWartBlock extends BushBlock {
      protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
          builder.add(NetherWartBlock.AGE);
diff --git a/patches/server/0219-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0219-Turtle-eggs-random-tick-crack-chance.patch
index e26d4a114..b1a1310d4 100644
--- a/patches/server/0219-Turtle-eggs-random-tick-crack-chance.patch
+++ b/patches/server/0219-Turtle-eggs-random-tick-crack-chance.patch
@@ -4,10 +4,10 @@ Date: Fri, 31 Dec 2021 06:18:54 -0600
 Subject: [PATCH] Turtle eggs random tick crack chance
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
+diff --git a/net/minecraft/world/level/block/TurtleEggBlock.java b/net/minecraft/world/level/block/TurtleEggBlock.java
 index 30af2a98a52208c3a36dfaad474582806f86aede..6f02cec4384382569ad7d7c830dd6349aeac5293 100644
---- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
+--- a/net/minecraft/world/level/block/TurtleEggBlock.java
++++ b/net/minecraft/world/level/block/TurtleEggBlock.java
 @@ -171,7 +171,7 @@ public class TurtleEggBlock extends Block {
      private boolean shouldUpdateHatchLevel(Level world) {
          float f = world.getTimeOfDay(1.0F);
diff --git a/patches/server/0220-Mob-head-visibility-percent.patch b/patches/server/0220-Mob-head-visibility-percent.patch
index 525033eaa..68598f2e9 100644
--- a/patches/server/0220-Mob-head-visibility-percent.patch
+++ b/patches/server/0220-Mob-head-visibility-percent.patch
@@ -4,10 +4,10 @@ Date: Fri, 31 Dec 2021 06:40:19 -0600
 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
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index c7e2330e7f30081dbf5d79f08c8adb1d7d84fa03..480617d9e59bfbb21cccf2555616ad3985b7f7be 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1069,9 +1069,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
              ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
              EntityType<?> entitytypes = entity.getType();
diff --git a/patches/server/0221-Configurable-valid-characters-for-usernames.patch b/patches/server/0221-Configurable-valid-characters-for-usernames.patch
index 214ad260c..801a6ebf3 100644
--- a/patches/server/0221-Configurable-valid-characters-for-usernames.patch
+++ b/patches/server/0221-Configurable-valid-characters-for-usernames.patch
@@ -4,10 +4,10 @@ Date: Sat, 1 Jan 2022 18:38:58 -0600
 Subject: [PATCH] Configurable valid characters for usernames
 
 
-diff --git a/src/main/java/net/minecraft/util/StringUtil.java b/src/main/java/net/minecraft/util/StringUtil.java
+diff --git a/net/minecraft/util/StringUtil.java b/net/minecraft/util/StringUtil.java
 index 6c33002dc8bbb3759c3156302ab7d1f26ce5e8ee..c89fc375aff548a2b03eaf4da3b6a075012df012 100644
---- a/src/main/java/net/minecraft/util/StringUtil.java
-+++ b/src/main/java/net/minecraft/util/StringUtil.java
+--- a/net/minecraft/util/StringUtil.java
++++ b/net/minecraft/util/StringUtil.java
 @@ -69,6 +69,7 @@ public class StringUtil {
  
      // Paper start - Username validation
diff --git a/patches/server/0222-Stop-bees-from-dying-after-stinging.patch b/patches/server/0222-Stop-bees-from-dying-after-stinging.patch
index 89b001233..d0494d54f 100644
--- a/patches/server/0222-Stop-bees-from-dying-after-stinging.patch
+++ b/patches/server/0222-Stop-bees-from-dying-after-stinging.patch
@@ -4,10 +4,10 @@ Date: Mon, 3 Jan 2022 01:19:46 -0600
 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
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
 index c73cc8ffe5f67826971872de78adce72d202325a..19d1facb4173c11bb3a1d519603e4ec6906cdaa3 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+--- a/net/minecraft/world/entity/animal/Bee.java
++++ b/net/minecraft/world/entity/animal/Bee.java
 @@ -465,6 +465,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
              this.hurtServer(world, this.damageSources().drown(), 1.0F);
          }
diff --git a/patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch
index 90bebd470..3229477ef 100644
--- a/patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch
+++ b/patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch
@@ -4,10 +4,10 @@ Date: Thu, 30 Dec 2021 09:56:43 -0600
 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
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index 80a8bd2dc32763f8ee2062c2d1b36188f2532523..1dc4476ca1fc41030001d4d23ffff1b810a056cd 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -1170,6 +1170,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
@@ -16,10 +16,10 @@ index 80a8bd2dc32763f8ee2062c2d1b36188f2532523..1dc4476ca1fc41030001d4d23ffff1b8
          this.isRestarting = isRestarting;
          this.hasLoggedStop = true; // Paper - Debugging
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
 index 683c7c373e1b9f764bb9b53cdaace9740f607c75..509e67eeab1f07ecce3bce0c8c222bc2c184ca6f 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -399,6 +399,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              }
  
diff --git a/patches/server/0224-Configurable-farmland-trample-height.patch b/patches/server/0224-Configurable-farmland-trample-height.patch
index dec714266..022af4ca2 100644
--- a/patches/server/0224-Configurable-farmland-trample-height.patch
+++ b/patches/server/0224-Configurable-farmland-trample-height.patch
@@ -21,10 +21,10 @@ Value set -> Actual fall distance needed to trample
    5.5 -> 5.87
    6.0 -> 6.75
 
-diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+diff --git a/net/minecraft/world/level/block/FarmBlock.java b/net/minecraft/world/level/block/FarmBlock.java
 index fc5a755c558714442c1e12e88ee05764d6c1d9f4..f1ef2eda3282b3bcd99e388dc56d5542cd93bedb 100644
---- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+--- a/net/minecraft/world/level/block/FarmBlock.java
++++ b/net/minecraft/world/level/block/FarmBlock.java
 @@ -112,7 +112,7 @@ public class FarmBlock extends Block {
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
          super.fallOn(world, state, pos, entity, fallDistance); // CraftBukkit - moved here as game rules / events shouldn't affect fall damage.
diff --git a/patches/server/0225-Configurable-player-pickup-exp-delay.patch b/patches/server/0225-Configurable-player-pickup-exp-delay.patch
index 2eb1958fb..6578ebbca 100644
--- a/patches/server/0225-Configurable-player-pickup-exp-delay.patch
+++ b/patches/server/0225-Configurable-player-pickup-exp-delay.patch
@@ -8,10 +8,10 @@ Players only pick up 1 orb at a time, so even with setting this to 0
 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
+diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java
 index f1eb74a43881400f23f3750c909f999b35c2f5ce..ba4fe614e2a3378f17b544c78c92a271523e8d37 100644
---- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+--- a/net/minecraft/world/entity/ExperienceOrb.java
++++ b/net/minecraft/world/entity/ExperienceOrb.java
 @@ -335,7 +335,7 @@ public class ExperienceOrb extends Entity {
      public void playerTouch(Player player) {
          if (player instanceof ServerPlayer entityplayer) {
@@ -21,10 +21,10 @@ index f1eb74a43881400f23f3750c909f999b35c2f5ce..ba4fe614e2a3378f17b544c78c92a271
                  player.take(this, 1);
                  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
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index dda9391962b7360714cc1491e6cabfc2616dab25..7893d257deef3c1bb0187c6a0b04659716b520f9 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
 @@ -665,7 +665,7 @@ public abstract class Player extends LivingEntity {
              while (iterator.hasNext()) {
                  Entity entity = (Entity) iterator.next();
diff --git a/patches/server/0226-Allow-void-trading.patch b/patches/server/0226-Allow-void-trading.patch
index b903321ab..d4455c976 100644
--- a/patches/server/0226-Allow-void-trading.patch
+++ b/patches/server/0226-Allow-void-trading.patch
@@ -4,10 +4,10 @@ Date: Sat, 15 Jan 2022 03:27:29 -0600
 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
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
 index 0487d55861302e1bf84225901d873b02c2f11d6e..1b647544ebd578d1f8fbb6b65a2c27ac07761683 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
 @@ -2840,7 +2840,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
diff --git a/patches/server/0227-Configurable-phantom-size.patch b/patches/server/0227-Configurable-phantom-size.patch
index cae629204..c180eaa78 100644
--- a/patches/server/0227-Configurable-phantom-size.patch
+++ b/patches/server/0227-Configurable-phantom-size.patch
@@ -4,10 +4,10 @@ Date: Mon, 17 Jan 2022 21:28:49 -0600
 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
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
 index 0682479b37064d7690c8da1569de8f7452a0439d..860162797972263283737e8f30d8b784955206be 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+--- a/net/minecraft/world/entity/monster/Phantom.java
++++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -274,7 +274,11 @@ public class Phantom extends FlyingMob implements Enemy {
      @Override
      public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData entityData) {
diff --git a/patches/server/0228-Max-joins-per-second.patch b/patches/server/0228-Max-joins-per-second.patch
index 2343aeee5..fc2edcca8 100644
--- a/patches/server/0228-Max-joins-per-second.patch
+++ b/patches/server/0228-Max-joins-per-second.patch
@@ -5,10 +5,10 @@ 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
+diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
 index 3c866432c8a938c677a315612f3e159bda67a2a2..8661c1b1cfe2b3db000e1f08814fd4409c4b7fab 100644
---- a/src/main/java/net/minecraft/network/Connection.java
-+++ b/src/main/java/net/minecraft/network/Connection.java
+--- a/net/minecraft/network/Connection.java
++++ b/net/minecraft/network/Connection.java
 @@ -617,11 +617,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper - Buffer joins to world
      private static int joinAttemptsThisTick; // Paper - Buffer joins to world
diff --git a/patches/server/0229-Configurable-minimum-demand-for-trades.patch b/patches/server/0229-Configurable-minimum-demand-for-trades.patch
index 594b0d573..4466ce0cb 100644
--- a/patches/server/0229-Configurable-minimum-demand-for-trades.patch
+++ b/patches/server/0229-Configurable-minimum-demand-for-trades.patch
@@ -8,10 +8,10 @@ adds a patch to fix this by preventing demand from going below zero.
 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
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index fcaf3db893d14b8359bddc1cc69da82e533ebc87..e03066a9e336fb67f729a84404ef8b37208fa77d 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -548,7 +548,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          while (iterator.hasNext()) {
              MerchantOffer merchantrecipe = (MerchantOffer) iterator.next();
@@ -21,10 +21,10 @@ index fcaf3db893d14b8359bddc1cc69da82e533ebc87..e03066a9e336fb67f729a84404ef8b37
          }
  
      }
-diff --git a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
+diff --git a/net/minecraft/world/item/trading/MerchantOffer.java b/net/minecraft/world/item/trading/MerchantOffer.java
 index 0efc8d997b34302c3e0a5d7ec73a11a940dbeefe..af157881d440b34cfe79fbc9b03cc9ef28515eb8 100644
---- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
-+++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
+--- a/net/minecraft/world/item/trading/MerchantOffer.java
++++ b/net/minecraft/world/item/trading/MerchantOffer.java
 @@ -131,7 +131,12 @@ public class MerchantOffer {
      }
  
diff --git a/patches/server/0230-Lobotomize-stuck-villagers.patch b/patches/server/0230-Lobotomize-stuck-villagers.patch
index 4ab49d33c..b31b5d0da 100644
--- a/patches/server/0230-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0230-Lobotomize-stuck-villagers.patch
@@ -4,10 +4,10 @@ Date: Thu, 3 Dec 2020 17:56:18 -0600
 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
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index e03066a9e336fb67f729a84404ef8b37208fa77d..4170bd886f68e3c21df6f9680ad6f6aa26d74c01 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -141,6 +141,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }, MemoryModuleType.MEETING_POINT, (entityvillager, holder) -> {
          return holder.is(PoiTypes.MEETING);
diff --git a/patches/server/0231-Option-for-villager-display-trade-item.patch b/patches/server/0231-Option-for-villager-display-trade-item.patch
index d77176136..f76d4a832 100644
--- a/patches/server/0231-Option-for-villager-display-trade-item.patch
+++ b/patches/server/0231-Option-for-villager-display-trade-item.patch
@@ -4,10 +4,10 @@ Date: Tue, 25 Jan 2022 15:03:48 -0600
 Subject: [PATCH] Option for villager display trade item
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
+diff --git a/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java b/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
 index 18dad0825616c4167a0a7555689ee64910a87e09..6945992491027d43eca4f1ca697ad45ce06ded55 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
+--- a/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
++++ b/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
 @@ -46,6 +46,7 @@ public class ShowTradesToPlayer extends Behavior<Villager> {
  
      @Override
diff --git a/patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
index 63465cb8b..62d5cbd61 100644
--- a/patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
+++ b/patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
@@ -4,10 +4,10 @@ Date: Sun, 30 Jan 2022 02:03:34 -0600
 Subject: [PATCH] MC-238526 - Fix spawner not spawning water animals correctly
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
+diff --git a/net/minecraft/world/entity/animal/WaterAnimal.java b/net/minecraft/world/entity/animal/WaterAnimal.java
 index 8c4532a250f8679d729a35c17e9b5bd339264450..2b8336bd88641cfb29e94c8f01abfbdb39938bf3 100644
---- a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
+--- a/net/minecraft/world/entity/animal/WaterAnimal.java
++++ b/net/minecraft/world/entity/animal/WaterAnimal.java
 @@ -74,6 +74,6 @@ public abstract class WaterAnimal extends PathfinderMob {
          i = world.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.maximum.or(i);
          j = world.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.minimum.or(j);
diff --git a/patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch
index 28635779e..95203dd35 100644
--- a/patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch
+++ b/patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch
@@ -4,10 +4,10 @@ Date: Tue, 8 Feb 2022 13:35:48 -0600
 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
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index 480617d9e59bfbb21cccf2555616ad3985b7f7be..b7607d917899823b0b95167a9dced495b7ae110f 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1695,13 +1695,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
          Entity entity = damageSource.getEntity();
  
diff --git a/patches/server/0234-Anvil-repair-damage-options.patch b/patches/server/0234-Anvil-repair-damage-options.patch
index 52564796d..96572f9c5 100644
--- a/patches/server/0234-Anvil-repair-damage-options.patch
+++ b/patches/server/0234-Anvil-repair-damage-options.patch
@@ -4,10 +4,10 @@ Date: Sat, 12 Feb 2022 01:08:18 +0100
 Subject: [PATCH] Anvil repair/damage options
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
+diff --git a/net/minecraft/world/level/block/AnvilBlock.java b/net/minecraft/world/level/block/AnvilBlock.java
 index 50c907c962f936d2035bb7550750cdbd220b29c2..f9a2d2d4f798efa0d691996ec5ff7fe00260b36c 100644
---- a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
+--- a/net/minecraft/world/level/block/AnvilBlock.java
++++ b/net/minecraft/world/level/block/AnvilBlock.java
 @@ -59,6 +59,53 @@ public class AnvilBlock extends FallingBlock {
          return this.defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getClockWise());
      }
diff --git a/patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch
index 11fd438c1..9e57f6c20 100644
--- a/patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch
+++ b/patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch
@@ -4,10 +4,10 @@ Date: Mon, 9 May 2022 23:18:09 +0200
 Subject: [PATCH] Option to disable turtle egg trampling with feather falling
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
+diff --git a/net/minecraft/world/level/block/TurtleEggBlock.java b/net/minecraft/world/level/block/TurtleEggBlock.java
 index 6f02cec4384382569ad7d7c830dd6349aeac5293..cf86448e2067712863d30c9aecc48daedefd227f 100644
---- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
+--- a/net/minecraft/world/level/block/TurtleEggBlock.java
++++ b/net/minecraft/world/level/block/TurtleEggBlock.java
 @@ -220,6 +220,12 @@ public class TurtleEggBlock extends Block {
          if (!(entity instanceof LivingEntity)) {
              return false;
diff --git a/patches/server/0236-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0236-Add-toggle-for-enchant-level-clamping.patch
index 99b336bea..b92cd1d23 100644
--- a/patches/server/0236-Add-toggle-for-enchant-level-clamping.patch
+++ b/patches/server/0236-Add-toggle-for-enchant-level-clamping.patch
@@ -4,10 +4,10 @@ Date: Sat, 30 Apr 2022 10:32:40 +0200
 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
+diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
 index 300a044bb0f0e377133f24469cea1a9669de6e58..978c0d7296f400fe2ebda89e4f61386e6e87fe0c 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
+--- a/net/minecraft/server/Main.java
++++ b/net/minecraft/server/Main.java
 @@ -122,6 +122,11 @@ public class Main {
                  JvmProfiler.INSTANCE.start(Environment.SERVER);
              }
@@ -20,10 +20,10 @@ index 300a044bb0f0e377133f24469cea1a9669de6e58..978c0d7296f400fe2ebda89e4f61386e
              io.papermc.paper.plugin.PluginInitializerManager.load(optionset); // Paper
              Bootstrap.bootStrap();
              Bootstrap.validate();
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/ItemEnchantments.java b/src/main/java/net/minecraft/world/item/enchantment/ItemEnchantments.java
+diff --git a/net/minecraft/world/item/enchantment/ItemEnchantments.java b/net/minecraft/world/item/enchantment/ItemEnchantments.java
 index cfc6a657cae92c68868a76c1b7b1febe2a16e9f4..a12c08da793139e39dc11c213c94796b83bd8240 100644
---- a/src/main/java/net/minecraft/world/item/enchantment/ItemEnchantments.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/ItemEnchantments.java
+--- a/net/minecraft/world/item/enchantment/ItemEnchantments.java
++++ b/net/minecraft/world/item/enchantment/ItemEnchantments.java
 @@ -35,7 +35,7 @@ public class ItemEnchantments implements TooltipProvider {
      private static final java.util.Comparator<Holder<Enchantment>> ENCHANTMENT_ORDER = java.util.Comparator.comparing(Holder::getRegisteredName);
      public static final ItemEnchantments EMPTY = new ItemEnchantments(new Object2IntAVLTreeMap<>(ENCHANTMENT_ORDER), true);
diff --git a/patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch
index 32df779fd..7827cb0d3 100644
--- a/patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
  iron golems
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index 4170bd886f68e3c21df6f9680ad6f6aa26d74c01..e7ac8d4c6e839c19776b9c99bf6658104607a579 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+--- a/net/minecraft/world/entity/npc/Villager.java
++++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -1075,6 +1075,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
  
diff --git a/patches/server/0239-Stonecutter-damage.patch b/patches/server/0239-Stonecutter-damage.patch
index daf4a50e9..78ded98a9 100644
--- a/patches/server/0239-Stonecutter-damage.patch
+++ b/patches/server/0239-Stonecutter-damage.patch
@@ -4,10 +4,10 @@ Date: Wed, 8 Jun 2022 14:19:35 -0400
 Subject: [PATCH] Stonecutter damage
 
 
-diff --git a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+diff --git a/net/minecraft/world/damagesource/CombatTracker.java b/net/minecraft/world/damagesource/CombatTracker.java
 index 254aea4138afa1009a3c949a24c1a0fb8edbbd1d..10afc08930d7fe27ffa396ec5a10afb7769a3f0b 100644
---- a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-+++ b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+--- a/net/minecraft/world/damagesource/CombatTracker.java
++++ b/net/minecraft/world/damagesource/CombatTracker.java
 @@ -101,6 +101,10 @@ public class CombatTracker {
                  // Purpur start - Dont run with scissors!
                  if (damageSource.isScissors()) {
@@ -19,10 +19,10 @@ index 254aea4138afa1009a3c949a24c1a0fb8edbbd1d..10afc08930d7fe27ffa396ec5a10afb7
                  }
                  // Purpur end - Dont run with scissors!
                  return damageSource.getLocalizedDeathMessage(this.mob);
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+diff --git a/net/minecraft/world/damagesource/DamageSource.java b/net/minecraft/world/damagesource/DamageSource.java
 index 43985b4442145728c28bbeb9d18444a7c8f3a41f..ccdf9d40b767115e0e6db2c29af42f5ec4c40f85 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+--- a/net/minecraft/world/damagesource/DamageSource.java
++++ b/net/minecraft/world/damagesource/DamageSource.java
 @@ -30,6 +30,7 @@ public class DamageSource {
      private boolean melting = false;
      private boolean poison = false;
@@ -56,10 +56,10 @@ index 43985b4442145728c28bbeb9d18444a7c8f3a41f..ccdf9d40b767115e0e6db2c29af42f5e
          return damageSource;
      }
      // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSources.java b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
+diff --git a/net/minecraft/world/damagesource/DamageSources.java b/net/minecraft/world/damagesource/DamageSources.java
 index a4f710ad1aecd8265cde8d71d55eea952cd3c03b..820533b6a13b1f8abbfe378de6b5d66ce2b79835 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
+--- a/net/minecraft/world/damagesource/DamageSources.java
++++ b/net/minecraft/world/damagesource/DamageSources.java
 @@ -47,12 +47,14 @@ public class DamageSources {
      private final DamageSource melting;
      private final DamageSource poison;
@@ -87,10 +87,10 @@ index a4f710ad1aecd8265cde8d71d55eea952cd3c03b..820533b6a13b1f8abbfe378de6b5d66c
      public DamageSource inFire() {
          return this.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
+diff --git a/net/minecraft/world/level/block/StonecutterBlock.java b/net/minecraft/world/level/block/StonecutterBlock.java
 index f1366aea49206afcd64bf058ee673d6a562315c5..e93d1eba4fcd02e15287a1a66da94e695806a470 100644
---- a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
+--- a/net/minecraft/world/level/block/StonecutterBlock.java
++++ b/net/minecraft/world/level/block/StonecutterBlock.java
 @@ -93,4 +93,14 @@ public class StonecutterBlock extends Block {
      protected boolean isPathfindable(BlockState state, PathComputationType type) {
          return false;
@@ -106,10 +106,10 @@ index f1366aea49206afcd64bf058ee673d6a562315c5..e93d1eba4fcd02e15287a1a66da94e69
 +    }
 +    // Purpur end - Stonecutter damage
  }
-diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
+diff --git a/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 index e295fe4aac742ff8942b23456fdce8d7ff944e90..b65512f65e06865cc4d2964bd4ca2806784be738 100644
---- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-+++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
+--- a/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
++++ b/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 @@ -491,7 +491,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
              return PathType.TRAPDOOR;
          } else if (blockState.is(Blocks.POWDER_SNOW)) {
diff --git a/patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch
index 14b80320d..48e11ff92 100644
--- a/patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch
@@ -4,10 +4,10 @@ Date: Wed, 8 Jun 2022 14:32:55 -0400
 Subject: [PATCH] Configurable damage settings for magma blocks
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/MagmaBlock.java b/src/main/java/net/minecraft/world/level/block/MagmaBlock.java
+diff --git a/net/minecraft/world/level/block/MagmaBlock.java b/net/minecraft/world/level/block/MagmaBlock.java
 index 7ffdcf18bf4bd8b5325c76945b2d80ca3fe52958..4adbbd27c5b2e4cef630c6c8aae38d3f2b94c11e 100644
---- a/src/main/java/net/minecraft/world/level/block/MagmaBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/MagmaBlock.java
+--- a/net/minecraft/world/level/block/MagmaBlock.java
++++ b/net/minecraft/world/level/block/MagmaBlock.java
 @@ -29,7 +29,7 @@ public class MagmaBlock extends Block {
  
      @Override
diff --git a/patches/server/0241-Add-config-for-snow-on-blue-ice.patch b/patches/server/0241-Add-config-for-snow-on-blue-ice.patch
index 4c1f98d29..add2a8517 100644
--- a/patches/server/0241-Add-config-for-snow-on-blue-ice.patch
+++ b/patches/server/0241-Add-config-for-snow-on-blue-ice.patch
@@ -4,10 +4,10 @@ Date: Wed, 8 Jun 2022 15:19:41 -0400
 Subject: [PATCH] Add config for snow on blue ice
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/SnowLayerBlock.java b/src/main/java/net/minecraft/world/level/block/SnowLayerBlock.java
+diff --git a/net/minecraft/world/level/block/SnowLayerBlock.java b/net/minecraft/world/level/block/SnowLayerBlock.java
 index 9908a0b5b1fec5f9de518a733f7abbbff7e1a9f9..0ad444cf7f798f63e9140a42c5d5d8cab0fcf14f 100644
---- a/src/main/java/net/minecraft/world/level/block/SnowLayerBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SnowLayerBlock.java
+--- a/net/minecraft/world/level/block/SnowLayerBlock.java
++++ b/net/minecraft/world/level/block/SnowLayerBlock.java
 @@ -88,6 +88,12 @@ public class SnowLayerBlock extends Block {
      protected boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
          BlockState iblockdata1 = world.getBlockState(pos.below());
diff --git a/patches/server/0242-Skeletons-eat-wither-roses.patch b/patches/server/0242-Skeletons-eat-wither-roses.patch
index 982e12f52..dcde5a7cd 100644
--- a/patches/server/0242-Skeletons-eat-wither-roses.patch
+++ b/patches/server/0242-Skeletons-eat-wither-roses.patch
@@ -4,10 +4,10 @@ Date: Sat, 25 Jun 2022 00:18:33 -0400
 Subject: [PATCH] Skeletons eat wither roses
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+diff --git a/net/minecraft/world/entity/monster/Skeleton.java b/net/minecraft/world/entity/monster/Skeleton.java
 index 93b570c0d18f2fc76180c5c6ea292e191cb81be2..f1a9546aaa8499b198228f6a684850f7b20e67c9 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+--- a/net/minecraft/world/entity/monster/Skeleton.java
++++ b/net/minecraft/world/entity/monster/Skeleton.java
 @@ -17,6 +17,16 @@ import net.minecraft.world.item.Items;
  import net.minecraft.world.level.ItemLike;
  import net.minecraft.world.level.Level;
diff --git a/patches/server/0243-Enchantment-Table-Persists-Lapis.patch b/patches/server/0243-Enchantment-Table-Persists-Lapis.patch
index 1b24b3a21..8ba553bdc 100644
--- a/patches/server/0243-Enchantment-Table-Persists-Lapis.patch
+++ b/patches/server/0243-Enchantment-Table-Persists-Lapis.patch
@@ -4,10 +4,10 @@ Date: Sat, 25 Jun 2022 08:04:06 -0400
 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
+diff --git a/net/minecraft/world/inventory/EnchantmentMenu.java b/net/minecraft/world/inventory/EnchantmentMenu.java
 index bb9b17a058273ee1519b2abbefba97cad7feb51b..29996864b35711b29629e9071d28493ac27fbde6 100644
---- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
+--- a/net/minecraft/world/inventory/EnchantmentMenu.java
++++ b/net/minecraft/world/inventory/EnchantmentMenu.java
 @@ -41,6 +41,12 @@ import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
  import org.bukkit.entity.Player;
  // CraftBukkit end
@@ -69,10 +69,10 @@ index bb9b17a058273ee1519b2abbefba97cad7feb51b..29996864b35711b29629e9071d28493a
              this.clearContainer(player, this.enchantSlots);
          });
      }
-diff --git a/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java b/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java
+diff --git a/net/minecraft/world/level/block/EnchantingTableBlock.java b/net/minecraft/world/level/block/EnchantingTableBlock.java
 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
+--- a/net/minecraft/world/level/block/EnchantingTableBlock.java
++++ b/net/minecraft/world/level/block/EnchantingTableBlock.java
 @@ -118,4 +118,18 @@ public class EnchantingTableBlock extends BaseEntityBlock {
      protected boolean isPathfindable(BlockState state, PathComputationType type) {
          return false;
@@ -92,10 +92,10 @@ index 4c4e6290035710480cd5c1d7399f2443df01a5a6..248039ac7eab85b29ae3c525a986d91a
 +    }
 +    // Purpur end
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
+diff --git a/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java b/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
 index 39aac959775afeaeea211f21d498cb0ddf0a3fcb..6349a342c023f378af431a73a62fb017882e257d 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
+--- a/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
 @@ -28,6 +28,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
      private static final RandomSource RANDOM = RandomSource.create();
      @Nullable
diff --git a/patches/server/0244-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0244-Option-to-disable-kick-for-out-of-order-chat.patch
index 232030096..0c31f2217 100644
--- a/patches/server/0244-Option-to-disable-kick-for-out-of-order-chat.patch
+++ b/patches/server/0244-Option-to-disable-kick-for-out-of-order-chat.patch
@@ -4,10 +4,10 @@ Date: Sun, 3 Jul 2022 04:13:57 -0500
 Subject: [PATCH] Option to disable kick for out of order chat
 
 
-diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+diff --git a/net/minecraft/network/chat/SignedMessageChain.java b/net/minecraft/network/chat/SignedMessageChain.java
 index 300929a406905f5ff1ede664d5b99fb0938d4d2e..a4e9ac0e07f08e0b6aa682e8c1587d9c84fc3c6c 100644
---- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-+++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+--- a/net/minecraft/network/chat/SignedMessageChain.java
++++ b/net/minecraft/network/chat/SignedMessageChain.java
 @@ -45,7 +45,7 @@ public class SignedMessageChain {
                      SignedMessageLink signedMessageLink = SignedMessageChain.this.nextLink;
                      if (signedMessageLink == null) {
diff --git a/patches/server/0245-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0245-Config-for-sculk-shrieker-can_summon-state.patch
index 2def00ebe..aedea867e 100644
--- a/patches/server/0245-Config-for-sculk-shrieker-can_summon-state.patch
+++ b/patches/server/0245-Config-for-sculk-shrieker-can_summon-state.patch
@@ -4,10 +4,10 @@ Date: Mon, 4 Jul 2022 13:32:51 -0400
 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
+diff --git a/net/minecraft/world/level/block/SculkShriekerBlock.java b/net/minecraft/world/level/block/SculkShriekerBlock.java
 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
+--- a/net/minecraft/world/level/block/SculkShriekerBlock.java
++++ b/net/minecraft/world/level/block/SculkShriekerBlock.java
 @@ -130,7 +130,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo
      @Nullable
      @Override
diff --git a/patches/server/0246-Config-to-not-let-coral-die.patch b/patches/server/0246-Config-to-not-let-coral-die.patch
index a845f4ad6..fa3a5c54b 100644
--- a/patches/server/0246-Config-to-not-let-coral-die.patch
+++ b/patches/server/0246-Config-to-not-let-coral-die.patch
@@ -4,10 +4,10 @@ Date: Mon, 4 Jul 2022 13:57:06 -0400
 Subject: [PATCH] Config to not let coral die
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java b/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
+diff --git a/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java b/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
 index d7ca7a43d2d5f8cad416156fd40588cdd6634f52..920ad0a4ecc83da82c8382a48883cefb7a4b9d11 100644
---- a/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
+--- a/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
++++ b/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
 @@ -39,6 +39,7 @@ public abstract class BaseCoralPlantTypeBlock extends Block implements SimpleWat
      }
  
@@ -16,10 +16,10 @@ index d7ca7a43d2d5f8cad416156fd40588cdd6634f52..920ad0a4ecc83da82c8382a48883cefb
          if (state.getValue(WATERLOGGED)) {
              return true;
          } else {
-diff --git a/src/main/java/net/minecraft/world/level/block/CoralBlock.java b/src/main/java/net/minecraft/world/level/block/CoralBlock.java
+diff --git a/net/minecraft/world/level/block/CoralBlock.java b/net/minecraft/world/level/block/CoralBlock.java
 index a59b23f4062fa896836dec72cbd5097411774ad1..c87b90041825172afd079202241b7f9a206816c6 100644
---- a/src/main/java/net/minecraft/world/level/block/CoralBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CoralBlock.java
+--- a/net/minecraft/world/level/block/CoralBlock.java
++++ b/net/minecraft/world/level/block/CoralBlock.java
 @@ -60,6 +60,7 @@ public class CoralBlock extends Block {
      }
  
diff --git a/patches/server/0248-Add-toggle-for-RNG-manipulation.patch b/patches/server/0248-Add-toggle-for-RNG-manipulation.patch
index 659c22c6f..c6e6cf268 100644
--- a/patches/server/0248-Add-toggle-for-RNG-manipulation.patch
+++ b/patches/server/0248-Add-toggle-for-RNG-manipulation.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add toggle for RNG manipulation
 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
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index 25a6f228bad7deca7e7301868039d27bf65505c8..35cd273eb885558003a728eedc63f958e5accf74 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -599,7 +599,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          this.bb = Entity.INITIAL_AABB;
          this.stuckSpeedMultiplier = Vec3.ZERO;
@@ -19,10 +19,10 @@ index 25a6f228bad7deca7e7301868039d27bf65505c8..35cd273eb885558003a728eedc63f958
          this.remainingFireTicks = -this.getFireImmuneTicks();
          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
+diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java
 index a2f51788f88c20f282ea2a20485c56109b90c22b..c7a7d1df79beb527ff94f876ca36a861c37c4947 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
+--- a/net/minecraft/world/entity/animal/Squid.java
++++ b/net/minecraft/world/entity/animal/Squid.java
 @@ -46,7 +46,7 @@ public class Squid extends AgeableWaterCreature {
  
      public Squid(EntityType<? extends Squid> type, Level world) {
diff --git a/patches/server/0249-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0249-Add-more-logger-output-for-invalid-movement-kicks.patch
index 572e33eff..19a353bc2 100644
--- a/patches/server/0249-Add-more-logger-output-for-invalid-movement-kicks.patch
+++ b/patches/server/0249-Add-more-logger-output-for-invalid-movement-kicks.patch
@@ -4,10 +4,10 @@ Date: Wed, 27 Jul 2022 00:42:39 -0500
 Subject: [PATCH] Add more logger output for invalid movement kicks
 
 
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index 47952e504cc4d36b1d875651bb9bbd0a90606ae2..5b33034f01c05b29cd1a90847aa27b356a02264f 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -756,6 +756,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
          if (packet.getId() == this.awaitingTeleport) {
diff --git a/patches/server/0250-Add-Bee-API.patch b/patches/server/0250-Add-Bee-API.patch
index 1478d4807..d004ee7fc 100644
--- a/patches/server/0250-Add-Bee-API.patch
+++ b/patches/server/0250-Add-Bee-API.patch
@@ -4,10 +4,10 @@ Date: Mon, 25 Jul 2022 19:33:49 +0200
 Subject: [PATCH] Add Bee API
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
 index 19d1facb4173c11bb3a1d519603e4ec6906cdaa3..d2ac2c3a2481ee216a491333b173625da3881737 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+--- a/net/minecraft/world/entity/animal/Bee.java
++++ b/net/minecraft/world/entity/animal/Bee.java
 @@ -991,6 +991,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
                  if (optional.isPresent()) {
                      Bee.this.savedFlowerPos = (BlockPos) optional.get();
diff --git a/patches/server/0252-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0252-mob-spawning-option-to-ignore-creative-players.patch
index 0f695e3fc..3c7c18e61 100644
--- a/patches/server/0252-mob-spawning-option-to-ignore-creative-players.patch
+++ b/patches/server/0252-mob-spawning-option-to-ignore-creative-players.patch
@@ -4,10 +4,10 @@ Date: Fri, 26 Aug 2022 22:44:41 -0700
 Subject: [PATCH] mob spawning option to ignore creative players
 
 
-diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
 index c1b76a1ebc1eea7ab70cf61d8175a31794dd122a..dc15c15951e4ca30b8341d24f813259a77f41c77 100644
---- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+--- a/net/minecraft/world/level/NaturalSpawner.java
++++ b/net/minecraft/world/level/NaturalSpawner.java
 @@ -280,7 +280,7 @@ public final class NaturalSpawner {
                              blockposition_mutableblockposition.set(l, i, i1);
                              double d0 = (double) l + 0.5D;
diff --git a/patches/server/0253-Add-skeleton-bow-accuracy-option.patch b/patches/server/0253-Add-skeleton-bow-accuracy-option.patch
index bc48af87d..e71d92ed3 100644
--- a/patches/server/0253-Add-skeleton-bow-accuracy-option.patch
+++ b/patches/server/0253-Add-skeleton-bow-accuracy-option.patch
@@ -4,10 +4,10 @@ Date: Fri, 2 Sep 2022 13:04:53 -0500
 Subject: [PATCH] Add skeleton bow accuracy option
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+diff --git a/net/minecraft/world/entity/monster/AbstractSkeleton.java b/net/minecraft/world/entity/monster/AbstractSkeleton.java
 index 20252b22c88d4cbfe7700052a8c56c9e0d703752..26b64d83b7466863b7340c3292494091e9fb89c1 100644
---- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+--- a/net/minecraft/world/entity/monster/AbstractSkeleton.java
++++ b/net/minecraft/world/entity/monster/AbstractSkeleton.java
 @@ -199,7 +199,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
              }
  
diff --git a/patches/server/0255-Implement-ram-and-rambar-commands.patch b/patches/server/0255-Implement-ram-and-rambar-commands.patch
index 85acd5e67..511a0ac60 100644
--- a/patches/server/0255-Implement-ram-and-rambar-commands.patch
+++ b/patches/server/0255-Implement-ram-and-rambar-commands.patch
@@ -4,10 +4,10 @@ Date: Mon, 26 Sep 2022 07:43:30 -0500
 Subject: [PATCH] Implement ram and rambar commands
 
 
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
 index 5873f74df67d59f25682286a5b027963d8a6d382..93c07a4c96e25ed1db5e1f721ab5d53192a0225f 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
 @@ -261,6 +261,8 @@ public class Commands {
              org.purpurmc.purpur.command.UptimeCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.TPSBarCommand.register(this.dispatcher); // Purpur
@@ -17,10 +17,10 @@ index 5873f74df67d59f25682286a5b027963d8a6d382..93c07a4c96e25ed1db5e1f721ab5d531
          }
  
          if (environment.includeIntegrated) {
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
 index d97db4d05d7940d8408e7e0d473a3b17d956b858..6f39fd99ffb28d6c0267f4251c54af0c519289db 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -330,6 +330,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      public boolean purpurClient = false; // Purpur - Purpur client support
      private boolean tpsBar = false; // Purpur
diff --git a/patches/server/0256-Configurable-block-blast-resistance.patch b/patches/server/0256-Configurable-block-blast-resistance.patch
index 89b81960b..1395cd53e 100644
--- a/patches/server/0256-Configurable-block-blast-resistance.patch
+++ b/patches/server/0256-Configurable-block-blast-resistance.patch
@@ -4,10 +4,10 @@ Date: Sat, 1 Oct 2022 13:29:17 -0700
 Subject: [PATCH] Configurable block blast resistance
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
 index 6376b8b3ff444f4cab93e2bb5d2becc77c33c118..c8ae6e4cd74549f753ec04def5d882de1ab72308 100644
---- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+--- a/net/minecraft/world/level/block/state/BlockBehaviour.java
++++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -91,7 +91,7 @@ public abstract class BlockBehaviour implements FeatureElement {
  
      protected static final Direction[] UPDATE_SHAPE_ORDER = new Direction[]{Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP};
diff --git a/patches/server/0257-Configurable-block-fall-damage-modifiers.patch b/patches/server/0257-Configurable-block-fall-damage-modifiers.patch
index ed1d695c4..77f2d9f32 100644
--- a/patches/server/0257-Configurable-block-fall-damage-modifiers.patch
+++ b/patches/server/0257-Configurable-block-fall-damage-modifiers.patch
@@ -4,10 +4,10 @@ Date: Sat, 1 Oct 2022 18:06:52 -0700
 Subject: [PATCH] Configurable block fall damage modifiers
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
+diff --git a/net/minecraft/world/level/block/BedBlock.java b/net/minecraft/world/level/block/BedBlock.java
 index db79ef24ea01db5f619ab29700d3d391438fb742..54836f2a1e4cc9046ba29fb71ea237b358c9cb7d 100644
---- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
+--- a/net/minecraft/world/level/block/BedBlock.java
++++ b/net/minecraft/world/level/block/BedBlock.java
 @@ -183,7 +183,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
  
      @Override
@@ -17,10 +17,10 @@ index db79ef24ea01db5f619ab29700d3d391438fb742..54836f2a1e4cc9046ba29fb71ea237b3
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
+diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
 index 7531381e2e4d87ceeaa6478e13b23f6c072bef07..f00526753a83f95689fad2a132bef79f4479eec6 100644
---- a/src/main/java/net/minecraft/world/level/block/Block.java
-+++ b/src/main/java/net/minecraft/world/level/block/Block.java
+--- a/net/minecraft/world/level/block/Block.java
++++ b/net/minecraft/world/level/block/Block.java
 @@ -88,6 +88,10 @@ public class Block extends BlockBehaviour implements ItemLike {
      public static final int UPDATE_LIMIT = 512;
      protected final StateDefinition<Block, BlockState> stateDefinition;
@@ -41,10 +41,10 @@ index 7531381e2e4d87ceeaa6478e13b23f6c072bef07..f00526753a83f95689fad2a132bef79f
      }
  
      public void updateEntityMovementAfterFallOn(BlockGetter world, Entity entity) {
-diff --git a/src/main/java/net/minecraft/world/level/block/HayBlock.java b/src/main/java/net/minecraft/world/level/block/HayBlock.java
+diff --git a/net/minecraft/world/level/block/HayBlock.java b/net/minecraft/world/level/block/HayBlock.java
 index ef364aa171a48482a45bc18cfe730ec20c3f7be6..74971d90506aa253d5ee821b5390fb2551a3a393 100644
---- a/src/main/java/net/minecraft/world/level/block/HayBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/HayBlock.java
+--- a/net/minecraft/world/level/block/HayBlock.java
++++ b/net/minecraft/world/level/block/HayBlock.java
 @@ -23,6 +23,6 @@ public class HayBlock extends RotatedPillarBlock {
  
      @Override
diff --git a/patches/server/0259-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0259-Milk-Keeps-Beneficial-Effects.patch
index c87e8663d..a54173af4 100644
--- a/patches/server/0259-Milk-Keeps-Beneficial-Effects.patch
+++ b/patches/server/0259-Milk-Keeps-Beneficial-Effects.patch
@@ -4,10 +4,10 @@ Date: Thu, 6 Oct 2022 10:41:01 -0700
 Subject: [PATCH] Milk Keeps Beneficial Effects
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
 index b7607d917899823b0b95167a9dced495b7ae110f..4ec31b94803c15b7caad5053dc94b900a8601d07 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1149,6 +1149,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
              while (iterator.hasNext()) {
@@ -16,10 +16,10 @@ index b7607d917899823b0b95167a9dced495b7ae110f..4ec31b94803c15b7caad5053dc94b900
                  EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED);
                  if (event.isCancelled()) {
                      continue;
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
 index 89ad300d0ba9088af64fb9fee19399939bb4eff6..2dc7afa79126b52be42fc986926d6a63f9994d12 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
+--- a/net/minecraft/world/entity/npc/WanderingTrader.java
++++ b/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -126,7 +126,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
              return this.canDrinkPotion && this.level().isNight() && !entityvillagertrader.isInvisible(); // Paper - Add more WanderingTrader API
          }));
diff --git a/patches/server/0260-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0260-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
index e539f8454..0cb69e15b 100644
--- a/patches/server/0260-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
+++ b/patches/server/0260-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
@@ -4,10 +4,10 @@ Date: Sun, 9 Oct 2022 01:50:39 +0200
 Subject: [PATCH] MC-121706 - Fix mobs not looking up and down when strafing
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
+diff --git a/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java b/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
 index 515c1f671cb2c3a7cc23053aedf404bbbe77af3e..42a1e5b9c08a9245dd0ce6d4025e3bb5d60feb62 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
+--- a/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
++++ b/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
 @@ -116,9 +116,9 @@ public class RangedBowAttackGoal<T extends Monster & RangedAttackMob> extends Go
                  }
  
diff --git a/patches/server/0262-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0262-Add-an-option-to-fix-MC-3304-projectile-looting.patch
index 6ce4e9fff..dd25e4036 100644
--- a/patches/server/0262-Add-an-option-to-fix-MC-3304-projectile-looting.patch
+++ b/patches/server/0262-Add-an-option-to-fix-MC-3304-projectile-looting.patch
@@ -4,10 +4,10 @@ Date: Sat, 1 Oct 2022 11:33:15 -0700
 Subject: [PATCH] Add an option to fix MC-3304 (projectile looting)
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+diff --git a/net/minecraft/world/entity/projectile/AbstractArrow.java b/net/minecraft/world/entity/projectile/AbstractArrow.java
 index d2a8e0fb1e673cec5701fd184cedfd8e49212acd..e136738ed53a488ad0aa67a04237ac6243fe712c 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+--- a/net/minecraft/world/entity/projectile/AbstractArrow.java
++++ b/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -82,6 +82,7 @@ public abstract class AbstractArrow extends Projectile {
      public ItemStack pickupItemStack;
      @Nullable
@@ -29,10 +29,10 @@ index d2a8e0fb1e673cec5701fd184cedfd8e49212acd..e136738ed53a488ad0aa67a04237ac62
      protected SoundEvent getDefaultHitGroundSoundEvent() {
          return SoundEvents.ARROW_HIT;
      }
-diff --git a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
+diff --git a/net/minecraft/world/item/ProjectileWeaponItem.java b/net/minecraft/world/item/ProjectileWeaponItem.java
 index 78ba170a83f8c026bd110eae494c52577182ed61..c2ae50872cead7202246b9cce4db6e0a81e1cf5f 100644
---- a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
-+++ b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
+--- a/net/minecraft/world/item/ProjectileWeaponItem.java
++++ b/net/minecraft/world/item/ProjectileWeaponItem.java
 @@ -105,6 +105,8 @@ public abstract class ProjectileWeaponItem extends Item {
              entityarrow.setCritArrow(true);
          }
@@ -42,10 +42,10 @@ index 78ba170a83f8c026bd110eae494c52577182ed61..c2ae50872cead7202246b9cce4db6e0a
          return entityarrow;
      }
  
-diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
+diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java
 index 810082126567eb02bec395065b95b3c3902d4973..be32255c9bd90f7de3f8f5a62d84c7dcf59fa722 100644
---- a/src/main/java/net/minecraft/world/item/TridentItem.java
-+++ b/src/main/java/net/minecraft/world/item/TridentItem.java
+--- a/net/minecraft/world/item/TridentItem.java
++++ b/net/minecraft/world/item/TridentItem.java
 @@ -101,6 +101,9 @@ public class TridentItem extends Item implements ProjectileItem {
                                  return false;
                              }
@@ -56,10 +56,10 @@ index 810082126567eb02bec395065b95b3c3902d4973..be32255c9bd90f7de3f8f5a62d84c7dc
                              if (event.shouldConsume()) stack.hurtWithoutBreaking(1, entityhuman); // Paper - PlayerLaunchProjectileEvent
                              entitythrowntrident.pickupItemStack = stack.copy(); // SPIGOT-4511 update since damage call moved
                              // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java b/src/main/java/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java
+diff --git a/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java b/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java
 index 5f27e1ce23f2ed68e4c8af1986fafce940dbf826..d8cf49cbd82ed12d23fa10a81a88cc4bcf1c0f10 100644
---- a/src/main/java/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java
-+++ b/src/main/java/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java
+--- a/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java
++++ b/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java
 @@ -66,6 +66,11 @@ public class EnchantedCountIncreaseFunction extends LootItemConditionalFunction
          Entity entity = context.getOptionalParameter(LootContextParams.ATTACKING_ENTITY);
          if (entity instanceof LivingEntity livingEntity) {
diff --git a/patches/server/0263-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0263-Add-option-to-allow-creeper-to-encircle-target-when-.patch
index e86528a2f..895340a2f 100644
--- a/patches/server/0263-Add-option-to-allow-creeper-to-encircle-target-when-.patch
+++ b/patches/server/0263-Add-option-to-allow-creeper-to-encircle-target-when-.patch
@@ -4,10 +4,10 @@ Date: Sat, 15 Oct 2022 16:01:03 -0700
 Subject: [PATCH] Add option to allow creeper to encircle target when fusing.
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
+diff --git a/net/minecraft/world/entity/ai/goal/SwellGoal.java b/net/minecraft/world/entity/ai/goal/SwellGoal.java
 index 137ec75ee803789deb7b1ca93dd9369c9af362b9..ca95d25af3e9a0536868b0c7fd8e7d2ff1154ee3 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
+--- a/net/minecraft/world/entity/ai/goal/SwellGoal.java
++++ b/net/minecraft/world/entity/ai/goal/SwellGoal.java
 @@ -54,6 +54,14 @@ public class SwellGoal extends Goal {
              this.creeper.setSwellDir(-1);
          } else {
diff --git a/patches/server/0264-Fire-Immunity-API.patch b/patches/server/0264-Fire-Immunity-API.patch
index de0642277..22086447d 100644
--- a/patches/server/0264-Fire-Immunity-API.patch
+++ b/patches/server/0264-Fire-Immunity-API.patch
@@ -4,10 +4,10 @@ Date: Fri, 4 Feb 2022 16:10:21 +1100
 Subject: [PATCH] Fire Immunity API
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index 35cd273eb885558003a728eedc63f958e5accf74..c12594a49435440a6c96039b2a54c1a3b1707fc0 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -390,6 +390,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
      public boolean fixedPose = false; // Paper - Expand Pose API
diff --git a/patches/server/0265-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0265-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
index c4e5f70f0..0847653c4 100644
--- a/patches/server/0265-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
+++ b/patches/server/0265-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
@@ -4,10 +4,10 @@ Date: Sun, 13 Nov 2022 05:05:34 -0600
 Subject: [PATCH] Add option to teleport to spawn on nether ceiling damage
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index c12594a49435440a6c96039b2a54c1a3b1707fc0..c00a48fef499bc3b18a92010d88b32f10c839898 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
 @@ -1001,6 +1001,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
              && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
diff --git a/patches/server/0266-Added-got-ram-event.patch b/patches/server/0266-Added-got-ram-event.patch
index d7f7524f0..fe7117984 100644
--- a/patches/server/0266-Added-got-ram-event.patch
+++ b/patches/server/0266-Added-got-ram-event.patch
@@ -4,10 +4,10 @@ Date: Sat, 29 Oct 2022 00:06:41 +0200
 Subject: [PATCH] Added got ram event
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
 index 214a97aa88c569f55619512e712b7bfe32d26b30..54485641271a0570a4c6229eb1c5cb8ddff534b4 100644
---- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+--- a/net/minecraft/world/entity/animal/goat/Goat.java
++++ b/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -435,6 +435,7 @@ public class Goat extends Animal {
  
      // Paper start - Goat ram API
diff --git a/patches/server/0267-Log-skipped-entity-s-position.patch b/patches/server/0267-Log-skipped-entity-s-position.patch
index e2d39db9e..03d216b91 100644
--- a/patches/server/0267-Log-skipped-entity-s-position.patch
+++ b/patches/server/0267-Log-skipped-entity-s-position.patch
@@ -4,10 +4,10 @@ Date: Thu, 24 Nov 2022 11:00:37 -0600
 Subject: [PATCH] Log skipped entity's position
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
+diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
 index 20a7fe2995db717f394fc3041435a95dbfee2ff7..2203410d3eac6362e949315b0ec15c270bdb5cb8 100644
---- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
+--- a/net/minecraft/world/entity/EntityType.java
++++ b/net/minecraft/world/entity/EntityType.java
 @@ -692,6 +692,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
              entity.load(nbt);
          }, () -> {
diff --git a/patches/server/0268-End-Crystal-Cramming.patch b/patches/server/0268-End-Crystal-Cramming.patch
index 5b2e68b63..498194dea 100644
--- a/patches/server/0268-End-Crystal-Cramming.patch
+++ b/patches/server/0268-End-Crystal-Cramming.patch
@@ -4,10 +4,10 @@ Date: Thu, 15 Dec 2022 11:42:15 -0600
 Subject: [PATCH] End Crystal Cramming
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 index 218263958a90dfd95e4ecb7218c9eeefb069e50d..0967d13f26ee5bbe968322659ee3087685d43292 100644
---- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+--- a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
++++ b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 @@ -102,6 +102,7 @@ public class EndCrystal extends Entity {
                  }
              }
diff --git a/patches/server/0269-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0269-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
index 3a06dee38..513ee4b1d 100644
--- a/patches/server/0269-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
+++ b/patches/server/0269-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
@@ -4,10 +4,10 @@ Date: Mon, 26 Dec 2022 19:10:43 +0100
 Subject: [PATCH] Option to allow beacon effects when covered by tinted glass
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+diff --git a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 index 15a24cad5700cc1fe7430e425909869be84fe928..98e3d0a6f1be8cef8678b4048a3a484012092f08 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+--- a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -178,6 +178,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
          int j = pos.getY();
          int k = pos.getZ();
diff --git a/patches/server/0270-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0270-Add-attribute-clamping-and-armor-limit-config.patch
index 572284de5..01556f4c1 100644
--- a/patches/server/0270-Add-attribute-clamping-and-armor-limit-config.patch
+++ b/patches/server/0270-Add-attribute-clamping-and-armor-limit-config.patch
@@ -4,10 +4,10 @@ Date: Thu, 27 Oct 2022 23:12:45 -0400
 Subject: [PATCH] Add attribute clamping and armor limit config
 
 
-diff --git a/src/main/java/net/minecraft/world/damagesource/CombatRules.java b/src/main/java/net/minecraft/world/damagesource/CombatRules.java
+diff --git a/net/minecraft/world/damagesource/CombatRules.java b/net/minecraft/world/damagesource/CombatRules.java
 index 064c1e33f3feee77837bb57887877ae1ca39548d..ffd009bca3fdbfd0b14df78072ef8d472a57cd65 100644
---- a/src/main/java/net/minecraft/world/damagesource/CombatRules.java
-+++ b/src/main/java/net/minecraft/world/damagesource/CombatRules.java
+--- a/net/minecraft/world/damagesource/CombatRules.java
++++ b/net/minecraft/world/damagesource/CombatRules.java
 @@ -15,7 +15,7 @@ public class CombatRules {
  
      public static float getDamageAfterAbsorb(LivingEntity armorWearer, float damageAmount, DamageSource damageSource, float armor, float armorToughness) {
@@ -26,10 +26,10 @@ index 064c1e33f3feee77837bb57887877ae1ca39548d..ffd009bca3fdbfd0b14df78072ef8d47
          return damageDealt * (1.0F - f / 25.0F);
      }
  }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/RangedAttribute.java b/src/main/java/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
+diff --git a/net/minecraft/world/entity/ai/attributes/RangedAttribute.java b/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
 index f0703302e7dbbda88de8c648d20d87c55ed9b1e0..a913ebabaa5f443afa987b972355a8f8d1723c78 100644
---- a/src/main/java/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
+--- a/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
++++ b/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
 @@ -29,6 +29,7 @@ public class RangedAttribute extends Attribute {
  
      @Override
diff --git a/patches/server/0271-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0271-Config-to-remove-explosion-radius-clamp.patch
index 7d8a0a4eb..6328e4255 100644
--- a/patches/server/0271-Config-to-remove-explosion-radius-clamp.patch
+++ b/patches/server/0271-Config-to-remove-explosion-radius-clamp.patch
@@ -4,10 +4,10 @@ Date: Mon, 9 Jan 2023 19:45:55 -0500
 Subject: [PATCH] Config to remove explosion radius clamp
 
 
-diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java
+diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
 index 685ccfb73bf7125585ef90b6a0f51b2f81daa428..05fdb02b6f73c24f6985755effecf92c0b365cf0 100644
---- a/src/main/java/net/minecraft/world/level/ServerExplosion.java
-+++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java
+--- a/net/minecraft/world/level/ServerExplosion.java
++++ b/net/minecraft/world/level/ServerExplosion.java
 @@ -311,7 +311,7 @@ public class ServerExplosion implements Explosion {
      public ServerExplosion(ServerLevel world, @Nullable Entity entity, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator behavior, Vec3 pos, float power, boolean createFire, Explosion.BlockInteraction destructionType) {
          this.level = world;
diff --git a/patches/server/0272-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0272-bonemealable-sugarcane-cactus-and-netherwart.patch
index 472367957..20d6139d9 100644
--- a/patches/server/0272-bonemealable-sugarcane-cactus-and-netherwart.patch
+++ b/patches/server/0272-bonemealable-sugarcane-cactus-and-netherwart.patch
@@ -4,10 +4,10 @@ Date: Thu, 9 Feb 2023 00:28:03 -0800
 Subject: [PATCH] bonemealable sugarcane, cactus, and netherwart
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
+diff --git a/net/minecraft/world/level/block/CactusBlock.java b/net/minecraft/world/level/block/CactusBlock.java
 index bbfd8f5d404d0add94f0d8ac89a2964692b37e44..9f163ed07f8e6a5370c4c355b4e910f7a49b6bcd 100644
---- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
+--- a/net/minecraft/world/level/block/CactusBlock.java
++++ b/net/minecraft/world/level/block/CactusBlock.java
 @@ -24,7 +24,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
  import net.minecraft.world.phys.shapes.VoxelShape;
  import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
@@ -52,10 +52,10 @@ index bbfd8f5d404d0add94f0d8ac89a2964692b37e44..9f163ed07f8e6a5370c4c355b4e910f7
 +    }
 +    // 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
+diff --git a/net/minecraft/world/level/block/NetherWartBlock.java b/net/minecraft/world/level/block/NetherWartBlock.java
 index b571bca4375ca7caf9b75dbf84009cb0604b66ad..264692baa4a20b66910d8ff379fa72acb99e27f8 100644
---- a/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
+--- a/net/minecraft/world/level/block/NetherWartBlock.java
++++ b/net/minecraft/world/level/block/NetherWartBlock.java
 @@ -16,7 +16,7 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty;
  import net.minecraft.world.phys.shapes.CollisionContext;
  import net.minecraft.world.phys.shapes.VoxelShape;
@@ -88,10 +88,10 @@ index b571bca4375ca7caf9b75dbf84009cb0604b66ad..264692baa4a20b66910d8ff379fa72ac
 +    }
      // Purpur end
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
+diff --git a/net/minecraft/world/level/block/SugarCaneBlock.java b/net/minecraft/world/level/block/SugarCaneBlock.java
 index 547ea09ed84595286c97c128b3b96f6d387ae25f..d0f8a13f27132257ece6dadf736c2dc6b1e5720e 100644
---- a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
+--- a/net/minecraft/world/level/block/SugarCaneBlock.java
++++ b/net/minecraft/world/level/block/SugarCaneBlock.java
 @@ -20,7 +20,7 @@ import net.minecraft.world.level.material.FluidState;
  import net.minecraft.world.phys.shapes.CollisionContext;
  import net.minecraft.world.phys.shapes.VoxelShape;
diff --git a/patches/server/0273-Add-PreExplodeEvents.patch b/patches/server/0273-Add-PreExplodeEvents.patch
index 5b9aefa41..2c5ae4276 100644
--- a/patches/server/0273-Add-PreExplodeEvents.patch
+++ b/patches/server/0273-Add-PreExplodeEvents.patch
@@ -4,10 +4,10 @@ Date: Mon, 26 Dec 2022 23:42:37 +0100
 Subject: [PATCH] Add PreExplodeEvents
 
 
-diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java
+diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
 index 05fdb02b6f73c24f6985755effecf92c0b365cf0..4c7e4683c53afb0800b7f17c5964ba8ff31848d1 100644
---- a/src/main/java/net/minecraft/world/level/ServerExplosion.java
-+++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java
+--- a/net/minecraft/world/level/ServerExplosion.java
++++ b/net/minecraft/world/level/ServerExplosion.java
 @@ -670,6 +670,23 @@ public class ServerExplosion implements Explosion {
              return;
          }
diff --git a/patches/server/0275-Make-GUI-Great-Again.patch b/patches/server/0275-Make-GUI-Great-Again.patch
index 2a79d5d76..1784bae2b 100644
--- a/patches/server/0275-Make-GUI-Great-Again.patch
+++ b/patches/server/0275-Make-GUI-Great-Again.patch
@@ -95,10 +95,10 @@ index 0000000000000000000000000000000000000000..15a226e3854d731f7724025ea3459c8a
 +        return new HighlightErrorConverter(formatters);
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
 index 509e67eeab1f07ecce3bce0c8c222bc2c184ca6f..df035169ea89c4078e9a9226ac6e752f29d585a1 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -111,6 +111,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                      return;
                  }
@@ -107,10 +107,10 @@ index 509e67eeab1f07ecce3bce0c8c222bc2c184ca6f..df035169ea89c4078e9a9226ac6e752f
                  new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
                  /*
                  jline.console.ConsoleReader bufferedreader = DedicatedServer.this.reader;
-diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
+diff --git a/net/minecraft/server/gui/MinecraftServerGui.java b/net/minecraft/server/gui/MinecraftServerGui.java
 index 759062d219ff490a3cb19e710c4d18e3e08288e0..8f74c2ec5252b6265549589310d742337c91cb2c 100644
---- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-+++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
+--- a/net/minecraft/server/gui/MinecraftServerGui.java
++++ b/net/minecraft/server/gui/MinecraftServerGui.java
 @@ -43,6 +43,11 @@ public class MinecraftServerGui extends JComponent {
      private Thread logAppenderThread;
      private final Collection<Runnable> finalizers = Lists.newArrayList();
diff --git a/patches/server/0276-Stored-Bee-API.patch b/patches/server/0276-Stored-Bee-API.patch
index 3bfebf3b6..8e80690d1 100644
--- a/patches/server/0276-Stored-Bee-API.patch
+++ b/patches/server/0276-Stored-Bee-API.patch
@@ -4,10 +4,10 @@ Date: Sat, 10 Jun 2023 20:27:12 -0400
 Subject: [PATCH] Stored Bee API
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+diff --git a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 index 7f0e37e23ff4c64355fdc822c0ac683959b8588a..fdebf45a27b903f4abb0bf55e1d79d78b7cc3d32 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+--- a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -147,11 +147,33 @@ public class BeehiveBlockEntity extends BlockEntity {
          return list;
      }
diff --git a/patches/server/0277-Shears-can-defuse-TNT.patch b/patches/server/0277-Shears-can-defuse-TNT.patch
index 9e953e2f1..b3b6087ce 100644
--- a/patches/server/0277-Shears-can-defuse-TNT.patch
+++ b/patches/server/0277-Shears-can-defuse-TNT.patch
@@ -7,10 +7,10 @@ Shears can now defuse TNT. Each world can have a configured chance for the TNT t
 
 By default the option is disabled to avoid breaking any possible vanilla mechanics.
 
-diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
+diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
 index 809f5e847e2f5bb594c130cebd2cb897ea768d82..6f1e21d6c104d71fe4fc3376ed2f2273a5f3d3cc 100644
---- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
+--- a/net/minecraft/world/entity/item/PrimedTnt.java
++++ b/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -249,4 +249,31 @@ public class PrimedTnt extends Entity implements TraceableEntity {
          return !level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
      }
diff --git a/patches/server/0278-Explorer-Map-API.patch b/patches/server/0278-Explorer-Map-API.patch
index 411627d30..3a4cecdd1 100644
--- a/patches/server/0278-Explorer-Map-API.patch
+++ b/patches/server/0278-Explorer-Map-API.patch
@@ -4,10 +4,10 @@ Date: Wed, 5 Jul 2023 12:48:15 -0500
 Subject: [PATCH] Explorer Map API
 
 
-diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
+diff --git a/net/minecraft/world/item/MapItem.java b/net/minecraft/world/item/MapItem.java
 index 8ff50a4c7461bbd9f469d503f6b5ee482d2463d7..5c0a46c11003b6e154195a8ef299416cc73eae33 100644
---- a/src/main/java/net/minecraft/world/item/MapItem.java
-+++ b/src/main/java/net/minecraft/world/item/MapItem.java
+--- a/net/minecraft/world/item/MapItem.java
++++ b/net/minecraft/world/item/MapItem.java
 @@ -194,6 +194,7 @@ public class MapItem extends Item {
      public static void renderBiomePreviewMap(ServerLevel world, ItemStack map) {
          MapItemSavedData mapItemSavedData = getSavedData(map, world);
@@ -16,10 +16,10 @@ index 8ff50a4c7461bbd9f469d503f6b5ee482d2463d7..5c0a46c11003b6e154195a8ef299416c
              if (world.dimension() == mapItemSavedData.dimension) {
                  int i = 1 << mapItemSavedData.scale;
                  int j = mapItemSavedData.centerX;
-diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
+diff --git a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 index ae321b3b8d98e42ef07fd1f0f738c1a2b428f6db..26da9e7c25ef6a89482838010d8ed6bcf8c87511 100644
---- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-+++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
+--- a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
++++ b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -81,6 +81,7 @@ public class MapItemSavedData extends SavedData {
      private final Map<String, MapFrame> frameMarkers = Maps.newHashMap();
      private int trackedDecorationCount;
diff --git a/patches/server/0279-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0279-Option-Ocelot-Spawn-Under-Sea-Level.patch
index 8bf0fbdf8..652382b96 100644
--- a/patches/server/0279-Option-Ocelot-Spawn-Under-Sea-Level.patch
+++ b/patches/server/0279-Option-Ocelot-Spawn-Under-Sea-Level.patch
@@ -4,10 +4,10 @@ Date: Fri, 21 Jul 2023 11:04:47 -0500
 Subject: [PATCH] Option Ocelot Spawn Under Sea Level
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+diff --git a/net/minecraft/world/entity/animal/Ocelot.java b/net/minecraft/world/entity/animal/Ocelot.java
 index be818af35d6e9495ce4d3d3fc8212f7a22ebae92..79db05362cddbef624e5f5e19e11faa951b6f81c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+--- a/net/minecraft/world/entity/animal/Ocelot.java
++++ b/net/minecraft/world/entity/animal/Ocelot.java
 @@ -288,7 +288,7 @@ public class Ocelot extends Animal {
          if (world.isUnobstructed(this) && !world.containsAnyLiquid(this.getBoundingBox())) {
              BlockPos blockposition = this.blockPosition();
diff --git a/patches/server/0280-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0280-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
index 4fa363448..e249d89dd 100644
--- a/patches/server/0280-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
+++ b/patches/server/0280-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
@@ -4,10 +4,10 @@ Date: Sun, 13 Aug 2023 06:26:08 -0700
 Subject: [PATCH] add an option for piglins to ignore gold-trimmed armor
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
+diff --git a/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 index e283b1296c1e831376bfe9491cbf02ed4b3fffe4..27a6de70530c2a1cbe2f77a7fb493038121710ea 100644
---- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
+--- a/net/minecraft/world/entity/monster/piglin/PiglinAi.java
++++ b/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 @@ -605,11 +605,18 @@ public class PiglinAi {
              }
  
diff --git a/patches/server/0281-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0281-Add-option-for-always-showing-item-in-player-death-m.patch
index 36c075bb4..564a4e0ba 100644
--- a/patches/server/0281-Add-option-for-always-showing-item-in-player-death-m.patch
+++ b/patches/server/0281-Add-option-for-always-showing-item-in-player-death-m.patch
@@ -4,10 +4,10 @@ Date: Tue, 22 Aug 2023 22:18:26 -0700
 Subject: [PATCH] Add option for always showing item in player death messages
 
 
-diff --git a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+diff --git a/net/minecraft/world/damagesource/CombatTracker.java b/net/minecraft/world/damagesource/CombatTracker.java
 index 10afc08930d7fe27ffa396ec5a10afb7769a3f0b..6853b91e047b92ae4042a26d6aad84874be11709 100644
---- a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-+++ b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+--- a/net/minecraft/world/damagesource/CombatTracker.java
++++ b/net/minecraft/world/damagesource/CombatTracker.java
 @@ -54,7 +54,7 @@ public class CombatTracker {
  
      private Component getMessageForAssistedFall(Entity attacker, Component attackerDisplayName, String itemDeathTranslationKey, String deathTranslationKey) {
@@ -17,10 +17,10 @@ index 10afc08930d7fe27ffa396ec5a10afb7769a3f0b..6853b91e047b92ae4042a26d6aad8487
              ? Component.translatable(itemDeathTranslationKey, this.mob.getDisplayName(), attackerDisplayName, itemStack.getDisplayName())
              : Component.translatable(deathTranslationKey, this.mob.getDisplayName(), attackerDisplayName);
      }
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+diff --git a/net/minecraft/world/damagesource/DamageSource.java b/net/minecraft/world/damagesource/DamageSource.java
 index ccdf9d40b767115e0e6db2c29af42f5ec4c40f85..3781bca61379516d537650c79c614933454fdcd8 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+--- a/net/minecraft/world/damagesource/DamageSource.java
++++ b/net/minecraft/world/damagesource/DamageSource.java
 @@ -219,7 +219,7 @@ public class DamageSource {
  
              ItemStack itemstack1 = itemstack;
diff --git a/patches/server/0282-place-end-crystal-on-any-block.patch b/patches/server/0282-place-end-crystal-on-any-block.patch
index 3000e2897..751a16754 100644
--- a/patches/server/0282-place-end-crystal-on-any-block.patch
+++ b/patches/server/0282-place-end-crystal-on-any-block.patch
@@ -4,10 +4,10 @@ Date: Wed, 23 Aug 2023 01:39:14 -0700
 Subject: [PATCH] place end crystal on any block
 
 
-diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
+diff --git a/net/minecraft/world/item/EndCrystalItem.java b/net/minecraft/world/item/EndCrystalItem.java
 index b62db8c7c8c57e43869ee239ebf4b02f112355d9..f60e39e56a5dab2de62ae9cfd7a30a70b4985c09 100644
---- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java
-+++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
+--- a/net/minecraft/world/item/EndCrystalItem.java
++++ b/net/minecraft/world/item/EndCrystalItem.java
 @@ -27,7 +27,7 @@ public class EndCrystalItem extends Item {
          BlockPos blockposition = context.getClickedPos();
          BlockState iblockdata = world.getBlockState(blockposition);
diff --git a/patches/server/0283-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0283-Add-option-to-disable-the-copper-oxidation-proximity.patch
index 46c6e1a71..0aecae0e6 100644
--- a/patches/server/0283-Add-option-to-disable-the-copper-oxidation-proximity.patch
+++ b/patches/server/0283-Add-option-to-disable-the-copper-oxidation-proximity.patch
@@ -4,10 +4,10 @@ Date: Mon, 9 Oct 2023 12:21:49 -0700
 Subject: [PATCH] Add option to disable the copper oxidation proximity penalty
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java b/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java
+diff --git a/net/minecraft/world/level/block/ChangeOverTimeBlock.java b/net/minecraft/world/level/block/ChangeOverTimeBlock.java
 index daae7fd6e0148cfba8e359d990748a0c83a3376e..0e06b1bcd906e92c083dc74d56d6d0a2a36f62a7 100644
---- a/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java
+--- a/net/minecraft/world/level/block/ChangeOverTimeBlock.java
++++ b/net/minecraft/world/level/block/ChangeOverTimeBlock.java
 @@ -67,7 +67,7 @@ public interface ChangeOverTimeBlock<T extends Enum<T>> {
          }
  
diff --git a/patches/server/0284-register-minecraft-debug-commands.patch b/patches/server/0284-register-minecraft-debug-commands.patch
index 11a7ee369..55cf276b6 100644
--- a/patches/server/0284-register-minecraft-debug-commands.patch
+++ b/patches/server/0284-register-minecraft-debug-commands.patch
@@ -4,10 +4,10 @@ Date: Sun, 18 Feb 2024 16:28:32 -0800
 Subject: [PATCH] register minecraft debug commands
 
 
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
 index 93c07a4c96e25ed1db5e1f721ab5d53192a0225f..fe9a01e19ef182fb8e9c653fc1232ec7f13037e4 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
 @@ -226,8 +226,8 @@ public class Commands {
              JfrCommand.register(this.dispatcher);
          }
@@ -19,10 +19,10 @@ index 93c07a4c96e25ed1db5e1f721ab5d53192a0225f..fe9a01e19ef182fb8e9c653fc1232ec7
              RaidCommand.register(this.dispatcher, commandRegistryAccess);
              DebugPathCommand.register(this.dispatcher);
              DebugMobSpawningCommand.register(this.dispatcher);
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
+diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
 index 978c0d7296f400fe2ebda89e4f61386e6e87fe0c..a880f4e5cf712654649ad043e58e073e9a87c0fe 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
+--- a/net/minecraft/server/Main.java
++++ b/net/minecraft/server/Main.java
 @@ -125,6 +125,7 @@ public class Main {
              // Purpur start - load config files early
              org.bukkit.configuration.file.YamlConfiguration purpurConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("purpur-settings"));
diff --git a/patches/server/0285-Configurable-villager-search-radius.patch b/patches/server/0285-Configurable-villager-search-radius.patch
index 67ab67b63..b48021cee 100644
--- a/patches/server/0285-Configurable-villager-search-radius.patch
+++ b/patches/server/0285-Configurable-villager-search-radius.patch
@@ -4,10 +4,10 @@ Date: Fri, 26 Jan 2024 15:57:24 +0900
 Subject: [PATCH] Configurable-villager-search-radius
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
+diff --git a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 index 0d177e828c2b338ce93c58aaef04df326e1eb0b2..273ba657926ce72a7c82861e880a82bf7f322a0b 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
+--- a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
++++ b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 @@ -86,7 +86,7 @@ public class AcquirePoi {
                                      };
                                      // Paper start - optimise POI access
@@ -17,10 +17,10 @@ index 0d177e828c2b338ce93c58aaef04df326e1eb0b2..273ba657926ce72a7c82861e880a82bf
                                      final Set<Pair<Holder<PoiType>, BlockPos>> set = new java.util.HashSet<>(poiposes.size());
                                      for (final Pair<Holder<PoiType>, BlockPos> poiPose : poiposes) {
                                          if (worldPosBiPredicate.test(world, poiPose.getSecond())) {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
+diff --git a/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java b/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
 index 92731b6b593289e9f583c9b705b219e81fcd8e73..9104d7010bda6f9f73b478c11490ef9c53f76da2 100644
---- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
+--- a/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
++++ b/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
 @@ -56,7 +56,7 @@ public class NearestBedSensor extends Sensor<Mob> {
              // Paper start - optimise POI access
              java.util.List<Pair<Holder<PoiType>, BlockPos>> poiposes = new java.util.ArrayList<>();
diff --git a/patches/server/0286-option-to-make-ravagers-afraid-of-rabbits.patch b/patches/server/0286-option-to-make-ravagers-afraid-of-rabbits.patch
index 4d0814930..658ec07a7 100644
--- a/patches/server/0286-option-to-make-ravagers-afraid-of-rabbits.patch
+++ b/patches/server/0286-option-to-make-ravagers-afraid-of-rabbits.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] option to make ravagers afraid of rabbits
 
 https://github.com/PurpurMC/Purpur/discussions/713
 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
 index 95562e3614880702655df4578119e6cf3702e566..a5134a80a707bc69ae5826eae89e79be5ec3fa41 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+--- a/net/minecraft/world/entity/monster/Ravager.java
++++ b/net/minecraft/world/entity/monster/Ravager.java
 @@ -122,6 +122,7 @@ public class Ravager extends Raider {
          super.registerGoals();
          this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/patches/server/0287-config-for-startup-commands.patch b/patches/server/0287-config-for-startup-commands.patch
index b1ee06163..a3c14ff56 100644
--- a/patches/server/0287-config-for-startup-commands.patch
+++ b/patches/server/0287-config-for-startup-commands.patch
@@ -4,10 +4,10 @@ Date: Sun, 5 May 2024 02:27:52 -0700
 Subject: [PATCH] config for startup commands
 
 
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index 1dc4476ca1fc41030001d4d23ffff1b810a056cd..115069f2bce9b7742d8d3fbf181a47cacf8b0046 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
 @@ -1293,6 +1293,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  }
              }
diff --git a/patches/server/0288-Config-to-reverse-bubble-column-flow.patch b/patches/server/0288-Config-to-reverse-bubble-column-flow.patch
index 221d084f1..ab41e721e 100644
--- a/patches/server/0288-Config-to-reverse-bubble-column-flow.patch
+++ b/patches/server/0288-Config-to-reverse-bubble-column-flow.patch
@@ -4,10 +4,10 @@ Date: Sat, 8 Jun 2024 22:06:47 -0700
 Subject: [PATCH] Config to reverse bubble column flow
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java
+diff --git a/net/minecraft/world/level/block/BubbleColumnBlock.java b/net/minecraft/world/level/block/BubbleColumnBlock.java
 index 385da0585f409ee453f10d45f5837cdc09adc21b..c65016cba376a41c267fb4b6499ec0a263851558 100644
---- a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java
+--- a/net/minecraft/world/level/block/BubbleColumnBlock.java
++++ b/net/minecraft/world/level/block/BubbleColumnBlock.java
 @@ -123,10 +123,10 @@ public class BubbleColumnBlock extends Block implements BucketPickup {
          if (state.is(Blocks.BUBBLE_COLUMN)) {
              return state;