diff --git a/gradle.properties b/gradle.properties
index e7340c21f..64b0fc9e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = e8f787219d8c3d98256cc7af2a40584463651a87
+paperCommit = b750837b0525c4bcac8121ca6ed02d572e1a0ecc
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch
index 3a92773c8..69a6c50df 100644
--- a/patches/server/0001-Airplane-Server-Changes.patch
+++ b/patches/server/0001-Airplane-Server-Changes.patch
@@ -90,7 +90,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..9d70f944af2c81ab5ab23b06857d740d
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5fd8f682d0a76bf804137018e1d3d4b44a31d9f7..25f1656a47037b0245cdd32e475b41e64dbad1de 100644
+index 83811726fc97d6288b7489d3cc48b86a5fbc33bd..7314fa88c7ee5185664f92aa064eaa38d8f5839d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -202,16 +202,26 @@ public class PaperConfig {
@@ -1640,10 +1640,10 @@ index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..8242200f073aee40482b190c7c0aafd5
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index fdc538afae89f40c7e71ef3ae1825adc88e18e62..8596bb86c917acc6ddabf5c2a489103652ad2895 100644
+index 9bb61ea359693f69a570f60be30f8b9b59ab0d19..00bd9c816a62791e892724ebfca08f3cce3645ff 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2452,8 +2452,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2455,8 +2455,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
  
@@ -1672,7 +1672,7 @@ index fdc538afae89f40c7e71ef3ae1825adc88e18e62..8596bb86c917acc6ddabf5c2a4891036
              Iterator iterator = this.entity.getIndirectPassengers().iterator();
  
              while (iterator.hasNext()) {
-@@ -2465,6 +2485,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2468,6 +2488,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
                      i = j;
                  }
              }
@@ -1683,7 +1683,7 @@ index fdc538afae89f40c7e71ef3ae1825adc88e18e62..8596bb86c917acc6ddabf5c2a4891036
              return this.scaledRange(i);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 4973adc524d2b10c1826b1b505c4b50f933befb9..ec326db06ac886f9ca069c5604574e35f4c6ef1f 100644
+index 6b5d0d15c8de2c783a49a0369342fe67c1a511fa..c6da3c0dd65671851fdbc0cf7a6e32e92be3b968 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -985,6 +985,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -1884,7 +1884,7 @@ index 7437f01ca8f416e2c9150250e324af4725a4efb6..bdcd0e38a3ba904811112f41d8bfbfc0
      int LARGE_MAX_STACK_SIZE = 64;
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2a3d2dbd764c3f86430bda78d3ae9431ae9015c8..16ee8991b8993c243b23131da7d4790d9c71bccd 100644
+index cfe6921b8da87c5dd09772988fb8e4e0da541cd9..d898b5c55f7659a344259cc0d5bc4abfb837eb15 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -338,6 +338,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -1920,7 +1920,7 @@ index 2a3d2dbd764c3f86430bda78d3ae9431ae9015c8..16ee8991b8993c243b23131da7d4790d
 +    }
 +
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> getPlayersInTrackRange() {
-         // Paper start - determine highest range of passengers
+         // determine highest range of passengers
          if (this.passengers.isEmpty()) {
              return ((ServerLevel)this.level).getChunkSource().chunkMap.playerEntityTrackerTrackMaps[this.trackingRangeType.ordinal()]
                  .getObjectsInRange(MCUtil.getCoordinateKey(this));
@@ -1945,8 +1945,8 @@ index 2a3d2dbd764c3f86430bda78d3ae9431ae9015c8..16ee8991b8993c243b23131da7d4790d
 +        // Airplane end
  
          return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
-         // Paper end - determine highest range of passengers
-@@ -2435,9 +2461,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+     }
+@@ -2434,9 +2460,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
  
              // Paper start
              return io.papermc.paper.util.CollisionUtil.getCollisionsForBlocksOrWorldBorder(this.level, this, axisalignedbb, null,
diff --git a/patches/server/0006-Component-related-conveniences.patch b/patches/server/0006-Component-related-conveniences.patch
index 7ea95dc0e..5da61c96f 100644
--- a/patches/server/0006-Component-related-conveniences.patch
+++ b/patches/server/0006-Component-related-conveniences.patch
@@ -103,10 +103,10 @@ index ad9fb50791779a5fe7d22268b71bd10d9c9ff3f0..1c1602f839828252748e1acacfe42c7c
          this.server.sendMessage(message, sender);
          Iterator iterator = this.players.iterator();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 16ee8991b8993c243b23131da7d4790d9c71bccd..cfbca7cc9cfde0a17f13487bde3471445568cbb8 100644
+index d898b5c55f7659a344259cc0d5bc4abfb837eb15..10661ecad0942b4ecd5cf0b23f8bcdcdaacfe3de 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3592,6 +3592,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3591,6 +3591,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return SlotAccess.NULL;
      }
  
diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch
index b6defc188..efcba1087 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0007-Ridables.patch
@@ -86,7 +86,7 @@ index 2dc4c7695dab7d03316f5473e29baa1db29debf2..eaca5e3c6d26d5fff1eae1cacabfd389
                          if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cfbca7cc9cfde0a17f13487bde3471445568cbb8..4fc93b94c97a0b9bca7de40d7db8c3f02104b1bd 100644
+index 10661ecad0942b4ecd5cf0b23f8bcdcdaacfe3de..15d3f860c5ad3dc849d943bd86114af3a8c04c82 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -107,7 +107,7 @@ index cfbca7cc9cfde0a17f13487bde3471445568cbb8..4fc93b94c97a0b9bca7de40d7db8c3f0
      private float eyeHeight;
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
-@@ -2628,6 +2628,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2627,6 +2627,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  this.passengers = ImmutableList.copyOf(list);
              }
  
