diff --git a/patches/unapplied/server/0701-Reset-placed-block-on-exception.patch b/patches/server/0674-Reset-placed-block-on-exception.patch
similarity index 88%
rename from patches/unapplied/server/0701-Reset-placed-block-on-exception.patch
rename to patches/server/0674-Reset-placed-block-on-exception.patch
index b6bf08780c..c5b6f9f135 100644
--- a/patches/unapplied/server/0701-Reset-placed-block-on-exception.patch
+++ b/patches/server/0674-Reset-placed-block-on-exception.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset placed block on exception
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index c19069f65a9ecbc9000ea4333417a2df4ace1007..1ac739c92031e80c35e1af4417e6358346079580 100644
+index cee3f1200af602b5dfd0b27d05eb01826c5bbb1d..7d76cdc59984b156628273c8357485eb10046007 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -80,6 +80,7 @@ public class BlockItem extends Item {
+@@ -77,6 +77,7 @@ public class BlockItem extends Item {
                  if (this instanceof PlaceOnWaterBlockItem || this instanceof SolidBucketItem) {
                      blockstate = org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(blockactioncontext1.getLevel(), blockactioncontext1.getClickedPos());
                  }
@@ -16,13 +16,14 @@ index c19069f65a9ecbc9000ea4333417a2df4ace1007..1ac739c92031e80c35e1af4417e63583
                  // CraftBukkit end
  
                  if (iblockdata == null) {
-@@ -95,7 +96,19 @@ public class BlockItem extends Item {
+@@ -92,8 +93,20 @@ public class BlockItem extends Item {
  
                      if (iblockdata1.is(iblockdata.getBlock())) {
                          iblockdata1 = this.updateBlockStateFromTag(blockposition, world, itemstack, iblockdata1);
 +                        // Paper start - Reset placed block on exception
 +                        try {
                          this.updateCustomBlockEntityTag(blockposition, world, entityhuman, itemstack, iblockdata1);
+                         BlockItem.updateBlockEntityComponents(world, blockposition, itemstack);
 +                        } catch (Exception e) {
 +                            oldBlockstate.update(true, false);
 +                            if (entityhuman instanceof ServerPlayer player) {
diff --git a/patches/unapplied/server/0702-Add-configurable-height-for-slime-spawn.patch b/patches/server/0675-Add-configurable-height-for-slime-spawn.patch
similarity index 92%
rename from patches/unapplied/server/0702-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0675-Add-configurable-height-for-slime-spawn.patch
index 08dbacd3f1..04458eb176 100644
--- a/patches/unapplied/server/0702-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0675-Add-configurable-height-for-slime-spawn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add configurable height for slime spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 0b8bcf9fc13ec6645c9e11cf52047272cdfce68c..3d9107d2c19a09215445aa0e0aacc32f9f82a536 100644
+index b32213c5a3a1ecaf602cf34bed44c537521c2846..f223e78eb1204bbf5f2de38a7ce5b663800f7dc4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-@@ -344,7 +344,11 @@ public class Slime extends Mob implements Enemy {
+@@ -340,7 +340,11 @@ public class Slime extends Mob implements Enemy {
                      return checkMobSpawnRules(type, world, spawnReason, pos, random);
                  }
  
@@ -21,7 +21,7 @@ index 0b8bcf9fc13ec6645c9e11cf52047272cdfce68c..3d9107d2c19a09215445aa0e0aacc32f
                      return checkMobSpawnRules(type, world, spawnReason, pos, random);
                  }
  
-@@ -355,7 +359,10 @@ public class Slime extends Mob implements Enemy {
+@@ -351,7 +355,10 @@ public class Slime extends Mob implements Enemy {
                  ChunkPos chunkcoordintpair = new ChunkPos(pos);
                  boolean flag = world.getMinecraftWorld().paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(chunkcoordintpair.x, chunkcoordintpair.z, ((WorldGenLevel) world).getSeed(), world.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper
  
diff --git a/patches/unapplied/server/0703-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0676-Fix-xp-reward-for-baby-zombies.patch
similarity index 89%
rename from patches/unapplied/server/0703-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0676-Fix-xp-reward-for-baby-zombies.patch
index f3c6e8841b..bd691e7ae9 100644
--- a/patches/unapplied/server/0703-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0676-Fix-xp-reward-for-baby-zombies.patch
@@ -9,10 +9,10 @@ so this resets it after each call to
 Zombie#getExperienceReward
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index a41a2ffe3b0af5c244a513c839829da3f86e5ed3..5c40e994007dbf46ebc12c1e6a6ca90379471b74 100644
+index e4fc7f96aac9cc2ed5b4158b6663de397ee1162f..d22464521f41c6a13d6c33f0a361497a3e04197f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -175,11 +175,16 @@ public class Zombie extends Monster {
+@@ -172,11 +172,16 @@ public class Zombie extends Monster {
  
      @Override
      public int getExperienceReward() {
diff --git a/patches/unapplied/server/0704-Multi-Block-Change-API-Implementation.patch b/patches/server/0677-Multi-Block-Change-API-Implementation.patch
similarity index 88%
rename from patches/unapplied/server/0704-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0677-Multi-Block-Change-API-Implementation.patch
index e9e18ae9c7..e8074defa0 100644
--- a/patches/unapplied/server/0704-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0677-Multi-Block-Change-API-Implementation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Multi Block Change API Implementation
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java
-index f96d61bdeb556665d6e6e5023f9d77fd82204e89..ccdc2345465313991f065e1176b58fb7d5e8722f 100644
+index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf721371f0c5ec 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java
-@@ -59,6 +59,14 @@ public class ClientboundSectionBlocksUpdatePacket implements Packet<ClientGamePa
+@@ -62,6 +62,14 @@ public class ClientboundSectionBlocksUpdatePacket implements Packet<ClientGamePa
  
      }
  
@@ -20,14 +20,14 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..ccdc2345465313991f065e1176b58fb7
 +    }
 +    // Paper end - Multi Block Change API
 +
-     @Override
-     public void write(FriendlyByteBuf buf) {
+     private void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
+         buf.writeVarInt(this.positions.length);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b522a5353cef252fa9040b81c9f012228d334e8f..b0e552d959f349878fc36f136f4d541f85d032fe 100644
+index 81060ef3c9ba90a5bd3ecda65a0e1ac02ce5a9ce..d2f98aeb4a209e9ed4a7b6bddba8a299fc21d002 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -852,6 +852,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -927,6 +927,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/unapplied/server/0705-Fix-NotePlayEvent.patch b/patches/server/0678-Fix-NotePlayEvent.patch
similarity index 87%
rename from patches/unapplied/server/0705-Fix-NotePlayEvent.patch
rename to patches/server/0678-Fix-NotePlayEvent.patch
index 85437cdf17..4a601d8f1b 100644
--- a/patches/unapplied/server/0705-Fix-NotePlayEvent.patch
+++ b/patches/server/0678-Fix-NotePlayEvent.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix NotePlayEvent
 public org.bukkit.craftbukkit.block.data.CraftBlockData toNMS(Ljava/lang/Enum;Ljava/lang/Class;)Ljava/lang/Enum;
 
 diff --git a/src/main/java/net/minecraft/world/level/block/NoteBlock.java b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-index 43fbdca9422b679c210bc556e2d48ad37babbe8b..92a24cf02f15f3ab893eb9a793770d9819e4f600 100644
+index 6215f096849f48843d6e25875b8b71f6827ec0a5..f77d51d10e01fc4eaf5516c05c8be0ef7a425893 100644
 --- a/src/main/java/net/minecraft/world/level/block/NoteBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-@@ -93,11 +93,12 @@ public class NoteBlock extends Block {
+@@ -94,11 +94,12 @@ public class NoteBlock extends Block {
      private void playNote(@Nullable Entity entity, BlockState state, Level world, BlockPos pos) {
          if (((NoteBlockInstrument) state.getValue(NoteBlock.INSTRUMENT)).worksAboveNoteBlock() || world.getBlockState(pos.above()).isAir()) {
              // CraftBukkit start
@@ -25,11 +25,11 @@ index 43fbdca9422b679c210bc556e2d48ad37babbe8b..92a24cf02f15f3ab893eb9a793770d98
              // CraftBukkit end
 +            // Paper - move NotePlayEvent call to fix instrument/note changes; TODO any way to cancel the game event?
              world.blockEvent(pos, this, 0, 0);
-             world.gameEvent(entity, GameEvent.NOTE_BLOCK_PLAY, pos);
+             world.gameEvent(entity, (Holder) GameEvent.NOTE_BLOCK_PLAY, pos);
          }
-@@ -136,10 +137,14 @@ public class NoteBlock extends Block {
+@@ -138,10 +139,14 @@ public class NoteBlock extends Block {
      @Override
-     public boolean triggerEvent(BlockState state, Level world, BlockPos pos, int type, int data) {
+     protected boolean triggerEvent(BlockState state, Level world, BlockPos pos, int type, int data) {
          NoteBlockInstrument blockpropertyinstrument = (NoteBlockInstrument) state.getValue(NoteBlock.INSTRUMENT);
 +        // Paper start - move NotePlayEvent call to fix instrument/note changes
 +        org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, blockpropertyinstrument, state.getValue(NOTE));
@@ -43,7 +43,7 @@ index 43fbdca9422b679c210bc556e2d48ad37babbe8b..92a24cf02f15f3ab893eb9a793770d98
  
              f = NoteBlock.getPitchFromNote(k);
              world.addParticle(ParticleTypes.NOTE, (double) pos.getX() + 0.5D, (double) pos.getY() + 1.2D, (double) pos.getZ() + 0.5D, (double) k / 24.0D, 0.0D, 0.0D);
-@@ -158,7 +163,7 @@ public class NoteBlock extends Block {
+@@ -160,7 +165,7 @@ public class NoteBlock extends Block {
  
              holder = Holder.direct(SoundEvent.createVariableRangeEvent(minecraftkey));
          } else {
diff --git a/patches/unapplied/server/0706-Freeze-Tick-Lock-API.patch b/patches/server/0679-Freeze-Tick-Lock-API.patch
similarity index 81%
rename from patches/unapplied/server/0706-Freeze-Tick-Lock-API.patch
rename to patches/server/0679-Freeze-Tick-Lock-API.patch
index 81d065ccaf..4c0f4ccb90 100644
--- a/patches/unapplied/server/0706-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0679-Freeze-Tick-Lock-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a14ac8aef9aec14a3ca31a61d66f03fec0841927..d391114787e4f7491241b6abc45dcf3f2a7f9fb5 100644
+index 2e0dc24bf6732637b29e21c8817f0d3502a2a89a..8e09bfb7c1b4fb34e6615b0cf774bc8e6cae29fa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -405,6 +405,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -407,6 +407,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
      private UUID originWorld;
@@ -16,7 +16,7 @@ index a14ac8aef9aec14a3ca31a61d66f03fec0841927..d391114787e4f7491241b6abc45dcf3f
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -764,7 +765,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -777,7 +778,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  this.setRemainingFireTicks(this.remainingFireTicks - 1);
              }
  
@@ -25,7 +25,7 @@ index a14ac8aef9aec14a3ca31a61d66f03fec0841927..d391114787e4f7491241b6abc45dcf3f
                  this.setTicksFrozen(0);
                  this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
              }
-@@ -2246,6 +2247,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2274,6 +2275,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              if (fromNetherPortal) {
                  nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
              }
@@ -35,7 +35,7 @@ index a14ac8aef9aec14a3ca31a61d66f03fec0841927..d391114787e4f7491241b6abc45dcf3f
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -2390,6 +2394,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2418,6 +2422,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              if (spawnReason == null) {
                  spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
              }
@@ -46,10 +46,10 @@ index a14ac8aef9aec14a3ca31a61d66f03fec0841927..d391114787e4f7491241b6abc45dcf3f
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e44a45ced6f7cd7db44388bb2e85c722b6b5ca8a..5de5ca787905d9e0133e5f75280748526c568203 100644
+index be044167883611dde0665749d9e243b9c7b6fbd2..7f8e82a1d5fa1ca665a66d2fb1342163f7c7a733 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3472,7 +3472,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3458,7 +3458,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
          this.level().getProfiler().pop();
          this.level().getProfiler().push("freezing");
@@ -59,7 +59,7 @@ index e44a45ced6f7cd7db44388bb2e85c722b6b5ca8a..5de5ca787905d9e0133e5f7528074852
  
              if (this.isInPowderSnow && this.canFreeze()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 25c064a7da80ef98a758d7cb8bd1aa3de452e2e4..46bc34741394740de46546bd4ce7db35c757316c 100644
+index 97716f0a20fbc5f7048256ad1942e8f56e9fb72b..113ca1d16cb7650d72f488cdaa9e670d51dc85f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -321,6 +321,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/unapplied/server/0707-More-PotionEffectType-API.patch b/patches/server/0680-More-PotionEffectType-API.patch
similarity index 96%
rename from patches/unapplied/server/0707-More-PotionEffectType-API.patch
rename to patches/server/0680-More-PotionEffectType-API.patch
index a2ccb85849..8b793975b7 100644
--- a/patches/unapplied/server/0707-More-PotionEffectType-API.patch
+++ b/patches/server/0680-More-PotionEffectType-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More PotionEffectType API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
-index 3e1273222492006c7a5bcfaefca12fb264ee20dd..6a5b7fd9fb276c5df7b01646530ee45c62b49460 100644
+index 8dffef71c8b193c0fc84b65a592c93827e341bf7..670a278c1573899f846d33aebc59d2e6616d2c5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
 +++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
-@@ -114,6 +114,48 @@ public class CraftPotionEffectType extends PotionEffectType implements Handleabl
+@@ -123,6 +123,48 @@ public class CraftPotionEffectType extends PotionEffectType implements Handleabl
          return this.handle.getDescriptionId();
      }
  
diff --git a/patches/unapplied/server/0708-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0681-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 89%
rename from patches/unapplied/server/0708-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0681-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 1b86e32b63..b19bb65d35 100644
--- a/patches/unapplied/server/0708-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0681-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Use a CHM for StructureTemplate.Pallete cache
 fixes a CME due to this collection being shared across threads
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-index 75ba5a7fe002b5834f12e3a1159c15e6166c9c28..be8aab51a1b92a3a0cc94976975fc3aabc46f0b4 100644
+index 05ff5d2fc689af238003a381168bf64b51f0d65e..bd401b38239fb7e510f82f458f9336b7da372da0 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-@@ -852,7 +852,7 @@ public class StructureTemplate {
+@@ -859,7 +859,7 @@ public class StructureTemplate {
      public static final class Palette {
  
          private final List<StructureTemplate.StructureBlockInfo> blocks;
diff --git a/patches/unapplied/server/0709-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0682-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 97%
rename from patches/unapplied/server/0709-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0682-API-for-creating-command-sender-which-forwards-feedb.patch
index cceecc25ea..3d56f3f0f1 100644
--- a/patches/unapplied/server/0709-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0682-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b3e1f987d31ef5a8f90bc366e248de86e93b9634..76b9f6c0c754be69c1369aa3c13f7ca1f56e9e13 100644
+index 6348f452a437c10f8291148e9bd4642b5fb09ec2..ab031edcac3865b85637cc9d5b8a939acdc904e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2117,6 +2117,13 @@ public final class CraftServer implements Server {
+@@ -2129,6 +2129,13 @@ public final class CraftServer implements Server {
          return this.console.console;
      }
  
diff --git a/patches/unapplied/server/0710-Add-missing-structure-set-seed-configs.patch b/patches/server/0683-Add-missing-structure-set-seed-configs.patch
similarity index 92%
rename from patches/unapplied/server/0710-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0683-Add-missing-structure-set-seed-configs.patch
index 0cc4a490fe..3118eb5fb7 100644
--- a/patches/unapplied/server/0710-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0683-Add-missing-structure-set-seed-configs.patch
@@ -20,10 +20,10 @@ seeds/salts to the frequency reducer which has a similar effect.
 Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index d09d5192f0a571e9758e95dd5e1392a9caa88bde..a7ac9a0c4966c2f9d2b325fa59e8792850d376e8 100644
+index 748caca458eb4eec6ece22d8362e36de252f07dd..c4972e5767488878f7929226258c41c1cc30a47f 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -568,7 +568,7 @@ public abstract class ChunkGenerator {
+@@ -574,7 +574,7 @@ public abstract class ChunkGenerator {
                  }
              }
  
@@ -33,7 +33,7 @@ index d09d5192f0a571e9758e95dd5e1392a9caa88bde..a7ac9a0c4966c2f9d2b325fa59e87928
                      this.tryGenerateStructure((StructureSet.StructureSelectionEntry) list.get(0), structureAccessor, registryManager, randomstate, structureTemplateManager, placementCalculator.getLevelSeed(), chunk, chunkcoordintpair, sectionposition);
                  } else {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
-index a310bfbf0d08187375ea17f4b04b276a0b7d0b9f..798e22fb4d685b5845ebf687e8004e94f13a9751 100644
+index e6c59f986ae89022bd76463209dfa550a3d4fb59..a6b6e5ea191c0e2cd7a2e4f01b89d8af40a83c1b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
 @@ -50,13 +50,14 @@ public class ChunkGeneratorStructureState {
@@ -135,7 +135,7 @@ index a310bfbf0d08187375ea17f4b04b276a0b7d0b9f..798e22fb4d685b5845ebf687e8004e94
 +            // Paper end - Add missing structure set seed configs
              randomsource.setSeed(this.concentricRingsSeed);
 +            } // Paper - Add missing structure set seed configs
-             double d0 = randomsource.nextDouble() * 3.141592653589793D * 2.0D;
+             double d0 = randomsource.nextDouble() * Math.PI * 2.0D;
              int l = 0;
              int i1 = 0;
 @@ -275,7 +309,7 @@ public class ChunkGeneratorStructureState {
@@ -148,10 +148,10 @@ index a310bfbf0d08187375ea17f4b04b276a0b7d0b9f..798e22fb4d685b5845ebf687e8004e94
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java b/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
-index 5e7c0d5a31156b75ac4895bd13c8b7138894a576..dc44ae806dc2779e5f0ec0de3fdb4b53da806a5b 100644
+index a4c34e9415632354d33668a38d06453ada4d3c77..cbf13e4f2da6a27619e9bc9a7cd73bb6e69cad2a 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
-@@ -79,9 +79,23 @@ public abstract class StructurePlacement {
+@@ -79,14 +79,30 @@ public abstract class StructurePlacement {
          return this.exclusionZone;
      }
  
@@ -171,12 +171,21 @@ index 5e7c0d5a31156b75ac4895bd13c8b7138894a576..dc44ae806dc2779e5f0ec0de3fdb4b53
 +        }
 +        // Paper end - Add missing structure set seed configs
          return this.isPlacementChunk(calculator, chunkX, chunkZ)
--            && (!(this.frequency < 1.0F) || this.frequencyReductionMethod.shouldGenerate(calculator.getLevelSeed(), this.salt, chunkX, chunkZ, this.frequency))
-+            && (!(this.frequency < 1.0F) || this.frequencyReductionMethod.shouldGenerate(calculator.getLevelSeed(), this.salt, chunkX, chunkZ, this.frequency, saltOverride)) // Paper - Add missing structure set seed configs
-             && (!this.exclusionZone.isPresent() || !this.exclusionZone.get().isPlacementForbidden(calculator, chunkX, chunkZ));
+-            && this.applyAdditionalChunkRestrictions(chunkX, chunkZ, calculator.getLevelSeed())
++            && this.applyAdditionalChunkRestrictions(chunkX, chunkZ, calculator.getLevelSeed(), saltOverride) // Paper - Add missing structure set seed configs
+             && this.applyInteractionsWithOtherStructures(calculator, chunkX, chunkZ);
      }
  
-@@ -93,25 +107,31 @@ public abstract class StructurePlacement {
+-    public boolean applyAdditionalChunkRestrictions(int chunkX, int chunkZ, long seed) {
+-        return !(this.frequency < 1.0F) || this.frequencyReductionMethod.shouldGenerate(seed, this.salt, chunkX, chunkZ, this.frequency);
++    // Paper start - Add missing structure set seed configs
++    public boolean applyAdditionalChunkRestrictions(int chunkX, int chunkZ, long seed, @org.jetbrains.annotations.Nullable Integer saltOverride) {
++        return !(this.frequency < 1.0F) || this.frequencyReductionMethod.shouldGenerate(seed, this.salt, chunkX, chunkZ, this.frequency, saltOverride);
++        // Paper end - Add missing structure set seed configs
+     }
+ 
+     public boolean applyInteractionsWithOtherStructures(ChunkGeneratorStructureState calculator, int centerChunkX, int centerChunkZ) {
+@@ -101,25 +117,31 @@ public abstract class StructurePlacement {
  
      public abstract StructurePlacementType<?> type();
  
@@ -213,7 +222,7 @@ index 5e7c0d5a31156b75ac4895bd13c8b7138894a576..dc44ae806dc2779e5f0ec0de3fdb4b53
          int i = chunkX >> 4;
          int j = chunkZ >> 4;
          WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
-@@ -139,7 +159,7 @@ public abstract class StructurePlacement {
+@@ -147,7 +169,7 @@ public abstract class StructurePlacement {
  
      @FunctionalInterface
      public interface FrequencyReducer {
@@ -222,7 +231,7 @@ index 5e7c0d5a31156b75ac4895bd13c8b7138894a576..dc44ae806dc2779e5f0ec0de3fdb4b53
      }
  
      public static enum FrequencyReductionMethod implements StringRepresentable {
-@@ -159,8 +179,8 @@ public abstract class StructurePlacement {
+@@ -167,8 +189,8 @@ public abstract class StructurePlacement {
              this.reducer = generationPredicate;
          }