diff --git a/patches/unapplied-server/0151-Piglin-portal-spawn-modifier.patch b/patches/server/0151-Piglin-portal-spawn-modifier.patch
similarity index 96%
rename from patches/unapplied-server/0151-Piglin-portal-spawn-modifier.patch
rename to patches/server/0151-Piglin-portal-spawn-modifier.patch
index 5ff448ad6..d3c6a38d0 100644
--- a/patches/unapplied-server/0151-Piglin-portal-spawn-modifier.patch
+++ b/patches/server/0151-Piglin-portal-spawn-modifier.patch
@@ -18,7 +18,7 @@ Difficulties:
 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
-index c00b13482ce3f603f1d85b9a5ad36b768de5a9f8..10e747edebd6463cdfcea592cec1c232d837f21b 100644
+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
 @@ -78,7 +78,7 @@ public class NetherPortalBlock extends Block implements Portal {
diff --git a/patches/unapplied-server/0152-Config-to-change-max-number-of-bees.patch b/patches/server/0152-Config-to-change-max-number-of-bees.patch
similarity index 96%
rename from patches/unapplied-server/0152-Config-to-change-max-number-of-bees.patch
rename to patches/server/0152-Config-to-change-max-number-of-bees.patch
index 6942ebdc5..4d77b178d 100644
--- a/patches/unapplied-server/0152-Config-to-change-max-number-of-bees.patch
+++ b/patches/server/0152-Config-to-change-max-number-of-bees.patch
@@ -5,7 +5,7 @@ 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
-index 83ad45aed0894e90825d22e078632352c3a06816..b7ad467d7d7f50bcb90e50f00f905873e89c7956 100644
+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
 @@ -60,7 +60,7 @@ public class BeehiveBlockEntity extends BlockEntity {
diff --git a/patches/unapplied-server/0153-Config-for-wither-explosion-radius.patch b/patches/server/0153-Config-for-wither-explosion-radius.patch
similarity index 100%
rename from patches/unapplied-server/0153-Config-for-wither-explosion-radius.patch
rename to patches/server/0153-Config-for-wither-explosion-radius.patch
diff --git a/patches/unapplied-server/0154-Gamemode-extra-permissions.patch b/patches/server/0154-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/unapplied-server/0154-Gamemode-extra-permissions.patch
rename to patches/server/0154-Gamemode-extra-permissions.patch
diff --git a/patches/unapplied-server/0155-Configurable-piston-push-limit.patch b/patches/server/0155-Configurable-piston-push-limit.patch
similarity index 100%
rename from patches/unapplied-server/0155-Configurable-piston-push-limit.patch
rename to patches/server/0155-Configurable-piston-push-limit.patch
diff --git a/patches/unapplied-server/0156-Configurable-broadcast-settings.patch b/patches/server/0156-Configurable-broadcast-settings.patch
similarity index 95%
rename from patches/unapplied-server/0156-Configurable-broadcast-settings.patch
rename to patches/server/0156-Configurable-broadcast-settings.patch
index 975d39c2d..81970a6d5 100644
--- a/patches/unapplied-server/0156-Configurable-broadcast-settings.patch
+++ b/patches/server/0156-Configurable-broadcast-settings.patch
@@ -17,10 +17,10 @@ index 0a16aa193ef24aa8f1716f9e089b8027fa3c0a3c..1e85c9318ede93b8e9fe548a8945324b
                          // Paper end
                      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5f6cab9de8a854ecbd031f9f9b4152f06b28267e..76c6624ba6233b951f7ded4e0ecc1a93fc81b331 100644
+index af7d238fafa84428509563548d343005fe17d460..e15233c4b8847621d400b942b9db641b7148d578 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1342,6 +1342,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -1339,6 +1339,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
              }));
              PlayerTeam scoreboardteam = this.getTeam();
  
diff --git a/patches/unapplied-server/0157-Configurable-mob-blindness.patch b/patches/server/0157-Configurable-mob-blindness.patch
similarity index 96%
rename from patches/unapplied-server/0157-Configurable-mob-blindness.patch
rename to patches/server/0157-Configurable-mob-blindness.patch
index dbb40ec09..8dbf704f5 100644
--- a/patches/unapplied-server/0157-Configurable-mob-blindness.patch
+++ b/patches/server/0157-Configurable-mob-blindness.patch
@@ -6,7 +6,7 @@ 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
-index 127befc7514ca36b75735b718751fb4cf3f915c4..0b99628d51df2c4df7ddf1c4c9f54e6dc3612533 100644
+index 327ff173c3f1223d457112f094116e0eec90fcc8..2a187f1b674a6e8279495921088d5a0620c4e404 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1078,6 +1078,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/unapplied-server/0158-Hide-hidden-players-from-entity-selector.patch b/patches/server/0158-Hide-hidden-players-from-entity-selector.patch
similarity index 100%
rename from patches/unapplied-server/0158-Hide-hidden-players-from-entity-selector.patch
rename to patches/server/0158-Hide-hidden-players-from-entity-selector.patch
diff --git a/patches/unapplied-server/0159-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0159-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 100%
rename from patches/unapplied-server/0159-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server/0159-Config-for-health-to-impact-Creeper-explosion-radius.patch
diff --git a/patches/unapplied-server/0160-Iron-golem-calm-anger-options.patch b/patches/server/0160-Iron-golem-calm-anger-options.patch
similarity index 100%
rename from patches/unapplied-server/0160-Iron-golem-calm-anger-options.patch
rename to patches/server/0160-Iron-golem-calm-anger-options.patch
diff --git a/patches/unapplied-server/0161-Breedable-parrots.patch b/patches/server/0161-Breedable-parrots.patch
similarity index 91%
rename from patches/unapplied-server/0161-Breedable-parrots.patch
rename to patches/server/0161-Breedable-parrots.patch
index 60ce03748..43b637153 100644
--- a/patches/unapplied-server/0161-Breedable-parrots.patch
+++ b/patches/server/0161-Breedable-parrots.patch
@@ -5,10 +5,10 @@ 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
-index 9c7e29307b811d859a0d743b232463e18391b5f0..00759f484cab0d7c8d4e8914dd9f27061c8b7d45 100644
+index f951905a9b985cfeb3a960898724651e395b42e8..4a6137b3984a6a7c4bc0472ada4b61f948840b59 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -224,6 +224,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -223,6 +223,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
      protected void registerGoals() {
          //this.goalSelector.addGoal(0, new TamableAnimal.TamableAnimalPanicGoal(1.25D)); // Purpur - move down
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -16,7 +16,7 @@ index 9c7e29307b811d859a0d743b232463e18391b5f0..00759f484cab0d7c8d4e8914dd9f2706
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new TamableAnimal.TamableAnimalPanicGoal(1.25D)); // Purpur
          this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0F));