@@ -120,7 +120,7 @@ index cfbca7cc9cfde0a17f13487bde3471445568cbb8..4fc93b94c97a0b9bca7de40d7db8c3f0
          }
          return true; // CraftBukkit
      }
-@@ -2668,6 +2674,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2667,6 +2673,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  return false;
              }
              // Spigot end
@@ -135,7 +135,7 @@ index cfbca7cc9cfde0a17f13487bde3471445568cbb8..4fc93b94c97a0b9bca7de40d7db8c3f0
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4255,4 +4269,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4254,4 +4268,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -5717,7 +5717,7 @@ index 0000000000000000000000000000000000000000..8eefb7b7eb33aecf48ac206d3f0139e0
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d4277ca70124292c6a79f0c01f992f3732e52f02..705fab389cc8efa65432bbcb766e4afd185c0856 100644
+index 0e1dcfdf846f978340380352e092375ffa089cb0..7c51a6113bbf35f96693daf2988b6d59e53cbca1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1239,4 +1239,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0054-Fix-the-dead-lagging-the-server.patch b/patches/server/0054-Fix-the-dead-lagging-the-server.patch
index f6c3c0c62..a5b964e88 100644
--- a/patches/server/0054-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0054-Fix-the-dead-lagging-the-server.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c813f28c56b54bd3870cc12e3ecf0ae98545a6b0..176b17217c41801d8b49622ad341f37111941795 100644
+index b6e1424029209064f3698e7a2c326a2b0708bad3..0a1ca98b993a65b3c267e1722bd7846efd4cd6d0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1764,6 +1764,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1763,6 +1763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
diff --git a/patches/server/0066-Configurable-void-damage-height-and-damage.patch b/patches/server/0066-Configurable-void-damage-height-and-damage.patch
index 0834ddb16..7be52469e 100644
--- a/patches/server/0066-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0066-Configurable-void-damage-height-and-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 176b17217c41801d8b49622ad341f37111941795..bb33d9e8e54ce17e51fbf10d5b618fb0fe7e29ae 100644
+index 0a1ca98b993a65b3c267e1722bd7846efd4cd6d0..498ffb2aa24e6464f567999a6a941b2cb334e002 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -795,7 +795,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -794,7 +794,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
  
      public void checkOutOfWorld() {
          // Paper start - Configurable nether ceiling damage
diff --git a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
index 49e6841c5..d6f428966 100644
--- a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
@@ -5,10 +5,10 @@ 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
-index bb33d9e8e54ce17e51fbf10d5b618fb0fe7e29ae..9043422cfa025e98d9c2bb3d9511c8d735d5b476 100644
+index 498ffb2aa24e6464f567999a6a941b2cb334e002..6f8da1602dfe69ac35c98cbe744a25d1dd876a54 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4306,5 +4306,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4305,5 +4305,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public boolean processClick(InteractionHand hand) {
          return false;
      }
diff --git a/patches/server/0073-Item-entity-immunities.patch b/patches/server/0073-Item-entity-immunities.patch
index 348ca349d..b6a7cf031 100644
--- a/patches/server/0073-Item-entity-immunities.patch
+++ b/patches/server/0073-Item-entity-immunities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8596bb86c917acc6ddabf5c2a489103652ad2895..e348f0b0f9cd6e41ad49bb8130748df700230a7f 100644
+index 00bd9c816a62791e892724ebfca08f3cce3645ff..b2eaeb1f36471f9b14a23e54338a2e7168677a80 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2322,7 +2322,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2325,7 +2325,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
  
      public class TrackedEntity {
  
diff --git a/patches/server/0099-Stop-squids-floating-on-top-of-water.patch b/patches/server/0099-Stop-squids-floating-on-top-of-water.patch
index 0a61fb3c1..f7f23e3b6 100644
--- a/patches/server/0099-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0099-Stop-squids-floating-on-top-of-water.patch
@@ -5,10 +5,10 @@ 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
-index 9043422cfa025e98d9c2bb3d9511c8d735d5b476..ff1592b73dbcf45b6936fe36fe0c3bb17bff198f 100644
+index 6f8da1602dfe69ac35c98cbe744a25d1dd876a54..213d13800d2d8680c2f981cd5850c5a73d0978b1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3871,11 +3871,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3870,11 +3870,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          this.yRotO = this.getYRot();
      }
  
diff --git a/patches/server/0102-Entities-can-use-portals-configuration.patch b/patches/server/0102-Entities-can-use-portals-configuration.patch
index 06072ed6e..cfff915ba 100644
--- a/patches/server/0102-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0102-Entities-can-use-portals-configuration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ff1592b73dbcf45b6936fe36fe0c3bb17bff198f..1c74a0b488048a250b1c2af6974cb8a1e18d7cec 100644
+index 213d13800d2d8680c2f981cd5850c5a73d0978b1..bb167f668bc0b1218327f6ad3bd6b2cbe023d976 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2728,7 +2728,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2727,7 +2727,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public void handleInsidePortal(BlockPos pos) {
          if (this.isOnPortalCooldown()) {
              this.setPortalCooldown();
@@ -17,7 +17,7 @@ index ff1592b73dbcf45b6936fe36fe0c3bb17bff198f..1c74a0b488048a250b1c2af6974cb8a1
              if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
              }
-@@ -3360,7 +3360,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3359,7 +3359,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      }
  
      public boolean canChangeDimensions() {
diff --git a/patches/server/0113-Stonecutter-damage.patch b/patches/server/0113-Stonecutter-damage.patch
index 47e8ff2aa..965880de9 100644
--- a/patches/server/0113-Stonecutter-damage.patch
+++ b/patches/server/0113-Stonecutter-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stonecutter damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1c74a0b488048a250b1c2af6974cb8a1e18d7cec..e049dd0e1d068ab80e78fb5989979a266f132eb6 100644
+index bb167f668bc0b1218327f6ad3bd6b2cbe023d976..54442921dd314f22760f158cde662592821ea6de 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1030,7 +1030,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1029,7 +1029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  }
                  // CraftBukkit end
  
diff --git a/patches/server/0147-Add-MC-4-fix-back.patch b/patches/server/0147-Add-MC-4-fix-back.patch
deleted file mode 100644
index f6a44860b..000000000
--- a/patches/server/0147-Add-MC-4-fix-back.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 7 Jan 2021 07:51:25 -0600
-Subject: [PATCH] Add MC-4 fix back
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e049dd0e1d068ab80e78fb5989979a266f132eb6..307f51ca7a27574c3b5f1bf42bac5a56bdebb949 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4076,7 +4076,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-         // Paper end
-         // Paper start - fix MC-4
-         if (this instanceof ItemEntity) {
--            if (false && com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Paper - revert
-+            if (com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Paper - revert // Purpur
-                 // encode/decode from PacketPlayOutEntity
-                 x = Mth.lfloor(x * 4096.0D) * (1 / 4096.0D);
-                 y = Mth.lfloor(y * 4096.0D) * (1 / 4096.0D);
diff --git a/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0147-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 100%
rename from patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/server/0147-Add-mobGriefing-bypass-to-everything-affected.patch
diff --git a/patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0148-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 100%
rename from patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/server/0148-Config-to-allow-Note-Block-sounds-when-blocked.patch
diff --git a/patches/server/0150-Add-EntityTeleportHinderedEvent.patch b/patches/server/0149-Add-EntityTeleportHinderedEvent.patch
similarity index 99%
rename from patches/server/0150-Add-EntityTeleportHinderedEvent.patch
rename to patches/server/0149-Add-EntityTeleportHinderedEvent.patch
index bda2b11a2..a605cdaac 100644
--- a/patches/server/0150-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0149-Add-EntityTeleportHinderedEvent.patch
@@ -98,7 +98,7 @@ index efdfaf989a1f51759f240d95ef425694b35f5e06..19b162cd4d8fa4f5c996d54800e3859c
          noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove);
          persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 705fab389cc8efa65432bbcb766e4afd185c0856..bff5eec5823d0de0fd6bcfaaccab70685ea56081 100644
+index 7c51a6113bbf35f96693daf2988b6d59e53cbca1..9430d4e270cd5ebabeffde0e28f0a96657ce0262 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -561,6 +561,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0151-Add-StructureGenerateEvent.patch b/patches/server/0150-Add-StructureGenerateEvent.patch
similarity index 92%
rename from patches/server/0151-Add-StructureGenerateEvent.patch
rename to patches/server/0150-Add-StructureGenerateEvent.patch
index 8c4bcfdd9..0cd0bb02a 100644
--- a/patches/server/0151-Add-StructureGenerateEvent.patch
+++ b/patches/server/0150-Add-StructureGenerateEvent.patch
@@ -19,10 +19,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.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 4ed70cc15abd52e8e474d57a3d6be20e94a2f027..a4292e82cdb678d941056e5b059753eb4447b661 100644
+index fde436065aeeb47cd177656a7c9fe8dc34178e87..6a1cb38de5733e384546984a0eadd4bab53c0122 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -348,7 +348,14 @@ public abstract class ChunkGenerator {
+@@ -346,7 +346,14 @@ public abstract class ChunkGenerator {
  
          if (structuresettingsfeature != null) {
              StructureStart<?> structurestart1 = feature.generate(registryManager, this, this.biomeSource, structureManager, worldSeed, chunkcoordintpair, biome, j, structuresettingsfeature, chunk);
diff --git a/patches/server/0152-Farmland-trampling-changes.patch b/patches/server/0151-Farmland-trampling-changes.patch
similarity index 100%
rename from patches/server/0152-Farmland-trampling-changes.patch
rename to patches/server/0151-Farmland-trampling-changes.patch
diff --git a/patches/server/0153-Movement-options-for-armor-stands.patch b/patches/server/0152-Movement-options-for-armor-stands.patch
similarity index 96%
rename from patches/server/0153-Movement-options-for-armor-stands.patch
rename to patches/server/0152-Movement-options-for-armor-stands.patch
index 500a440b0..61d2b7651 100644
--- a/patches/server/0153-Movement-options-for-armor-stands.patch
+++ b/patches/server/0152-Movement-options-for-armor-stands.patch
@@ -17,10 +17,10 @@ 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
-index 307f51ca7a27574c3b5f1bf42bac5a56bdebb949..bd225cf3e8b8c6ab72134fecdef357b444eb5e68 100644
+index 54442921dd314f22760f158cde662592821ea6de..eae9077653e2fa92fbcba99bc3aca96ef499d20b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1617,7 +1617,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1616,7 +1616,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return this.isInWater() || flag;
      }
  
diff --git a/patches/server/0154-Fix-stuck-in-portals.patch b/patches/server/0153-Fix-stuck-in-portals.patch
similarity index 95%
rename from patches/server/0154-Fix-stuck-in-portals.patch
rename to patches/server/0153-Fix-stuck-in-portals.patch
index 473e545f8..38f9aa4e2 100644
--- a/patches/server/0154-Fix-stuck-in-portals.patch
+++ b/patches/server/0153-Fix-stuck-in-portals.patch
@@ -17,10 +17,10 @@ index cefbdb8f5892d5d46ca6ddc8aa6710be42c189a6..4a201004d397cf960822259d4f7d19cf
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bd225cf3e8b8c6ab72134fecdef357b444eb5e68..6beffbc4769972778477d86ac8a53d26d3b520ae 100644
+index eae9077653e2fa92fbcba99bc3aca96ef499d20b..280059b0edd791c2ac376d611399e7562639410b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2725,12 +2725,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2724,12 +2724,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  
diff --git a/patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0154-Toggle-for-water-sensitive-mob-damage.patch
similarity index 100%
rename from patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0154-Toggle-for-water-sensitive-mob-damage.patch
diff --git a/patches/server/0156-Config-to-always-tame-in-Creative.patch b/patches/server/0155-Config-to-always-tame-in-Creative.patch
similarity index 100%
rename from patches/server/0156-Config-to-always-tame-in-Creative.patch
rename to patches/server/0155-Config-to-always-tame-in-Creative.patch
diff --git a/patches/server/0157-End-crystal-explosion-options.patch b/patches/server/0156-End-crystal-explosion-options.patch
similarity index 100%
rename from patches/server/0157-End-crystal-explosion-options.patch
rename to patches/server/0156-End-crystal-explosion-options.patch
diff --git a/patches/server/0158-Add-unsafe-Entity-serialization-API.patch b/patches/server/0157-Add-unsafe-Entity-serialization-API.patch
similarity index 98%
rename from patches/server/0158-Add-unsafe-Entity-serialization-API.patch
rename to patches/server/0157-Add-unsafe-Entity-serialization-API.patch
index 20ae5ff4d..dee7a731b 100644
--- a/patches/server/0158-Add-unsafe-Entity-serialization-API.patch
+++ b/patches/server/0157-Add-unsafe-Entity-serialization-API.patch
@@ -17,7 +17,7 @@ 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/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index bff5eec5823d0de0fd6bcfaaccab70685ea56081..40640e8ddaa3870e18945a4cc10fe064e3dbe849 100644
+index 9430d4e270cd5ebabeffde0e28f0a96657ce0262..c50089b21d3b258ae4b3f0a6b2625fb129764fee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1265,5 +1265,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0158-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 100%
rename from patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server/0158-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
diff --git a/patches/server/0160-Dont-run-with-scissors.patch b/patches/server/0159-Dont-run-with-scissors.patch
similarity index 100%
rename from patches/server/0160-Dont-run-with-scissors.patch
rename to patches/server/0159-Dont-run-with-scissors.patch
diff --git a/patches/server/0161-One-Punch-Man.patch b/patches/server/0160-One-Punch-Man.patch
similarity index 100%
rename from patches/server/0161-One-Punch-Man.patch
rename to patches/server/0160-One-Punch-Man.patch
diff --git a/patches/server/0162-Add-config-for-snow-on-blue-ice.patch b/patches/server/0161-Add-config-for-snow-on-blue-ice.patch
similarity index 100%
rename from patches/server/0162-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0161-Add-config-for-snow-on-blue-ice.patch
diff --git a/patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0162-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 100%
rename from patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server/0162-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
diff --git a/patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0163-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 100%
rename from patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server/0163-Config-to-ignore-nearby-mobs-when-sleeping.patch
diff --git a/patches/server/0165-Add-back-player-spawned-endermite-API.patch b/patches/server/0164-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/server/0165-Add-back-player-spawned-endermite-API.patch
rename to patches/server/0164-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0165-Config-Enderman-aggressiveness-towards-Endermites.patch
similarity index 100%
rename from patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch
rename to patches/server/0165-Config-Enderman-aggressiveness-towards-Endermites.patch
diff --git a/patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0166-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 100%
rename from patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server/0166-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
diff --git a/patches/server/0168-Tick-fluids-config.patch b/patches/server/0167-Tick-fluids-config.patch
similarity index 100%
rename from patches/server/0168-Tick-fluids-config.patch
rename to patches/server/0167-Tick-fluids-config.patch
diff --git a/patches/server/0169-Config-to-disable-Llama-caravans.patch b/patches/server/0168-Config-to-disable-Llama-caravans.patch
similarity index 100%
rename from patches/server/0169-Config-to-disable-Llama-caravans.patch
rename to patches/server/0168-Config-to-disable-Llama-caravans.patch
diff --git a/patches/server/0170-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0169-Config-to-make-Creepers-explode-on-death.patch
similarity index 100%
rename from patches/server/0170-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server/0169-Config-to-make-Creepers-explode-on-death.patch
diff --git a/patches/server/0171-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0170-Configurable-ravager-griefable-blocks-list.patch
similarity index 100%
rename from patches/server/0171-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server/0170-Configurable-ravager-griefable-blocks-list.patch
diff --git a/patches/server/0172-Sneak-to-bulk-process-composter.patch b/patches/server/0171-Sneak-to-bulk-process-composter.patch
similarity index 100%
rename from patches/server/0172-Sneak-to-bulk-process-composter.patch
rename to patches/server/0171-Sneak-to-bulk-process-composter.patch
diff --git a/patches/server/0173-Config-for-skipping-night.patch b/patches/server/0172-Config-for-skipping-night.patch
similarity index 100%
rename from patches/server/0173-Config-for-skipping-night.patch
rename to patches/server/0172-Config-for-skipping-night.patch
diff --git a/patches/server/0174-Add-config-for-villager-trading.patch b/patches/server/0173-Add-config-for-villager-trading.patch
similarity index 100%
rename from patches/server/0174-Add-config-for-villager-trading.patch
rename to patches/server/0173-Add-config-for-villager-trading.patch
diff --git a/patches/server/0175-Allow-infinity-on-crossbows.patch b/patches/server/0174-Allow-infinity-on-crossbows.patch
similarity index 100%
rename from patches/server/0175-Allow-infinity-on-crossbows.patch
rename to patches/server/0174-Allow-infinity-on-crossbows.patch
diff --git a/patches/server/0176-Drowning-Settings.patch b/patches/server/0175-Drowning-Settings.patch
similarity index 95%
rename from patches/server/0176-Drowning-Settings.patch
rename to patches/server/0175-Drowning-Settings.patch
index 342af1e6b..c2afd2262 100644
--- a/patches/server/0176-Drowning-Settings.patch
+++ b/patches/server/0175-Drowning-Settings.patch
@@ -5,10 +5,10 @@ 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
-index 6beffbc4769972778477d86ac8a53d26d3b520ae..e03f7211d30919764daa53438a0647109b007138 100644
+index 280059b0edd791c2ac376d611399e7562639410b..6db992f8e6bef8ce7ed3f4386640a2324bec249d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2959,7 +2959,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2958,7 +2958,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      }
  
      public int getMaxAirSupply() {
diff --git a/patches/server/0177-Break-individual-slabs-when-sneaking.patch b/patches/server/0176-Break-individual-slabs-when-sneaking.patch
similarity index 100%
rename from patches/server/0177-Break-individual-slabs-when-sneaking.patch
rename to patches/server/0176-Break-individual-slabs-when-sneaking.patch
diff --git a/patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0177-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 100%
rename from patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server/0177-Config-to-disable-hostile-mob-spawn-on-ice.patch
diff --git a/patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0178-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 100%
rename from patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server/0178-Config-to-show-Armor-Stand-arms-on-spawn.patch
diff --git a/patches/server/0180-Option-to-make-doors-require-redstone.patch b/patches/server/0179-Option-to-make-doors-require-redstone.patch
similarity index 100%
rename from patches/server/0180-Option-to-make-doors-require-redstone.patch
rename to patches/server/0179-Option-to-make-doors-require-redstone.patch
diff --git a/patches/server/0181-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0180-Config-to-allow-for-unsafe-enchants.patch
similarity index 100%
rename from patches/server/0181-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server/0180-Config-to-allow-for-unsafe-enchants.patch
diff --git a/patches/server/0182-Configurable-sponge-absorption.patch b/patches/server/0181-Configurable-sponge-absorption.patch
similarity index 100%
rename from patches/server/0182-Configurable-sponge-absorption.patch
rename to patches/server/0181-Configurable-sponge-absorption.patch
diff --git a/patches/server/0183-Projectile-offset-config.patch b/patches/server/0182-Projectile-offset-config.patch
similarity index 100%
rename from patches/server/0183-Projectile-offset-config.patch
rename to patches/server/0182-Projectile-offset-config.patch
diff --git a/patches/server/0184-Config-for-powered-rail-activation-distance.patch b/patches/server/0183-Config-for-powered-rail-activation-distance.patch
similarity index 100%
rename from patches/server/0184-Config-for-powered-rail-activation-distance.patch
rename to patches/server/0183-Config-for-powered-rail-activation-distance.patch
diff --git a/patches/server/0185-Piglin-portal-spawn-modifier.patch b/patches/server/0184-Piglin-portal-spawn-modifier.patch
similarity index 100%
rename from patches/server/0185-Piglin-portal-spawn-modifier.patch
rename to patches/server/0184-Piglin-portal-spawn-modifier.patch
diff --git a/patches/server/0186-Config-to-change-max-number-of-bees.patch b/patches/server/0185-Config-to-change-max-number-of-bees.patch
similarity index 100%
rename from patches/server/0186-Config-to-change-max-number-of-bees.patch
rename to patches/server/0185-Config-to-change-max-number-of-bees.patch
diff --git a/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch
similarity index 95%
rename from patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch
index 3138478bb..eddd1b1d9 100644
--- a/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable damage settings for magma blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e03f7211d30919764daa53438a0647109b007138..bd1d12e64a709f63339aaf9725246b68fe198d9d 100644
+index 6db992f8e6bef8ce7ed3f4386640a2324bec249d..90ba2eba2417c9d529a175dbc1228e84588b67b8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1030,7 +1030,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1029,7 +1029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  }
                  // CraftBukkit end
  
diff --git a/patches/server/0188-Config-for-wither-explosion-radius.patch b/patches/server/0187-Config-for-wither-explosion-radius.patch
similarity index 100%
rename from patches/server/0188-Config-for-wither-explosion-radius.patch
rename to patches/server/0187-Config-for-wither-explosion-radius.patch
diff --git a/patches/server/0189-Gamemode-extra-permissions.patch b/patches/server/0188-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/server/0189-Gamemode-extra-permissions.patch
rename to patches/server/0188-Gamemode-extra-permissions.patch
diff --git a/patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0189-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
similarity index 100%
rename from patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
rename to patches/server/0189-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
diff --git a/patches/server/0191-Configurable-piston-push-limit.patch b/patches/server/0190-Configurable-piston-push-limit.patch
similarity index 100%
rename from patches/server/0191-Configurable-piston-push-limit.patch
rename to patches/server/0190-Configurable-piston-push-limit.patch
diff --git a/patches/server/0192-Configurable-broadcast-settings.patch b/patches/server/0191-Configurable-broadcast-settings.patch
similarity index 100%
rename from patches/server/0192-Configurable-broadcast-settings.patch
rename to patches/server/0191-Configurable-broadcast-settings.patch
diff --git a/patches/server/0193-Fix-SPIGOT-6278.patch b/patches/server/0192-Fix-SPIGOT-6278.patch
similarity index 100%
rename from patches/server/0193-Fix-SPIGOT-6278.patch
rename to patches/server/0192-Fix-SPIGOT-6278.patch
diff --git a/patches/server/0194-Configurable-mob-blindness.patch b/patches/server/0193-Configurable-mob-blindness.patch
similarity index 100%
rename from patches/server/0194-Configurable-mob-blindness.patch
rename to patches/server/0193-Configurable-mob-blindness.patch
diff --git a/patches/server/0195-Hide-hidden-players-from-entity-selector.patch b/patches/server/0194-Hide-hidden-players-from-entity-selector.patch
similarity index 100%
rename from patches/server/0195-Hide-hidden-players-from-entity-selector.patch
rename to patches/server/0194-Hide-hidden-players-from-entity-selector.patch
diff --git a/patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0195-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 100%
rename from patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server/0195-Config-for-health-to-impact-Creeper-explosion-radius.patch
diff --git a/patches/server/0197-Iron-golem-poppy-calms-anger.patch b/patches/server/0196-Iron-golem-poppy-calms-anger.patch
similarity index 100%
rename from patches/server/0197-Iron-golem-poppy-calms-anger.patch
rename to patches/server/0196-Iron-golem-poppy-calms-anger.patch
diff --git a/patches/server/0198-Breedable-parrots.patch b/patches/server/0197-Breedable-parrots.patch
similarity index 100%
rename from patches/server/0198-Breedable-parrots.patch
rename to patches/server/0197-Breedable-parrots.patch
diff --git a/patches/server/0199-Configurable-powered-rail-boost-modifier.patch b/patches/server/0198-Configurable-powered-rail-boost-modifier.patch
similarity index 100%
rename from patches/server/0199-Configurable-powered-rail-boost-modifier.patch
rename to patches/server/0198-Configurable-powered-rail-boost-modifier.patch
diff --git a/patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0199-Add-config-change-multiplier-critical-damage-value.patch
similarity index 100%
rename from patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server/0199-Add-config-change-multiplier-critical-damage-value.patch
diff --git a/patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0200-Option-to-disable-dragon-egg-teleporting.patch
similarity index 100%
rename from patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server/0200-Option-to-disable-dragon-egg-teleporting.patch
diff --git a/patches/server/0202-Config-for-unverified-username-message.patch b/patches/server/0201-Config-for-unverified-username-message.patch
similarity index 100%
rename from patches/server/0202-Config-for-unverified-username-message.patch
rename to patches/server/0201-Config-for-unverified-username-message.patch
diff --git a/patches/server/0203-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0202-Make-anvil-cumulative-cost-configurable.patch
similarity index 100%
rename from patches/server/0203-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server/0202-Make-anvil-cumulative-cost-configurable.patch
diff --git a/patches/server/0204-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0203-ShulkerBox-allow-oversized-stacks.patch
similarity index 100%
rename from patches/server/0204-ShulkerBox-allow-oversized-stacks.patch
rename to patches/server/0203-ShulkerBox-allow-oversized-stacks.patch
diff --git a/patches/server/0205-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0204-Bee-can-work-when-raining-or-at-night.patch
similarity index 100%
rename from patches/server/0205-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server/0204-Bee-can-work-when-raining-or-at-night.patch
diff --git a/patches/server/0206-API-for-any-mob-to-burn-daylight.patch b/patches/server/0205-API-for-any-mob-to-burn-daylight.patch
similarity index 98%
rename from patches/server/0206-API-for-any-mob-to-burn-daylight.patch
rename to patches/server/0205-API-for-any-mob-to-burn-daylight.patch
index 298d007d2..171a24161 100644
--- a/patches/server/0206-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0205-API-for-any-mob-to-burn-daylight.patch
@@ -6,10 +6,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
-index bd1d12e64a709f63339aaf9725246b68fe198d9d..b31830f3c71f206730b775671aa0b43d87e10629 100644
+index 90ba2eba2417c9d529a175dbc1228e84588b67b8..770e09f47f74d944f178ae2459936f7ef300e8d1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4319,5 +4319,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4318,5 +4318,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public boolean canSaveToDisk() {
          return true;
      }
@@ -333,7 +333,7 @@ index 1f90c40c5e92232c38a33097903fd6e2f6f2ff02..39fa4a9a52c510e88036ab790a8739d2
          // Paper end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 40640e8ddaa3870e18945a4cc10fe064e3dbe849..e1e9cca7293483cc4928c96ddd72e616c857b4c9 100644
+index c50089b21d3b258ae4b3f0a6b2625fb129764fee..ce85691da804b62591f65e993206a873e84c1f8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1272,5 +1272,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0207-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0206-Fix-advancement-triggers-on-entity-death.patch
similarity index 100%
rename from patches/server/0207-Fix-advancement-triggers-on-entity-death.patch
rename to patches/server/0206-Fix-advancement-triggers-on-entity-death.patch
diff --git a/patches/server/0208-Config-MobEffect-by-world.patch b/patches/server/0207-Config-MobEffect-by-world.patch
similarity index 100%
rename from patches/server/0208-Config-MobEffect-by-world.patch
rename to patches/server/0207-Config-MobEffect-by-world.patch
diff --git a/patches/server/0209-Beacon-Activation-Range-Configurable.patch b/patches/server/0208-Beacon-Activation-Range-Configurable.patch
similarity index 100%
rename from patches/server/0209-Beacon-Activation-Range-Configurable.patch
rename to patches/server/0208-Beacon-Activation-Range-Configurable.patch
diff --git a/patches/server/0210-Add-toggle-for-sand-duping-fix.patch b/patches/server/0209-Add-toggle-for-sand-duping-fix.patch
similarity index 100%
rename from patches/server/0210-Add-toggle-for-sand-duping-fix.patch
rename to patches/server/0209-Add-toggle-for-sand-duping-fix.patch
diff --git a/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch
similarity index 95%
rename from patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch
rename to patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch
index e4c5e23ec..4095a5a81 100644
--- a/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch
+++ b/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b31830f3c71f206730b775671aa0b43d87e10629..4af1929cb5b8959d45d5d72616441f7eba5f9d15 100644
+index 770e09f47f74d944f178ae2459936f7ef300e8d1..e8cc670b6852b1831ce9f76c1531f55cfe9f3215 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2776,7 +2776,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2775,7 +2775,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0212-Flying-Fall-Damage-API.patch b/patches/server/0211-Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/server/0212-Flying-Fall-Damage-API.patch
rename to patches/server/0211-Flying-Fall-Damage-API.patch
diff --git a/patches/server/0213-Make-lightning-rod-range-configurable.patch b/patches/server/0212-Make-lightning-rod-range-configurable.patch
similarity index 100%
rename from patches/server/0213-Make-lightning-rod-range-configurable.patch
rename to patches/server/0212-Make-lightning-rod-range-configurable.patch
diff --git a/patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0213-Burp-after-eating-food-fills-hunger-bar-completely.patch
similarity index 100%
rename from patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch
rename to patches/server/0213-Burp-after-eating-food-fills-hunger-bar-completely.patch
diff --git a/patches/server/0215-Allow-player-join-full-server-by-permission.patch b/patches/server/0214-Allow-player-join-full-server-by-permission.patch
similarity index 100%
rename from patches/server/0215-Allow-player-join-full-server-by-permission.patch
rename to patches/server/0214-Allow-player-join-full-server-by-permission.patch
diff --git a/patches/server/0216-Populator-seed-controls.patch b/patches/server/0215-Populator-seed-controls.patch
similarity index 100%
rename from patches/server/0216-Populator-seed-controls.patch
rename to patches/server/0215-Populator-seed-controls.patch
diff --git a/patches/server/0217-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0216-Add-permission-bypass-for-portal-waiting.patch
similarity index 100%
rename from patches/server/0217-Add-permission-bypass-for-portal-waiting.patch
rename to patches/server/0216-Add-permission-bypass-for-portal-waiting.patch
diff --git a/patches/server/0218-Shulker-spawn-from-bullet-options.patch b/patches/server/0217-Shulker-spawn-from-bullet-options.patch
similarity index 100%
rename from patches/server/0218-Shulker-spawn-from-bullet-options.patch
rename to patches/server/0217-Shulker-spawn-from-bullet-options.patch
diff --git a/patches/server/0219-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0218-Eating-glow-berries-adds-glow-effect.patch
similarity index 100%
rename from patches/server/0219-Eating-glow-berries-adds-glow-effect.patch
rename to patches/server/0218-Eating-glow-berries-adds-glow-effect.patch
diff --git a/patches/server/0220-Option-to-make-drowned-break-doors.patch b/patches/server/0219-Option-to-make-drowned-break-doors.patch
similarity index 100%
rename from patches/server/0220-Option-to-make-drowned-break-doors.patch
rename to patches/server/0219-Option-to-make-drowned-break-doors.patch
diff --git a/patches/server/0221-Configurable-hunger-starvation-damage.patch b/patches/server/0220-Configurable-hunger-starvation-damage.patch
similarity index 100%
rename from patches/server/0221-Configurable-hunger-starvation-damage.patch
rename to patches/server/0220-Configurable-hunger-starvation-damage.patch
diff --git a/patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0221-Redirect-System.out-calls-to-plugin-loggers.patch
similarity index 100%
rename from patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch
rename to patches/server/0221-Redirect-System.out-calls-to-plugin-loggers.patch
diff --git a/patches/server/0223-Armor-click-equip-options.patch b/patches/server/0222-Armor-click-equip-options.patch
similarity index 100%
rename from patches/server/0223-Armor-click-equip-options.patch
rename to patches/server/0222-Armor-click-equip-options.patch
diff --git a/patches/server/0224-Add-uptime-command.patch b/patches/server/0223-Add-uptime-command.patch
similarity index 100%
rename from patches/server/0224-Add-uptime-command.patch
rename to patches/server/0223-Add-uptime-command.patch
diff --git a/patches/server/0225-Structure-seed-options.patch b/patches/server/0224-Structure-seed-options.patch
similarity index 95%
rename from patches/server/0225-Structure-seed-options.patch
rename to patches/server/0224-Structure-seed-options.patch
index 6a89e5730..5784154e9 100644
--- a/patches/server/0225-Structure-seed-options.patch
+++ b/patches/server/0224-Structure-seed-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Structure seed options
 
 
 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 a4292e82cdb678d941056e5b059753eb4447b661..5ee7dfda765e3a2f49ee5cd0f4cb7cd5929ac48b 100644
+index 6a1cb38de5733e384546984a0eadd4bab53c0122..3db79ce2ee0e72fe521beaaf6373a5ff0820be69 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -426,6 +426,17 @@ public abstract class ChunkGenerator {
+@@ -424,6 +424,17 @@ public abstract class ChunkGenerator {
                      case "village":
                          seed = conf.villageSeed;
                          break;
diff --git a/patches/server/0226-Tool-actionable-options.patch b/patches/server/0225-Tool-actionable-options.patch
similarity index 100%
rename from patches/server/0226-Tool-actionable-options.patch
rename to patches/server/0225-Tool-actionable-options.patch
diff --git a/patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch b/patches/server/0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
similarity index 100%
rename from patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
rename to patches/server/0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
diff --git a/patches/server/0228-Store-placer-on-Block-when-placed.patch b/patches/server/0227-Store-placer-on-Block-when-placed.patch
similarity index 100%
rename from patches/server/0228-Store-placer-on-Block-when-placed.patch
rename to patches/server/0227-Store-placer-on-Block-when-placed.patch
diff --git a/patches/server/0229-Summoner-API.patch b/patches/server/0228-Summoner-API.patch
similarity index 100%
rename from patches/server/0229-Summoner-API.patch
rename to patches/server/0228-Summoner-API.patch
diff --git a/patches/server/0230-Customizable-sleeping-actionbar-messages.patch b/patches/server/0229-Customizable-sleeping-actionbar-messages.patch
similarity index 100%
rename from patches/server/0230-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0229-Customizable-sleeping-actionbar-messages.patch
diff --git a/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0230-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 100%
rename from patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0230-option-to-disable-shulker-box-items-from-dropping-co.patch
diff --git a/patches/server/0232-Silk-touchable-budding-amethyst.patch b/patches/server/0231-Silk-touchable-budding-amethyst.patch
similarity index 100%
rename from patches/server/0232-Silk-touchable-budding-amethyst.patch
rename to patches/server/0231-Silk-touchable-budding-amethyst.patch
diff --git a/patches/server/0233-Big-dripleaf-tilt-delay.patch b/patches/server/0232-Big-dripleaf-tilt-delay.patch
similarity index 100%
rename from patches/server/0233-Big-dripleaf-tilt-delay.patch
rename to patches/server/0232-Big-dripleaf-tilt-delay.patch
diff --git a/patches/server/0234-Player-ridable-in-water-option.patch b/patches/server/0233-Player-ridable-in-water-option.patch
similarity index 100%
rename from patches/server/0234-Player-ridable-in-water-option.patch
rename to patches/server/0233-Player-ridable-in-water-option.patch
diff --git a/patches/server/0235-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0234-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 100%
rename from patches/server/0235-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0234-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
diff --git a/patches/server/0236-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch b/patches/server/0235-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
similarity index 100%
rename from patches/server/0236-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
rename to patches/server/0235-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
diff --git a/patches/server/0237-Add-compass-command.patch b/patches/server/0236-Add-compass-command.patch
similarity index 100%
rename from patches/server/0237-Add-compass-command.patch
rename to patches/server/0236-Add-compass-command.patch
diff --git a/patches/server/0238-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0237-Config-to-prevent-horses-from-standing-with-riders.patch
similarity index 100%
rename from patches/server/0238-Config-to-prevent-horses-from-standing-with-riders.patch
rename to patches/server/0237-Config-to-prevent-horses-from-standing-with-riders.patch
diff --git a/patches/server/0239-Toggle-for-kinetic-damage.patch b/patches/server/0238-Toggle-for-kinetic-damage.patch
similarity index 100%
rename from patches/server/0239-Toggle-for-kinetic-damage.patch
rename to patches/server/0238-Toggle-for-kinetic-damage.patch
diff --git a/patches/server/0240-Add-Option-for-disable-observer-clocks.patch b/patches/server/0239-Add-Option-for-disable-observer-clocks.patch
similarity index 100%
rename from patches/server/0240-Add-Option-for-disable-observer-clocks.patch
rename to patches/server/0239-Add-Option-for-disable-observer-clocks.patch
diff --git a/patches/server/0241-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0240-Customizeable-Zombie-Villager-curing-times.patch
similarity index 100%
rename from patches/server/0241-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/server/0240-Customizeable-Zombie-Villager-curing-times.patch
diff --git a/patches/server/0242-Option-for-sponges-to-work-on-lava.patch b/patches/server/0241-Option-for-sponges-to-work-on-lava.patch
similarity index 100%
rename from patches/server/0242-Option-for-sponges-to-work-on-lava.patch
rename to patches/server/0241-Option-for-sponges-to-work-on-lava.patch
diff --git a/patches/server/0243-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0242-Toggle-for-Wither-s-spawn-sound.patch
similarity index 100%
rename from patches/server/0243-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/server/0242-Toggle-for-Wither-s-spawn-sound.patch
diff --git a/patches/server/0244-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0243-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 100%
rename from patches/server/0244-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/server/0243-Cactus-breaks-from-solid-neighbors-config.patch
diff --git a/patches/server/0245-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0244-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 100%
rename from patches/server/0245-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/server/0244-Config-to-remove-curse-of-binding-with-weakness.patch
diff --git a/patches/server/0246-Conduit-behavior-configuration.patch b/patches/server/0245-Conduit-behavior-configuration.patch
similarity index 100%
rename from patches/server/0246-Conduit-behavior-configuration.patch
rename to patches/server/0245-Conduit-behavior-configuration.patch
diff --git a/patches/server/0247-Cauldron-fill-chances.patch b/patches/server/0246-Cauldron-fill-chances.patch
similarity index 100%
rename from patches/server/0247-Cauldron-fill-chances.patch
rename to patches/server/0246-Cauldron-fill-chances.patch
diff --git a/patches/server/0248-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0247-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 100%
rename from patches/server/0248-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/server/0247-Config-to-allow-mobs-to-pathfind-over-rails.patch
diff --git a/patches/server/0249-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/server/0248-Add-force-and-prompt-parameters-to-resource-pack-api.patch
similarity index 100%
rename from patches/server/0249-Add-force-and-prompt-parameters-to-resource-pack-api.patch
rename to patches/server/0248-Add-force-and-prompt-parameters-to-resource-pack-api.patch
diff --git a/patches/server/0250-Shulker-change-color-with-dye.patch b/patches/server/0249-Shulker-change-color-with-dye.patch
similarity index 100%
rename from patches/server/0250-Shulker-change-color-with-dye.patch
rename to patches/server/0249-Shulker-change-color-with-dye.patch
diff --git a/patches/server/0251-Extended-OfflinePlayer-API.patch b/patches/server/0250-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/server/0251-Extended-OfflinePlayer-API.patch
rename to patches/server/0250-Extended-OfflinePlayer-API.patch
diff --git a/patches/server/0252-Added-the-ability-to-add-combustible-items.patch b/patches/server/0251-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/server/0252-Added-the-ability-to-add-combustible-items.patch
rename to patches/server/0251-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/server/0253-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0252-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
similarity index 100%
rename from patches/server/0253-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
rename to patches/server/0252-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
diff --git a/patches/server/0254-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0253-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
similarity index 100%
rename from patches/server/0254-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
rename to patches/server/0253-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
diff --git a/patches/server/0255-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0254-Shift-right-click-to-use-exp-for-mending.patch
similarity index 100%
rename from patches/server/0255-Shift-right-click-to-use-exp-for-mending.patch
rename to patches/server/0254-Shift-right-click-to-use-exp-for-mending.patch
diff --git a/patches/server/0256-Add-option-to-supress-unrecognized-recipe-errors.patch b/patches/server/0255-Add-option-to-supress-unrecognized-recipe-errors.patch
similarity index 100%
rename from patches/server/0256-Add-option-to-supress-unrecognized-recipe-errors.patch
rename to patches/server/0255-Add-option-to-supress-unrecognized-recipe-errors.patch