-@@ -332,6 +333,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -330,6 +331,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
                  }
              }
  
@@ -24,7 +24,7 @@ index 9c7e29307b811d859a0d743b232463e18391b5f0..00759f484cab0d7c8d4e8914dd9f2706
              return InteractionResult.SUCCESS;
          } else if (!itemstack.is(ItemTags.PARROT_POISONOUS_FOOD)) {
              if (!this.isFlying() && this.isTame() && this.isOwnedBy(player)) {
-@@ -356,7 +358,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -354,7 +356,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
  
      @Override
      public boolean isFood(ItemStack stack) {
@@ -33,7 +33,7 @@ index 9c7e29307b811d859a0d743b232463e18391b5f0..00759f484cab0d7c8d4e8914dd9f2706
      }
  
      public static boolean checkParrotSpawnRules(EntityType<Parrot> type, LevelAccessor world, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random) {
-@@ -368,13 +370,13 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -366,13 +368,13 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
  
      @Override
      public boolean canMate(Animal other) {
diff --git a/patches/unapplied-server/0162-Configurable-powered-rail-boost-modifier.patch b/patches/server/0162-Configurable-powered-rail-boost-modifier.patch
similarity index 100%
rename from patches/unapplied-server/0162-Configurable-powered-rail-boost-modifier.patch
rename to patches/server/0162-Configurable-powered-rail-boost-modifier.patch
diff --git a/patches/unapplied-server/0163-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0163-Add-config-change-multiplier-critical-damage-value.patch
similarity index 93%
rename from patches/unapplied-server/0163-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server/0163-Add-config-change-multiplier-critical-damage-value.patch
index ac2fa14d2..f96cfafeb 100644
--- a/patches/unapplied-server/0163-Add-config-change-multiplier-critical-damage-value.patch
+++ b/patches/server/0163-Add-config-change-multiplier-critical-damage-value.patch
@@ -5,10 +5,10 @@ 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
-index ae5f7c275003b6fb9f6c5a0277482b4fddf8e74c..4c42ad7e43ab1f19456a89f1b0e82b7a1f6e4108 100644
+index 3dbb473655c4f115e28ce31fa647cd0cb7fbe3c6..1cb8a5391e31017c0e0d958c72338904efc708cb 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1306,7 +1306,7 @@ public abstract class Player extends LivingEntity {
+@@ -1309,7 +1309,7 @@ public abstract class Player extends LivingEntity {
                      flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
                      if (flag2) {
                          damagesource = damagesource.critical(true); // Paper start - critical damage API
diff --git a/patches/unapplied-server/0164-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0164-Option-to-disable-dragon-egg-teleporting.patch
similarity index 100%
rename from patches/unapplied-server/0164-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server/0164-Option-to-disable-dragon-egg-teleporting.patch
diff --git a/patches/unapplied-server/0165-Config-for-unverified-username-message.patch b/patches/server/0165-Config-for-unverified-username-message.patch
similarity index 100%
rename from patches/unapplied-server/0165-Config-for-unverified-username-message.patch
rename to patches/server/0165-Config-for-unverified-username-message.patch
diff --git a/patches/unapplied-server/0166-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0166-Make-anvil-cumulative-cost-configurable.patch
similarity index 100%
rename from patches/unapplied-server/0166-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server/0166-Make-anvil-cumulative-cost-configurable.patch
diff --git a/patches/unapplied-server/0167-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0167-Bee-can-work-when-raining-or-at-night.patch
similarity index 93%
rename from patches/unapplied-server/0167-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server/0167-Bee-can-work-when-raining-or-at-night.patch
index 7c49dc1de..a642a3029 100644
--- a/patches/unapplied-server/0167-Bee-can-work-when-raining-or-at-night.patch
+++ b/patches/server/0167-Bee-can-work-when-raining-or-at-night.patch
@@ -5,10 +5,10 @@ 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
-index d47e5f774567aa4710686430b66eb1409c2f0c97..8caee835f524d23d061ff73d9fb609482ed57505 100644
+index e6e5954ca4366ad20b1d1413053739c767c45824..ea5559e6f536ab823f987ce57fc01d6dab26314d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -426,7 +426,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -430,7 +430,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      }
  
      public static boolean isNightOrRaining(Level world) {
diff --git a/patches/unapplied-server/0168-API-for-any-mob-to-burn-daylight.patch b/patches/server/0168-API-for-any-mob-to-burn-daylight.patch
similarity index 94%
rename from patches/unapplied-server/0168-API-for-any-mob-to-burn-daylight.patch
rename to patches/server/0168-API-for-any-mob-to-burn-daylight.patch
index 71fde9818..6ae0aa6a6 100644
--- a/patches/unapplied-server/0168-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0168-API-for-any-mob-to-burn-daylight.patch
@@ -6,7 +6,7 @@ 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
-index 8d0e578c5ee54af4e9f183b2865573881a3f9062..c1ba5eab15bb4b7599c1e5e23b90dfb361af93b6 100644
+index 60ffa728e6b8c861b0d108d1562150ccb671af33..433dbe3c9350cd55ff22d490e077bf1a31ae83be 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -578,6 +578,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -33,10 +33,10 @@ index 8d0e578c5ee54af4e9f183b2865573881a3f9062..c1ba5eab15bb4b7599c1e5e23b90dfb3
          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
-index 0b99628d51df2c4df7ddf1c4c9f54e6dc3612533..3dade05c9299f339f94b8a29475dc5ba646b26c8 100644
+index 2a187f1b674a6e8279495921088d5a0620c4e404..33fe6d19b3702d8de987fd9292dfca35e08ca875 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -297,6 +297,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -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
      public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
@@ -64,7 +64,7 @@ index 0b99628d51df2c4df7ddf1c4c9f54e6dc3612533..3dade05c9299f339f94b8a29475dc5ba
      }
  
      // CraftBukkit start
-@@ -3804,6 +3811,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3815,6 +3822,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
              }
          }
  
@@ -100,10 +100,10 @@ index 0b99628d51df2c4df7ddf1c4c9f54e6dc3612533..3dade05c9299f339f94b8a29475dc5ba
  
      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
-index 01da954d982b59bca8d8b76e66021ee04138a923..7ca12a1128661ea36e2e33cda204c7d2df55a21c 100644
+index 30be625e2f9c84f9ee3dbb68c8fc3806eae8a510..5ce7224afc224698e8b1c200c66a1069aab4458c 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1776,17 +1776,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1777,17 +1777,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      protected void playAttackSound() {}
  
      public boolean isSunBurnTick() {
@@ -124,10 +124,10 @@ index 01da954d982b59bca8d8b76e66021ee04138a923..7ca12a1128661ea36e2e33cda204c7d2
  
      @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
-index cf8422f7b9234a16f4537dfd212c55ded92cb1aa..bbe4c1cb4244ab813ef7d56c46c3ae62701c4824 100644
+index 617d06f7757ffbdd3eea14f7cbd881eaac075cc3..d41ed97feabd5b37f1ffae2a7b12c10895404591 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -68,6 +68,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -70,6 +70,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
      protected AbstractSkeleton(EntityType<? extends AbstractSkeleton> type, Level world) {
          super(type, world);
          this.reassessWeaponGoal();
@@ -135,7 +135,7 @@ index cf8422f7b9234a16f4537dfd212c55ded92cb1aa..bbe4c1cb4244ab813ef7d56c46c3ae62
      }
  
      @Override
-@@ -98,37 +99,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -100,37 +101,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
      abstract SoundEvent getStepSound();
  
      // Paper start - shouldBurnInDay API
@@ -175,7 +175,7 @@ index cf8422f7b9234a16f4537dfd212c55ded92cb1aa..bbe4c1cb4244ab813ef7d56c46c3ae62
          super.aiStep();
      }
  
-@@ -245,7 +223,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -252,7 +230,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          super.readAdditionalSaveData(nbt);
          this.reassessWeaponGoal();
          // Paper start - shouldBurnInDay API
@@ -184,7 +184,7 @@ index cf8422f7b9234a16f4537dfd212c55ded92cb1aa..bbe4c1cb4244ab813ef7d56c46c3ae62
              this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
          }
          // Paper end - shouldBurnInDay API
-@@ -255,7 +233,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -262,7 +240,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
@@ -215,13 +215,13 @@ index 78e95f15de02cc0b2f2c6d71bf6c10828986c6f4..324fca775bacd06dcd521ce4b33d4f7d
  
      @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
-index 6e665d75f2c3a6cec6307a2befb07e73e48da5eb..cc84fbab113f5633df274deb48de2484b05bb3ff 100644
+index 6a180656fb53b2f2a70cf219dc9ce7918b7d88ad..58318fcd78022eae68637e83d29498591a0387ad 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/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);
-         this.lookControl = new Phantom.PhantomLookControl(this, this);
+         this.lookControl = new Phantom.PhantomLookControl(this);
 +        this.setShouldBurnInDay(true); // Purpur - API for any mob to burn daylight
      }
  
@@ -357,7 +357,7 @@ index d79eb7bd6d38a4f1aee89cf0cf331a126351e767..b34dec421adc3ce56c0720a839a43ce4
          }
          // Paper end - Add more Zombie API
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ac4064172f982a6efc25378fbd088cca1dda4a14..02b07d43364c7dec37f1d2adffe123a5b595f669 100644
+index c0b6efefc4d4f31602f39afa76f837300c22f804..d4396ece618c0fec437ed915ce07be3fb5f7dca9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -87,6 +87,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -375,7 +375,7 @@ index ac4064172f982a6efc25378fbd088cca1dda4a14..02b07d43364c7dec37f1d2adffe123a5
          Preconditions.checkArgument(entity != null, "Unknown entity");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d0c409f4efad289e3e325f44b500fc72589d89d4..bf84c9664ca6d6c3d862e592c39bcc59374b63fe 100644
+index 4f98d138a275a6c34528b7a5148ef265bc38d6b5..7ccc40555964b906be6987532de1f319e38741ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1211,4 +1211,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/unapplied-server/0169-Config-MobEffect-by-world.patch b/patches/server/0169-Config-MobEffect-by-world.patch
similarity index 95%
rename from patches/unapplied-server/0169-Config-MobEffect-by-world.patch
rename to patches/server/0169-Config-MobEffect-by-world.patch
index 367e8410c..13a4b70c2 100644
--- a/patches/unapplied-server/0169-Config-MobEffect-by-world.patch
+++ b/patches/server/0169-Config-MobEffect-by-world.patch
@@ -18,10 +18,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
-index 83c6d17f75c3f0b531bdfd5b5f9bc2a5b3eb7a2c..df43c007e7b9fee58b2cd0892b966ce88cb1f890 100644
+index 3f1e59229d6a71117700a56c87914bc9401f1da2..32c8474ffa88e997bb484caecb21e3dc98991e70 100644
 --- a/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java
 +++ b/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java
-@@ -11,8 +11,8 @@ class PoisonMobEffect extends MobEffect {
+@@ -13,8 +13,8 @@ public class PoisonMobEffect extends MobEffect {
  
      @Override
      public boolean applyEffectTick(ServerLevel world, LivingEntity entity, int amplifier) {
@@ -59,10 +59,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
-index 303cefba51e19ac43b1f6188ad64ef480715ebaf..98ec88751b3e71c2e7aad633096b7f41608c0b33 100644
+index 55132e6e064ddd15b26286eca335305ed57b2f9e..1e04947995009689315352b79989e7ce4e20073c 100644
 --- a/src/main/java/net/minecraft/world/effect/WitherMobEffect.java
 +++ b/src/main/java/net/minecraft/world/effect/WitherMobEffect.java
-@@ -10,7 +10,7 @@ class WitherMobEffect extends MobEffect {
+@@ -12,7 +12,7 @@ public class WitherMobEffect extends MobEffect {
  
      @Override
      public boolean applyEffectTick(ServerLevel world, LivingEntity entity, int amplifier) {
diff --git a/patches/unapplied-server/0170-Beacon-Activation-Range-Configurable.patch b/patches/server/0170-Beacon-Activation-Range-Configurable.patch
similarity index 100%
rename from patches/unapplied-server/0170-Beacon-Activation-Range-Configurable.patch
rename to patches/server/0170-Beacon-Activation-Range-Configurable.patch
diff --git a/patches/unapplied-server/0171-Make-lightning-rod-range-configurable.patch b/patches/server/0171-Make-lightning-rod-range-configurable.patch
similarity index 93%
rename from patches/unapplied-server/0171-Make-lightning-rod-range-configurable.patch
rename to patches/server/0171-Make-lightning-rod-range-configurable.patch
index a9dc77207..8235db415 100644
--- a/patches/unapplied-server/0171-Make-lightning-rod-range-configurable.patch
+++ b/patches/server/0171-Make-lightning-rod-range-configurable.patch
@@ -5,10 +5,10 @@ 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
-index ad4f51ed28c797cae83a80234837203ac5dd9017..cbca8b51a38f54caa81a6265eef2cdf93205f55b 100644
+index bd4dbaee9a90909b9fd63d7c6fbac235a1d2264e..01f20a248c15bf46377a8cdb37759b43e872fb08 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1086,7 +1086,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1087,7 +1087,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              return holder.is(PoiTypes.LIGHTNING_ROD);
          }, (blockposition1) -> {
              return blockposition1.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1;
diff --git a/patches/unapplied-server/0172-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch b/patches/server/0172-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
similarity index 96%
rename from patches/unapplied-server/0172-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
rename to patches/server/0172-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
index 499ed123b..f0cbd1a6e 100644
--- a/patches/unapplied-server/0172-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
+++ b/patches/server/0172-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
@@ -18,10 +18,10 @@ index 837bdc7d6bd4e05b0deded829c678c86ae3d79d5..0c7c0524e487ff32e16dd9939d92bc64
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4c42ad7e43ab1f19456a89f1b0e82b7a1f6e4108..c7393d9c8cb2bc4583cd3715a154f9411cc223e1 100644
+index 1cb8a5391e31017c0e0d958c72338904efc708cb..6885f1fb87e9cb5ac5e1ddd55f8b836a711c6f0a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -198,6 +198,7 @@ public abstract class Player extends LivingEntity {
+@@ -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
      public int sixRowEnderchestSlotCount = -1; // Purpur
@@ -29,7 +29,7 @@ index 4c42ad7e43ab1f19456a89f1b0e82b7a1f6e4108..c7393d9c8cb2bc4583cd3715a154f941
  
      // CraftBukkit start
      public boolean fauxSleeping;
-@@ -273,6 +274,12 @@ public abstract class Player extends LivingEntity {
+@@ -276,6 +277,12 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public void tick() {
@@ -40,7 +40,7 @@ index 4c42ad7e43ab1f19456a89f1b0e82b7a1f6e4108..c7393d9c8cb2bc4583cd3715a154f941
 +        // Purpur end
 +
          this.noPhysics = this.isSpectator();
-         if (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
 index 6a686be6a69ae890d519a54ca099d4ba14e5b9e1..4f8ee2e5db3352306f3c035052866d95630f4aaf 100644
diff --git a/patches/unapplied-server/0173-Allow-player-join-full-server-by-permission.patch b/patches/server/0173-Allow-player-join-full-server-by-permission.patch
similarity index 93%
rename from patches/unapplied-server/0173-Allow-player-join-full-server-by-permission.patch
rename to patches/server/0173-Allow-player-join-full-server-by-permission.patch
index 6d33d24eb..fbcdb3243 100644
--- a/patches/unapplied-server/0173-Allow-player-join-full-server-by-permission.patch
+++ b/patches/server/0173-Allow-player-join-full-server-by-permission.patch
@@ -5,7 +5,7 @@ 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
-index af6ddb3231083244455d750f91bd3e4b2b4b5a0d..d823c9dc6d898f55e677dc320c84a4d8696671b1 100644
+index db0fe267c1eeb6e2f3ac03a64431d3126d7f5d5a..e1d195ab8b005edd7fcded810ddf903b47c000a1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -711,7 +711,7 @@ public abstract class PlayerList {
diff --git a/patches/unapplied-server/0174-Add-portal-permission-bypass.patch b/patches/server/0174-Add-portal-permission-bypass.patch
similarity index 91%
rename from patches/unapplied-server/0174-Add-portal-permission-bypass.patch
rename to patches/server/0174-Add-portal-permission-bypass.patch
index 917381934..766f9270f 100644
--- a/patches/unapplied-server/0174-Add-portal-permission-bypass.patch
+++ b/patches/server/0174-Add-portal-permission-bypass.patch
@@ -5,10 +5,10 @@ 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
-index c7393d9c8cb2bc4583cd3715a154f9411cc223e1..81f88c838f35860fdb7d7f62ed1b98f5734c766e 100644
+index 6885f1fb87e9cb5ac5e1ddd55f8b836a711c6f0a..7fccb7672e41545d747de1425335df7061222e52 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -199,6 +199,7 @@ public abstract class Player extends LivingEntity {
+@@ -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
      public int burpDelay = 0; // Purpur
@@ -17,7 +17,7 @@ index c7393d9c8cb2bc4583cd3715a154f9411cc223e1..81f88c838f35860fdb7d7f62ed1b98f5
      // 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
-index 10e747edebd6463cdfcea592cec1c232d837f21b..02bcba52e28f757b59e2f384d5744834962870f0 100644
+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
 @@ -137,7 +137,7 @@ public class NetherPortalBlock extends Block implements Portal {
diff --git a/patches/unapplied-server/0175-Shulker-spawn-from-bullet-options.patch b/patches/server/0175-Shulker-spawn-from-bullet-options.patch
similarity index 92%
rename from patches/unapplied-server/0175-Shulker-spawn-from-bullet-options.patch
rename to patches/server/0175-Shulker-spawn-from-bullet-options.patch
index 7d010504e..eef654bc1 100644
--- a/patches/unapplied-server/0175-Shulker-spawn-from-bullet-options.patch
+++ b/patches/server/0175-Shulker-spawn-from-bullet-options.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Shulker spawn from bullet options
 (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
-index 4a04ade0cfeac23afbac1a5ef7dfff0df2136191..79bf3d04fa2c7bcadfff08dc9a464e589866f7db 100644
+index ef44ab79cba3778111c9f27f77219b384761d9e4..8464a8288f7ec7ae14e44b93607ebb0617790c46 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -512,12 +512,21 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -53,12 +53,12 @@ index 4a04ade0cfeac23afbac1a5ef7dfff0df2136191..79bf3d04fa2c7bcadfff08dc9a464e58
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/item/DyeColor.java b/src/main/java/net/minecraft/world/item/DyeColor.java
-index 79dc7cf5bfe92b4df21d164f39726dfe618331e4..6721432f9cdd11c9658c34f0ac407be217f9d276 100644
+index 648e6979aa72b9d1e1ea3b40d5a876e3c690b934..d9cd4f47e9990bdd85e30f68ca3b755a953332a1 100644
 --- a/src/main/java/net/minecraft/world/item/DyeColor.java
 +++ b/src/main/java/net/minecraft/world/item/DyeColor.java
-@@ -103,4 +103,10 @@ public enum DyeColor implements StringRepresentable {
-     public String getSerializedName() {
-         return this.name;
+@@ -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))));
      }
 +
 +    // Purpur start
diff --git a/patches/unapplied-server/0176-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0176-Eating-glow-berries-adds-glow-effect.patch
similarity index 96%
rename from patches/unapplied-server/0176-Eating-glow-berries-adds-glow-effect.patch
rename to patches/server/0176-Eating-glow-berries-adds-glow-effect.patch
index 819332d97..020ab9847 100644
--- a/patches/unapplied-server/0176-Eating-glow-berries-adds-glow-effect.patch
+++ b/patches/server/0176-Eating-glow-berries-adds-glow-effect.patch
@@ -5,10 +5,10 @@ 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
-index bf7d12594375d5b252db540a6d669a6e6aca7de8..580bd63fdbf9555f867362d3c1f39f41fd750089 100644
+index 41fbe61268c0a16078b5f846ab12bde172872ff7..317e69eb4e3a4c312d5e856a0bff31a9e3eb5326 100644
 --- a/src/main/java/net/minecraft/world/item/Items.java
 +++ b/src/main/java/net/minecraft/world/item/Items.java
-@@ -2104,7 +2104,7 @@ public class Items {
+@@ -1987,7 +1987,7 @@ public class Items {
          "sweet_berries", createBlockItemWithCustomItemName(Blocks.SWEET_BERRY_BUSH), new Item.Properties().food(Foods.SWEET_BERRIES)
      );
      public static final Item GLOW_BERRIES = registerItem(
diff --git a/patches/unapplied-server/0177-Option-to-make-drowned-break-doors.patch b/patches/server/0177-Option-to-make-drowned-break-doors.patch
similarity index 94%
rename from patches/unapplied-server/0177-Option-to-make-drowned-break-doors.patch
rename to patches/server/0177-Option-to-make-drowned-break-doors.patch
index 905476de4..f1e3a1c5b 100644
--- a/patches/unapplied-server/0177-Option-to-make-drowned-break-doors.patch
+++ b/patches/server/0177-Option-to-make-drowned-break-doors.patch
@@ -5,10 +5,10 @@ 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
-index 1f41e4a88fb41347b8b1ac6b3d1c454ad35ebfc4..ec00c6b2a8b6a5e0ef030d65f86d4a7d72dbeb21 100644
+index f33fa55bd8f894389121d38eb811ff739f31c811..44f6949166cdf78e2d197ab5a5affae6eb649ec7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -127,6 +127,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -130,6 +130,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));
          this.goalSelector.addGoal(6, new Drowned.DrownedSwimUpGoal(this, 1.0, this.level().getSeaLevel()));
diff --git a/patches/unapplied-server/0178-Configurable-hunger-starvation-damage.patch b/patches/server/0178-Configurable-hunger-starvation-damage.patch
similarity index 100%
rename from patches/unapplied-server/0178-Configurable-hunger-starvation-damage.patch
rename to patches/server/0178-Configurable-hunger-starvation-damage.patch
diff --git a/patches/unapplied-server/0179-Enhance-SysoutCatcher.patch b/patches/server/0179-Enhance-SysoutCatcher.patch
similarity index 100%
rename from patches/unapplied-server/0179-Enhance-SysoutCatcher.patch
rename to patches/server/0179-Enhance-SysoutCatcher.patch
diff --git a/patches/unapplied-server/0180-Add-uptime-command.patch b/patches/server/0180-Add-uptime-command.patch
similarity index 98%
rename from patches/unapplied-server/0180-Add-uptime-command.patch
rename to patches/server/0180-Add-uptime-command.patch
index 464266444..3774e9665 100644
--- a/patches/unapplied-server/0180-Add-uptime-command.patch
+++ b/patches/server/0180-Add-uptime-command.patch
@@ -17,7 +17,7 @@ index 632fd1b7d3474889b700b153d9cb49676f801b07..068fa5baf5b031358a1ff71e7ac37644
          }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3b5121bf06ea5ae528778ae643bc5e4c3bb736ae..6d843cf9b326ded0152702802e2c7bd94b0fe936 100644
+index 791fa782d5092e17f332dd6660c42d151182e854..36fb238819e529fdecd8dd904c074d7a3a937db2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -314,6 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied-server/0181-Tool-actionable-options.patch b/patches/server/0181-Tool-actionable-options.patch
similarity index 100%
rename from patches/unapplied-server/0181-Tool-actionable-options.patch
rename to patches/server/0181-Tool-actionable-options.patch
diff --git a/patches/unapplied-server/0182-Store-placer-on-Block-when-placed.patch b/patches/server/0182-Store-placer-on-Block-when-placed.patch
similarity index 89%
rename from patches/unapplied-server/0182-Store-placer-on-Block-when-placed.patch
rename to patches/server/0182-Store-placer-on-Block-when-placed.patch
index 5a1cc4009..a972be7e2 100644
--- a/patches/unapplied-server/0182-Store-placer-on-Block-when-placed.patch
+++ b/patches/server/0182-Store-placer-on-Block-when-placed.patch
@@ -5,10 +5,10 @@ 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
-index d644d02b039ca918391a32a04549f7a34386b3f9..42b259c3878bd34b8e7cb768887fd1456be8db35 100644
+index 095c86ea25fc4f385d96d2e92fa67a150e27c489..5964c2e77e9f21c72d9e0655e5f48d2798317779 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -503,6 +503,7 @@ public final class ItemStack implements DataComponentHolder {
+@@ -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) {
                              blockstate.update(true, false);
@@ -16,7 +16,7 @@ index d644d02b039ca918391a32a04549f7a34386b3f9..42b259c3878bd34b8e7cb768887fd145
                          }
                      world.isBlockPlaceCancelled = false; // Paper - prevent calling cleanup logic when undoing a block place upon a cancelled BlockPlaceEvent
                          world.preventPoiUpdated = false;
-@@ -535,6 +536,7 @@ public final class ItemStack implements DataComponentHolder {
+@@ -540,6 +541,7 @@ public final class ItemStack implements DataComponentHolder {
                              if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
                                  block.onPlace(world, newblockposition, oldBlock, true, context);
                              }
@@ -25,7 +25,7 @@ index d644d02b039ca918391a32a04549f7a34386b3f9..42b259c3878bd34b8e7cb768887fd145
                              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
-index b6d6c2cb9b227a17fb4ce42bc75f92206fbea043..c35513d05bd70e296a0e5ffe92c36016a13173b4 100644
+index c0b1f903962b25d8ff6c2b4fcd2be0e45de09b35..17a157e2dcd977c9f7d886f8867056e88962c32e 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -433,7 +433,17 @@ public class Block extends BlockBehaviour implements ItemLike {
diff --git a/patches/unapplied-server/0183-Summoner-API.patch b/patches/server/0183-Summoner-API.patch
similarity index 98%
rename from patches/unapplied-server/0183-Summoner-API.patch
rename to patches/server/0183-Summoner-API.patch
index 91ee02057..f19f10e9d 100644
--- a/patches/unapplied-server/0183-Summoner-API.patch
+++ b/patches/server/0183-Summoner-API.patch
@@ -93,7 +93,7 @@ index 02cf5a92ff56ada1198e157e0f87f243ad65e488..f445a96eb3991410103225d1b9289261
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index f94bb66eb1118a2de2aa89a1b42c3ba24b769d4d..f19d9fc0a993739e34a2d55bbab9f4736f7688b8 100644
+index 8b89c5e88a14b31a807080d54f38148d5901d579..54100d5d9ed31fe292750e668f3c2ba9257f5ef3 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
 @@ -86,6 +86,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
@@ -120,7 +120,7 @@ index f94bb66eb1118a2de2aa89a1b42c3ba24b769d4d..f19d9fc0a993739e34a2d55bbab9f473
      @Override
      protected PathNavigation createNavigation(Level world) {
          FlyingPathNavigation navigationflying = new FlyingPathNavigation(this, world);
-@@ -260,6 +270,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -259,6 +269,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
          nbt.putInt("Invul", this.getInvulnerableTicks());
@@ -128,7 +128,7 @@ index f94bb66eb1118a2de2aa89a1b42c3ba24b769d4d..f19d9fc0a993739e34a2d55bbab9f473
      }
  
      @Override
-@@ -269,6 +280,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -268,6 +279,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
          if (this.hasCustomName()) {
              this.bossEvent.setName(this.getDisplayName());
          }
diff --git a/patches/unapplied-server/0184-Customizable-sleeping-actionbar-messages.patch b/patches/server/0184-Customizable-sleeping-actionbar-messages.patch
similarity index 94%
rename from patches/unapplied-server/0184-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0184-Customizable-sleeping-actionbar-messages.patch
index 477bba82c..be06ef47a 100644
--- a/patches/unapplied-server/0184-Customizable-sleeping-actionbar-messages.patch
+++ b/patches/server/0184-Customizable-sleeping-actionbar-messages.patch
@@ -5,10 +5,10 @@ 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
-index cbca8b51a38f54caa81a6265eef2cdf93205f55b..139bc93411fb8bafedf283c92161bc5905e7e982 100644
+index 01f20a248c15bf46377a8cdb37759b43e872fb08..04b2d2d917465898f919650d2346608390664bd2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1135,11 +1135,27 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1136,11 +1136,27 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          if (this.canSleepThroughNights()) {
              if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
                  int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
@@ -38,10 +38,10 @@ index cbca8b51a38f54caa81a6265eef2cdf93205f55b..139bc93411fb8bafedf283c92161bc59
                  }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 76c6624ba6233b951f7ded4e0ecc1a93fc81b331..6a4ced206570f8c1c609e772c0b7d1cf5a6ff9ce 100644
+index e15233c4b8847621d400b942b9db641b7148d578..1b691eafa658bbdfd87dd4a7692e0f6a96103ac2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1839,7 +1839,19 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -1830,7 +1830,19 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
                      });
  
                      if (!this.serverLevel().canSleepThroughNights()) {
diff --git a/patches/unapplied-server/0185-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0185-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 94%
rename from patches/unapplied-server/0185-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0185-option-to-disable-shulker-box-items-from-dropping-co.patch
index 3e583a17f..318f68b9b 100644
--- a/patches/unapplied-server/0185-option-to-disable-shulker-box-items-from-dropping-co.patch
+++ b/patches/server/0185-option-to-disable-shulker-box-items-from-dropping-co.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] option to disable shulker box items from dropping contents
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index b5b7f1db21a22f16f06ced775c8173f90e36a91c..33d9b5fb6897fefb0f7b9009df7339341cb42317 100644
+index ac5dc472337cd9613db5fc03f64763245129dfd9..f8928d5ac2f107a904ecc636e6bdeee7edd8da45 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -249,6 +249,7 @@ public class BlockItem extends Item {
+@@ -274,6 +274,7 @@ public class BlockItem extends Item {
          ItemContainerContents itemcontainercontents = (ItemContainerContents) entity.getItem().set(DataComponents.CONTAINER, ItemContainerContents.EMPTY);
  
          if (itemcontainercontents != null) {
diff --git a/patches/unapplied-server/0186-Big-dripleaf-tilt-delay.patch b/patches/server/0186-Big-dripleaf-tilt-delay.patch
similarity index 100%
rename from patches/unapplied-server/0186-Big-dripleaf-tilt-delay.patch
rename to patches/server/0186-Big-dripleaf-tilt-delay.patch
diff --git a/patches/unapplied-server/0187-Player-ridable-in-water-option.patch b/patches/server/0187-Player-ridable-in-water-option.patch
similarity index 93%
rename from patches/unapplied-server/0187-Player-ridable-in-water-option.patch
rename to patches/server/0187-Player-ridable-in-water-option.patch
index cac1c9248..c033863ef 100644
--- a/patches/unapplied-server/0187-Player-ridable-in-water-option.patch
+++ b/patches/server/0187-Player-ridable-in-water-option.patch
@@ -5,10 +5,10 @@ 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
-index 81f88c838f35860fdb7d7f62ed1b98f5734c766e..d7d5ce7ea223248ebda0a3e4b104baed47378ce1 100644
+index 7fccb7672e41545d747de1425335df7061222e52..2b3ec55bdc652bb432f9747d6215992fd3d710a5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2034,6 +2034,13 @@ public abstract class Player extends LivingEntity {
+@@ -2037,6 +2037,13 @@ public abstract class Player extends LivingEntity {
          return slot != EquipmentSlot.BODY;
      }
  
diff --git a/patches/unapplied-server/0188-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0188-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 94%
rename from patches/unapplied-server/0188-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0188-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
index b9516e183..1b9fc79d7 100644
--- a/patches/unapplied-server/0188-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
+++ b/patches/server/0188-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
@@ -5,10 +5,10 @@ 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
-index 7adfc08d511efcb69f954fc1f4b4eba90b9d15df..5d2ac5334899935e032f7c882710914906ddc94d 100644
+index dec6be6b823b00642a0066726e3cad298b7ed6a7..2681153860b37d49eb8b12ae08198e56b9fd5cf6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -430,6 +430,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -429,6 +429,7 @@ public class EnderMan extends Monster implements NeutralMob {
              } else {
                  flag1 = flag && this.hurtWithCleanWater(world, source, (ThrownPotion) source.getDirectEntity(), amount);
  
diff --git a/patches/unapplied-server/0189-Add-compass-command.patch b/patches/server/0189-Add-compass-command.patch
similarity index 97%
rename from patches/unapplied-server/0189-Add-compass-command.patch
rename to patches/server/0189-Add-compass-command.patch
index 1765a9cb9..ecd291e86 100644
--- a/patches/unapplied-server/0189-Add-compass-command.patch
+++ b/patches/server/0189-Add-compass-command.patch
@@ -17,10 +17,10 @@ index 068fa5baf5b031358a1ff71e7ac376448c0ec95c..eedb3707523b47ab79db326f6d7382cc
  
          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
-index 6a4ced206570f8c1c609e772c0b7d1cf5a6ff9ce..883317c9957c13049ff2c01ceb154fba1afe278b 100644
+index 1b691eafa658bbdfd87dd4a7692e0f6a96103ac2..ed1d75fdee29ac92d71f219af79eb7fc5ae99099 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -331,6 +331,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -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
      private boolean tpsBar = false; // Purpur
@@ -28,7 +28,7 @@ index 6a4ced206570f8c1c609e772c0b7d1cf5a6ff9ce..883317c9957c13049ff2c01ceb154fba
  
      // Paper start - rewrite chunk system
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -694,6 +695,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -692,6 +693,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          }
  
          if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index 6a4ced206570f8c1c609e772c0b7d1cf5a6ff9ce..883317c9957c13049ff2c01ceb154fba
      }
  
      @Override
-@@ -747,6 +749,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -745,6 +747,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
  
          this.saveEnderPearls(nbt);
          nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -44,7 +44,7 @@ index 6a4ced206570f8c1c609e772c0b7d1cf5a6ff9ce..883317c9957c13049ff2c01ceb154fba
      }
  
      private void saveParentVehicle(CompoundTag nbt) {
-@@ -3465,5 +3468,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -3445,5 +3448,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      public void tpsBar(boolean tpsBar) {
          this.tpsBar = tpsBar;
      }
diff --git a/patches/unapplied-server/0190-Toggle-for-kinetic-damage.patch b/patches/server/0190-Toggle-for-kinetic-damage.patch
similarity index 92%
rename from patches/unapplied-server/0190-Toggle-for-kinetic-damage.patch
rename to patches/server/0190-Toggle-for-kinetic-damage.patch
index 419982cd2..24d371cee 100644
--- a/patches/unapplied-server/0190-Toggle-for-kinetic-damage.patch
+++ b/patches/server/0190-Toggle-for-kinetic-damage.patch
@@ -5,10 +5,10 @@ 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
-index 3dade05c9299f339f94b8a29475dc5ba646b26c8..c23ca02f9adbbbf32b0bf9f8a82f55781468aade 100644
+index 33fe6d19b3702d8de987fd9292dfca35e08ca875..0af3e463971697626f847cb96f8a431857c1261e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3228,6 +3228,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3239,6 +3239,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
              if (f > 0.0F) {
                  this.playSound(this.getFallDamageSound((int) f), 1.0F, 1.0F);
diff --git a/patches/unapplied-server/0191-Add-Option-for-disable-observer-clocks.patch b/patches/server/0191-Add-Option-for-disable-observer-clocks.patch
similarity index 100%
rename from patches/unapplied-server/0191-Add-Option-for-disable-observer-clocks.patch
rename to patches/server/0191-Add-Option-for-disable-observer-clocks.patch
diff --git a/patches/unapplied-server/0192-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0192-Customizeable-Zombie-Villager-curing-times.patch
similarity index 96%
rename from patches/unapplied-server/0192-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/server/0192-Customizeable-Zombie-Villager-curing-times.patch
index a8b06aa05..fe616fa9b 100644
--- a/patches/unapplied-server/0192-Customizeable-Zombie-Villager-curing-times.patch
+++ b/patches/server/0192-Customizeable-Zombie-Villager-curing-times.patch
@@ -5,7 +5,7 @@ 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
-index 7298ba35cb27269e778de6b265933baed3077b36..623e8ef53d6336b3e3c83fd37eda13244a3b4ab6 100644
+index 95315588a523439a53ac7af3db5fc23adbed6f01..811c5c4bc98401bc9314894eb5cb64bf31b03f63 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -227,7 +227,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
diff --git a/patches/unapplied-server/0193-Option-for-sponges-to-work-on-lava-and-mud.patch b/patches/server/0193-Option-for-sponges-to-work-on-lava-and-mud.patch
similarity index 92%
rename from patches/unapplied-server/0193-Option-for-sponges-to-work-on-lava-and-mud.patch
rename to patches/server/0193-Option-for-sponges-to-work-on-lava-and-mud.patch
index 3f92a8a7a..9fafcefac 100644
--- a/patches/unapplied-server/0193-Option-for-sponges-to-work-on-lava-and-mud.patch
+++ b/patches/server/0193-Option-for-sponges-to-work-on-lava-and-mud.patch
@@ -6,7 +6,7 @@ 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
-index d82c62cdb219cee0bbc3083e38e18b7615ad09ef..4c5bc71fef307d13b640e534ace0b4411f6e97e2 100644
+index 9201d911cf155aab7735600073426a0d4213f38b..4540d3a31ed89ea3684feeffb85a391655e9cbbc 100644
 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 @@ -80,7 +80,7 @@ public class SpongeBlock extends Block {
@@ -15,7 +15,7 @@ index d82c62cdb219cee0bbc3083e38e18b7615ad09ef..4c5bc71fef307d13b640e534ace0b441
  
 -                if (!fluid.is(FluidTags.WATER)) {
 +                if (!fluid.is(FluidTags.WATER) && (!world.purpurConfig.spongeAbsorbsLava || !fluid.is(FluidTags.LAVA)) && (!world.purpurConfig.spongeAbsorbsWaterFromMud || !iblockdata.is(Blocks.MUD))) { // Purpur
-                     return false;
+                     return BlockPos.TraversalNodeStatus.SKIP;
                  } else {
                      Block block = iblockdata.getBlock();
 @@ -95,6 +95,10 @@ public class SpongeBlock extends Block {
@@ -28,7 +28,7 @@ index d82c62cdb219cee0bbc3083e38e18b7615ad09ef..4c5bc71fef307d13b640e534ace0b441
 +                    // Purpur end
                      } else {
                          if (!iblockdata.is(Blocks.KELP) && !iblockdata.is(Blocks.KELP_PLANT) && !iblockdata.is(Blocks.SEAGRASS) && !iblockdata.is(Blocks.TALL_SEAGRASS)) {
-                             return false;
+                             return BlockPos.TraversalNodeStatus.SKIP;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 index 2710709349c9d32b4b7e83bbb1cc9b1fde29310a..afad9ec6ea76ba66cad2f895ce04cc704e8d3235 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
diff --git a/patches/unapplied-server/0194-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0194-Toggle-for-Wither-s-spawn-sound.patch
similarity index 93%
rename from patches/unapplied-server/0194-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/server/0194-Toggle-for-Wither-s-spawn-sound.patch
index 368feb102..c1c2053e8 100644
--- a/patches/unapplied-server/0194-Toggle-for-Wither-s-spawn-sound.patch
+++ b/patches/server/0194-Toggle-for-Wither-s-spawn-sound.patch
@@ -5,10 +5,10 @@ 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
-index f19d9fc0a993739e34a2d55bbab9f4736f7688b8..a1be1d02bfd8155752e5ea66aa2aaa29361a213a 100644
+index 54100d5d9ed31fe292750e668f3c2ba9257f5ef3..6a85049919f0cdc7051d1789a951d9e36162dfb9 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
-@@ -431,7 +431,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -430,7 +430,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
                  }
                  // CraftBukkit end
  
diff --git a/patches/unapplied-server/0195-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0195-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 100%
rename from patches/unapplied-server/0195-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/server/0195-Cactus-breaks-from-solid-neighbors-config.patch
diff --git a/patches/unapplied-server/0196-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0196-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 94%
rename from patches/unapplied-server/0196-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/server/0196-Config-to-remove-curse-of-binding-with-weakness.patch
index c1b9d0408..ff850ba75 100644
--- a/patches/unapplied-server/0196-Config-to-remove-curse-of-binding-with-weakness.patch
+++ b/patches/server/0196-Config-to-remove-curse-of-binding-with-weakness.patch
@@ -5,10 +5,10 @@ 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
-index 6c0b6abb1698fac9bb902f695b725d4ab783ee90..091e3c3514fcb378b68098114106d09f04d8fb0d 100644
+index db7caaa2e77b9b98adac8add3040131c673c036b..262d9b2507d37edf0ed9c0821059e518d1baa9e9 100644
 --- a/src/main/java/net/minecraft/world/inventory/ArmorSlot.java
 +++ b/src/main/java/net/minecraft/world/inventory/ArmorSlot.java
-@@ -45,7 +45,7 @@ class ArmorSlot extends Slot {
+@@ -44,7 +44,7 @@ class ArmorSlot extends Slot {
      @Override
      public boolean mayPickup(Player playerEntity) {
          ItemStack itemStack = this.getItem();
diff --git a/patches/unapplied-server/0197-Conduit-behavior-configuration.patch b/patches/server/0197-Conduit-behavior-configuration.patch
similarity index 100%
rename from patches/unapplied-server/0197-Conduit-behavior-configuration.patch
rename to patches/server/0197-Conduit-behavior-configuration.patch
diff --git a/patches/unapplied-server/0198-Cauldron-fill-chances.patch b/patches/server/0198-Cauldron-fill-chances.patch
similarity index 100%
rename from patches/unapplied-server/0198-Cauldron-fill-chances.patch
rename to patches/server/0198-Cauldron-fill-chances.patch
diff --git a/patches/unapplied-server/0199-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0199-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 100%
rename from patches/unapplied-server/0199-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/server/0199-Config-to-allow-mobs-to-pathfind-over-rails.patch
diff --git a/patches/unapplied-server/0200-Shulker-change-color-with-dye.patch b/patches/server/0200-Shulker-change-color-with-dye.patch
similarity index 96%
rename from patches/unapplied-server/0200-Shulker-change-color-with-dye.patch
rename to patches/server/0200-Shulker-change-color-with-dye.patch
index 539c8d324..52f0beba5 100644
--- a/patches/unapplied-server/0200-Shulker-change-color-with-dye.patch
+++ b/patches/server/0200-Shulker-change-color-with-dye.patch
@@ -5,7 +5,7 @@ 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
-index 79bf3d04fa2c7bcadfff08dc9a464e589866f7db..131c7d7e85a3d9ac0e485fd8e56bd419a775289d 100644
+index 8464a8288f7ec7ae14e44b93607ebb0617790c46..837a251afd68b68c5f5f6ab940d62332cb80fe6f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -126,6 +126,19 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye